1012 Commits

Author	SHA1	Message	Date
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
harshanl	c826be9b3e	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2015-11-03 18:59:26 +05:30
harshanl	74a3b0e346	Fixed EMM-910	2015-11-03 18:58:52 +05:30
geethkokila	30c53b7d14	Fixing the EMM-900, Ading the LB host name and port to the email url	2015-11-03 16:24:49 +05:30
harshanl	2b9239d208	Optimized the authenticator framework	2015-11-03 14:29:38 +05:30
harshanl	fa92aecf58	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2015-11-03 11:34:32 +05:30
harshanl	520c07693d	Added support for non-secured endpoints within a security enabled webapp	2015-11-02 20:45:43 +05:30
geethkokila	feab85796f	Fixing the EMM-896 which restrict deleting the policy once applied due to a contraint violation	2015-11-02 19:44:52 +05:30
geethkokila	2479be9f5a	Fixing the email client issue	2015-11-02 19:37:21 +05:30
harshanl	6ebfbc4136	Merge branch 'master' of https://github.com/hasuniea/carbon-device-mgt into hasuniea-master	2015-10-30 18:34:16 +05:30
harshanl	c9ffedbac5	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2015-10-30 18:29:53 +05:30
harshanl	8f982722fb	Added oauth response messages	2015-10-30 18:29:32 +05:30
geethkokila	20122b3f1e	Fixing the roles and users adding issue	2015-10-30 17:48:30 +05:30
Kasun Delgolla	c00b1ee713	Committing fix for JIRA- EMM-860	2015-10-29 20:46:48 +05:30
Kasun Delgolla	6f2d1ad065	Merge branch 'master' of github.com:wso2/carbon-device-mgt	2015-10-29 20:45:29 +05:30
harshanl	7cdd262b91	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2015-10-29 17:53:18 +05:30
harshanl	7c0996270f	Fixed EMM-887	2015-10-29 17:53:09 +05:30
Kasun Delgolla	f519b7c029	Merge branch 'master' of github.com:wso2/carbon-device-mgt	2015-10-29 15:46:41 +05:30
prabathabey	90240e7d3f	Merging https://github.com/wso2/carbon-device-mgt/pull/40 and resolving conflicts	2015-10-29 14:11:24 +05:30
Kasun Delgolla	9fa7c16e54	Merge branch 'master' of github.com:wso2/carbon-device-mgt	2015-10-29 10:41:34 +05:30
hasuniea	3de4718ab5	refactored certificate generator	2015-10-29 10:04:13 +05:30
harshanl	8a1dba166a	Updated FeatureMgr spec	2015-10-28 22:09:01 +05:30
Dilshan Edirisuriya	5c2b7c9624	Removing commons codec version	2015-10-28 20:06:10 +05:30
Dilshan Edirisuriya	bbc1132100	Commenting previous lines	2015-10-28 19:24:05 +05:30
Kasun Delgolla	efa90b244f	Merge branch 'master' of github.com:wso2/carbon-device-mgt	2015-10-28 19:05:31 +05:30
Dilshan Edirisuriya	0b800b8615	Bug fixes	2015-10-28 18:49:47 +05:30
Kasun Delgolla	acdfc475be	Merge branch 'master' of github.com:wso2/carbon-device-mgt	2015-10-28 10:17:23 +05:30
hasuniea	8f595818dd	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2015-10-23 14:51:10 +05:30
hasuniea	e1a24abfa3	refactored certificate service	2015-10-23 14:46:56 +05:30
geethkokila	168a011376	Fixing the issue of identity snapshot change	2015-10-22 16:27:40 +05:30
Kasun Delgolla	f830a14a8b	Merge branch 'master' of github.com:wso2/carbon-device-mgt	2015-10-22 11:09:44 +05:30
harshanl	b3e0f804b0	Added comments.	2015-10-21 17:19:49 +05:30
harshanl	52fab37c61	Fixed issue in permission validator	2015-10-21 15:43:26 +05:30
harshanl	e1c9f1c602	Added url param support to permission tree.	2015-10-21 12:55:44 +05:30
Kasun Delgolla	3385bfacd2	Merge branch 'master' of github.com:wso2/carbon-device-mgt	2015-10-21 11:17:10 +05:30
hasuniea	efd029083b	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2015-10-21 10:55:01 +05:30
hasuniea	2c2216e48d	implement certificateManagement service	2015-10-21 10:38:09 +05:30
harshanl	340a690995	Added sql script	2015-10-20 10:11:42 +05:30
Kasun Delgolla	8d52735e6a	Adding app list + info to monitoring operation	2015-10-20 09:51:43 +05:30
hasuniea	3a6e9f09fa	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2015-10-20 09:15:36 +05:30
harshanl	1d4bba9807	License issue fixed	2015-10-20 08:12:02 +05:30
harshanl	09fbf9e8a1	Fixed DAO issues	2015-10-19 22:45:39 +05:30
harshanl	04eba0f313	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2015-10-19 22:45:12 +05:30