1966 Commits

Author	SHA1	Message	Date
dilanua	0836b2c99e	Fixing user create page QR-generation issues	2016-08-12 14:46:17 +05:30
dilanua	73b4abc46b	Updating user remove UI	2016-08-12 14:24:38 +05:30
dilanua	4acfde1511	Adding user edit UI and fixes	2016-08-12 14:08:46 +05:30
dilanua	312f9d3f26	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2016-08-12 13:50:00 +05:30
dilanua	280c5e496d	Adding user edit UI and fixes	2016-08-12 13:49:38 +05:30
Ace	d8c6720857	Removing previous query	2016-08-12 13:44:26 +05:30
Ace	74b7af7be7	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2016-08-12 13:40:57 +05:30
Ace	aa01c7a52e	Adding query improvements to activities retrieval query	2016-08-12 13:40:49 +05:30
madhawap	ecfe94235f	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2016-08-12 12:46:27 +05:30
madhawap	c6cc5e8df3	fixes to role updating endpoint	2016-08-12 12:45:58 +05:30
dilanua	b9efedfdbd	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2016-08-12 11:27:01 +05:30
dilanua	632202899a	Fixing issues in bulk user invitations	2016-08-12 11:25:43 +05:30
harshanl	c448d915d8	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2016-08-12 11:09:10 +05:30
kamidu	9fde8c0442	Resolving conflicts	2016-08-11 19:08:12 +05:30
kamidu	120fe530ac	Fix the device view related issues	2016-08-11 19:05:03 +05:30
dilanua	d7eed8bc1d	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2016-08-11 18:43:16 +05:30
dilanua	0945c8f547	Adding user create UI	2016-08-11 18:42:53 +05:30
harshanl	e80c2f4050	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2016-08-11 17:27:10 +05:30
hasuniea	ed5e954194	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2016-08-11 16:06:43 +05:30
hasuniea	349c3bdb63	fixing App Version not updating in portal after being initially set	2016-08-11 15:56:03 +05:30
dilanua	390d929e70	Adding policy priority UI	2016-08-11 15:49:45 +05:30
dilanua	352643a421	Changing deactivate-policy api method to PUT	2016-08-11 15:31:28 +05:30
harshanl	34e97aeeae	Removed device search using roleName parameter.	2016-08-11 14:03:09 +05:30
dilanua	4549452634	Updating getAllPolicies UI function with icon key	2016-08-11 11:04:34 +05:30
dilanua	6e2249419d	Updating policy edit base UI	2016-08-10 18:50:20 +05:30
dilanua	0521f1a9dd	Updating policy view Base UI	2016-08-10 18:33:28 +05:30
harshanl	8fa311e119	Removed unnecessary properties from EnrollmentInfo object	2016-08-10 18:25:35 +05:30
prabathabey	fc5021a0d5	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2016-08-10 14:24:33 +05:30
prabathabey	c7730adbcb	Improving the retrieval of activities	2016-08-10 14:24:21 +05:30
harshanl	eb801696bf	Fixed EMM-1492	2016-08-10 12:55:58 +05:30
harshanl	f82ce82648	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2016-08-10 11:14:53 +05:30
harshanl	08ff70bb3c	Refactored CertMgt component	2016-08-10 11:14:46 +05:30
Rasika Perera	c01db9c773	Replaced emm specific unit implementation with old generalized cdmf unit	2016-08-10 08:40:48 +05:30
Rasika Perera	bb526513e8	Removed enrollment url calculation	2016-08-10 08:33:28 +05:30
mharindu	55acb7e7d3	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2016-08-09 19:08:24 +05:30
mharindu	bd41e4f4fb	Implemented scope based authorization in device-mgt UI module	2016-08-09 19:08:07 +05:30
madhawap	d0d101297f	changes to removeCertificate endpoint, fix for the jira EMM-1490	2016-08-09 11:27:04 +05:30
madhawap	f12d2a5d69	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2016-08-09 11:17:01 +05:30
madhawap	324e7fd4c6	changes to removeCertificate endpoint, fix for the jira EMM-1490	2016-08-09 11:16:37 +05:30
Ace	aa7d3385ce	Adding missed role-listing changes	2016-08-09 08:10:51 +05:30
Ace	c693a11d7c	Fixing user,device,role listing pages	2016-08-09 07:56:56 +05:30
mharindu	5bdb4630af	Fixed conflicts and merged	2016-08-08 19:38:49 +05:30
mharindu	734aaa8c9e	Fixed null pointer exception	2016-08-08 19:24:57 +05:30
mharindu	886e2e08f2	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into scope-impl	2016-08-08 18:49:40 +05:30
hasuniea	48543862c0	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2016-08-08 18:28:49 +05:30
dilanua	952905c60d	Adding Policy Edit UI	2016-08-08 18:26:50 +05:30
mharindu	2e79dd290e	Modified scopes	2016-08-08 18:24:44 +05:30
hasuniea	1b07b18678	adding security fixes	2016-08-08 18:05:12 +05:30
dilanua	fa0891d9a2	Adding Policy View UI	2016-08-08 14:23:11 +05:30
mharindu	acf6d7ecd7	Fixed conflicts and merged	2016-08-08 10:42:30 +05:30