1054 Commits

Author	SHA1	Message	Date
manoj	99f82e4817	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2015-11-20 12:52:32 +05:30
harshanl	b4d17b888b	fixed secondary user-store related issues & multi-tenancy issues	2015-11-20 00:43:01 +05:30
geethkokila	c1eea6894d	Fixing the feature remove from the policy	2015-11-19 14:45:08 +05:30
manoj	a04658af14	App Manager integration	2015-11-19 10:21:59 +05:30
manoj	79c268cb41	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2015-11-19 10:18:01 +05:30
Dileesha Rajapakse	767ea70436	Refactored CommandOperation DAO class	2015-11-18 22:05:15 +05:30
Dileesha Rajapakse	8bd9295f81	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2015-11-17 19:28:40 +05:30
Dileesha Rajapakse	f3cfb79bac	Refactored Operation DAO classes	2015-11-17 19:28:32 +05:30
harshanl	f0471203e7	Added logic to skip device authorization for policy operations	2015-11-17 18:28:42 +05:30
Dileesha Rajapakse	6e95451f57	Refactored Operation DAO class	2015-11-17 17:26:55 +05:30
manoj	dbf8d13ced	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2015-11-17 16:15:24 +05:30
manoj	20db31c2a9	Add app manager features	2015-11-17 16:14:51 +05:30
Dileesha Rajapakse	825017a492	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2015-11-17 09:58:43 +05:30
Dileesha Rajapakse	4379232c25	Refactored Enrollment DAO class	2015-11-16 22:01:21 +05:30
harshanl	2fa99ac475	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2015-11-16 19:57:59 +05:30
harshanl	a3e20367f2	Fixed issue in Policy Task when DeviceAuthorization enabled.	2015-11-16 19:51:59 +05:30
geethkokila	271c4f76cb	Fixnig the null pointer isssue	2015-11-16 18:08:21 +05:30
geethkokila	700b308b45	Fixing the null pointer and removnig innactive devices being monitored	2015-11-16 17:44:30 +05:30
geethkokila	1989abf881	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2015-11-16 17:41:37 +05:30
geethkokila	fed4f72d4b	Fixing the null pointer	2015-11-16 17:41:07 +05:30
harshanl	1252d4c160	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2015-11-16 17:21:33 +05:30
geethkokila	0f146e83fa	Fixing the issue which cause policy not bieng applied to device which were enrolled before the adding the policy to the system	2015-11-16 17:17:15 +05:30
geethkokila	813f9072d8	Fixing the database issue which causes the deviceids slelect did not work	2015-11-16 17:15:16 +05:30
Dileesha Rajapakse	f8a2117911	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2015-11-16 16:52:43 +05:30
Dileesha Rajapakse	6446be100d	Refactored Policy Management DAO classes	2015-11-16 16:49:35 +05:30
Dileesha Rajapakse	91d9db1ffa	Refactored ApplicationMapping and ProfileOperation DAO classes	2015-11-16 14:15:54 +05:30
Dilshan Edirisuriya	7023537fcd	Setting owner in authentication info	2015-11-16 13:49:02 +05:30
Dileesha Rajapakse	27254cc922	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2015-11-16 11:45:29 +05:30
harshanl	cb02c9da80	Fixed issues in DeviceAuthorization	2015-11-16 11:43:52 +05:30
Dileesha Rajapakse	6f0276ab2f	Modified Application Mapping DAO classes	2015-11-16 11:39:52 +05:30
Dileesha Rajapakse	7b2cfd69f5	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2015-11-16 09:49:37 +05:30
harshanl	b9ca6705ae	Merged changes	2015-11-13 21:57:05 +05:30
harshanl	e14f09b8a8	Added requireDeviceAuthorization support	2015-11-13 21:33:33 +05:30
manoj	fdc4ad8e18	Set user level autherization is support by plugin or not	2015-11-13 21:29:47 +05:30
manoj	22c2da7fcb	Set user level autherization is support by plugin or not	2015-11-13 21:22:38 +05:30
manoj	dc2e41e083	Add authentication method boolean check. Android allows user level authentication. IOS and windows allow device authetication. This is a temporary fix until fix windows and IOS certifcate level user extraction	2015-11-13 19:02:55 +05:30
manoj	adc3b652bf	Add authentication method boolean check. Android allows user level authentication. IOS and windows allow device authetication. This is a temporary fix until fix windows and IOS certifcate level user extraction	2015-11-13 18:57:45 +05:30
Dileesha Rajapakse	786eb93bca	Refactored Operation DAO classes	2015-11-13 14:15:05 +05:30
Dileesha Rajapakse	123ea228ad	Refactored Enrolment DAO class	2015-11-12 10:30:45 +05:30
Dileesha Rajapakse	72ffe4e4a4	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2015-11-12 09:04:56 +05:30
harshanl	5af6f314d0	Fixed EMM-939	2015-11-11 20:58:47 +05:30
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