Commit Graph

1563 Commits

Author SHA1 Message Date
geethkokila
4ed5599ba8 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-10-30 17:48:35 +05:30
geethkokila
20122b3f1e Fixing the roles and users adding issue 2015-10-30 17:48:30 +05:30
Dileesha Rajapakse
d6a30daac1 Resolved merge conflicts 2015-10-30 12:29:57 +05:30
mharindu
d2b8224f31 Changed the VARCHAR size of application identifier 2015-10-30 11:28:57 +05:30
Kasun Delgolla
c00b1ee713 Committing fix for JIRA- EMM-860 2015-10-29 20:46:48 +05:30
Kasun Delgolla
6f2d1ad065 Merge branch 'master' of github.com:wso2/carbon-device-mgt 2015-10-29 20:45:29 +05:30
harshanl
7cdd262b91 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-10-29 17:53:18 +05:30
harshanl
7c0996270f Fixed EMM-887 2015-10-29 17:53:09 +05:30
Kasun Delgolla
f519b7c029 Merge branch 'master' of github.com:wso2/carbon-device-mgt 2015-10-29 15:46:41 +05:30
prabathabey
5d0c706bca Resolving more conflicts 2015-10-29 14:20:55 +05:30
prabathabey
27f293b09f Fixing merge conflicts 2015-10-29 14:19:47 +05:30
prabathabey
90240e7d3f Merging https://github.com/wso2/carbon-device-mgt/pull/40 and resolving conflicts 2015-10-29 14:11:24 +05:30
prabathabey
5ec27d989f Removing unnecessary INSERT statements found in device management schema 2015-10-29 14:02:21 +05:30
Dileesha Rajapakse
aeb4455e2d Fixed merge conflicts 2015-10-29 12:43:59 +05:30
Dileesha Rajapakse
abe49b57d0 Refactored CDM sql scripts 2015-10-29 12:33:38 +05:30
Dileesha Rajapakse
935455f700 Refactored postgresql.sql DB script 2015-10-29 11:46:49 +05:30
prabathabey
fb3e7f4c33 Fixing issues encountered in CDM-F core database schema 2015-10-29 10:49:19 +05:30
Kasun Delgolla
9fa7c16e54 Merge branch 'master' of github.com:wso2/carbon-device-mgt 2015-10-29 10:41:34 +05:30
Dileesha Rajapakse
1b62efebc5 Renamed SQL Table 'DM_ENROLMENT_OPERATION_MAPPING' to 'DM_ENROLMENT_OP_MAPPING' 2015-10-29 10:36:55 +05:30
Prabath Abeysekara
1e542661e1 Merge pull request #39 from dilee/master
Refactored mysql DB Script
2015-10-29 10:24:34 +05:30
hasuniea
6ae4bfe4e0 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-10-29 10:04:41 +05:30
hasuniea
3de4718ab5 refactored certificate generator 2015-10-29 10:04:13 +05:30
Dileesha Rajapakse
13d9672b74 Fixed merge conflicts 2015-10-29 09:45:26 +05:30
prabathabey
aecee71fc6 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-10-28 22:39:59 +05:30
prabathabey
0282cff5b3 Adding missing auto_increment declaration in DEVICE_TYPE table config and script clean up 2015-10-28 22:39:47 +05:30
harshanl
8a1dba166a Updated FeatureMgr spec 2015-10-28 22:09:01 +05:30
Dileesha Rajapakse
86935ac16c Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-10-28 20:59:56 +05:30
prabathabey
79cc441c71 Renaming postgres.sql to postgresql.sql 2015-10-28 20:42:43 +05:30
Dilshan Edirisuriya
5c2b7c9624 Removing commons codec version 2015-10-28 20:06:10 +05:30
Dilshan Edirisuriya
bbc1132100 Commenting previous lines 2015-10-28 19:24:05 +05:30
Kasun Delgolla
efa90b244f Merge branch 'master' of github.com:wso2/carbon-device-mgt 2015-10-28 19:05:31 +05:30
Dilshan Edirisuriya
0b800b8615 Bug fixes 2015-10-28 18:49:47 +05:30
Dileesha Rajapakse
ab969c7369 Refactored postgresql DB Script 2015-10-28 18:31:02 +05:30
Dileesha Rajapakse
d7dc46d3a7 Refactored DB Scripts 2015-10-28 15:44:49 +05:30
Dileesha Rajapakse
ac73155147 Refactored DB Scripts 2015-10-28 14:27:00 +05:30
Kasun Delgolla
acdfc475be Merge branch 'master' of github.com:wso2/carbon-device-mgt 2015-10-28 10:17:23 +05:30
Dileesha Rajapakse
b55c5bc793 Refactored mysql DB Script 2015-10-26 17:52:19 +05:30
hasuniea
8f595818dd Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-10-23 14:51:10 +05:30
hasuniea
e1a24abfa3 refactored certificate service 2015-10-23 14:46:56 +05:30
Kamidu Sachith
3fc80f75cf Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-10-23 09:10:37 +05:30
Dileesha Rajapakse
d061f908a8 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-10-22 17:26:06 +05:30
geethkokila
168a011376 Fixing the issue of identity snapshot change 2015-10-22 16:27:40 +05:30
Dileesha Rajapakse
323357d613 Refactored mysql DB Script 2015-10-22 15:24:35 +05:30
Kasun Delgolla
f830a14a8b Merge branch 'master' of github.com:wso2/carbon-device-mgt 2015-10-22 11:09:44 +05:30
harshanl
b3e0f804b0 Added comments. 2015-10-21 17:19:49 +05:30
harshanl
52fab37c61 Fixed issue in permission validator 2015-10-21 15:43:26 +05:30
harshanl
e1c9f1c602 Added url param support to permission tree. 2015-10-21 12:55:44 +05:30
Kamidu Sachith
aba6f7cbaa Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-10-21 12:40:53 +05:30
Kasun Delgolla
3385bfacd2 Merge branch 'master' of github.com:wso2/carbon-device-mgt 2015-10-21 11:17:10 +05:30
hasuniea
efd029083b Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-10-21 10:55:01 +05:30