ayyoob
|
ebebca8573
|
Added support for push notification for xmpp, mqtt and few changes to the after testing
|
2016-06-20 02:33:59 +05:30 |
|
ayyoob
|
0c2de7965f
|
Added device scope validation
|
2016-06-20 02:33:17 +05:30 |
|
madhawap
|
ea56d4ced3
|
Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt into rest-api-improvements
|
2016-06-17 17:37:23 +05:30 |
|
madhawap
|
015ca0575e
|
added 'updatedTimeStamp' to the Activity get response
|
2016-06-17 17:36:50 +05:30 |
|
ayyoob
|
1373e995fb
|
added support to load device type configuration in base ui
|
2016-06-17 17:21:39 +05:30 |
|
dilanua
|
1513c6cf8a
|
Adding isActive property to PolicyWrapper
|
2016-06-17 12:05:35 +05:30 |
|
madhawap
|
7cdb7dcee1
|
Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt into rest-api-improvements
|
2016-06-17 10:14:21 +05:30 |
|
dilanua
|
0eed97e84c
|
Adding API for getting device types
|
2016-06-15 14:21:31 +05:30 |
|
madhawap
|
b3f95d19c1
|
add changes to 'since' QueryParam and 'if-modified-since' HeaderParam
|
2016-06-15 12:05:44 +05:30 |
|
inoshperera
|
96eb71314b
|
Merge pull request #297 from madhawap/rest-api-improvements
add changes to 'since' QueryParam and 'if-modified-since' HeaderParam
|
2016-06-14 18:49:01 +05:30 |
|
madhawap
|
d7b860b955
|
Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt into rest-api-improvements
|
2016-06-14 18:09:16 +05:30 |
|
madhawap
|
59119f9167
|
add changes to 'since' QueryParam and 'if-modified-since' HeaderParam
|
2016-06-14 18:08:43 +05:30 |
|
ayyoob
|
7b2c04152f
|
changed the UI calls from tomcat to apimgt gateway
|
2016-06-14 15:49:34 +05:30 |
|
Ace
|
7b62d2769e
|
Changing response code returned when adding user
|
2016-06-14 15:28:59 +05:30 |
|
madhawap
|
3d416da6fe
|
add changes to 'since' QueryParam and 'if-modified-since' HeaderParam
|
2016-06-14 12:03:14 +05:30 |
|
geethkokila
|
626142a59b
|
Fixing the isssue in retrieving the device info
|
2016-06-14 10:47:07 +05:30 |
|
Ace
|
016414c076
|
Bug fixes for role search
|
2016-06-13 15:43:21 +05:30 |
|
geethkokila
|
d6501cbf8c
|
Fixing the device search issues
|
2016-06-13 10:15:26 +05:30 |
|
hasuniea
|
629a0103d9
|
renaming scep web app
|
2016-06-10 09:39:39 +05:30 |
|
hasuniea
|
81aae9716d
|
fixing certmgt issue
|
2016-06-09 14:16:02 +05:30 |
|
hasuniea
|
ec3d032bc5
|
fixinf code issues
|
2016-06-09 10:07:01 +05:30 |
|
hasuniea
|
6471055c3f
|
add refactored stuff
|
2016-06-09 10:00:35 +05:30 |
|
ayyoob
|
b94eed267c
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into transport
|
2016-06-08 22:41:04 +05:30 |
|
ayyoob
|
52e84273d1
|
added profile check before publishing apis
|
2016-06-08 22:38:49 +05:30 |
|
Shabirmean
|
adec5cc303
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2016-06-08 12:01:32 +05:30 |
|
Sahan Kariyawasam
|
35f43a60e7
|
Added Dashboard server url property
|
2016-06-07 19:18:03 +05:30 |
|
geethkokila
|
1fabb0eee3
|
Fixing the database syncing issue
|
2016-06-07 12:55:15 +05:30 |
|
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 |
|
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 |
|
ayyoob
|
bb051deebc
|
added https url for jaggery app deployment server
|
2016-06-06 13:55:05 +05:30 |
|
ayyoob
|
c5a997b1bf
|
added missing imports
|
2016-06-06 10:42:31 +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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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
|
9c75252209
|
Updating permission.xml of certificate management admin service webapp with updated resource paths
|
2016-05-31 16:46:43 +05:30 |
|
prabathabey
|
d65174d026
|
making the certificate management war adhere the REST API guidelines
|
2016-05-31 16:27:35 +05:30 |
|
mharindu
|
cfe24229fc
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into apim
|
2016-05-31 16:19:03 +05:30 |
|
prabathabey
|
f5aa2c5eb1
|
Improving swagger annotations added to certificate management service
|
2016-05-31 16:17:05 +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 |
|
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 |
|
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 |
|
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 |
|
geethkokila
|
01e3cc4987
|
Fixing the activity related issues
|
2016-05-26 18:44:12 +05:30 |
|
hasuniea
|
ad7fa09e32
|
add certificate service
|
2016-05-26 18:11:07 +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 |
|
mharindu
|
52388ed33d
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into apim
|
2016-05-26 12:44:36 +05:30 |
|
mharindu
|
106be76118
|
Fixed issues of API publishing to gateway
|
2016-05-26 12:41:20 +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
|
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 |
|
Rasika Perera
|
d7f4a39075
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2016-05-25 11:34:51 +05:30 |
|
Rasika Perera
|
b879927dc1
|
Adding licence headers for handlebar templates
|
2016-05-25 11:28:24 +05:30 |
|
geethkokila
|
afba711969
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2016-05-25 08:16:14 +05:30 |
|
dilanua
|
7530a98f6b
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2016-05-24 18:27:06 +05:30 |
|
dilanua
|
339512e287
|
Updating comments in dashboard analytics feature
|
2016-05-24 18:26:47 +05:30 |
|
inoshperera
|
d7fe6d5e96
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2016-05-24 17:46:17 +05:30 |
|
Milan Perera
|
356c8f125e
|
Merge pull request #273 from ayyoob/transport
added webapp publisher missing bundle
|
2016-05-24 15:44:17 +05:30 |
|
ayyoob
|
feaf6b2b35
|
added webapp publisher missing bundle
|
2016-05-24 15:35:48 +05:30 |
|
dilanua
|
4663d78060
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2016-05-23 17:14:52 +05:30 |
|
dilanua
|
47e17e4a51
|
Introducing more detailed exceptions, controlled filter-sets to dashboard analytics feature
|
2016-05-23 17:14:29 +05:30 |
|
mharindu
|
50d35a90f8
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2016-05-23 16:51:38 +05:30 |
|
mharindu
|
66ccad65cf
|
Partial commit for APIM Gateway migration
|
2016-05-23 16:51:26 +05:30 |
|
inosh
|
1341884957
|
resolving conflicts
|
2016-05-23 14:14:05 +05:30 |
|
inosh
|
60b42715d6
|
syncing admin api from product emm
|
2016-05-23 14:11:25 +05:30 |
|
geethkokila
|
16b809b255
|
Fixing the conflicts
|
2016-05-23 11:21:48 +05:30 |
|
geethkokila
|
1697a7ce85
|
Doing a partial commit for syncing the code base
|
2016-05-23 11:19:37 +05:30 |
|
geethkokila
|
ba25ecc6ef
|
Doing a partial commit for syncing the code base
|
2016-05-23 11:19:22 +05:30 |
|
Prabath Abeysekara
|
830b3fc075
|
Merge pull request #272 from wso2/release-1.1.0
Release 1.1.0 and upgrading the versions
|
2016-05-23 10:08:13 +05:30 |
|
dilanua
|
8c4752ede3
|
Adding more comments to dashboard analytics data service interface
|
2016-05-22 16:54:07 +05:30 |
|
dilanua
|
975a3b915f
|
Properly layering beans and custom exceptions in dashboard analytics feature
|
2016-05-22 08:12:25 +05:30 |
|
dilanua
|
a7c7452e2e
|
Adding final updates to dashboard analytics feature
|
2016-05-20 17:10:37 +05:30 |
|
mharindu
|
3e291c5b13
|
[maven-release-plugin] prepare for next development iteration
|
2016-05-20 16:43:16 +05:30 |
|