Commit Graph

2480 Commits

Author SHA1 Message Date
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
Chatura Dilan
ca2d837ecc Merge branch 'IoTS-1.0.0' of github.com:wso2/carbon-device-mgt-plugins into IoTS-1.0.0 2016-11-08 18:05:02 +05:30
Chatura Dilan
9e78b87365 Fixed issue in device operation bar 2016-11-08 18:04:42 +05:30
Chatura Dilan
d6701ee04c Fixed issue in device view UI 2016-11-08 18:02:47 +05:30
Ayyoob Hamza
86ea0cae89 Merge pull request #402 from ruwany/st2
Adding windows/android datasources
2016-11-08 17:29:49 +05:30
Chatura Dilan
1f4cda26e9 Merge pull request #403 from GPrathap/IoTS-1.0.0
adding mb mqtt authorization extension
2016-11-08 16:05:30 +05:30
GPrathap
136f2f34b1 changing MQTT message broker port to 1886 2016-11-08 15:59:04 +05:30
GPrathap
c96f2a8162 adding mb mqtt authorization extension 2016-11-08 15:53:09 +05:30
Chatura Dilan
49dd83ed33 Adding CDMF operation bar to Android 2016-11-08 15:16:10 +05:30
Ace
43198565a2 Adding windows/android datasources 2016-11-08 15:11:04 +05:30
Chatura Dilan
b207e5d624 Added missing units 2016-11-08 15:08:57 +05:30
Ayyoob Hamza
c24a602c54 Merge pull request #401 from ruwany/st2
Updating device-type configs
2016-11-08 12:46:37 +05:30
Ace
9965fc13c8 Updating device-type configs 2016-11-08 12:44:53 +05:30
Ruwan
2802205d7e Merge pull request #400 from ayyoob/IoTS-1.0.0
few changes in sample device types to load cdmc specific units
2016-11-07 06:04:20 +05:30
ayyoob
ecdbf6d272 few changes in sample device types to load cdmc specific units 2016-11-07 00:51:47 +05:30
Ayyoob Hamza
75c34eabfa Merge pull request #399 from ruwany/st2
Restructuring iot and mobile plugins
2016-11-04 20:20:04 +05:30
Ace
7d14e23d00 merging with upstream 2016-11-04 20:09:13 +05:30
Ace
daf37338c6 merging changes with upstream
partial
2016-11-04 19:41:33 +05:30