Commit Graph

2209 Commits

Author SHA1 Message Date
pasinduj
08387e178d Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-12-21 09:37:21 +05:30
prabathabey
b5b4e50b25 Revert "Improving performance of webapp authenticator valve implementation"
This reverts commit 36462e2e4e.
2015-12-19 13:28:24 +05:30
prabathabey
337afa5da2 Revert "Further optimizing webapp authenticator valve implementation"
This reverts commit 262e53ddcc.
2015-12-19 13:27:45 +05:30
prabathabey
262e53ddcc Further optimizing webapp authenticator valve implementation 2015-12-19 13:09:31 +05:30
prabathabey
28a2e918e7 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-12-19 12:07:19 +05:30
prabathabey
36462e2e4e Improving performance of webapp authenticator valve implementation 2015-12-19 12:07:08 +05:30
hasuniea
a351144f54 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-12-18 23:28:43 +05:30
Kasun Delgolla
0b9020c504 Merge pull request #100 from dilee/master
Fixed issues in EnrollmentDAOImpl
2015-12-18 23:28:43 +05:30
Dileesha Rajapakse
b25438097e Fixed issues in EnrollmentDAOImpl 2015-12-18 23:26:01 +05:30
Harshan Liyanage
2c7f38c4cc Merge pull request #96 from dilee/master
Fixed EMM-1116
2015-12-18 22:40:35 +05:30
Harshan Liyanage
c600b2a3c9 Merge pull request #99 from Kamidu/master
Removing unwanted debug comments
2015-12-18 22:40:13 +05:30
harshanl
6441c201e5 Added search support for pagination 2015-12-18 22:17:07 +05:30
Kamidu Sachith
230dbd1331 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-12-18 20:38:30 +05:30
Kamidu Sachith
057a55a3ab Removing unwanted debug comments 2015-12-18 20:38:14 +05:30
Kasun Delgolla
773d78df3f Merge pull request #98 from Kamidu/master
Code clean up and formatting
2015-12-18 18:12:07 +05:30
prabathabey
8585abff8d Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-12-18 18:00:55 +05:30
prabathabey
05020c960d Upgrading Carbon kernel and identity versions 2015-12-18 17:59:42 +05:30
Kamidu Sachith
30768bba71 Code clean up and formatting 2015-12-18 17:54:50 +05:30
Kasun Delgolla
8c18935a33 Merge pull request #97 from Kamidu/master
Fix for the disable failier of the backend oauth authenticator
2015-12-18 17:30:05 +05:30
Dileesha Rajapakse
9e5891a728 Fixed EMM-1116 2015-12-18 15:34:50 +05:30
Kamidu Sachith
3fbc3ea40f Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-12-18 15:26:45 +05:30
Kamidu Sachith
7b544f3545 Fix the disable failier of the authenticator 2015-12-18 15:26:26 +05:30
hasuniea
f176f73067 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-12-18 12:46:54 +05:30
Prabath Abeysekara
8204ceec05 Merge pull request #92 from dilee/master
Fixed EMM-1103
2015-12-18 11:27:09 +05:30
hasuniea
8d6ab7160f Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-12-17 17:05:31 +05:30
Dileesha Rajapakse
eb680da572 Fixed EMM-1103 2015-12-17 14:57:28 +05:30
harshanl
91ece82eca Updated operation DAO to sort data in DESC order of timestamp. 2015-12-17 12:52:42 +05:30
pasinduj
3899e8779f Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-12-17 11:50:21 +05:30
hasuniea
a251b5d84e Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-12-17 10:37:11 +05:30
harshanl
d4b6ba5e36 Added pagination support for operation management apis. 2015-12-17 10:32:06 +05:30
pasinduj
ddefa19e0f Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-12-17 09:41:19 +05:30
Kasun Delgolla
d5f87f4dc1 Committing policy compliance monitoring issue 2015-12-16 14:38:32 +05:30
hasuniea
eaca364b0e Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-12-14 10:12:45 +05:30
pasinduj
9a50455a29 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-12-14 08:57:36 +05:30
harshanl
00cf61c44c Fixed EMM-1069 and refactore DCR services 2015-12-11 20:04:22 +05:30
pasinduj
7be1de1b85 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-12-11 11:30:41 +05:30
harshanl
08ebd7f881 Added DCR proxy endpoint & refactored code. 2015-12-11 11:10:53 +05:30
geethkokila
93a295f8a7 Fixing the dynamic imports 2015-12-10 18:25:45 +05:30
harshanl
8a698b1b81 Removed staging repo 2015-12-10 17:32:23 +05:30
pasinduj
5ac2447080 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-12-10 17:00:35 +05:30
pasinduj
bb010bde28 modified oracle db script to remove a foriegn key 2015-12-10 16:59:03 +05:30
harshanl
20a03c42fc Merged with master 2015-12-10 16:52:35 +05:30
harshanl
89e6f0786d Refactored dynamic-client module to use remote services. 2015-12-10 16:50:33 +05:30
Harshan Liyanage
e4390f77e3 Merge pull request #61 from dilee/master
Fixed syntax errors in sequence creation
2015-12-10 15:32:48 +05:30
Dileesha Rajapakse
96366de4dd Fixed syntax errors in sequence creation 2015-12-10 15:30:17 +05:30
pasinduj
e986518ce1 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-12-10 11:45:35 +05:30
pasinduj
4656a9eae7 modified all dbscripts removing a foriegn key 2015-12-10 11:43:44 +05:30
geethkokila
4acd3411b4 Changing the identity version 2015-12-10 11:19:15 +05:30
hasuniea
1d578bc7c1 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-12-10 10:02:19 +05:30
pasinduj
a9a502ac74 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-12-10 09:15:17 +05:30