101 Commits

Author	SHA1	Message	Date
hasuniea	4ccf018bb3	adding validations	2016-07-08 15:26:20 +05:30
prabathabey	1205d26463	Merging rest-api-improvements branch with master	2016-06-21 16:05:27 +05:30
Chatura Dilan	6a702adaa3	Change emm_admin to admin	2016-06-21 15:51:35 +05:30
Chatura Dilan	529c828b81	Fixed paths in Android related permissions.xml	2016-06-21 11:32:01 +05:30
inoshperera	bb0ea53909	Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt-plugins into rest-api-improvements	2016-06-16 07:57:46 +05:30
inoshperera	c45400afd0	fixing error messages not thrown properly.	2016-06-16 07:57:40 +05:30
Kasun Delgolla	ef281e1524	Fixing operation response ERROR state exception	2016-06-15 13:51:08 -07:00
inoshperera	90747a5579	Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt-plugins into rest-api-improvements	2016-06-08 16:56:14 +05:30
inoshperera	486e2f48ed	adding validation	2016-06-08 16:55:42 +05:30
dilanua	c9a07df91a	Fixing wrong device id shown for OTA-UPGRADE operation	2016-06-04 00:27:19 +05:30
dilanua	741bb0ac16	Updating Responces in pending-operations api	2016-06-03 23:49:19 +05:30
dilanua	bcba6216c0	Update UpgradeFirmware operation with server properties	2016-06-03 20:51:54 +05:30
dilanua	9ac7ffe828	Update UpgradeFirmware operation with server properties	2016-06-03 20:47:44 +05:30
mharindu	4a8ab39dec	Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt-plugins into rest-api-improvements	2016-06-03 19:49:00 +05:30
Ace	6425d6ab1a	Adding null check for operations response	2016-06-03 19:27:20 +05:30
mharindu	9237fed74e	Added notification title	2016-06-03 19:22:44 +05:30
prabathabey	55aa1c8113	Fixing compilation issues	2016-06-02 21:07:33 +05:30
mharindu	62a116ba71	Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt-plugins into rest-api-improvements	2016-06-02 17:12:09 +05:30
mharindu	c5d1eaa21b	Fixed issue in location service	2016-06-02 17:11:05 +05:30
hasuniea	2b89b692a4	adding event configuration refference	2016-06-02 16:37:50 +05:30
hasuniea	c170373ace	fix responce code	2016-06-02 15:57:00 +05:30
hasuniea	ec91b0a539	fixing eventReceiver	2016-06-02 15:30:09 +05:30
hasuniea	198b3c67dc	add entry in permission xml	2016-05-31 19:16:52 +05:30
hasuniea	0bcbab7071	Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt-plugins into rest-api-improvements	2016-05-31 18:54:27 +05:30
Chatura Dilan	d3a0fc3f12	Added install application permissions	2016-05-31 18:50:26 +05:30
hasuniea	daee6109cc	fixing code issues	2016-05-31 18:48:49 +05:30
Chatura Dilan	7c59e391de	Merge branch 'rest-api-improvements' of github.com:wso2/carbon-device-mgt-plugins into rest-api-improvements	2016-05-31 18:42:54 +05:30
Chatura Dilan	ba1f3bbbcc	fixed issue in unlock devices permissions	2016-05-31 18:42:37 +05:30
hasuniea	786c6859bd	Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt-plugins into rest-api-improvements	2016-05-31 18:15:11 +05:30
hasuniea	d01e176933	add eventreceiver fix	2016-05-31 18:08:16 +05:30
prabathabey	640cf95528	Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt-plugins into rest-api-improvements	2016-05-31 18:02:15 +05:30
prabathabey	d7b4b83424	Fixing path of license resource	2016-05-31 18:02:04 +05:30
mharindu	56a2ca0aa0	Added missing HTTP method attribute in permissions.xml in android webapp	2016-05-31 17:21:31 +05:30
Chatura Dilan	9086a130c4	Merge branch 'rest-api-improvements' of github.com:wso2/carbon-device-mgt-plugins into rest-api-improvements	2016-05-31 16:21:54 +05:30
Chatura Dilan	3fd56b56c4	Fix cxf servelt issues	2016-05-31 16:21:42 +05:30
prabathabey	212c11750c	Added http schem supported by the API	2016-05-31 16:13:20 +05:30
inoshperera	763854ef9a	Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt-plugins into rest-api-improvements	2016-05-31 14:51:07 +05:30
ayyoob	61d88f77b6	removed device Id from notification bean	2016-05-31 14:48:23 +05:30
inoshperera	6d14133bab	fixing the mismatch of swagger annotation and implementation	2016-05-31 14:45:05 +05:30
Chatura Dilan	bf1e00f472	Fixed the host name of Android API	2016-05-30 17:07:04 +05:30
prabathabey	18257b8729	Changing the name of the android API webapp	2016-05-30 12:08:44 +05:30
prabathabey	63bb616e9c	Improving swagger annotations	2016-05-28 08:12:10 +05:30
prabathabey	631d57e70d	Improving swagger annotations	2016-05-28 06:03:06 +05:30
Kasun Delgolla	a01fe5e4f9	Adding missing parameters	2016-05-28 02:14:56 +05:30
prabathabey	44aa3a93a9	Adding more improvements to swagger annotations	2016-05-28 02:07:17 +05:30
inoshperera	9f8ca3ea9a	Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt-plugins into rest-api-improvements	2016-05-28 01:50:20 +05:30
inoshperera	4dbf1bdc2f	adding swagger annotation and making APIs standerdize	2016-05-28 01:50:14 +05:30
Kasun Delgolla	bd65e8b2a7	Committing missing android features	2016-05-28 01:38:03 +05:30
Chatura Dilan	b8cfcf4413	Fixed Enrollment issue	2016-05-27 23:18:11 +05:30
Chatura Dilan	91003fdee1	Merge branch 'rest-api-improvements' of github.com:wso2/carbon-device-mgt-plugins into rest-api-improvements	2016-05-27 22:44:22 +05:30