Commit Graph

935 Commits

Author SHA1 Message Date
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
Milan Perera
e56e3d0b85 Merge pull request #228 from charithag/master
Fix UI issues occured after merge with emm ui
2016-04-19 15:11:19 +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
hasuniea
61353730ab Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-04-18 18:02:34 +05:30
charithag
c8b55ea2c9 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-04-18 18:00:27 +05:30
Prabath Abeysekara
8a7d4bb6e0 Merge pull request #227 from ayyoob/das-ext
Few changes on android sense and added android sense agent code
2016-04-18 17:32:21 +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
Ruwan
20c88f1d30 Merge pull request #225 from NuwanSameera/master
Add feature uninstall function to all device types.
2016-04-11 19:05:32 +05:30
NuwanSameera
50f8716527 Resolve conflicts. 2016-04-11 16:09:23 +05:30
NuwanSameera
273305a67c Add feature Uninstall to all device types. 2016-04-11 16:02:53 +05:30
hasuniea
34cf1abf80 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-04-11 09:42:38 +05:30
Ruwan
4953a2b225 Merge pull request #224 from charithag/master
Fix issues in virtual fire alarm jax-rs api
2016-04-08 16:28:48 +05:30
charithag
73d3321154 Fix issues in virtual fire alarm jax-rs api 2016-04-08 16:13:37 +05:30
hasuniea
339deef5c0 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-04-08 11:03:34 +05:30
Ruwan
9549ea2013 Merge pull request #223 from charithag/master
Refactoring admin jax-rs to comply with restructured cdm
2016-04-08 09:30:13 +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
charithag
8b867e5846 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-04-06 14:51:40 +05:30
hasuniea
b41cac80db Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-04-04 14:50:46 +05:30
mharindu
2548a1dd18 Fix for EMM-1297 2016-04-04 14:21:11 +05:30
charithag
6465e6f07a Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-04-04 09:10:24 +05:30
Kasun Delgolla
b6755b2123 Merge pull request #222 from charithag/master
Refactor group management service
2016-04-01 13:54:38 +05:30
charithag
5b0ed5c341 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-04-01 13:43:50 +05:30
charithag
d09aa13497 Refactor group management service 2016-04-01 13:31:07 +05:30
Prabath Abeysekara
26303f0849 Merge pull request #221 from charithag/master
Refactor group management service
2016-04-01 12:57:34 +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
NuwanSameera
94014a802e Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-03-31 16:32:19 +05:30
Prabath Abeysekara
205045a2b4 Merge pull request #220 from ayyoob/merge-latest
Merged IoT plugins
2016-03-31 16:28:55 +05:30
NuwanSameera
9ded0db567 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-03-31 10:22:51 +05:30
ayyoob
95aeb686fd changed mobile artifact names to new format 2016-03-31 05:55:56 +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