Commit Graph

164 Commits

Author SHA1 Message Date
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
126c2ec371 Implemented permission authorizing module 2015-09-17 11:09:31 +05:30
milanperera
47ac0b1146 Fixed conflicts and merged local changes 2015-09-15 10:22:53 +05:30
harshanl
b8720917e1 Added Dynamic-client-registration module 2015-09-11 20:53:19 +05:30
milanperera
517039cccb Partial commit 2015-09-10 11:20:29 +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
harshanl
9ae6099d2b Fixed nitification table 2015-09-07 18:47:11 +05:30
milanperera
8d38c37d53 Fixed conflicts and merged 2015-09-07 12:39:51 +05:30
milanperera
23bb023686 Partial Commit for Permission Authorizer module 2015-09-03 12:07:55 +05:30
harshanl
bbec523a47 Added notification mechanism 2015-09-03 00:19:58 +05:30
mharindu
1903b375f3 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-09-02 15:34:11 +05:30
prabathabey
46c5dba5c5 Improving web-app authenticator framework 2015-09-02 15:24:53 +05:30
mharindu
fd29deb372 Fixed conflicts of local repo and merged 2015-09-01 12:57:13 +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
Dilshan Edirisuriya
5a146ed907 POM changes 2015-08-31 14:45:55 +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
Dilshan Edirisuriya
439e0dde6d pom changes to adopt certificate component integrations 2015-08-28 15:31:12 +05:30
Dilshan Edirisuriya
99d3745a9b Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-08-28 15:08:25 +05:30
Dilshan Edirisuriya
fd84190342 Adding certificate management components 2015-08-28 15:08:16 +05:30
geethkokila
cada581396 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-08-28 12:33:15 +05:30
geethkokila
12a2e1f11f Partially commiting to fix update problem 2015-08-28 12:31:03 +05:30
harshanl
ae03025546 Fixed syntax issues in sql scripts 2015-08-27 18:56:58 +05:30
mharindu
8c748b3dfd Removed unnecessary comments 2015-08-26 17:45:21 +05:30
mharindu
8949992148 Fixed 204 issue in LicenseManager 2015-08-22 00:12:24 +05:30
geethkokila
cceb3ac5db Fixing errors and adding caching sketch 2015-08-21 12:09:32 +05:30
geethkokila
90f8f4aab6 Adding test cases and fixing some logic issues and fixing the null pointer from the policy core 2015-08-07 13:03:34 +05:30
geethkokila
b8462b02ac Fixing the conflicts 2015-07-29 07:30:14 +05:30
prabathabey
54cd6b80f4 Fixing merge conflicts 2015-07-28 15:21:06 +05:30
prabathabey
955c119006 Adding policy delegation 2015-07-28 15:19:34 +05:30
geethkokila
dc205aa081 Fixing the conflicts 2015-07-27 20:32:12 +05:30
geethkokila
6d687364c6 Fixing the monitoring tasks 2015-07-27 12:27:12 +05:30
milanperera
256880089e Merged 2015-07-27 11:16:03 +05:30
milanperera
f0ec3dbe4c Fixed NPE issues in policy-mgt 2015-07-27 10:49:46 +05:30
prabathabey
b298407160 Fixing improper parent configurations found in apimgt.extensions component and feature 2015-07-25 13:29:57 +05:30
prabathabey
1716c2c7f6 Making apimgt extensions module a separate component/feature pair 2015-07-25 12:41:18 +05:30
prabathabey
1a6526fc77 Removing API publisher lifecycle listener implementation out of device.mgt.core and making it a separate module 2015-07-24 19:22:14 +05:30
prabathabey
bfa1ea1875 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-07-24 12:36:35 +05:30
milanperera
5b2e0c8989 Merged 2015-07-24 12:32:26 +05:30
prabathabey
8fb37722ea Fixing an invalid artifact id used in device management extensions pom 2015-07-24 12:30:30 +05:30
geethkokila
fde54d2d32 Fixing the monitoring service 2015-07-24 12:26:57 +05:30
prabathabey
2694b98883 Adding device management extension feature 2015-07-24 12:19:55 +05:30
milanperera
5a8975d7ac Partial Commit 2015-07-23 16:55:54 +05:30
prabathabey
701228810b Removing user-api-publisher-config.xml and making JAX-RS services get auto-published as APIs depending on parameters configured in web.xml of each corresponding web applications 2015-07-23 14:35:25 +05:30
harshanl
57299063b3 Added policy configuration to the cdm-config 2015-07-20 11:16:15 +05:30