2344 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
ayyoob	ba6e202442	Few changes added after testing with the cluster	2016-06-27 00:12:46 +05:30
inoshperera	50009c7ac5	adding apply policy end point	2016-06-24 16:13:50 +05:30
inoshperera	16edca2aea	fixing ios enrollment issue by fetching the identity certificate from the header.	2016-06-24 13:57:48 +05:30
madhawap	ee11bde8b0	Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt into rest-api-improvements	2016-06-24 12:21:53 +05:30
madhawap	235d690f1e	Implemented 'offset' and 'limit' parameters to the 'operation' api	2016-06-24 12:19:32 +05:30
prabathabey	0c54753b34	Cleaning up UserManagementService API implementation	2016-06-22 15:31:55 +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	3813856be8	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:19 +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	a67f432993	Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt into rest-api-improvements	2016-06-20 15:41:59 +05:30
geethkokila	236eb90ce2	Fixing the limit and offset for activity	2016-06-20 15:41:53 +05:30
Dilan U. Ariyaratne	796ba65ec1	Merge pull request #302 from madhawap/rest-api-improvements ... fix related to http status code in 'getDevices' endpoint	2016-06-20 12:19:47 +05:30
madhawap	f2ab923df5	fix related to http status code in 'getDevices' endpoint	2016-06-20 12:17:59 +05:30
Ruwan	66f4c0607d	Merge pull request #301 from ayyoob/transport ... Added support for push notification(xmpp, mqtt)	2016-06-20 05:48:05 +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
ayyoob	0c2de7965f	Added device scope validation	2016-06-20 02:33:17 +05:30
Ruwan	e8cfb1ea45	Merge pull request #300 from ayyoob/transport ... added support to load device type configuration in base ui	2016-06-17 18:09:06 +05:30
inoshperera	a9f8e8c84d	Merge pull request #299 from madhawap/rest-api-improvements ... add changes to 'since' QueryParam and 'if-modified-since' HeaderParam	2016-06-17 17:45:29 +05:30
madhawap	ea56d4ced3	Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt into rest-api-improvements	2016-06-17 17:37:23 +05:30
madhawap	015ca0575e	added 'updatedTimeStamp' to the Activity get response	2016-06-17 17:36:50 +05:30
ayyoob	1373e995fb	added support to load device type configuration in base ui	2016-06-17 17:21:39 +05:30
dilanua	1513c6cf8a	Adding isActive property to PolicyWrapper	2016-06-17 12:05:35 +05:30
madhawap	7cdb7dcee1	Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt into rest-api-improvements	2016-06-17 10:14:21 +05:30
dilanua	0eed97e84c	Adding API for getting device types	2016-06-15 14:21:31 +05:30
madhawap	b3f95d19c1	add changes to 'since' QueryParam and 'if-modified-since' HeaderParam	2016-06-15 12:05:44 +05:30
madhawap	a827e6289a	Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt into rest-api-improvements	2016-06-15 10:33:53 +05:30
inoshperera	96eb71314b	Merge pull request #297 from madhawap/rest-api-improvements ... add changes to 'since' QueryParam and 'if-modified-since' HeaderParam	2016-06-14 18:49:01 +05:30
madhawap	d7b860b955	Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt into rest-api-improvements	2016-06-14 18:09:16 +05:30
madhawap	59119f9167	add changes to 'since' QueryParam and 'if-modified-since' HeaderParam	2016-06-14 18:08:43 +05:30
Ruwan	f6a126b560	Merge pull request #298 from ayyoob/transport ... changed the UI calls from tomcat to apimgt gateway	2016-06-14 15:51:43 +05:30
ayyoob	7b2c04152f	changed the UI calls from tomcat to apimgt gateway	2016-06-14 15:49:34 +05:30
Ace	7b62d2769e	Changing response code returned when adding user	2016-06-14 15:28:59 +05:30
ayyoob	31fc16247c	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into transport	2016-06-14 15:20:31 +05:30
madhawap	3d416da6fe	add changes to 'since' QueryParam and 'if-modified-since' HeaderParam	2016-06-14 12:03:14 +05:30
geethkokila	626142a59b	Fixing the isssue in retrieving the device info	2016-06-14 10:47:07 +05:30
Ace	016414c076	Bug fixes for role search	2016-06-13 15:43:21 +05:30
geethkokila	d6501cbf8c	Fixing the device search issues	2016-06-13 10:15:26 +05:30
hasuniea	220a34faa9	renamed scep feature	2016-06-10 10:04:52 +05:30
hasuniea	629a0103d9	renaming scep web app	2016-06-10 09:39:39 +05:30
hasuniea	81aae9716d	fixing certmgt issue	2016-06-09 14:16:02 +05:30
hasuniea	ec3d032bc5	fixinf code issues	2016-06-09 10:07:01 +05:30
hasuniea	6471055c3f	add refactored stuff	2016-06-09 10:00:35 +05:30
Ruwan	0d524226cd	Merge pull request #296 from ayyoob/transport ... added profile check before publishing apis	2016-06-08 23:00:08 +05:30
ayyoob	b94eed267c	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into transport	2016-06-08 22:41:04 +05:30
ayyoob	52e84273d1	added profile check before publishing apis	2016-06-08 22:38:49 +05:30
Ruwan	211ea9a8e4	Merge pull request #295 from Shabirmean/master ... Changes to the certificate generators to fetch the Certificate alias from the Unique Identifier set in the CSR	2016-06-08 12:20:31 +05:30
Shabirmean	adec5cc303	Merge branch 'master' of https://github.com/wso2/carbon-device-mgt	2016-06-08 12:01:32 +05:30
Ruwan	4d4d24a413	Merge pull request #294 from sahan-kariyawasam/master ... Added dashboard server url as a property	2016-06-07 22:18:43 +05:30