Commit Graph

2208 Commits

Author SHA1 Message Date
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
inoshperera
d71f0c6e6d Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt into rest-api-improvements 2016-06-03 01:46:03 +05:30
inoshperera
037acbe5bb fixing platform configuration appearing twice issue. 2016-06-03 01:43:21 +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
geethkokila
cc6883d955 Changing the if to a while loop, fixing the activity id issue 2016-06-02 22:26:19 +05:30
prabathabey
67c9ee0e70 Fixing commit conflict 2016-06-02 20:52:26 +05:30
prabathabey
b24250f3f2 Returning device info within the device bean itself 2016-06-02 20:49:23 +05:30
hasuniea
dc72fd1553 Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt into rest-api-improvements 2016-06-02 19:01:01 +05:30
hasuniea
e2cebcd430 removed If-Modified-Since header param 2016-06-02 19:00:41 +05:30
inoshperera
ee948abc9d fixing conflicts and improving swagger annotations and validations 2016-06-02 18:44:26 +05:30
inoshperera
5620e38681 adding proper error messages for APIs 2016-06-02 11:04:33 +05:30
prabathabey
92cf44380e Adding validations to certificate deletion operation 2016-06-02 00:48:44 +05:30
prabathabey
fe22bfc125 Renaming 'recieved' to 'received' 2016-06-02 00:33:14 +05:30
prabathabey
d32cd96a74 Fixing merge conflicts 2016-06-02 00:28:47 +05:30
prabathabey
9ebf705323 Re-enabling retrieval of device info 2016-06-02 00:22:46 +05:30
prabathabey
e002ffb54a Re-enabling retrieval of device info 2016-06-02 00:20:14 +05:30
dilanua
dada719486 Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt into rest-api-improvements 2016-06-01 15:59:14 +05:30
dilanua
0bd2a46690 Adding H2/MSSQL/ORACLE/POSTGRESQL support for GET /admin/devices API 2016-06-01 15:58:45 +05:30
Milan Perera
cc761e7e70 Merge pull request #286 from ayyoob/rest-api-improvements
removed unused permission from permission.xml and updated certificate api permission
2016-06-01 13:58:20 +05:30
ayyoob
52c59c8e53 added permission updates on certificates 2016-06-01 12:39:38 +05:30
ayyoob
aa6298b5e7 updated device management admin api permission 2016-06-01 12:28:10 +05:30
ayyoob
d926bdaa34 removed unused permission from permission.xml 2016-06-01 12:20:18 +05:30
dilanua
07a4a65c7c Fixing permission issues with GET /devices/*/*/features API 2016-06-01 11:14:17 +05:30
dilanua
25e45dc9f1 Fixing issues in GET /operations and /admin/devices APIs 2016-06-01 10:44:08 +05:30
mharindu
7a029743ba Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt into rest-api-improvements 2016-06-01 02:18:53 +05:30
mharindu
81aa298740 Fixed RoleManagementService API issues 2016-06-01 02:18:15 +05:30
prabathabey
3cb9b5bae2 Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt into rest-api-improvements 2016-06-01 01:30:17 +05:30
prabathabey
61beca5048 Fixing getDevice method to support status, ownership, etc as query param filters 2016-06-01 01:30:02 +05:30
Prabath Abeysekara
8d0e01a0ac Merge pull request #285 from ayyoob/rest-api-improvements
updated permissions in the permission.xml
2016-06-01 01:26:40 +05:30
ayyoob
9f1de717c5 updated permissions in the permission.xml 2016-06-01 01:23:13 +05:30
mharindu
7aa37ff4d5 Fixed issues in RoleManagementService 2016-06-01 00:31:48 +05:30
mharindu
63ea40eb27 Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt into rest-api-improvements 2016-06-01 00:10:36 +05:30
mharindu
ce557266ec Fixed issues in RoleManagementService 2016-06-01 00:10:30 +05:30
Prabath Abeysekara
12a22d86ef Merge pull request #284 from ayyoob/rest-api-improvements
few changes after testing user management api
2016-05-31 23:32:34 +05:30
ayyoob
d9c15b62e7 few changes after testing user management api 2016-05-31 23:26:51 +05:30
Prabath Abeysekara
14322d4ba5 Merge pull request #283 from ayyoob/rest-api-improvements
fixed api issues in policy
2016-05-31 19:16:25 +05:30
ayyoob
5b8b15f69b fixed api issues in policy 2016-05-31 19:12:58 +05:30
prabathabey
c9a2dc4399 Improving user management API implementation 2016-05-31 19:05:37 +05:30
prabathabey
627d99e913 Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt into rest-api-improvements 2016-05-31 18:36:13 +05:30
prabathabey
00a16ea2bc Improving Role management API implementation 2016-05-31 18:36:00 +05:30
dilanua
4a74ea8100 Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt into rest-api-improvements 2016-05-31 18:34:07 +05:30
dilanua
374d509881 Updating DeviceManagementAdminServiceImpl 2016-05-31 18:34:00 +05:30
prabathabey
3e21c6d50d Improving ceritificate management webapp impl 2016-05-31 17:49:26 +05:30
Ace
ddfd678b2a Adding user management API bug fixes and improvements 2016-05-31 17:26:20 +05:30