Commit Graph

1231 Commits

Author SHA1 Message Date
Kasun Delgolla
9fa7c16e54 Merge branch 'master' of github.com:wso2/carbon-device-mgt 2015-10-29 10:41:34 +05:30
Prabath Abeysekara
1e542661e1 Merge pull request #39 from dilee/master
Refactored mysql DB Script
2015-10-29 10:24:34 +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
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
Kasun Delgolla
3385bfacd2 Merge branch 'master' of github.com:wso2/carbon-device-mgt 2015-10-21 11:17:10 +05:30
harshanl
340a690995 Added sql script 2015-10-20 10:11:42 +05:30
Kasun Delgolla
8d52735e6a Adding app list + info to monitoring operation 2015-10-20 09:51:43 +05:30
harshanl
1d4bba9807 License issue fixed 2015-10-20 08:12:02 +05:30
harshanl
09fbf9e8a1 Fixed DAO issues 2015-10-19 22:45:39 +05:30
harshanl
04eba0f313 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-10-19 22:45:12 +05:30
geethkokila
c46c4f1be9 Fixing the policy update issues 2015-10-19 20:34:02 +05:30
harshanl
89e930d530 Fixed isssues in pagination 2015-10-18 21:56:13 +05:30
harshanl
25d7459974 Pagination changes 2015-10-18 20:50:39 +05:30
harshanl
ca3653737c Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-10-18 20:22:47 +05:30
harshanl
155606a326 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-10-18 18:54:35 +05:30
geethkokila
703eebb715 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-10-18 18:39:55 +05:30
prabathabey
a0ebec9f3d Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-10-18 18:18:26 +05:30
prabathabey
c74e27102f Fixing issues in adding license configs 2015-10-18 18:16:52 +05:30
inosh-perera
cab888d321 fixing issues in oauth app creation, SAML. Moving service provider configuratiions to config files 2015-10-18 17:26:32 +05:30
harshanl
81b6770c08 Fixed oauth issue with tenants 2015-10-18 01:44:28 +05:30
geethkokila
af71369f66 Merge branch 'Kamidu-master' 2015-10-17 20:18:53 +05:30
geethkokila
182e15d632 Merge branch 'master' of https://github.com/Kamidu/carbon-device-mgt into Kamidu-master 2015-10-17 20:18:25 +05:30
Kamidu Sachith
ddbd2c5372 Java 8 support 2015-10-17 20:03:19 +05:30
harshanl
9b40f73597 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-10-17 17:11:32 +05:30
harshanl
00f60c2add Refactored pom file 2015-10-17 17:11:26 +05:30
geethkokila
d15eb10636 Adding the null check to monitiring frequncy and fixing the servlet-api issue which is caused a compilation error 2015-10-17 17:08:12 +05:30
geethkokila
f49345e722 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-10-16 23:47:19 +05:30
geethkokila
8a8a152d36 Adding the policy task config 2015-10-16 23:47:16 +05:30
harshanl
0646b424ed Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-10-16 23:40:25 +05:30
harshanl
6c196d5317 Added pagination support 2015-10-16 23:40:13 +05:30