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 |
|
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
|
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 |
|
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 |
|
prabathabey
|
7e3865a233
|
Fixing admin webapp path in p2.inf
|
2016-05-27 10:55:47 +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 |
|
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 |
|
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 |
|
Dilan U. Ariyaratne
|
dfe39e1b19
|
Merge pull request #278 from dilee/master
Fixed Oracle driver-related syntax issues and changed dashboard-related table names
|
2016-05-26 17:18:57 +05:30 |
|
Dileesha Rajapakse
|
8821227de2
|
Fixed Oracle driver related syntax issues and table names
|
2016-05-26 17:15:35 +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 |
|
Hasunie
|
e5586ea9fc
|
Merge pull request #276 from hasuniea/master
add SCEP csr signing feature
|
2016-05-25 18:24:12 +05:30 |
|
hasuniea
|
c281b6a6f0
|
SCEP csr sign feature
|
2016-05-25 18:14:28 +05:30 |
|
hasuniea
|
7281abf876
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2016-05-25 18:11:29 +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
|
c9c0a75430
|
added a bundleDef :net.minidev:json-smart
|
2016-05-25 14:39:59 +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 |
|
hasuniea
|
ad1a4cbd6a
|
fixed code conflicts
|
2016-05-25 13:51:46 +05:30 |
|
hasuniea
|
e2e517d7ca
|
SCEP endpoint
|
2016-05-25 13:44: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 |
|
geethkokila
|
c64a6e0ec5
|
Changing apis to return activity when an operation is added
|
2016-05-25 11:42:44 +05:30 |
|