Commit Graph

1205 Commits

Author SHA1 Message Date
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
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
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
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
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
Ace
d13368d144 Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt into rest-api-improvements 2016-05-31 17:17:20 +05:30
Ace
bfe215deac Adding changes and bug fixes to UserMgtService 2016-05-31 17:13:11 +05:30
Milan Perera
289fef040b Merge pull request #282 from ayyoob/rest-api-improvements
Rest api improvements in password reset
2016-05-31 17:13:11 +05:30
ayyoob
d63e5e876b added password validation error msg 2016-05-31 17:09:34 +05:30
prabathabey
1d4d0b7ae2 Improving certificate management webapp implementation 2016-05-31 16:13:45 +05:30
ayyoob
74a96015a7 Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt into rest-api-improvements 2016-05-31 13:57:54 +05:30
ayyoob
cf1e808cbd refactored after testing UserAdminManangmentService 2016-05-31 13:57:38 +05:30
hasuniea
dfc673b08f Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt into rest-api-improvements 2016-05-31 13:13:32 +05:30
hasuniea
1443c7757e fixing code issues 2016-05-31 13:13:01 +05:30
prabathabey
9f48145614 Improving device admin service impl 2016-05-31 13:12:57 +05:30
prabathabey
697c727801 Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt into rest-api-improvements 2016-05-31 13:00:26 +05:30
prabathabey
fc3d6cccbf Fixing Issues in notification management APIs 2016-05-31 12:49:51 +05:30
hasuniea
57d445237a add certificateMgtService 2016-05-31 12:48:26 +05:30
charitha
92a732cd41 Moved redundant texts to constants 2016-05-31 11:30:36 +05:30
geethkokila
3defcfe20d Fixing the applicationMgtAdminService for returing activity 2016-05-31 11:25:11 +05:30
charitha
e2c03adec4 FIx for https://wso2.org/jira/browse/IOTS-169 2016-05-31 11:14:37 +05:30
prabathabey
fbf213f77c Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt into rest-api-improvements 2016-05-30 17:47:14 +05:30
prabathabey
20fd2ec768 Improving application installation/uninstallation handling 2016-05-30 17:46:37 +05:30
hasuniea
9c3c08b4ca fix UnAuthorizedDeviceAccessException.java 2016-05-30 17:15:21 +05:30
prabathabey
af58e5ec88 Code cleanup 2016-05-30 16:42:10 +05:30
prabathabey
5ed982beb4 Adding more improvements to the JAX-RS APIs of CDM-F 2016-05-30 16:40:57 +05:30
prabathabey
fd7a137b07 Improving jax-rs APIS of CDM-F 2016-05-30 13:39:52 +05:30
hasuniea
20343d9349 fixed swagger message issue 2016-05-30 13:03:21 +05:30
prabathabey
726a700528 Improving error handling in checking for monitoring frquency 2016-05-30 11:45:02 +05:30
prabathabey
6e5148a374 Fixing inconsistencies between what's represented via swagger and the real implementation, and bugs found in admin services 2016-05-30 08:21:59 +05:30
prabathabey
54f9d02ebb Code cleanup 2016-05-28 11:10:22 +05:30
prabathabey
77d4c167af code cleanup 2016-05-28 08:31:20 +05:30
geethkokila
b7da99a621 Adding activity apis to get the updated once after a given time 2016-05-28 08:25:27 +05:30
prabathabey
2925f52cd8 Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt into rest-api-improvements 2016-05-28 08:12:19 +05:30
prabathabey
6d50ba14b1 Code cleanup 2016-05-28 08:11:51 +05:30
inoshperera
db3dc0517b adding activity status related details. 2016-05-28 07:48:45 +05:30
prabathabey
e1dfecb518 Changing the value of If-Modified-Since header as a string 2016-05-28 06:41:26 +05:30
prabathabey
76ec7bdc28 Improving swagger metada 2016-05-28 06:03:47 +05:30
prabathabey
425c0e7498 Improving swagger annotations of CDM-F core APIs further 2016-05-28 04:52:00 +05:30
geethkokila
ed0da9e1d0 Fixing the device informations to get the applications 2016-05-28 03:12:10 +05:30
prabathabey
95458ce9b0 Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt into rest-api-improvements 2016-05-28 02:04:31 +05:30
prabathabey
d92fb53dc9 Annotate APIs with 'Api' element to give users an abstract idea on what these APIs roughly do 2016-05-28 02:04:02 +05:30
geethkokila
ecc8b5e6f2 Fixing the api issues 2016-05-28 02:02:43 +05:30
geethkokila
0221782533 Adding new apis for getting the device location when list of device identifiers are supplied 2016-05-28 01:57:36 +05:30
geethkokila
62c84319d8 Fixing the device search for application list 2016-05-28 01:15:52 +05:30
prabathabey
88cab5abf5 Fixing commit conflicts 2016-05-28 01:01:47 +05:30
prabathabey
37aa05f79c Committing improved swagger annotated cdm-f APIs 2016-05-28 00:55:25 +05:30
dilanua
f4f47cbfdd Changing view names to fix oracle naming issues in dashboard analytics feature 2016-05-28 00:41:21 +05:30
geethkokila
6328d35797 Changing the device info object by adding the application list 2016-05-28 00:19:04 +05:30
inoshperera
3c73217e96 fixing osgi issue related to usage of carbon context. And adding api publishing check from config. 2016-05-27 19:15:46 +05:30
inoshperera
1ffbb2183a adding permissions for DM services 2016-05-27 14:20:10 +05:30
prabathabey
0b9c64594c Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt into rest-api-improvements 2016-05-27 12:29:01 +05:30
prabathabey
32cb32b706 modifying the name of the device management admin api war 2016-05-27 12:28:48 +05:30
inoshperera
4623fa2269 swagger annotations added to APIs 2016-05-27 11:55:58 +05:30
prabathabey
30f6fc53b5 Merging the latest changes introduced in master 2016-05-27 11:44:58 +05:30
prabathabey
ebefd60533 Renaming TenantConfiguration as PlatformConfiguration 2016-05-27 11:22:54 +05:30
Milan Perera
4462c353b4 Merge pull request #277 from ayyoob/transport
Fixed https://wso2.org/jira/browse/IOTS-177
2016-05-26 21:21:06 +05:30
geethkokila
86e564713d Adding the changes for getting activity ids which are changes after a certain time 2016-05-26 21:16:01 +05:30
geethkokila
01e3cc4987 Fixing the activity related issues 2016-05-26 18:44:12 +05:30
prabathabey
6d33d7036b Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt into rest-api-improvements 2016-05-26 18:02:12 +05:30
prabathabey
0f5cf86d04 Adding the base path to be included in the swagger docs and appending the proper version to the webapp name 2016-05-26 18:00:45 +05:30
ayyoob
5532db6dd4 Fixed https://wso2.org/jira/browse/IOTS-177 2016-05-26 17:10:37 +05:30
inoshperera
aeec472805 Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt into rest-api-improvements 2016-05-26 12:53:20 +05:30
inoshperera
2959c05e1a adding swagger annotations for device and activity APIs. 2016-05-26 12:52:49 +05:30
prabathabey
7e8f38cf16 Fixing conflicts while merging the latest changes in master 2016-05-25 17:59:12 +05:30
prabathabey
e7bf0c7658 Resolving conflicts caused by merging with the updates in master 2016-05-25 17:45:37 +05:30
prabathabey
8b9cf0da85 Resolving conflicts caused by merging with the updates in master 2016-05-25 17:37:21 +05:30
prabathabey
29b3b965b0 Making all CDM-F REST APIs compatible with the REST API specifications 2016-05-25 16:26:29 +05:30
Milan Perera
67e5a5a23a Merge pull request #275 from GPrathap/master
added a bundleDef :net.minidev:json-smart
2016-05-25 14:56:36 +05:30
GPrathap
78475963e3 added entry for websocket url 2016-05-25 14:38:46 +05:30
inoshperera
deb4195f7a Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-05-25 13:54:42 +05:30
inoshperera
a40e44899a syncing REST apis of core and product EMM 2016-05-25 12:38:24 +05:30
Ruwan
98f8ace1ff Merge pull request #274 from rasika90/master
Adding licence headers for server-side handlebar templates
2016-05-25 11:45:12 +05:30