Commit Graph

1390 Commits (7b544f354513a597074f23b4589081300bf79ee1)
 

Author SHA1 Message Date
Dilshan Edirisuriya d2182e7375 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
Dilshan Edirisuriya d5199dbd62 Fixing issues
9 years ago
mharindu ad5335c9f5 Fixed local conflicts and merged
9 years ago
mharindu 6385c13012 Fixed issues in DeviceDAO
9 years ago
geethkokila 6c5f7d7ada Fixing conflicts and checkcriterion method
9 years ago
prabathabey 26cf4e82da Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
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 a7e3462e91 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
Dilshan Edirisuriya 39d1af7242 Saving in keystore
9 years ago
mharindu fd29deb372 Fixed conflicts of local repo and merged
9 years ago
prabathabey 892b9681f5 Fixing transaction handling issues
9 years ago
Dilshan Edirisuriya b391681438 Merge branches 'master' and 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
Dilshan Edirisuriya 3d736d628e adding conf file to touchpoint
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 c673395ce6 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
harshanl 23c931f5f1 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
Dilshan Edirisuriya 5a146ed907 POM changes
9 years ago
harshanl 20873e7786 Added null checks
9 years ago
Dilshan Edirisuriya c547d85f35 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
geethkokila c6d993e532 Fixing bugs and adding the ability to read from cdm-config.xml file for monitoring task
9 years ago
Your Name b906d43cc8 Committing tenant configuration manager service
9 years ago
geethkokila bcb2c1ddb1 Commiting the monitoring changes and test case changes
9 years ago
Dilshan Edirisuriya 439e0dde6d pom changes to adopt certificate component integrations
9 years ago
Dilshan Edirisuriya 60a0a60243 adding certificate management features
9 years ago
Dilshan Edirisuriya 99d3745a9b Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
Dilshan Edirisuriya fd84190342 Adding certificate management components
9 years ago
geethkokila cada581396 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
geethkokila 44b496d350 Partially commiting due to update
9 years ago
geethkokila 12a2e1f11f Partially commiting to fix update problem
9 years ago
hasuniea 7a54838996 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
harshanl ae03025546 Fixed syntax issues in sql scripts
9 years ago
mharindu 69cf3f8939 Cleaned code and added comments
9 years ago
mharindu abc16557dc Removed unnecessary new lines in DeviceDAOImpl
9 years ago
mharindu 460fda1bb9 Removed unnecessary new lines in DeviceDAOImpl
9 years ago
mharindu 94326323bc Added class level and method level comments for Policy core
9 years ago
harshanl aeed8b92a1 Enabled adding custom permissions to permission-tree through webapps
9 years ago
mharindu 7fed00a14d Removed unnecessary logs and added null checks in MonitoringManager
9 years ago
mharindu 8c748b3dfd Removed unnecessary comments
9 years ago
mharindu 97c19c23b0 Added method level comments and null checks in DCA
9 years ago
mharindu 5e285071d8 Removed unnecessary white spaces
9 years ago
hasuniea 9f6dd55223 fixed issue in modify enrollment
9 years ago
mharindu a51e7646e3 Fixing issues of previous PRs
9 years ago
harshanl 1850a76462 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
prabathabey 3582973f84 Code cleanup
9 years ago
prabathabey d4c5d9023e Adding necessary instructions for transaction handling
9 years ago
prabathabey de2c378214 Code cleanup
9 years ago
prabathabey f66d1dd07b Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
harshanl 423c8e2727 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
prabathabey ce0cc1699f Fixing more transaction handling related issues
9 years ago