679 Commits

Author	SHA1	Message	Date
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
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
geethkokila	2479be9f5a	Fixing the email client issue	2015-11-02 19:37:21 +05:30
Kasun Delgolla	c00b1ee713	Committing fix for JIRA- EMM-860	2015-10-29 20:46:48 +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
harshanl	8a1dba166a	Updated FeatureMgr spec	2015-10-28 22:09:01 +05:30
harshanl	340a690995	Added sql script	2015-10-20 10:11:42 +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	89e930d530	Fixed isssues in pagination	2015-10-18 21:56:13 +05:30
harshanl	25d7459974	Pagination changes	2015-10-18 20:50:39 +05:30
harshanl	155606a326	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2015-10-18 18:54:35 +05:30
prabathabey	a0ebec9f3d	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2015-10-18 18:18:26 +05:30
prabathabey	c74e27102f	Fixing issues in adding license configs	2015-10-18 18:16:52 +05:30
harshanl	81b6770c08	Fixed oauth issue with tenants	2015-10-18 01:44:28 +05:30
harshanl	6c196d5317	Added pagination support	2015-10-16 23:40:13 +05:30
harshanl	9a68aa92bc	Removed the use of web-app context in permission.xml of webapps	2015-10-14 22:33:36 +05:30
harshanl	d4eab9f86e	Code refactored.	2015-10-12 19:48:35 +05:30
harshanl	429b738dba	Fixed issues in permission tree'	2015-10-06 22:41:59 +05:30
harshanl	77f5f466d6	Added scope validator and refactored code	2015-10-06 11:44:40 +05:30
harshanl	648d8ec209	Added OAuth scope validator & fixed DataHolders	2015-10-05 11:28:47 +05:30
harshanl	234cd47931	Added identity-extensions	2015-10-02 18:00:05 +05:30
milanperera	e408d50037	Refactored permission module	2015-10-02 17:07:57 +05:30
milanperera	a0187b905b	Removed unneccessary imports and code segments	2015-10-02 16:57:42 +05:30
milanperera	a84edd7a99	Added seperate permission tree class	2015-10-02 16:40:52 +05:30
milanperera	02ad7fb8e1	Refactored authorization module	2015-10-02 16:40:13 +05:30
milanperera	ed937467cd	Refactored permission authorizer module	2015-10-01 17:35:08 +05:30
milanperera	68befaae01	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2015-10-01 12:14:28 +05:30
milanperera	1034eb85c6	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2015-09-28 16:55:50 +05:30
mharindu	0a321e279a	Added null check to getLicense	2015-09-24 14:37:52 +05:30
Dilshan Edirisuriya	9ce1c2002a	Null check in DAO	2015-09-22 14:09:59 +05:30
milanperera	126c2ec371	Implemented permission authorizing module	2015-09-17 11:09:31 +05:30
milanperera	47ac0b1146	Fixed conflicts and merged local changes	2015-09-15 10:22:53 +05:30
Dilshan Edirisuriya	ac5a7f4ab1	Null check in JWT authenticator and fixing tenant id issue in device DAO	2015-09-14 17:12:07 +05:30
milanperera	37854a2cef	Partial Commit	2015-09-14 15:51:23 +05:30
Dilshan Edirisuriya	5f2ec88300	Changes in certificate managment	2015-09-14 15:28:28 +05:30
Dilshan Edirisuriya	3907c0fba2	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2015-09-14 15:23:18 +05:30
Dilshan Edirisuriya	4a03c7abf7	certificate authentication changes	2015-09-14 15:23:11 +05:30
harshanl	b8720917e1	Added Dynamic-client-registration module	2015-09-11 20:53:19 +05:30
milanperera	517039cccb	Partial commit	2015-09-10 11:20:29 +05:30
mharindu	2331b61bdc	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2015-09-08 11:16:41 +05:30
harshanl	bf0e95fa6c	Fixed notification service issues	2015-09-07 18:14:20 +05:30
harshanl	330f059a09	Added App-Mgt config testcases	2015-09-05 01:26:52 +05:30
mharindu	3421663724	Fixed conflics and merged	2015-09-04 11:15:59 +05:30
geethkokila	4500aacd38	Adding the scep support for getting the device tenant id	2015-09-03 23:38:27 +05:30