Commit Graph

380 Commits (1ad9439162375e00688f7b22e8bbb6338bafcb76)

Author SHA1 Message Date
prabathabey be7e63c390 merging rest-api-improvements branch to master
9 years ago
Chatura Dilan 24b462f4f4 Added is-active field to the Application
9 years ago
prabathabey 624e7df688 Improving HTTP status code handling and the resource implementations
9 years ago
geethkokila 1fabb0eee3 Fixing the database syncing issue
9 years ago
prabathabey b24250f3f2 Returning device info within the device bean itself
9 years ago
prabathabey 5ed982beb4 Adding more improvements to the JAX-RS APIs of CDM-F
9 years ago
prabathabey 726a700528 Improving error handling in checking for monitoring frquency
9 years ago
prabathabey 6e5148a374 Fixing inconsistencies between what's represented via swagger and the real implementation, and bugs found in admin services
9 years ago
prabathabey 8b9cf0da85 Resolving conflicts caused by merging with the updates in master
9 years ago
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
Kamidu Sachith d7c942f395 Enable ownership editing on the policy
9 years ago
geethkokila feab85796f Fixing the EMM-896 which restrict deleting the policy once applied due to a contraint violation
9 years ago
geethkokila 20122b3f1e Fixing the roles and users adding issue
9 years ago
Kasun Delgolla f519b7c029 Merge branch 'master' of github.com:wso2/carbon-device-mgt
9 years ago
prabathabey 90240e7d3f Merging https://github.com/wso2/carbon-device-mgt/pull/40 and resolving conflicts
9 years ago
Kasun Delgolla 8d52735e6a Adding app list + info to monitoring operation
9 years ago
geethkokila c46c4f1be9 Fixing the policy update issues
9 years ago
geethkokila d15eb10636 Adding the null check to monitiring frequncy and fixing the servlet-api issue which is caused a compilation error
9 years ago
geethkokila f49345e722 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
geethkokila 8a8a152d36 Adding the policy task config
9 years ago
Dulitha Wijewantha 5962694ec2 Adding annotation for the description
9 years ago
Dulitha Wijewantha 002a1ec580 Merge branch 'master' of github.com:wso2/carbon-device-mgt
9 years ago
Dulitha Wijewantha 1025e9a425 Fixes to user api
9 years ago
geethkokila d52df2474e Fixing policy descriptions
9 years ago
geethkokila 9fca18ae90 Fixing the monitoring issue
9 years ago
geethkokila 81034c84f5 Fixing the method name issue in policy manager service
9 years ago
Dulitha Wijewantha 45ce4dbe4e Policy Updating
9 years ago
harshanl 234cd47931 Added identity-extensions
9 years ago
mharindu 9813816fab Fixed bug of adding operations
9 years ago
mharindu 9920f2919a Fixed spelling mistakes of policy component
9 years ago
mharindu fbd697edb0 Fixed issue in policy delegation executor
9 years ago
geethkokila 11ead87a5e Fixing the policy listing issue
9 years ago
geethkokila 6ef4bdd73e Fixing enrolment id issues
9 years ago
geethkokila 7dd48bf00e Fixing the monitoring task for INACTIVE, BLOCKED, REMOVED, UNCLAIMED, DISENROLLMENT_REQUESTED, SUSPENDED devices
9 years ago
mharindu 1903b375f3 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
geethkokila dff526b272 Removing the unnessary commets and imports
9 years ago
geethkokila 5ee8c0f065 Fixing the cache manager issues
9 years ago
mharindu cd853c9ee8 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
mharindu ad5335c9f5 Fixed local conflicts and merged
9 years ago
geethkokila 6c5f7d7ada Fixing conflicts and checkcriterion method
9 years ago
prabathabey 2b6bf203e2 Resolving conflicts observed in policy management implementation
9 years ago
geethkokila 044995ed97 Adding the activate method when policies are added.
9 years ago
mharindu fd29deb372 Fixed conflicts of local repo and merged
9 years ago
prabathabey 892b9681f5 Fixing transaction handling issues
9 years ago
geethkokila 458618191d Fixing datasource exaust issue, Fixing the enrolmentinfo getId method, adding policy cache manager. Changing the test cases
9 years ago
geethkokila c6d993e532 Fixing bugs and adding the ability to read from cdm-config.xml file for monitoring task
9 years ago
geethkokila bcb2c1ddb1 Commiting the monitoring changes and test case changes
9 years ago
geethkokila 44b496d350 Partially commiting due to update
9 years ago
mharindu 94326323bc Added class level and method level comments for Policy core
9 years ago
mharindu 7fed00a14d Removed unnecessary logs and added null checks in MonitoringManager
9 years ago
mharindu 5e285071d8 Removed unnecessary white spaces
9 years ago
mharindu a51e7646e3 Fixing issues of previous PRs
9 years ago
Dilshan Edirisuriya 6cff144573 Merge pull request #26 from milanperera/master
9 years ago
mharindu fa82a28c0f Added null check to MonitoringManagerImpl
9 years ago
prabathabey 2311572d49 code cleanup
9 years ago
prabathabey cd31662a96 Fixing transactional anomalies found in PolicyManagerImpl
9 years ago
prabathabey 05c3d080e0 Fixing transactional anomalies found in PolicyManagerImpl
9 years ago
prabathabey cdbdc86f42 Fixing transactional anomalies and code cleanup
9 years ago
Dilshan Edirisuriya 3c444f6102 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
Dilshan Edirisuriya 5b46a4e2f8 Commenting out unreachable state for now
9 years ago
geethkokila cceb3ac5db Fixing errors and adding caching sketch
9 years ago
dilanua 4e5a38998d Updating DAO Layer
9 years ago
geethkokila 90f8f4aab6 Adding test cases and fixing some logic issues and fixing the null pointer from the policy core
9 years ago
geethkokila b8462b02ac Fixing the conflicts
9 years ago
prabathabey 54cd6b80f4 Fixing merge conflicts
9 years ago
prabathabey 955c119006 Adding policy delegation
9 years ago
geethkokila dc205aa081 Fixing the conflicts
9 years ago
geethkokila 6d687364c6 Fixing the monitoring tasks
9 years ago
milanperera f0ec3dbe4c Fixed NPE issues in policy-mgt
9 years ago
milanperera 5b2e0c8989 Merged
9 years ago
geethkokila fde54d2d32 Fixing the monitoring service
9 years ago
milanperera 5a8975d7ac Partial Commit
9 years ago
geethkokila 2769392bc0 Fixing the monitoring task for not to notify the blocked and inactive devices
9 years ago
geethkokila bd75f70a24 Fixing the merge conflicts
9 years ago
geethkokila 6270dff93c Fixing priviledege carbon context issue in device-mgt component
9 years ago
geethkokila 8ab843e76c Merge branch 'master' of https://github.com/milanperera/carbon-device-mgt into milanperera-master
9 years ago
milanperera 35ac8ec6c9 Fixed formating issues in PolicyManagerImpl
9 years ago
milanperera de6572d819 Fixed for JIRA MDM-372
9 years ago
geethkokila aee2402d0d Fixing the get tenant id issue, added the priviledge carbon context at the test running by setting up the carbon-home
9 years ago
milanperera 7313ba1e7e Implemented policy monitoring add operation
9 years ago
harshanl 00b9303283 Fixed the issue with java package name
9 years ago
geethkokila c4739efd0e Fixing the policy monitoring service adding
9 years ago
geethkokila 9ca5815ec3 Fixing the saving issues
9 years ago
geethkokila e0301e4ce3 Adding the 90% completed monitoring task
9 years ago
manoj b0a55a55c8 code clean up
10 years ago
manoj 6daa71771c Unit tests for service layer
10 years ago
geethkokila d048913e06 Adding the momitoring task partialy
10 years ago
geethkokila 388701c3a2 Adding partial commit to add a interface for plugins to implement to notify devices for monotoring
10 years ago
geethkokila 8bc7c5824a Fixing test case failures and device dao errors
10 years ago
geethkokila e0dd398b27 Fixing build failiures
10 years ago
geethkokila 3c73bba40c Commiting ppartialy to get updates
10 years ago
geethkokila 524ce44036 Merge branch 'master' of https://github.com/wso1/carbon-device-mgt
10 years ago
geethkokila 2e89722883 Fixing the monitoring dao
10 years ago
prabathabey 974a616737 DAO refactoring
10 years ago
prabathabey 8d348a358c Committing initial version of supporting device life cycle management
10 years ago
geethkokila e4d156a77e Adding policy monitoring to core, this is only having the monitoring daos and manager class and exceptions
10 years ago
prabathabey 2526d87c21 Introducing a separate bean to carry all enrolment data
10 years ago
prabathabey 60960d80b4 More code cleanups
10 years ago
geethkokila 549e4a784c Fixing issues
10 years ago
prabathabey c13975191e Code cleanup
10 years ago
mharindu 29b58576f8 Fixed an issue in policy based on ownership type
10 years ago