Commit Graph

3689 Commits (1ce74f47c9c1ba6f734ba0835bb0529e102f1339)
 

Author SHA1 Message Date
Ruwan b2e95e8f94 Merge pull request #230 from ayyoob/das-ext
9 years ago
ayyoob d2f59f50bb few changes to resolve start up issues
9 years ago
ayyoob 087be385c4 merged with upstream
9 years ago
ayyoob f5fc978b5b refactored analytics scripts
9 years ago
Ruwan c609ef1c9b Merge pull request #229 from NuwanSameera/master
9 years ago
NuwanSameera 4ad62b1dc1 Remove monitor operations from controller api.
9 years ago
Kasun Delgolla a6a0fc2a57 Adding VPN feature for android
9 years ago
NuwanSameera 1606c365e6 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins
9 years ago
Milan Perera e56e3d0b85 Merge pull request #228 from charithag/master
9 years ago
charithag 4a2b28cd9f Fix UI issues occured after merge with emm ui
9 years ago
NuwanSameera f3cbe67cad \Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins
9 years ago
Prabath Abeysekara ec983337a9 Merge pull request #226 from charithag/master
9 years ago
NuwanSameera f8c4b6413c Resolve conflicts
9 years ago
NuwanSameera 2d4f07fc55 Add REST Api annotations to Api implementations.
9 years ago
hasuniea 61353730ab Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins
9 years ago
charithag c8b55ea2c9 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins
9 years ago
Prabath Abeysekara 8a7d4bb6e0 Merge pull request #227 from ayyoob/das-ext
9 years ago
ayyoob 2567c812f2 removed das extension feature
9 years ago
charithag 7fb167b7fa Moved devicemgt_admin jax-rs to carbon-device-mgt
9 years ago
ayyoob 30578a9161 added android sense code after testing
9 years ago
ayyoob 0b67c0f74a added android sense agent code
9 years ago
ayyoob 3e1b0c54e9 made content validator to process batch events
9 years ago
ayyoob cdb1f62ba9 Made device plugins to connect securely with the MQTT broker
9 years ago
ayyoob d3a769776b Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins into das-ext
9 years ago
ayyoob 6709360249 adding das receivers and publisher with OAUTH
9 years ago
Ruwan 20c88f1d30 Merge pull request #225 from NuwanSameera/master
9 years ago
NuwanSameera 50f8716527 Resolve conflicts.
9 years ago
NuwanSameera 273305a67c Add feature Uninstall to all device types.
9 years ago
hasuniea 34cf1abf80 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins
9 years ago
Ruwan 4953a2b225 Merge pull request #224 from charithag/master
9 years ago
charithag 73d3321154 Fix issues in virtual fire alarm jax-rs api
9 years ago
hasuniea 339deef5c0 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins
9 years ago
Ruwan 9549ea2013 Merge pull request #223 from charithag/master
9 years ago
charithag 6daa5c43c6 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins
9 years ago
charithag 29486fedd5 Refactoring admin jax-rs to comply with restructured cdm
9 years ago
mharindu 918302475b Fixed incorrect location coordinate issue (EMM-1313)
9 years ago
charithag 8b867e5846 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins
9 years ago
hasuniea b41cac80db Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins
9 years ago
mharindu 2548a1dd18 Fix for EMM-1297
9 years ago
charithag 6465e6f07a Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins
9 years ago
Kasun Delgolla b6755b2123 Merge pull request #222 from charithag/master
9 years ago
charithag 5b0ed5c341 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins
9 years ago
charithag d09aa13497 Refactor group management service
9 years ago
Prabath Abeysekara 26303f0849 Merge pull request #221 from charithag/master
9 years ago
charithag ecc63f0f0e Refactor group management service
9 years ago
NuwanSameera d637325590 Add db scripts to mssql, oracle, postgresql databases.
9 years ago
NuwanSameera 94014a802e Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins
9 years ago
Prabath Abeysekara 205045a2b4 Merge pull request #220 from ayyoob/merge-latest
9 years ago
NuwanSameera 9ded0db567 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins
9 years ago
ayyoob 95aeb686fd changed mobile artifact names to new format
9 years ago