513 Commits

Author	SHA1	Message	Date
geethkokila	4500aacd38	Adding the scep support for getting the device tenant id	2015-09-03 23:38:27 +05:30
hasuniea	581c4f013b	refactored changes	2015-09-03 20:19:28 +05:30
harshanl	bbec523a47	Added notification mechanism	2015-09-03 00:19:58 +05:30
hasuniea	7642112a9f	code clean up	2015-09-02 17:27:28 +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
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
harshanl	076d60ec83	PermissionManager changes	2015-08-22 03:01:20 +05:30
prabathabey	00807e8295	Fixing transaction anomalies and code clean up	2015-08-22 01:51:42 +05:30
dilanua	4e5a38998d	Updating DAO Layer	2015-08-07 22:09:51 +05:30
dilanua	df81bef812	Fixing issue in SQL Result retrieval on getOperationsByDeviceAndStatus	2015-08-07 18:13:42 +05:30
geethkokila	3fa65ae98c	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2015-07-30 23:32:12 +05:30
milanperera	e30956b619	Fixed an issue in SQL query of getPendingOperations(CommandOp)	2015-07-30 18:34:56 +05:30
prabathabey	53302070e6	Code cleanup, adding file system based license manager, fixing some design issue in CommandOperationDAOImpl	2015-07-30 15:16:12 +05:30
geethkokila	b8462b02ac	Fixing the conflicts	2015-07-29 07:30:14 +05:30
prabathabey	c134cc7e25	Fixing license manager initialization related issues and code cleanup	2015-07-28 20:38:02 +05:30
prabathabey	ca38cc9f51	Removing URL printer start-up handler from device.mgt.core	2015-07-28 18:09:49 +05:30
prabathabey	c471017c40	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2015-07-28 17:25:54 +05:30
prabathabey	134b4ae53c	Code cleanup	2015-07-28 17:25:41 +05:30
Dilshan Edirisuriya	e7f02365a8	Importing axis2.transport.mail	2015-07-28 16:42:20 +05:30
prabathabey	54cd6b80f4	Fixing merge conflicts	2015-07-28 15:21:06 +05:30