696 Commits

Author	SHA1	Message	Date
mharindu	564c2b280e	Fixed conflicts and merged	2016-07-26 16:38:51 +05:30
Chatura Dilan	046cd6586c	Merge branch 'master' of github.com:wso2/carbon-device-mgt	2016-07-26 12:00:17 +05:30
Chatura Dilan	7af8ecc686	Added userstore for role listing	2016-07-26 11:59:10 +05:30
prabathabey	bd1322e801	Improving transaction handling in certificate management component and cleaning up the OperationManagerImpl	2016-07-26 11:28:31 +05:30
mharindu	827567733c	Fixed scope update issue in API update	2016-07-22 16:41:40 +05:30
mharindu	b3d309583d	Fixed issues in scope service	2016-07-21 20:13:38 +05:30
mharindu	7f1e2fdf0b	Implemented scope management service	2016-07-21 12:43:21 +05:30
mharindu	bdec8880bb	Fixed conflicts and merged	2016-07-18 20:22:27 +05:30
mharindu	186432e1df	Fixed webapp name resolving issue	2016-07-18 20:08:51 +05:30
Dulitha Wijewantha	03f323d6e2	Fixed a bug where getBoolean wasn't used	2016-07-18 12:29:58 +05:30
mharindu	80f737822e	Fixed enrollment device mapping issue	2016-07-15 19:45:04 +05:30
Prabath Abeysekara	fbb09a7f58	Merge pull request #316 from xenobyte/master ... Fixed predictable pseudorandom number generator	2016-07-15 13:17:23 +05:30
prabathabey	40b43a8b97	DAO exceptions thrown while retrieving advance details of devices appears to have been swallowen at the REST API implementation that exposes the aforementioned functionality. This particular fix resolves it	2016-07-14 01:24:00 +05:30
Timo Briddigkeit	b674304087	Made constants real constant using final	2016-07-13 15:57:12 +02:00
Timo Briddigkeit	ee5b077e6a	Fixed various XML External Entity (XXE) attack vulnerabilities	2016-07-13 15:02:11 +02:00
mharindu	0f904e21d8	Fixed conflicts and merged	2016-07-11 22:12:15 +05:30
prabathabey	78057b2992	Adding an API to return the list of device types registered in the underlying device management platform	2016-07-05 15:09:11 +05:30
mharindu	cc5f677165	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into scope-impl	2016-07-04 18:01:55 +05:30
hasuniea	282ac72249	adding SCEPManagerService to scep manager compenent	2016-07-04 17:58:14 +05:30
mharindu	60659ce15b	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into scope-impl	2016-07-04 14:09:44 +05:30
hasuniea	54498f41cd	modifying scep utils	2016-07-04 12:24:28 +05:30
mharindu	ac75ff1d71	Fixed conflict and merged	2016-07-03 15:09:05 +05:30
mharindu	49623a4693	Implemented scope based authorization	2016-07-03 15:03:47 +05:30
Chatura Dilan	2befefc967	Added OS build date	2016-07-01 15:45:59 +05:30
madhawap	b55a164457	added 'updateNotificationStatus' endpoint and minor formattings to swagger annotations	2016-06-30 20:38:04 +05:30
madhawap	dbf938416b	added 'updateNotificationStatus' endpoint and minor formattings to swagger annotations	2016-06-30 20:24:01 +05:30
Chatura Dilan	24b462f4f4	Added is-active field to the Application	2016-06-29 17:41:45 +05:30
madhawap	88feb5a852	Add Pagination to Notification end points	2016-06-28 13:15:06 +05:30
Dilan U. Ariyaratne	a278b788d6	Merge pull request #308 from madhawap/rest-api-improvements ... added priorities end-point to PolicyManagement	2016-06-27 11:45:17 +05:30
madhawap	235d690f1e	Implemented 'offset' and 'limit' parameters to the 'operation' api	2016-06-24 12:19:32 +05:30
prabathabey	f1eca17991	Code cleanup	2016-06-22 14:57:12 +05:30
prabathabey	9a7286a84b	Removing DeviceWrapper and all its associated usage, as it appeared to be a redundant element in the precense of 'Device'	2016-06-22 14:52:59 +05:30
prabathabey	aeb4ad3295	Merging rest-api-improvements branch to master	2016-06-21 15:52:35 +05:30
geethkokila	c07914eb36	Adding the activity count for the activty paginantion	2016-06-21 12:56:57 +05:30
geethkokila	236eb90ce2	Fixing the limit and offset for activity	2016-06-20 15:41:53 +05:30
ayyoob	ebebca8573	Added support for push notification for xmpp, mqtt and few changes to the after testing	2016-06-20 02:33:59 +05:30
madhawap	015ca0575e	added 'updatedTimeStamp' to the Activity get response	2016-06-17 17:36:50 +05:30
geethkokila	626142a59b	Fixing the isssue in retrieving the device info	2016-06-14 10:47:07 +05:30
geethkokila	d6501cbf8c	Fixing the device search issues	2016-06-13 10:15:26 +05:30
mharindu	9eb2f5df86	Fixed foriegn key violation issue when getting pending operations	2016-06-04 11:33:22 +05:30
ayyoob	23ee3e25e7	updated the timestamp	2016-06-03 19:38:24 +05:30
geethkokila	42ce71da2c	Fixing the spelling mistake	2016-06-03 18:06:33 +05:30
geethkokila	6aea69ae44	Fixing the duplicate issue	2016-06-03 11:40:00 +05:30
geethkokila	efa74030b4	Fixing response duplicate issue	2016-06-03 10:25:22 +05:30
prabathabey	8819c6e36b	Adding support for 'If-Modified-Since' header and 'since' query filter	2016-06-03 04:35:22 +05:30
prabathabey	3c21583db6	Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt into rest-api-improvements	2016-06-02 23:45:04 +05:30
prabathabey	1a29a9f58f	Further fixing retrieving application list with device info	2016-06-02 23:44:46 +05:30
geethkokila	ae887d6842	Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt into rest-api-improvements	2016-06-02 23:10:18 +05:30
geethkokila	a04300b3b6	Fixing the activity Id issue	2016-06-02 23:09:55 +05:30
prabathabey	d3ce96585f	Fixing issues in returning application list in the device response	2016-06-02 22:45:44 +05:30