Commit Graph

2344 Commits

Author SHA1 Message Date
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
13db7c906f changing the webapp name of cdmf admin APIs 2016-05-30 12:08:22 +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
mharindu
71eb657e52 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into apim 2016-05-28 21:05:09 +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
dafd219868 Merge pull request #280 from madhawap/master
Added username field to the device certificate DB and related changes
2016-05-27 22:31:28 +05:30
Madhawa Perera
4b128a6ebd Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-05-27 22:15:53 +05:30
Madhawa Perera
d805245ffc added username field to the device certificate db and related changes 2016-05-27 22:15:21 +05:30
Hasunie
981db24ca8 Merge pull request #279 from hasuniea/master
add certificate feature
2016-05-27 19:48:49 +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
hasuniea
271170c26e refactored cert feature 2016-05-27 18:42:24 +05:30
inoshperera
1ffbb2183a adding permissions for DM services 2016-05-27 14:20:10 +05:30
ayyoob
e03be5183d updated JWT Authenticator implementation to support tenancy 2016-05-27 14:01:54 +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
prabathabey
7e3865a233 Fixing admin webapp path in p2.inf 2016-05-27 10:55:47 +05:30
ayyoob
c9cd051a6b subscribed to super tenant apis 2016-05-27 02:20:15 +05:30
ayyoob
e8b9f03748 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into apim 2016-05-27 01:27:32 +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
ayyoob
9640653b09 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into transport 2016-05-26 19:59:16 +05:30
geethkokila
01e3cc4987 Fixing the activity related issues 2016-05-26 18:44:12 +05:30
geethkokila
f29cacffff Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-05-26 18:23:40 +05:30
geethkokila
6365e5a8a9 Fixing activity the activity id 2016-05-26 18:23:29 +05:30
hasuniea
ad7fa09e32 add certificate service 2016-05-26 18:11:07 +05:30