Shabirmean
|
a55dc9bce8
|
Adding necessary imports for the Certificate generation from CSR
|
2016-06-07 09:29:54 +05:30 |
|
Shabirmean
|
4380f7e242
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2016-06-06 19:13:56 +05:30 |
|
Milan Perera
|
489fa46569
|
Merge pull request #293 from milanperera/apim
Changed HTTPS Url
|
2016-06-06 15:59:11 +05:30 |
|
mharindu
|
de72cc21c6
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into apim
|
2016-06-06 15:52:57 +05:30 |
|
mharindu
|
3858920d72
|
Changed HTTPS Url
|
2016-06-06 15:52:22 +05:30 |
|
Ruwan
|
db56143fa3
|
Merge pull request #292 from ayyoob/transport
added https url for jaggery app deployment server
|
2016-06-06 13:58:55 +05:30 |
|
ayyoob
|
bb051deebc
|
added https url for jaggery app deployment server
|
2016-06-06 13:55:05 +05:30 |
|
Milan Perera
|
c3ea1b3be8
|
Merge pull request #291 from ayyoob/transport
added missing imports
|
2016-06-06 10:47:21 +05:30 |
|
ayyoob
|
c5a997b1bf
|
added missing imports
|
2016-06-06 10:42:31 +05:30 |
|
ayyoob
|
cd6a5aad6f
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into transport
|
2016-06-06 10:33:06 +05:30 |
|
Milan Perera
|
64da754ab2
|
Merge pull request #290 from milanperera/apim
Fixed APIM publishing issues
|
2016-06-06 09:45:23 +05:30 |
|
mharindu
|
a80ca2d696
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into apim
|
2016-06-06 09:10:07 +05:30 |
|
Kasun Delgolla
|
008a8a893f
|
Merge pull request #289 from GPrathap/master
fixing jira:IOTS-195
|
2016-06-05 23:37:14 +05:30 |
|
GPrathap
|
efb71d472a
|
changing sso default state
|
2016-06-05 23:21:39 +05:30 |
|
GPrathap
|
e23044d59d
|
fixing jira:IOTS-195
|
2016-06-05 23:15:54 +05:30 |
|
mharindu
|
f7c653b61c
|
Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt into rest-api-improvements
|
2016-06-04 11:33:37 +05:30 |
|
mharindu
|
9eb2f5df86
|
Fixed foriegn key violation issue when getting pending operations
|
2016-06-04 11:33:22 +05:30 |
|
Milan Perera
|
17e89024c9
|
Merge pull request #288 from madhawap/rest-api-improvements
Fixes to if-modified-since in activity provider
|
2016-06-03 23:32:47 +05:30 |
|
madhawap
|
f80603a365
|
Fixes to if-modified-since in activity provider
|
2016-06-03 22:19:40 +05:30 |
|
Ace
|
4609888ad1
|
Fixes to ifmodified-since in activity provider
|
2016-06-03 21:03:29 +05:30 |
|
Milan Perera
|
575c6d1f8c
|
Merge pull request #287 from ayyoob/rest-api-improvements
updated the timestamp
|
2016-06-03 19:47:51 +05:30 |
|
ayyoob
|
23ee3e25e7
|
updated the timestamp
|
2016-06-03 19:38:24 +05:30 |
|
geethkokila
|
42ce71da2c
|
Fixing the spelling mistake
|
2016-06-03 18:06:33 +05:30 |
|
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 |
|
Shabirmean
|
cbd42d2026
|
Changes to the certificate generators to fetch the Certificate alias from the Unique Identifier set in the CSR
|
2016-06-02 17:13:09 +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 |
|