538 Commits

Author	SHA1	Message	Date
manoj	eda34cf4de	Change logic of token extraction	2015-05-26 15:12:31 +05:30
manoj	54290e0ab3	Change OAuthAutheticator to get api version and context	2015-05-26 13:01:20 +05:30
manoj	f2c33f9421	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2015-05-22 13:22:37 +05:30
manoj	cfe9bd5f9f	Email format	2015-05-22 13:22:00 +05:30
geethkokila	5cd63c1c88	Fixing policy count	2015-05-22 13:07:14 +05:30
geethkokila	5a4d2e20a4	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2015-05-22 10:27:46 +05:30
geethkokila	30b01fc3bc	Fixing the sort issue	2015-05-22 10:27:34 +05:30
dilanua	851fb35554	Updated DeviceTypeDAOImpl.java	2015-05-22 04:28:26 +05:30
mharindu	ffaccbe371	Refactored policy	2015-05-22 03:03:46 +05:30
manoj	48a2062f64	Add operations for effective policy	2015-05-22 02:32:04 +05:30
geethkokila	6e18b7c11a	Adding the policy priority changing dao methods	2015-05-22 02:05:16 +05:30
mharindu	39ae880972	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2015-05-22 01:23:17 +05:30
mharindu	89d0fa0894	Implemented device count and policy count	2015-05-22 01:23:03 +05:30
geethkokila	29066134db	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2015-05-22 01:17:33 +05:30
manoj	302470ff8b	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2015-05-22 01:19:48 +05:30
manoj	acdf6021a7	Policy related operations	2015-05-22 01:19:27 +05:30
manoj	85df7ca9a0	Policy related operations	2015-05-22 01:18:44 +05:30
geethkokila	3e37b73360	Removing unnessaccery code blocks	2015-05-22 01:17:20 +05:30
geethkokila	1f507e4224	Removing unneccessary catch exception	2015-05-22 01:13:38 +05:30
geethkokila	e8255e45c6	Adding the user list to policies	2015-05-22 01:04:44 +05:30
mharindu	ed9eebca52	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2015-05-21 23:18:39 +05:30
geethkokila	3382686d52	Fixing policies related issues, and adding the delete policy	2015-05-21 23:17:33 +05:30
mharindu	7b9dba545a	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2015-05-21 21:34:54 +05:30
geethkokila	a1f851243c	Fixing null pointer issue	2015-05-21 21:33:53 +05:30
geethkokila	37b4e27c42	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2015-05-21 20:42:17 +05:30
geethkokila	e07d917ad6	Fixing bugs	2015-05-21 20:41:57 +05:30
mharindu	5c1cff9bb8	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2015-05-21 20:08:38 +05:30
prabathabey	486d39e54d	Fixing authentication issues surfaced due to not properly configuring WebappAuthenticatorRepository	2015-05-21 20:07:14 +05:30
mharindu	1c4e74f706	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2015-05-21 19:51:41 +05:30
mharindu	695ff8edcb	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt ... Conflicts: features/device-mgt/org.wso2.carbon.device.mgt.server.feature/src/main/resources/conf/user-api-publisher-config.xml	2015-05-21 19:51:32 +05:30
prabathabey	cdcb7d2546	Fixing build failures	2015-05-21 19:49:41 +05:30
prabathabey	abf1e3d2ea	Fixing build failures	2015-05-21 19:16:40 +05:30
prabathabey	7942fb4cbb	Fixing issues surfaced when a proper authentication scheme is not defined for certain resources	2015-05-21 18:53:02 +05:30
mharindu	6e11c8e112	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2015-05-21 17:54:30 +05:30
geethkokila	a9d3d15438	Adding pofile operations	2015-05-21 17:46:57 +05:30
mharindu	1904264c0d	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2015-05-21 17:39:56 +05:30
geethkokila	0638ec2357	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2015-05-21 17:27:31 +05:30
geethkokila	548ce6873f	Changing the get effective policy method to store the policy as a operation, and adding ownership type to the policy database	2015-05-21 17:27:17 +05:30
mharindu	30edad0529	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2015-05-21 17:08:15 +05:30
Dulitha Wijewantha	341abb47ab	Fixes to the timestamp and filters	2015-05-21 16:48:49 +05:30
prabathabey	c8affcf836	Improving the way webapp requests are authenticated	2015-05-21 15:19:33 +05:30
mharindu	3d69503e96	Merged	2015-05-20 14:25:17 +05:30
geethkokila	4a4349382a	Adding the user core changes	2015-05-19 20:45:12 +05:30
mharindu	048c175fda	Fixed issue of get device info function	2015-05-19 19:08:24 +05:30
Milan Perera	c068ac88de	Update DeviceManagementServiceImpl.java	2015-05-19 17:30:20 +05:30
Milan Perera	7d3bf84d9f	Update DeviceManagementServiceProviderImpl.java	2015-05-19 17:26:24 +05:30
Milan Perera	8f00128ab1	Update DeviceManager.java	2015-05-19 17:22:36 +05:30
mharindu	d0819adf6d	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2015-05-19 17:13:57 +05:30
mharindu	40feabb9df	Fixed bug in device disenrollment	2015-05-19 17:13:36 +05:30
geethkokila	1d180c1a1e	Adding the policy related new tables	2015-05-19 16:00:49 +05:30