639 Commits

Author	SHA1	Message	Date
Dilshan Edirisuriya	ac5a7f4ab1	Null check in JWT authenticator and fixing tenant id issue in device DAO	2015-09-14 17:12:07 +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
mharindu	2331b61bdc	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2015-09-08 11:16:41 +05:30
harshanl	bf0e95fa6c	Fixed notification service issues	2015-09-07 18:14:20 +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	0e7ff3c0c8	Merged	2015-09-03 20:40:49 +05:30
hasuniea	581c4f013b	refactored changes	2015-09-03 20:19:28 +05:30
mharindu	069c7e7c5f	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2015-09-03 12:03:41 +05:30
harshanl	bbec523a47	Added notification mechanism	2015-09-03 00:19:58 +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
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
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	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	b14461a5af	Fixing the datasource issue in the device magt core	2015-09-01 17:16:51 +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
prabathabey	2b6bf203e2	Resolving conflicts observed in policy management implementation	2015-09-01 15:06:41 +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
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	20873e7786	Added null checks	2015-08-31 14:37:44 +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
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
harshanl	aeed8b92a1	Enabled adding custom permissions to permission-tree through webapps	2015-08-26 18:20:37 +05:30
mharindu	8c748b3dfd	Removed unnecessary comments	2015-08-26 17:45:21 +05:30
hasuniea	9f6dd55223	fixed issue in modify enrollment	2015-08-26 14:05:21 +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
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
prabathabey	cdbdc86f42	Fixing transactional anomalies and code cleanup	2015-08-22 03:56:44 +05:30