community/device-mgt-core
1
0
Fork 0
mirror of https://repository.entgra.net/community/device-mgt-core.git synced 2025-10-06 02:01:45 +00:00
Code Issues Packages Projects Releases Wiki Activity
1,609 Commits 31 Branches 461 Tags 183 MiB
3e34aeeff4
Commit Graph

1213 Commits

Author SHA1 Message Date
Dileesha Rajapakse
1975821446 Refactored Device and Application DAO classes 2015-11-11 18:47:02 +05:30
Geeth
5fd9e87dc8 Merge pull request #44 from Kamidu/master 
change the formatter
 2015-11-10 20:35:58 +05:30
Kamidu Sachith
8953a61cc4 Enable Owneship type editing in policy 2015-11-10 20:17:59 +05:30
harshanl
5d107b0d56 Merged changes 2015-11-10 18:46:26 +05:30
harshanl
93e641893c Merged changes 2015-11-10 18:31:02 +05:30
harshanl
026a7c187a Fixed EMM-945, EMM-910, EMM-911, EMM-870 2015-11-10 18:17:34 +05:30
inosh-perera
4faa740c9d Fixing JIRA EMM-947 - only the registered device types are returned to UI 2015-11-10 17:36:30 +05:30
Kamidu Sachith
d7c942f395 Enable ownership editing on the policy 2015-11-10 14:51:10 +05:30
Kamidu Sachith
4590de6a76 chenge the formatter 2015-11-04 15:12:23 +05:30
harshanl
c826be9b3e Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-11-03 18:59:26 +05:30
harshanl
74a3b0e346 Fixed EMM-910 2015-11-03 18:58:52 +05:30
geethkokila
30c53b7d14 Fixing the EMM-900, Ading the LB host name and port to the email url 2015-11-03 16:24:49 +05:30
harshanl
2b9239d208 Optimized the authenticator framework 2015-11-03 14:29:38 +05:30
harshanl
fa92aecf58 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-11-03 11:34:32 +05:30
harshanl
520c07693d Added support for non-secured endpoints within a security enabled webapp 2015-11-02 20:45:43 +05:30
geethkokila
feab85796f Fixing the EMM-896 which restrict deleting the policy once applied due to a contraint violation 2015-11-02 19:44:52 +05:30
geethkokila
2479be9f5a Fixing the email client issue 2015-11-02 19:37:21 +05:30
harshanl
6ebfbc4136 Merge branch 'master' of https://github.com/hasuniea/carbon-device-mgt into hasuniea-master 2015-10-30 18:34:16 +05:30
harshanl
c9ffedbac5 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-10-30 18:29:53 +05:30
harshanl
8f982722fb Added oauth response messages 2015-10-30 18:29:32 +05:30
geethkokila
20122b3f1e Fixing the roles and users adding issue 2015-10-30 17:48:30 +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
90240e7d3f Merging https://github.com/wso2/carbon-device-mgt/pull/40 and resolving conflicts 2015-10-29 14:11:24 +05:30
Kasun Delgolla
9fa7c16e54 Merge branch 'master' of github.com:wso2/carbon-device-mgt 2015-10-29 10:41:34 +05:30
hasuniea
3de4718ab5 refactored certificate generator 2015-10-29 10:04:13 +05:30
harshanl
8a1dba166a Updated FeatureMgr spec 2015-10-28 22:09:01 +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
Kasun Delgolla
acdfc475be Merge branch 'master' of github.com:wso2/carbon-device-mgt 2015-10-28 10:17:23 +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
geethkokila
168a011376 Fixing the issue of identity snapshot change 2015-10-22 16:27:40 +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
hasuniea
efd029083b Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-10-21 10:55:01 +05:30
hasuniea
2c2216e48d implement certificateManagement service 2015-10-21 10:38:09 +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
hasuniea
3a6e9f09fa Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-10-20 09:15:36 +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
hasuniea
53f4dc7ae5 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-10-19 20:49:43 +05:30
hasuniea
7a110a8eb5 implemented certificateGenerater 2015-10-19 20:49:26 +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
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
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
Dulitha Wijewantha
5962694ec2 Adding annotation for the description 2015-10-16 23:37:58 +05:30
Dulitha Wijewantha
002a1ec580 Merge branch 'master' of github.com:wso2/carbon-device-mgt 2015-10-16 21:06:04 +05:30
Dulitha Wijewantha
1025e9a425 Fixes to user api 2015-10-16 21:05:51 +05:30
Kamidu Sachith
d5dcf44f27 Change the service registration 2015-10-16 18:39:34 +05:30
harshanl
2a6db0cdc4 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-10-15 16:32:09 +05:30
geethkokila
d52df2474e Fixing policy descriptions 2015-10-15 13:01:53 +05:30
harshanl
9a68aa92bc Removed the use of web-app context in permission.xml of webapps 2015-10-14 22:33:36 +05:30
geethkokila
9fca18ae90 Fixing the monitoring issue 2015-10-14 18:54:39 +05:30
harshanl
b0d6038b69 Refactored dynamic client code & add tenancy handling to authenticators 2015-10-13 22:30:12 +05:30
Kamidu Sachith
5c215189d1 Enable java8 support 2015-10-13 11:45:00 +05:30
harshanl
d9bcb617eb Merge branch 'master' of https://github.com/Kamidu/carbon-device-mgt into Kamidu-master 2015-10-12 19:49:40 +05:30
harshanl
d4eab9f86e Code refactored. 2015-10-12 19:48:35 +05:30
geethkokila
81034c84f5 Fixing the method name issue in policy manager service 2015-10-12 18:59:41 +05:30
Kamidu Sachith
a66949c7e0 Code Fixing 2015-10-12 18:45:32 +05:30
Kamidu Sachith
824f57b5d2 Change the code for better performance 2015-10-12 18:36:59 +05:30
Kamidu Sachith
fe355b3184 Romoving Temporary Solutions 2015-10-12 18:13:46 +05:30
Kamidu Sachith
743f394fb9 Requested Modifications 2015-10-12 18:11:44 +05:30
Kamidu Sachith
d932522d37 refactoring class 2015-10-12 18:03:13 +05:30
Kamidu Sachith
8cc38c87f5 requested modification 2015-10-12 17:57:43 +05:30
Kamidu Sachith
831fed6d38 Resolving imports 2015-10-12 17:42:10 +05:30
Dulitha Wijewantha
5e07e52be8 Merge branch 'master' of github.com:wso2/carbon-device-mgt 2015-10-12 12:20:46 +05:30
Dulitha Wijewantha
45ce4dbe4e Policy Updating 
* Fixed issues regarding roles updating for policy
* Fixed the relevent test cases

JIRA:- https://wso2.org/jira/browse/EMM-812
 2015-10-12 12:09:21 +05:30
harshanl
741777682a Fixed dynamic client registration issues with server startup 2015-10-09 19:20:12 +05:30
Kamidu Sachith
786728b49b Recomended Changes to Enabling OAuth Authentication for BackEnd Services 2015-10-08 17:54:49 +05:30
Kamidu Sachith
97df36842d Enabling OAuth Authentication for BackEnd Services 2015-10-08 14:02:29 +05:30
harshanl
1c8bb7551d Refactored Dynamic-client registration service to use AppMgt osgi service 2015-10-07 23:15:17 +05:30
prabathabey
69ba3e83ea Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-10-07 17:01:33 +05:30
prabathabey
774683a418 Adding proper dependency exclusions 2015-10-07 17:01:27 +05:30
harshanl
134a13727f updated cxf version & fixed migration issues 2015-10-07 16:58:09 +05:30
harshanl
36ca79d31a Fixed build issues 2015-10-07 00:17:17 +05:30
harshanl
302eb3a8a9 Merged changes 2015-10-07 00:00:28 +05:30
harshanl
429b738dba Fixed issues in permission tree' 2015-10-06 22:41:59 +05:30
harshanl
f6c65dd481 Refactored dynamic-client registration code 2015-10-06 13:15:40 +05:30
harshanl
52e0a43b5e Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-10-06 11:44:46 +05:30
harshanl
77f5f466d6 Added scope validator and refactored code 2015-10-06 11:44:40 +05:30
prabathabey
c74a979c8d Bumping the versions of all dependent component versions to their respective latests 2015-10-05 20:34:43 +05:30
Dilshan Edirisuriya
0d259b2a6e Enabling SAML 2015-10-05 11:34:14 +05:30
harshanl
648d8ec209 Added OAuth scope validator & fixed DataHolders 2015-10-05 11:28:47 +05:30
harshanl
234cd47931 Added identity-extensions 2015-10-02 18:00:05 +05:30
milanperera
17112c3616 Removed unused constants 2015-10-02 17:12:14 +05:30
milanperera
e408d50037 Refactored permission module 2015-10-02 17:07:57 +05:30
milanperera
a0187b905b Removed unneccessary imports and code segments 2015-10-02 16:57:42 +05:30
milanperera
a84edd7a99 Added seperate permission tree class 2015-10-02 16:40:52 +05:30
milanperera
02ad7fb8e1 Refactored authorization module 2015-10-02 16:40:13 +05:30
prabathabey
d79de19176 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-10-01 19:24:54 +05:30
prabathabey
bce52e54a3 Upgrading dependency versions to their respective latests 2015-10-01 19:24:48 +05:30
milanperera
ed937467cd Refactored permission authorizer module 2015-10-01 17:35:08 +05:30
milanperera
68befaae01 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-10-01 12:14:28 +05:30
harshanl
335f53f01c refactored pom files 2015-09-29 17:33:35 +05:30
harshanl
cb9616b02b Refactored dynamic-client registration 2015-09-29 16:34:28 +05:30
mharindu
9813816fab Fixed bug of adding operations 2015-09-29 16:24:35 +05:30
milanperera
1034eb85c6 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-09-28 16:55:50 +05:30
mharindu
0a321e279a Added null check to getLicense 2015-09-24 14:37:52 +05:30
Dilshan Edirisuriya
9ce1c2002a Null check in DAO 2015-09-22 14:09:59 +05:30
milanperera
49016cbc56 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-09-17 11:09:39 +05:30
milanperera
126c2ec371 Implemented permission authorizing module 2015-09-17 11:09:31 +05:30
Dilshan Edirisuriya
c52dfb460a Removing import 2015-09-16 18:58:57 +05:30
milanperera
47ac0b1146 Fixed conflicts and merged local changes 2015-09-15 10:22:53 +05:30
Dilshan Edirisuriya
ac5a7f4ab1 Null check in JWT authenticator and fixing tenant id issue in device DAO 2015-09-14 17:12:07 +05:30
milanperera
37854a2cef Partial Commit 2015-09-14 15:51:23 +05:30
Dilshan Edirisuriya
5f2ec88300 Changes in certificate managment 2015-09-14 15:28:28 +05:30
Dilshan Edirisuriya
3907c0fba2 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-09-14 15:23:18 +05:30
Dilshan Edirisuriya
4a03c7abf7 certificate authentication changes 2015-09-14 15:23:11 +05:30
harshanl
b8720917e1 Added Dynamic-client-registration module 2015-09-11 20:53:19 +05:30
milanperera
3de2591444 Partial commit 2015-09-10 11:36:18 +05:30
milanperera
517039cccb Partial commit 2015-09-10 11:20:29 +05:30
mharindu
9920f2919a Fixed spelling mistakes of policy component 2015-09-09 20:00:10 +05:30
mharindu
b33925c497 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-09-09 19:57:07 +05:30
Dilshan Edirisuriya
e1a74e049d Bypassing URLS 2015-09-09 17:16:26 +05:30
Dilshan Edirisuriya
d17f1356e7 Certificate authenticator changes 2015-09-08 17:21:23 +05:30
milanperera
3cb68355b4 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-09-08 11:29:05 +05:30
mharindu
fbd697edb0 Fixed issue in policy delegation executor 2015-09-08 11:27:29 +05:30
mharindu
2331b61bdc Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-09-08 11:16:41 +05:30
harshanl
1193eff974 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-09-07 18:14:34 +05:30
harshanl
bf0e95fa6c Fixed notification service issues 2015-09-07 18:14:20 +05:30
Dilshan Edirisuriya
ccffdb2252 Get attribute implementation 2015-09-07 15:15:59 +05:30
milanperera
3c89293220 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-09-07 12:43:54 +05:30
milanperera
8d38c37d53 Fixed conflicts and merged 2015-09-07 12:39:51 +05:30
harshanl
330f059a09 Added App-Mgt config testcases 2015-09-05 01:26:52 +05:30
mharindu
3421663724 Fixed conflics and merged 2015-09-04 11:15:59 +05:30
geethkokila
4500aacd38 Adding the scep support for getting the device tenant id 2015-09-03 23:38:27 +05:30
mharindu
2f5ef48fa8 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-09-03 20:51:12 +05:30
geethkokila
d2fe9679e0 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-09-03 20:49:39 +05:30
geethkokila
11ead87a5e Fixing the policy listing issue 2015-09-03 20:49:26 +05:30
mharindu
0e7ff3c0c8 Merged 2015-09-03 20:40:49 +05:30
hasuniea
0c0d54f041 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-09-03 20:20:10 +05:30
hasuniea
581c4f013b refactored changes 2015-09-03 20:19:28 +05:30
mharindu
59654848ef Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-09-03 20:16:17 +05:30
prabathabey
bd6316d8b5 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-09-03 20:15:07 +05:30
prabathabey
dbf95bcc7c Fixing an issue in the logic of authentication incoming requests 2015-09-03 20:14:45 +05:30
milanperera
23bb023686 Partial Commit for Permission Authorizer module 2015-09-03 12:07:55 +05:30
mharindu
069c7e7c5f Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-09-03 12:03:41 +05:30
harshanl
30dfa7600e Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-09-03 00:20:49 +05:30
harshanl
bbec523a47 Added notification mechanism 2015-09-03 00:19:58 +05:30
prabathabey
46c5f2534f Fixing NoSuchElement exception thrown when standard context is accessed 2015-09-03 00:18:39 +05:30
mharindu
7a801c46eb Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-09-02 22:58:48 +05:30
geethkokila
6ef4bdd73e Fixing enrolment id issues 2015-09-02 22:55:52 +05:30
mharindu
5bcc020b3e Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-09-02 22:35:40 +05:30
prabathabey
dc2680ac5e Making APIPublisher util compose the relevant API endpoint url programmatically 2015-09-02 21:21:51 +05:30
prabathabey
256c42243f Improving APIPublisher implementation 2015-09-02 21:12:06 +05:30
prabathabey
9288e3846d Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-09-02 20:26:01 +05:30
prabathabey
4334994b36 Fixing issues encountered in APIPublisher implementation 2015-09-02 20:25:52 +05:30
harshanl
d7ea5625bc Fixed apimgt publisher component issues 2015-09-02 20:24:33 +05:30
mharindu
6418c55f4f Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-09-02 19:58:55 +05:30
geethkokila
bdf976ad2e Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-09-02 19:40:09 +05:30
geethkokila
7dd48bf00e Fixing the monitoring task for INACTIVE, BLOCKED, REMOVED, UNCLAIMED, DISENROLLMENT_REQUESTED, SUSPENDED devices 2015-09-02 19:39:50 +05:30
prabathabey
2f22d1c82a Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-09-02 19:03:13 +05:30
prabathabey
f2635e9e98 Adding more improvements into web-app authenticator framework 2015-09-02 18:59:36 +05:30
mharindu
97987f6e10 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-09-02 17:45:27 +05:30
mharindu
cbf10a8b59 Refactored addOperation method 2015-09-02 17:35:41 +05:30
hasuniea
7642112a9f code clean up 2015-09-02 17:27:28 +05:30
Prabath Abeysekara
ee0e9af4cb Merge pull request #27 from milanperera/master 
Fixing issues of previous PRs
 2015-09-02 17:19:05 +05:30
Dilshan Edirisuriya
673ef32535 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-09-02 16:46:59 +05:30
Dilshan Edirisuriya
454c459172 Extract certificate from signature 2015-09-02 16:46:51 +05:30
mharindu
0c43338f5d Added runtime exception to DCA 2015-09-02 16:16:18 +05:30
mharindu
1903b375f3 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-09-02 15:34:11 +05:30
prabathabey
aa6f311d26 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-09-02 15:25:58 +05:30
prabathabey
46c5dba5c5 Improving web-app authenticator framework 2015-09-02 15:24:53 +05:30
geethkokila
dff526b272 Removing the unnessary commets and imports 2015-09-02 15:02:33 +05:30
geethkokila
5ee8c0f065 Fixing the cache manager issues 2015-09-02 14:47:36 +05:30
hasuniea
9d5f2af7e9 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-09-02 14:26:15 +05:30
mharindu
8503a997ea Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-09-02 10:40:30 +05:30
Dilshan Edirisuriya
aeae7a09f0 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-09-02 10:39:58 +05:30
Dilshan Edirisuriya
0140974487 Certificate verification 2015-09-02 10:39:51 +05:30
harshanl
e1da84ec55 Added JWT authenticator 2015-09-01 22:48:35 +05:30
mharindu
725894ed2c Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-09-01 18:20:09 +05:30
geethkokila
f2b8f978f5 Fixing the operations connection close problems 2015-09-01 18:15:02 +05:30
mharindu
cd853c9ee8 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-09-01 17:20:12 +05:30
geethkokila
f4b2a9ca3a Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-09-01 17:17:05 +05:30
geethkokila
b14461a5af Fixing the datasource issue in the device magt core 2015-09-01 17:16:51 +05:30
Dilshan Edirisuriya
d2182e7375 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-09-01 16:13:24 +05:30
Dilshan Edirisuriya
d5199dbd62 Fixing issues 2015-09-01 16:13:17 +05:30
mharindu
ad5335c9f5 Fixed local conflicts and merged 2015-09-01 15:29:24 +05:30
mharindu
6385c13012 Fixed issues in DeviceDAO 2015-09-01 15:25:16 +05:30
geethkokila
6c5f7d7ada Fixing conflicts and checkcriterion method 2015-09-01 15:14:40 +05:30
prabathabey
26cf4e82da Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-09-01 15:07:21 +05:30
prabathabey
2b6bf203e2 Resolving conflicts observed in policy management implementation 2015-09-01 15:06:41 +05:30
geethkokila
044995ed97 Adding the activate method when policies are added. 2015-09-01 15:03:09 +05:30
mharindu
a7e3462e91 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-09-01 14:13:06 +05:30
Dilshan Edirisuriya
39d1af7242 Saving in keystore 2015-09-01 13:25:19 +05:30
mharindu
fd29deb372 Fixed conflicts of local repo and merged 2015-09-01 12:57:13 +05:30
prabathabey
892b9681f5 Fixing transaction handling issues 2015-09-01 12:51:18 +05:30
Dilshan Edirisuriya
b391681438 Merge branches 'master' and 'master' of https://github.com/wso2/carbon-device-mgt 2015-09-01 11:19:10 +05:30
Dilshan Edirisuriya
3d736d628e adding conf file to touchpoint 2015-09-01 11:19:04 +05:30
geethkokila
458618191d Fixing datasource exaust issue, Fixing the enrolmentinfo getId method, adding policy cache manager. Changing the test cases 2015-08-31 19:31:13 +05:30
geethkokila
c673395ce6 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-08-31 17:13:42 +05:30
harshanl
23c931f5f1 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-08-31 16:17:55 +05:30
harshanl
20873e7786 Added null checks 2015-08-31 14:37:44 +05:30
Dilshan Edirisuriya
c547d85f35 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-08-31 11:57:07 +05:30
geethkokila
c6d993e532 Fixing bugs and adding the ability to read from cdm-config.xml file for monitoring task 2015-08-30 21:45:56 +05:30
Your Name
b906d43cc8 Committing tenant configuration manager service 2015-08-29 22:14:07 +05:30
geethkokila
bcb2c1ddb1 Commiting the monitoring changes and test case changes 2015-08-29 17:39:07 +05:30
Dilshan Edirisuriya
fd84190342 Adding certificate management components 2015-08-28 15:08:16 +05:30
geethkokila
44b496d350 Partially commiting due to update 2015-08-28 12:33:10 +05:30
hasuniea
7a54838996 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-08-28 12:22:07 +05:30
mharindu
69cf3f8939 Cleaned code and added comments 2015-08-27 17:15:37 +05:30
mharindu
abc16557dc Removed unnecessary new lines in DeviceDAOImpl 2015-08-27 10:45:10 +05:30
mharindu
460fda1bb9 Removed unnecessary new lines in DeviceDAOImpl 2015-08-27 10:43:52 +05:30
mharindu
94326323bc Added class level and method level comments for Policy core 2015-08-27 01:00:59 +05:30
harshanl
aeed8b92a1 Enabled adding custom permissions to permission-tree through webapps 2015-08-26 18:20:37 +05:30
mharindu
7fed00a14d Removed unnecessary logs and added null checks in MonitoringManager 2015-08-26 18:10:10 +05:30
mharindu
8c748b3dfd Removed unnecessary comments 2015-08-26 17:45:21 +05:30
mharindu
97c19c23b0 Added method level comments and null checks in DCA 2015-08-26 17:14:12 +05:30
mharindu
5e285071d8 Removed unnecessary white spaces 2015-08-26 15:16:29 +05:30
hasuniea
9f6dd55223 fixed issue in modify enrollment 2015-08-26 14:05:21 +05:30
mharindu
a51e7646e3 Fixing issues of previous PRs 2015-08-26 12:48:53 +05:30
harshanl
1850a76462 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-08-25 09:47:11 +05:30
prabathabey
3582973f84 Code cleanup 2015-08-24 11:04:47 +05:30
prabathabey
d4c5d9023e Adding necessary instructions for transaction handling 2015-08-24 11:04:28 +05:30
prabathabey
de2c378214 Code cleanup 2015-08-24 10:15:50 +05:30
prabathabey
f66d1dd07b Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-08-24 10:14:22 +05:30
harshanl
423c8e2727 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-08-24 10:05:24 +05:30
prabathabey
ce0cc1699f Fixing more transaction handling related issues 2015-08-23 20:19:20 +05:30
Dilshan Edirisuriya
6cff144573 Merge pull request #26 from milanperera/master 
Added null check to MonitoringManagerImpl
 2015-08-22 05:16:26 +05:30
mharindu
fa82a28c0f Added null check to MonitoringManagerImpl 2015-08-22 05:15:05 +05:30
prabathabey
2311572d49 code cleanup 2015-08-22 04:48:24 +05:30
prabathabey
cd31662a96 Fixing transactional anomalies found in PolicyManagerImpl 2015-08-22 04:42:35 +05:30
prabathabey
05c3d080e0 Fixing transactional anomalies found in PolicyManagerImpl 2015-08-22 04:09:59 +05:30
prabathabey
cdbdc86f42 Fixing transactional anomalies and code cleanup 2015-08-22 03:56:44 +05:30