Commit Graph

487 Commits (7a54838996794b12c3fd245e116092665bf9a462)

Author SHA1 Message Date
hasuniea 7a54838996 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
harshanl aeed8b92a1 Enabled adding custom permissions to permission-tree through webapps
9 years ago
hasuniea 9f6dd55223 fixed issue in modify enrollment
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
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
prabathabey cdbdc86f42 Fixing transactional anomalies and code cleanup
9 years ago
harshanl 076d60ec83 PermissionManager changes
9 years ago
prabathabey 00807e8295 Fixing transaction anomalies and code clean up
9 years ago
dilanua 4e5a38998d Updating DAO Layer
10 years ago
dilanua df81bef812 Fixing issue in SQL Result retrieval on getOperationsByDeviceAndStatus
10 years ago
geethkokila 3fa65ae98c Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
10 years ago
milanperera e30956b619 Fixed an issue in SQL query of getPendingOperations(CommandOp)
10 years ago
prabathabey 53302070e6 Code cleanup, adding file system based license manager, fixing some design issue in CommandOperationDAOImpl
10 years ago
geethkokila b8462b02ac Fixing the conflicts
10 years ago
prabathabey c134cc7e25 Fixing license manager initialization related issues and code cleanup
10 years ago
prabathabey ca38cc9f51 Removing URL printer start-up handler from device.mgt.core
10 years ago
prabathabey c471017c40 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
10 years ago
prabathabey 134b4ae53c Code cleanup
10 years ago
Dilshan Edirisuriya e7f02365a8 Importing axis2.transport.mail
10 years ago
prabathabey 54cd6b80f4 Fixing merge conflicts
10 years ago
prabathabey 955c119006 Adding policy delegation
10 years ago
geethkokila dc205aa081 Fixing the conflicts
10 years ago
geethkokila 6d687364c6 Fixing the monitoring tasks
10 years ago
milanperera 256880089e Merged
10 years ago
prabathabey 1a6526fc77 Removing API publisher lifecycle listener implementation out of device.mgt.core and making it a separate module
10 years ago
milanperera 5b2e0c8989 Merged
10 years ago
prabathabey a68ca0cfd6 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
10 years ago
prabathabey 8394b63e0c Making license manager a util exposed as part of org.wso2.carbon.device.mgt.extensions
10 years ago
milanperera 7ec10d670c Fixed bugs in device disenrolment
10 years ago
milanperera 5a8975d7ac Partial Commit
10 years ago
milanperera 35ce4be1a1 Partial Commit
10 years ago
Prabath Abeysekara 3512e3e60a Merge pull request #20 from milanperera/master
10 years ago
milanperera 6f56e27f1d Refactored SQL queries
10 years ago
prabathabey 6c857fdc4d Removing user-api-publisher-config.xml and making JAX-RS services get auto-published as APIs depending on parameters configured in web.xml of each corresponding web applications
10 years ago
geethkokila bd75f70a24 Fixing the merge conflicts
10 years ago
geethkokila 6270dff93c Fixing priviledege carbon context issue in device-mgt component
10 years ago
prabathabey d9459b09ba Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
10 years ago
prabathabey fac53e4814 Upgrading tomcat version usd in carbon-devicemgt
10 years ago
prabathabey 9e5e3cf73d Enforcing proxy port to be used when configured
10 years ago
prabathabey e4fd0607e8 Removing some hack used to workaround issues that popped up while writing unit tests upon tenant-enabled code
10 years ago
prabathabey 15d56e29c3 temporarily commenting out test cases till tenancy-test bits are properly added
10 years ago
geethkokila 9dc5a1e2e5 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
10 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
10 years ago
harshanl 50640c9dfd Added tenant configuration persistance
10 years ago
prabathabey 7d089d8b09 Removing IDE warnings
10 years ago
prabathabey a461e887d1 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
10 years ago