Commit Graph

271 Commits (9640653b09de7b874d5e68968822aa3313b20b19)

Author SHA1 Message Date
inosh 1341884957 resolving conflicts
9 years ago
inosh 60b42715d6 syncing admin api from product emm
9 years ago
mharindu 3e291c5b13 [maven-release-plugin] prepare for next development iteration
9 years ago
mharindu 9549ac446b [maven-release-plugin] prepare release v1.1.0
9 years ago
prabathabey a375252a94 Adding pluggable push notification framework
9 years ago
Madhawa Perera 94aacb1625 Adding swagger annotations to beans
9 years ago
Madhawa Perera 5d1bf67630 Adding swagger annotations to beans
9 years ago
Madhawa Perera 087adafeb7 Adding swagger annotations to beans
9 years ago
geethkokila 3396a5066d Adding changes for the updated time of device info and device location
9 years ago
geethkokila 4029c86da4 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
geethkokila 2fb42518b6 Adding the changes for the device group with policy.
9 years ago
prabathabey 9068a3d893 Fixing compilation failures caused due to API changes
9 years ago
geethkokila 4cf37bb16c Fixing the compilation error on the proprietory plugins.
9 years ago
dilanua ce8d4b53a2 Adding temporary development code bits of dashboard analytics feature
9 years ago
ayyoob c45895685b Added device type multi tenancy capability.
9 years ago
geethkokila e9da24c9e8 Changing the snapshot versions from 1.0.4 to 1.1.0
9 years ago
geethkokila 41191d6df0 Adding the search feature to device mgt plugin
9 years ago
geethkokila e0e0a57c11 [maven-release-plugin] prepare for next development iteration
9 years ago
geethkokila cebb88e712 [maven-release-plugin] prepare release v1.0.3
9 years ago
geethkokila e66d291947 [maven-release-plugin] prepare for next development iteration
9 years ago
geethkokila f416a73e75 [maven-release-plugin] prepare release v1.0.2
9 years ago
geethkokila d0a2c5521c Commenting this due to policy compliance warn will block the device
9 years ago
geethkokila 185a59fbd4 [maven-release-plugin] prepare for next development iteration
9 years ago
geethkokila b3580d754b [maven-release-plugin] prepare release v1.0.1
9 years ago
harshanl 402b843e5d Updated task schedule service to fix EMM-1145, EMM-1100
9 years ago
prabathabey 7a27e88551 Changing the log levels configured in log4j.properties files used as part of test configurations
9 years ago
geethkokila 4e9255fbc9 [maven-release-plugin] prepare for next development iteration
9 years ago
geethkokila ceb60adb34 [maven-release-plugin] prepare release v1.0.0
9 years ago
pasinduj ddefa19e0f Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
Kasun Delgolla d5f87f4dc1 Committing policy compliance monitoring issue
9 years ago
pasinduj 9a50455a29 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
harshanl 00cf61c44c Fixed EMM-1069 and refactore DCR services
9 years ago
pasinduj f49f13501f modified dbscripts removing policy ID forigen key from one table
9 years ago
pasinduj a390df68ec modified dbscripts to remove foriegn key reference
9 years ago
harshanl 5b9c44655d Merge branch 'master' of https://github.com/pasindujw/carbon-device-mgt into pasindujw-master
9 years ago
harshanl 30e8dc885c Fixed EMM-1034
9 years ago
pasinduj 9c7ebdafdb modified PolicyDAOImpl to fix PolicyRemove error occured by a database Foriegn Key Reference
9 years ago
harshanl b4d17b888b fixed secondary user-store related issues & multi-tenancy issues
9 years ago
geethkokila c1eea6894d Fixing the feature remove from the policy
9 years ago
geethkokila 271c4f76cb Fixnig the null pointer isssue
9 years ago
geethkokila 700b308b45 Fixing the null pointer and removnig innactive devices being monitored
9 years ago
geethkokila 1989abf881 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
geethkokila fed4f72d4b Fixing the null pointer
9 years ago
harshanl 1252d4c160 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
geethkokila 0f146e83fa Fixing the issue which cause policy not bieng applied to device which were enrolled before the adding the policy to the system
9 years ago
geethkokila 813f9072d8 Fixing the database issue which causes the deviceids slelect did not work
9 years ago
Dileesha Rajapakse 6446be100d Refactored Policy Management DAO classes
9 years ago
Geeth 5fd9e87dc8 Merge pull request #44 from Kamidu/master
9 years ago
Kamidu Sachith 8953a61cc4 Enable Owneship type editing in policy
9 years ago
harshanl 026a7c187a Fixed EMM-945, EMM-910, EMM-911, EMM-870
9 years ago