800 Commits

Author	SHA1	Message	Date
Dilshan Edirisuriya	0140974487	Certificate verification	2015-09-02 10:39:51 +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
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
Dilshan Edirisuriya	39d1af7242	Saving in keystore	2015-09-01 13:25:19 +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
harshanl	aeed8b92a1	Enabled adding custom permissions to permission-tree through webapps	2015-08-26 18:20:37 +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
harshanl	076d60ec83	PermissionManager changes	2015-08-22 03:01:20 +05:30
prabathabey	d7e363cef7	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2015-08-22 01:51:56 +05:30
prabathabey	00807e8295	Fixing transaction anomalies and code clean up	2015-08-22 01:51:42 +05:30
Prabath Abeysekara	a5c9886c63	Merge pull request #25 from milanperera/master ... Fixed "204 Content Not Found" issue in LicenseManager	2015-08-22 00:51:12 +05:30
mharindu	f36c82b059	Refactored LicenseManager	2015-08-22 00:47:17 +05:30
mharindu	4709107719	Refactored LicenseManager	2015-08-22 00:31:18 +05:30
mharindu	8949992148	Fixed 204 issue in LicenseManager	2015-08-22 00:12:24 +05:30
Dilshan Edirisuriya	3c444f6102	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt ... Conflicts: components/policy-mgt/org.wso2.carbon.policy.mgt.core/src/main/java/org/wso2/carbon/policy/mgt/core/mgt/impl/MonitoringManagerImpl.java	2015-08-21 14:53:36 +05:30
Dilshan Edirisuriya	5b46a4e2f8	Commenting out unreachable state for now	2015-08-21 14:46:49 +05:30
geethkokila	cceb3ac5db	Fixing errors and adding caching sketch	2015-08-21 12:09:32 +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	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