Commit Graph

481 Commits

Author SHA1 Message Date
ayyoob
087be385c4 merged with upstream 2016-04-19 23:58:38 +05:30
ayyoob
f5fc978b5b refactored analytics scripts 2016-04-19 23:43:27 +05:30
Ruwan
c609ef1c9b Merge pull request #229 from NuwanSameera/master
Remove monitor operations from controller APIs.
2016-04-19 18:35:40 +05:30
NuwanSameera
4ad62b1dc1 Remove monitor operations from controller api. 2016-04-19 17:16:58 +05:30
Kasun Delgolla
a6a0fc2a57 Adding VPN feature for android 2016-04-19 16:25:19 +05:30
NuwanSameera
1606c365e6 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-04-19 15:13:04 +05:30
charithag
4a2b28cd9f Fix UI issues occured after merge with emm ui 2016-04-19 14:57:16 +05:30
NuwanSameera
f3cbe67cad \Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-04-19 13:38:25 +05:30
Prabath Abeysekara
ec983337a9 Merge pull request #226 from charithag/master
Moved devicemgt_admin jax-rs to carbon-device-mgt
2016-04-19 13:36:46 +05:30
NuwanSameera
f8c4b6413c Resolve conflicts 2016-04-19 11:46:27 +05:30
NuwanSameera
2d4f07fc55 Add REST Api annotations to Api implementations. 2016-04-19 11:33:31 +05:30
charithag
c8b55ea2c9 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-04-18 18:00:27 +05:30
ayyoob
2567c812f2 removed das extension feature 2016-04-18 17:13:51 +05:30
charithag
7fb167b7fa Moved devicemgt_admin jax-rs to carbon-device-mgt 2016-04-18 16:41:04 +05:30
ayyoob
30578a9161 added android sense code after testing 2016-04-18 02:59:43 +05:30
ayyoob
0b67c0f74a added android sense agent code 2016-04-17 12:18:25 +05:30
ayyoob
3e1b0c54e9 made content validator to process batch events 2016-04-16 01:10:58 +05:30
ayyoob
cdb1f62ba9 Made device plugins to connect securely with the MQTT broker 2016-04-15 23:10:48 +05:30
ayyoob
d3a769776b Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins into das-ext 2016-04-14 20:04:41 +05:30
ayyoob
6709360249 adding das receivers and publisher with OAUTH 2016-04-14 19:56:33 +05:30
NuwanSameera
50f8716527 Resolve conflicts. 2016-04-11 16:09:23 +05:30
charithag
73d3321154 Fix issues in virtual fire alarm jax-rs api 2016-04-08 16:13:37 +05:30
charithag
6daa5c43c6 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-04-07 20:47:37 +05:30
charithag
29486fedd5 Refactoring admin jax-rs to comply with restructured cdm 2016-04-07 20:42:56 +05:30
mharindu
918302475b Fixed incorrect location coordinate issue (EMM-1313) 2016-04-07 17:28:27 +05:30
mharindu
2548a1dd18 Fix for EMM-1297 2016-04-04 14:21:11 +05:30
charithag
d09aa13497 Refactor group management service 2016-04-01 13:31:07 +05:30
charithag
ecc63f0f0e Refactor group management service 2016-03-31 17:53:53 +05:30
NuwanSameera
d637325590 Add db scripts to mssql, oracle, postgresql databases. 2016-03-31 17:06:25 +05:30
ayyoob
3488d9d79d refactored device type implemenation 2016-03-31 04:24:45 +05:30
ayyoob
2778e1c1ef Merge branch 'master' of https://github.com/NuwanSameera/carbon-device-mgt-plugins into merge-latest 2016-03-30 22:53:48 +05:30
ayyoob
c05191dac5 Added IoT plugins feature and refactored IoT base. 2016-03-30 22:49:20 +05:30
ayyoob
0bf219c93a Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-03-30 20:25:26 +05:30
ayyoob
71d2897f20 Added jot plugins features 2016-03-30 20:25:02 +05:30
NuwanSameera
1f0f449385 Modify permissions.xml files in device type. 2016-03-30 17:55:33 +05:30
NuwanSameera
8656f84ac6 Move device type plugins to iot-plugins 2016-03-30 16:14:43 +05:30
inosh-perera
45512be823 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-03-30 16:09:04 +05:30
charithag
53eb49d5ae Fix bundle imports for java 8 2016-03-30 10:00:25 +05:30
inosh-perera
657cf05ef5 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-03-30 09:21:50 +05:30
inosh-perera
56a96cf2c3 addning new features for user restrictions 2016-03-30 09:21:42 +05:30
charithag
8c6690a597 Update MDM admin content from product-emm 2016-03-30 02:10:31 +05:30
charithag
6e981fb2c7 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-03-30 01:59:17 +05:30
charithag
f74a8ddf0d Add device type plugins and features related to emm with IoTS base feature. 2016-03-30 01:57:32 +05:30
charithag
4f5b5188ea Updated with core changes 2016-03-29 18:32:12 +05:30
mharindu
b74f26975e Fixed conflicts and merged 2016-03-29 17:29:21 +05:30
charithag
887af1a9f6 Enable IoT base plugin component back and fix isses 2016-03-29 14:22:48 +05:30
charithag
f6d04fba4b Fix module locations 2016-03-29 12:59:10 +05:30
mharindu
cb9ab9fb0a Added unlock feature 2016-03-29 11:10:50 +05:30
prabathabey
39d2ce12dc merging resturctured iot and mobile plugins 2016-03-27 03:02:20 +05:30
gayank
c0a25f08bd Fixing EMM-1289 2016-03-24 15:31:21 +05:30