Commit Graph

1233 Commits (5d0c706bca83d752c886b2cb52e85a2926ed9247)
 

Author SHA1 Message Date
prabathabey 5d0c706bca Resolving more conflicts
9 years ago
prabathabey 27f293b09f Fixing merge conflicts
9 years ago
prabathabey 90240e7d3f Merging https://github.com/wso2/carbon-device-mgt/pull/40 and resolving conflicts
9 years ago
prabathabey 5ec27d989f Removing unnecessary INSERT statements found in device management schema
9 years ago
Dileesha Rajapakse abe49b57d0 Refactored CDM sql scripts
9 years ago
Dileesha Rajapakse 935455f700 Refactored postgresql.sql DB script
9 years ago
prabathabey fb3e7f4c33 Fixing issues encountered in CDM-F core database schema
9 years ago
Dileesha Rajapakse 1b62efebc5 Renamed SQL Table 'DM_ENROLMENT_OPERATION_MAPPING' to 'DM_ENROLMENT_OP_MAPPING'
9 years ago
Prabath Abeysekara 1e542661e1 Merge pull request #39 from dilee/master
9 years ago
Dileesha Rajapakse 13d9672b74 Fixed merge conflicts
9 years ago
prabathabey aecee71fc6 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
prabathabey 0282cff5b3 Adding missing auto_increment declaration in DEVICE_TYPE table config and script clean up
9 years ago
harshanl 8a1dba166a Updated FeatureMgr spec
9 years ago
Dileesha Rajapakse 86935ac16c Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
prabathabey 79cc441c71 Renaming postgres.sql to postgresql.sql
9 years ago
Dilshan Edirisuriya 5c2b7c9624 Removing commons codec version
9 years ago
Dilshan Edirisuriya bbc1132100 Commenting previous lines
9 years ago
Dilshan Edirisuriya 0b800b8615 Bug fixes
9 years ago
Dileesha Rajapakse ab969c7369 Refactored postgresql DB Script
9 years ago
Dileesha Rajapakse d7dc46d3a7 Refactored DB Scripts
9 years ago
Dileesha Rajapakse ac73155147 Refactored DB Scripts
9 years ago
Dileesha Rajapakse b55c5bc793 Refactored mysql DB Script
9 years ago
Dileesha Rajapakse d061f908a8 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
geethkokila 168a011376 Fixing the issue of identity snapshot change
9 years ago
Dileesha Rajapakse 323357d613 Refactored mysql DB Script
9 years ago
harshanl b3e0f804b0 Added comments.
9 years ago
harshanl 52fab37c61 Fixed issue in permission validator
9 years ago
harshanl e1c9f1c602 Added url param support to permission tree.
9 years ago
harshanl 340a690995 Added sql script
9 years ago
harshanl 1d4bba9807 License issue fixed
9 years ago
harshanl 09fbf9e8a1 Fixed DAO issues
9 years ago
harshanl 04eba0f313 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
geethkokila c46c4f1be9 Fixing the policy update issues
9 years ago
harshanl 89e930d530 Fixed isssues in pagination
9 years ago
harshanl 25d7459974 Pagination changes
9 years ago
harshanl ca3653737c Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
harshanl 155606a326 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
geethkokila 703eebb715 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
prabathabey a0ebec9f3d Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
prabathabey c74e27102f Fixing issues in adding license configs
9 years ago
inosh-perera cab888d321 fixing issues in oauth app creation, SAML. Moving service provider configuratiions to config files
9 years ago
harshanl 81b6770c08 Fixed oauth issue with tenants
9 years ago
geethkokila af71369f66 Merge branch 'Kamidu-master'
9 years ago
geethkokila 182e15d632 Merge branch 'master' of https://github.com/Kamidu/carbon-device-mgt into Kamidu-master
9 years ago
Kamidu Sachith ddbd2c5372 Java 8 support
9 years ago
harshanl 9b40f73597 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
harshanl 00f60c2add Refactored pom file
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