565 Commits

Author	SHA1	Message	Date
prabathabey	6c6f644892	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2015-05-29 17:57:59 +05:30
prabathabey	de9b17f41f	Modifying Device bean definition	2015-05-29 17:57:45 +05:30
manoj	f8fbbdb467	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2015-05-29 17:51:19 +05:30
manoj	d15f19dab2	correct sql ambiguos selection of operation id	2015-05-29 17:38:19 +05:30
prabathabey	cdcba23021	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2015-05-29 17:30:47 +05:30
prabathabey	72e940b523	Code cleanup	2015-05-29 17:30:34 +05:30
manoj	e2ef2504a9	Y ... Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2015-05-29 17:00:50 +05:30
prabathabey	d444f4ce0c	Adding an interface method to DeviceManager.java to support claimable devices	2015-05-29 16:52:02 +05:30
manoj	54c776000f	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into release-1.0.0	2015-05-29 15:54:51 +05:30
manoj	c3805364c9	Refractor Operations to handle Policy Operations and remove joins	2015-05-29 15:54:40 +05:30
manoj	917c0cf965	Refractor Operations to handle Policy Operations and remove joins	2015-05-29 15:54:15 +05:30
prabathabey	a3e385bd2f	Serializing the complete OAuthAPplicationInfo bean	2015-05-28 22:06:40 +05:30
prabathabey	4e17a2669f	Fixing more dynamic authentication related issues	2015-05-28 21:44:48 +05:30
prabathabey	e909ac8bcc	Fixing issues prompted due to not properly inheriting JAX-RS annotations	2015-05-28 19:58:41 +05:30
prabathabey	ef12414210	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2015-05-28 19:47:35 +05:30
prabathabey	cc3f543768	Fixing dyanamic client registration related issues	2015-05-28 19:45:37 +05:30
mharindu	3d549701a4	Fixed query issue in function getDevicesByName	2015-05-28 17:45:11 +05:30
mharindu	3db38b7e17	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2015-05-28 15:48:22 +05:30
prabathabey	68cefe21a5	Fixing issues encountered in dynamic client authentication implementation	2015-05-28 15:20:00 +05:30
mharindu	fd0a978eb5	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2015-05-28 14:55:54 +05:30
mharindu	de8914fdcb	Added a function to retrieve device list from device name	2015-05-28 14:55:34 +05:30
prabathabey	e21c92a1ce	Code cleanup	2015-05-28 14:54:21 +05:30
prabathabey	6cdd122c97	Adding the initial implementation of dynamic client registration	2015-05-28 14:53:52 +05:30
prabathabey	3c5a3adc2f	Fixing failures prompted while invoking APIs that are OAuth protected	2015-05-26 17:08:38 +05:30
manoj	8ee09793f2	Change Bearer regex pattern	2015-05-26 15:34:56 +05:30
manoj	ca4f902185	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2015-05-26 15:13:25 +05:30
manoj	eda34cf4de	Change logic of token extraction	2015-05-26 15:12:31 +05:30
geethkokila	535c4e4717	Fixing policy deletion	2015-05-26 04:05:20 -04:00
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