Commit Graph

2144 Commits

Author SHA1 Message Date
Dilan U. Ariyaratne
3f476eac9f Merge pull request #414 from GPrathap/IoTS-1.0.0
removed @API and @Permission annotations
2016-11-20 19:32:32 +05:30
GPrathap
3d971d2bb7 removed @API and @Permission annotations and added @SwaggerDefinition and @Authorization annotations 2016-11-20 19:04:11 +05:30
dilanua
861c5f861e Updating device statistics menu item url 2016-11-20 12:09:59 +05:30
dilanua
dbeedf246b Adding deviceStatisticsEnabled property to check visibility of device-statistics menu item 2016-11-20 10:55:56 +05:30
ayyoob
bfb9c62968 changed device access verification approach 2016-11-20 02:37:42 +05:30
dilanua
edd400bde4 Changing menu item names 2016-11-18 19:54:59 +05:30
Ruwan
93ed31c584 Merge pull request #413 from ayyoob/IoTS-1.0.0
changes in operation bar and deployer files
2016-11-18 16:52:08 +05:30
ayyoob
68f1fb34fe changes in operation bar and deployer.xml 2016-11-17 23:33:26 +05:30
sinthuja
f3fc531a53 Adding the new version of android analytics carbon apps. 2016-11-17 22:51:54 +05:30
sinthuja
722593a51f Making autoVersionSubmodules enabled to avoid the necessity of giving the versions seperately for sub modules. 2016-11-17 10:43:40 +05:30
Charitha Goonetilleke
af33eb4afe Merge pull request #412 from wso2/release-3.0.0
Release 3.0.1
2016-11-16 19:48:01 +05:30
WSO2 Builder
61ca4c4900 [maven-release-plugin] prepare for next development iteration 2016-11-16 13:57:06 +00:00
WSO2 Builder
4746bf0c74 [maven-release-plugin] prepare release v3.0.0 2016-11-16 13:55:17 +00:00
charitha
3190ae0986 Update analytics version 2016-11-16 18:55:15 +05:30
charitha
7f8047b54b Update cdmf component versions to released version 2016-11-16 18:50:26 +05:30
Ace
ae33d236fa Adding android device-view changes 2016-11-16 15:43:23 +05:30
Ace
7e3df67548 Adding android-base-plugin 2016-11-16 15:07:44 +05:30
charitha
1170263139 Update component versions for IoTS-1.0.0 release 2016-11-16 13:32:45 +05:30
Dilan U. Ariyaratne
9c69e914e0 Merge pull request #409 from Megala21/master
Adding additional configurations to SSO
2016-11-16 11:04:25 +05:30
inoshperera
e25e9fd4a1 adding support for webclip uninstallation for ios 2016-11-16 09:33:43 +05:30
Megala
3ff394902e Removing unnecessary require statements 2016-11-15 23:04:51 +05:30
Megala
6d3fbc422f Adding link for the dashboard in tenant mode 2016-11-15 22:59:12 +05:30
Harshan Liyanage
39648022a1 Test commit 2016-11-15 15:46:46 +05:30
Megala
57e46525f8 Changing the dashboard menu to be only visible for super-tenant users 2016-11-15 10:25:33 +05:30
Megala
dec2950f6e Adding additional configurations for app-conf 2016-11-13 19:21:15 +05:30
Megala
18e597203b Merge remote-tracking branch 'upstream/master' 2016-11-11 15:00:39 +05:30
Madawa Soysa
c8a8bcc341 Merge pull request #408 from Malintha/master
Fixing javax.xml.parsers.import.pkg.version issue
2016-11-11 14:07:13 +05:30
Malintha Fernando
5722a9fbe6 Fixing javax.xml.parsers.import.pkg.version issue 2016-11-11 14:04:23 +05:30
Megala
fecf343a89 Merge remote-tracking branch 'upstream/master' 2016-11-11 11:15:40 +05:30
Ace
ea14e32337 Adding android-web-agent 2016-11-11 10:05:12 +05:30
Ruwan
5d10ac530d Merge pull request #407 from Malintha/master
importing javax.xml package for javax.xml.XMLConstants
2016-11-11 07:17:05 +05:30
Malintha Fernando
09f004bfd8 importing javax.xml package for javax.xml.XMLConstants 2016-11-11 06:38:36 +05:30
sinthuja
0ef0d871fb fixing the issues when reading the mqtt receiver configurations. 2016-11-10 21:23:14 +05:30
Kamidu Sachith Punchihewa
218e7aa58f Merge pull request #406 from Malintha/master
Adding secured documentBuilder factory
2016-11-10 15:08:25 +05:30
Malintha Fernando
13cb358153 Adding secured documentBuilder factory 2016-11-10 15:04:03 +05:30
Ace
3d32ad984c Adding fixes to android qr-gen code 2016-11-10 12:08:05 +05:30
Megala
7c76638ba0 Merge remote-tracking branch 'upstream/master' 2016-11-10 12:04:59 +05:30
kamidu
f5c3a55aa8 add dashboard link to emm webapp 2016-11-10 11:06:35 +05:30
Megala
dd031d5c86 Merge remote-tracking branch 'upstream/master' 2016-11-10 09:07:01 +05:30
inoshperera
5ba338795e Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-11-09 16:44:55 +05:30
inoshperera
b699cb8e4c adding a new table to keep track of the profies pushed to an ios device 2016-11-09 16:44:43 +05:30
sinthuja
6bb0387dac Merge remote-tracking branch 'origin/IoTS-1.0.0' into IoTS-1.0.0 2016-11-09 16:07:42 +05:30
sinthuja
3001a31a33 updating the secure-ui publisher name. 2016-11-09 16:07:29 +05:30
Kamidu Sachith Punchihewa
3a40049269 Merge pull request #405 from madawas/cache-filter
Adding cache prevention filter to emm-web-agent app
2016-11-09 15:23:53 +05:30
Madawa Soysa
40907a954a Adding cache prevention filter to emm-web-agent app 2016-11-09 15:06:02 +05:30
Chatura Dilan
557706e99c Added android features to the descriptor 2016-11-09 14:13:51 +05:30
Ace
cea96cc841 Merging with master 2016-11-09 12:54:33 +05:30
Chatura Dilan
47ba440fbb fixed extends 2016-11-09 12:36:37 +05:30
ayyoob
dedcf3b858 added correct db 2016-11-08 23:40:43 +05:30
Chatura Dilan
3b721cfc6c Fixed android descriptor 2016-11-08 18:22:44 +05:30