Timo Briddigkeit
|
90910518d6
|
Fixed null pointer dereferences
|
8 years ago |
Ace
|
15ae91d1c5
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
8 years ago |
Ace
|
ca10ad53bb
|
Adding emm apis as common modules
|
8 years ago |
prabathabey
|
40b43a8b97
|
DAO exceptions thrown while retrieving advance details of devices appears to have been swallowen at the REST API implementation that exposes the aforementioned functionality. This particular fix resolves it
|
8 years ago |
Timo Briddigkeit
|
b674304087
|
Made constants real constant using final
|
8 years ago |
Timo Briddigkeit
|
ee5b077e6a
|
Fixed various XML External Entity (XXE) attack vulnerabilities
|
8 years ago |
Timo Briddigkeit
|
09020ccb9f
|
Fixed predictable pseudorandom number generator
|
8 years ago |
mharindu
|
99664b23c5
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into scope-impl
|
8 years ago |
Dilan U. Ariyaratne
|
ab5aa3e31c
|
Merge pull request #315 from madhawap/master
Added missing end-point to the permissions.xml
|
8 years ago |
madhawap
|
0b338a1d25
|
Added missing end-point to the permissions.xml
|
8 years ago |
mharindu
|
789086a667
|
Changed context paths
|
8 years ago |
mharindu
|
0f904e21d8
|
Fixed conflicts and merged
|
8 years ago |
Chatura Dilan
|
4ec11e8c08
|
[maven-release-plugin] prepare for next development iteration
|
8 years ago |
Chatura Dilan
|
ffedcac543
|
[maven-release-plugin] prepare release v1.1.1
|
8 years ago |
mharindu
|
79a6da82f2
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
8 years ago |
mharindu
|
c7eef634ac
|
Added send-invitation endpoint
|
8 years ago |
dilanua
|
c61ef1c98e
|
Fixing issues of GET /compliance-data API
|
8 years ago |
Ace
|
58666bc4b0
|
Adding device name url param for device search
|
8 years ago |
madhawap
|
c3cbc5b4fb
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
8 years ago |
madhawap
|
0b1e4ad86b
|
Updated permissions.xml according to new end-points
|
8 years ago |
Ace
|
d58fb57f4e
|
Enabling device search for multiple params
|
8 years ago |
madhawap
|
e52fed0b2d
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
8 years ago |
madhawap
|
34354c032e
|
Added end-point to get devices enrolled under a specific user
|
8 years ago |
prabathabey
|
6edfad5fb7
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
8 years ago |
prabathabey
|
9aa54f2ead
|
Improving policy management functionalities to use deviceType in place of deviceTypeId for persisting policy information
|
8 years ago |
Dilan U. Ariyaratne
|
73551590b9
|
Merge pull request #313 from madhawap/master
Added end point to get Compliance Data Of a Device
|
8 years ago |
madhawap
|
09e2d2ecaf
|
Removing the internal status code added to the compliance data wrapper
|
8 years ago |
madhawap
|
68b7d304a0
|
Added end point to get Compliance Data Of a Device
|
8 years ago |
prabathabey
|
0125310440
|
Prepending the url template configured for updating notifications with a '/'
|
8 years ago |
prabathabey
|
78057b2992
|
Adding an API to return the list of device types registered in the underlying device management platform
|
8 years ago |
mharindu
|
cc5f677165
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into scope-impl
|
8 years ago |
mharindu
|
aa6085ac8c
|
Added scopes to APIs
|
8 years ago |
hasuniea
|
282ac72249
|
adding SCEPManagerService to scep manager compenent
|
8 years ago |
mharindu
|
ff82accb48
|
added scopes to notification API
|
8 years ago |
mharindu
|
60659ce15b
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into scope-impl
|
8 years ago |
mharindu
|
fe28bc25f1
|
Refactored scopes
|
8 years ago |
madhawap
|
c17dda082d
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
8 years ago |
madhawap
|
2136ebbeee
|
changes to 'updateNotificationStatus' swagger annotations
|
8 years ago |
hasuniea
|
54498f41cd
|
modifying scep utils
|
8 years ago |
mharindu
|
ac75ff1d71
|
Fixed conflict and merged
|
8 years ago |
mharindu
|
49623a4693
|
Implemented scope based authorization
|
8 years ago |
Chatura Dilan
|
2befefc967
|
Added OS build date
|
9 years ago |
madhawap
|
b55a164457
|
added 'updateNotificationStatus' endpoint and minor formattings to swagger annotations
|
9 years ago |
madhawap
|
dbf938416b
|
added 'updateNotificationStatus' endpoint and minor formattings to swagger annotations
|
9 years ago |
prabathabey
|
be7e63c390
|
merging rest-api-improvements branch to master
|
9 years ago |
prabathabey
|
ed5d611c35
|
Code cleanup
|
9 years ago |
prabathabey
|
f33ac36bfa
|
Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt into rest-api-improvements
|
9 years ago |
prabathabey
|
37852051ff
|
Improving Device and Policy Management APIs and cleaning up code of Role and User Management APIs
|
9 years ago |
Chatura Dilan
|
24b462f4f4
|
Added is-active field to the Application
|
9 years ago |
Ace
|
cf887a2e93
|
Merging emm module changes to devicemgt iot app
|
9 years ago |
Chatura Dilan
|
f100853031
|
Merge branch 'master' of github.com:wso2/carbon-device-mgt
|
9 years ago |
dilanua
|
d34f29ab46
|
Fixing device types not retrieving issue
|
9 years ago |
Chatura Dilan
|
bb6d2f2012
|
Fixed user search
|
9 years ago |
madhawap
|
d9b35c29cd
|
swagger annotation fix to policy 'apply-changes' end point
|
9 years ago |
madhawap
|
88feb5a852
|
Add Pagination to Notification end points
|
9 years ago |
prabathabey
|
624e7df688
|
Improving HTTP status code handling and the resource implementations
|
9 years ago |
prabathabey
|
a23f44e682
|
Improving AcitivityManagement API implementation with proper error handling, etc
|
9 years ago |
prabathabey
|
ad6b95ff62
|
Code cleanup
|
9 years ago |
prabathabey
|
a46bd9194b
|
Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt into rest-api-improvements
|
9 years ago |
prabathabey
|
4236744d39
|
Improving UserManagement and RoleManagement API implementations to return proper error codes when no role/user exists, etc
|
9 years ago |
Dilan U. Ariyaratne
|
a278b788d6
|
Merge pull request #308 from madhawap/rest-api-improvements
added priorities end-point to PolicyManagement
|
9 years ago |
madhawap
|
b50e007897
|
added /priorities end-point to PolicyManagement
|
9 years ago |
madhawap
|
9c215c4ac9
|
added /priorities end-point to PolicyManagement
|
9 years ago |
Ruwan
|
6ce7f8c65a
|
Merge pull request #307 from ayyoob/transport
Few changes added after testing with the cluster
|
9 years ago |
ayyoob
|
ba6e202442
|
Few changes added after testing with the cluster
|
9 years ago |
inoshperera
|
50009c7ac5
|
adding apply policy end point
|
9 years ago |
madhawap
|
ee11bde8b0
|
Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt into rest-api-improvements
|
9 years ago |
madhawap
|
235d690f1e
|
Implemented 'offset' and 'limit' parameters to the 'operation' api
|
9 years ago |
prabathabey
|
0c54753b34
|
Cleaning up UserManagementService API implementation
|
9 years ago |
prabathabey
|
f1eca17991
|
Code cleanup
|
9 years ago |
prabathabey
|
9a7286a84b
|
Removing DeviceWrapper and all its associated usage, as it appeared to be a redundant element in the precense of 'Device'
|
9 years ago |
prabathabey
|
3813856be8
|
Removing DeviceWrapper and all its associated usage, as it appeared to be a redundant element in the precense of 'Device'
|
9 years ago |
prabathabey
|
aeb4ad3295
|
Merging rest-api-improvements branch to master
|
9 years ago |
geethkokila
|
c07914eb36
|
Adding the activity count for the activty paginantion
|
9 years ago |
geethkokila
|
a67f432993
|
Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt into rest-api-improvements
|
9 years ago |
geethkokila
|
236eb90ce2
|
Fixing the limit and offset for activity
|
9 years ago |
madhawap
|
f2ab923df5
|
fix related to http status code in 'getDevices' endpoint
|
9 years ago |
ayyoob
|
ebebca8573
|
Added support for push notification for xmpp, mqtt and few changes to the after testing
|
9 years ago |
madhawap
|
ea56d4ced3
|
Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt into rest-api-improvements
|
9 years ago |
madhawap
|
015ca0575e
|
added 'updatedTimeStamp' to the Activity get response
|
9 years ago |
ayyoob
|
1373e995fb
|
added support to load device type configuration in base ui
|
9 years ago |
dilanua
|
1513c6cf8a
|
Adding isActive property to PolicyWrapper
|
9 years ago |
madhawap
|
7cdb7dcee1
|
Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt into rest-api-improvements
|
9 years ago |
dilanua
|
0eed97e84c
|
Adding API for getting device types
|
9 years ago |
madhawap
|
b3f95d19c1
|
add changes to 'since' QueryParam and 'if-modified-since' HeaderParam
|
9 years ago |
inoshperera
|
96eb71314b
|
Merge pull request #297 from madhawap/rest-api-improvements
add changes to 'since' QueryParam and 'if-modified-since' HeaderParam
|
9 years ago |
madhawap
|
d7b860b955
|
Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt into rest-api-improvements
|
9 years ago |
madhawap
|
59119f9167
|
add changes to 'since' QueryParam and 'if-modified-since' HeaderParam
|
9 years ago |
ayyoob
|
7b2c04152f
|
changed the UI calls from tomcat to apimgt gateway
|
9 years ago |
Ace
|
7b62d2769e
|
Changing response code returned when adding user
|
9 years ago |
madhawap
|
3d416da6fe
|
add changes to 'since' QueryParam and 'if-modified-since' HeaderParam
|
9 years ago |
geethkokila
|
626142a59b
|
Fixing the isssue in retrieving the device info
|
9 years ago |
Ace
|
016414c076
|
Bug fixes for role search
|
9 years ago |
geethkokila
|
d6501cbf8c
|
Fixing the device search issues
|
9 years ago |
Sahan Kariyawasam
|
35f43a60e7
|
Added Dashboard server url property
|
9 years ago |
mharindu
|
de72cc21c6
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into apim
|
9 years ago |
mharindu
|
3858920d72
|
Changed HTTPS Url
|
9 years ago |
ayyoob
|
bb051deebc
|
added https url for jaggery app deployment server
|
9 years ago |
mharindu
|
a80ca2d696
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into apim
|
9 years ago |
GPrathap
|
efb71d472a
|
changing sso default state
|
9 years ago |
GPrathap
|
e23044d59d
|
fixing jira:IOTS-195
|
9 years ago |
mharindu
|
f7c653b61c
|
Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt into rest-api-improvements
|
9 years ago |
mharindu
|
9eb2f5df86
|
Fixed foriegn key violation issue when getting pending operations
|
9 years ago |
madhawap
|
f80603a365
|
Fixes to if-modified-since in activity provider
|
9 years ago |
Ace
|
4609888ad1
|
Fixes to ifmodified-since in activity provider
|
9 years ago |
ayyoob
|
23ee3e25e7
|
updated the timestamp
|
9 years ago |
geethkokila
|
42ce71da2c
|
Fixing the spelling mistake
|
9 years ago |
geethkokila
|
6aea69ae44
|
Fixing the duplicate issue
|
9 years ago |
geethkokila
|
efa74030b4
|
Fixing response duplicate issue
|
9 years ago |
prabathabey
|
8819c6e36b
|
Adding support for 'If-Modified-Since' header and 'since' query filter
|
9 years ago |
inoshperera
|
d71f0c6e6d
|
Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt into rest-api-improvements
|
9 years ago |
inoshperera
|
037acbe5bb
|
fixing platform configuration appearing twice issue.
|
9 years ago |
prabathabey
|
3c21583db6
|
Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt into rest-api-improvements
|
9 years ago |
prabathabey
|
1a29a9f58f
|
Further fixing retrieving application list with device info
|
9 years ago |
geethkokila
|
ae887d6842
|
Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt into rest-api-improvements
|
9 years ago |
geethkokila
|
a04300b3b6
|
Fixing the activity Id issue
|
9 years ago |
prabathabey
|
d3ce96585f
|
Fixing issues in returning application list in the device response
|
9 years ago |
geethkokila
|
cc6883d955
|
Changing the if to a while loop, fixing the activity id issue
|
9 years ago |
prabathabey
|
67c9ee0e70
|
Fixing commit conflict
|
9 years ago |
prabathabey
|
b24250f3f2
|
Returning device info within the device bean itself
|
9 years ago |
hasuniea
|
dc72fd1553
|
Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt into rest-api-improvements
|
9 years ago |
hasuniea
|
e2cebcd430
|
removed If-Modified-Since header param
|
9 years ago |
inoshperera
|
ee948abc9d
|
fixing conflicts and improving swagger annotations and validations
|
9 years ago |
inoshperera
|
5620e38681
|
adding proper error messages for APIs
|
9 years ago |
prabathabey
|
fe22bfc125
|
Renaming 'recieved' to 'received'
|
9 years ago |
prabathabey
|
d32cd96a74
|
Fixing merge conflicts
|
9 years ago |
prabathabey
|
9ebf705323
|
Re-enabling retrieval of device info
|
9 years ago |
prabathabey
|
e002ffb54a
|
Re-enabling retrieval of device info
|
9 years ago |
dilanua
|
dada719486
|
Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt into rest-api-improvements
|
9 years ago |
dilanua
|
0bd2a46690
|
Adding H2/MSSQL/ORACLE/POSTGRESQL support for GET /admin/devices API
|
9 years ago |
ayyoob
|
aa6298b5e7
|
updated device management admin api permission
|
9 years ago |
ayyoob
|
d926bdaa34
|
removed unused permission from permission.xml
|
9 years ago |
dilanua
|
07a4a65c7c
|
Fixing permission issues with GET /devices/*/*/features API
|
9 years ago |
dilanua
|
25e45dc9f1
|
Fixing issues in GET /operations and /admin/devices APIs
|
9 years ago |
mharindu
|
7a029743ba
|
Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt into rest-api-improvements
|
9 years ago |
mharindu
|
81aa298740
|
Fixed RoleManagementService API issues
|
9 years ago |
prabathabey
|
3cb9b5bae2
|
Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt into rest-api-improvements
|
9 years ago |
prabathabey
|
61beca5048
|
Fixing getDevice method to support status, ownership, etc as query param filters
|
9 years ago |
ayyoob
|
9f1de717c5
|
updated permissions in the permission.xml
|
9 years ago |
mharindu
|
7aa37ff4d5
|
Fixed issues in RoleManagementService
|
9 years ago |
mharindu
|
63ea40eb27
|
Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt into rest-api-improvements
|
9 years ago |
mharindu
|
ce557266ec
|
Fixed issues in RoleManagementService
|
9 years ago |
ayyoob
|
d9c15b62e7
|
few changes after testing user management api
|
9 years ago |
Prabath Abeysekara
|
14322d4ba5
|
Merge pull request #283 from ayyoob/rest-api-improvements
fixed api issues in policy
|
9 years ago |
ayyoob
|
5b8b15f69b
|
fixed api issues in policy
|
9 years ago |
prabathabey
|
c9a2dc4399
|
Improving user management API implementation
|
9 years ago |
prabathabey
|
627d99e913
|
Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt into rest-api-improvements
|
9 years ago |
prabathabey
|
00a16ea2bc
|
Improving Role management API implementation
|
9 years ago |
dilanua
|
4a74ea8100
|
Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt into rest-api-improvements
|
9 years ago |
dilanua
|
374d509881
|
Updating DeviceManagementAdminServiceImpl
|
9 years ago |
prabathabey
|
3e21c6d50d
|
Improving ceritificate management webapp impl
|
9 years ago |
Ace
|
ddfd678b2a
|
Adding user management API bug fixes and improvements
|
9 years ago |
Ace
|
d13368d144
|
Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt into rest-api-improvements
|
9 years ago |
Ace
|
bfe215deac
|
Adding changes and bug fixes to UserMgtService
|
9 years ago |
Milan Perera
|
289fef040b
|
Merge pull request #282 from ayyoob/rest-api-improvements
Rest api improvements in password reset
|
9 years ago |
ayyoob
|
d63e5e876b
|
added password validation error msg
|
9 years ago |
mharindu
|
cfe24229fc
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into apim
|
9 years ago |
prabathabey
|
1d4d0b7ae2
|
Improving certificate management webapp implementation
|
9 years ago |
ayyoob
|
74a96015a7
|
Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt into rest-api-improvements
|
9 years ago |
ayyoob
|
cf1e808cbd
|
refactored after testing UserAdminManangmentService
|
9 years ago |
hasuniea
|
dfc673b08f
|
Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt into rest-api-improvements
|
9 years ago |
hasuniea
|
1443c7757e
|
fixing code issues
|
9 years ago |
prabathabey
|
9f48145614
|
Improving device admin service impl
|
9 years ago |
prabathabey
|
697c727801
|
Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt into rest-api-improvements
|
9 years ago |
prabathabey
|
fc3d6cccbf
|
Fixing Issues in notification management APIs
|
9 years ago |
hasuniea
|
57d445237a
|
add certificateMgtService
|
9 years ago |
charitha
|
92a732cd41
|
Moved redundant texts to constants
|
9 years ago |
geethkokila
|
3defcfe20d
|
Fixing the applicationMgtAdminService for returing activity
|
9 years ago |
charitha
|
e2c03adec4
|
FIx for https://wso2.org/jira/browse/IOTS-169
|
9 years ago |
prabathabey
|
fbf213f77c
|
Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt into rest-api-improvements
|
9 years ago |
prabathabey
|
20fd2ec768
|
Improving application installation/uninstallation handling
|
9 years ago |
hasuniea
|
9c3c08b4ca
|
fix UnAuthorizedDeviceAccessException.java
|
9 years ago |
prabathabey
|
af58e5ec88
|
Code cleanup
|
9 years ago |
prabathabey
|
5ed982beb4
|
Adding more improvements to the JAX-RS APIs of CDM-F
|
9 years ago |
prabathabey
|
fd7a137b07
|
Improving jax-rs APIS of CDM-F
|
9 years ago |
hasuniea
|
20343d9349
|
fixed swagger message issue
|
9 years ago |
prabathabey
|
726a700528
|
Improving error handling in checking for monitoring frquency
|
9 years ago |
prabathabey
|
6e5148a374
|
Fixing inconsistencies between what's represented via swagger and the real implementation, and bugs found in admin services
|
9 years ago |
mharindu
|
71eb657e52
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into apim
|
9 years ago |
prabathabey
|
54f9d02ebb
|
Code cleanup
|
9 years ago |
prabathabey
|
77d4c167af
|
code cleanup
|
9 years ago |
geethkokila
|
b7da99a621
|
Adding activity apis to get the updated once after a given time
|
9 years ago |
prabathabey
|
2925f52cd8
|
Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt into rest-api-improvements
|
9 years ago |
prabathabey
|
6d50ba14b1
|
Code cleanup
|
9 years ago |
inoshperera
|
db3dc0517b
|
adding activity status related details.
|
9 years ago |
prabathabey
|
e1dfecb518
|
Changing the value of If-Modified-Since header as a string
|
9 years ago |
prabathabey
|
76ec7bdc28
|
Improving swagger metada
|
9 years ago |
prabathabey
|
425c0e7498
|
Improving swagger annotations of CDM-F core APIs further
|
9 years ago |
geethkokila
|
ed0da9e1d0
|
Fixing the device informations to get the applications
|
9 years ago |
prabathabey
|
95458ce9b0
|
Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt into rest-api-improvements
|
9 years ago |
prabathabey
|
d92fb53dc9
|
Annotate APIs with 'Api' element to give users an abstract idea on what these APIs roughly do
|
9 years ago |
geethkokila
|
ecc8b5e6f2
|
Fixing the api issues
|
9 years ago |
geethkokila
|
0221782533
|
Adding new apis for getting the device location when list of device identifiers are supplied
|
9 years ago |
geethkokila
|
62c84319d8
|
Fixing the device search for application list
|
9 years ago |
prabathabey
|
88cab5abf5
|
Fixing commit conflicts
|
9 years ago |
prabathabey
|
37aa05f79c
|
Committing improved swagger annotated cdm-f APIs
|
9 years ago |
dilanua
|
f4f47cbfdd
|
Changing view names to fix oracle naming issues in dashboard analytics feature
|
9 years ago |
geethkokila
|
6328d35797
|
Changing the device info object by adding the application list
|
9 years ago |
inoshperera
|
3c73217e96
|
fixing osgi issue related to usage of carbon context. And adding api publishing check from config.
|
9 years ago |
inoshperera
|
1ffbb2183a
|
adding permissions for DM services
|
9 years ago |
prabathabey
|
0b9c64594c
|
Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt into rest-api-improvements
|
9 years ago |
prabathabey
|
32cb32b706
|
modifying the name of the device management admin api war
|
9 years ago |
inoshperera
|
4623fa2269
|
swagger annotations added to APIs
|
9 years ago |
prabathabey
|
30f6fc53b5
|
Merging the latest changes introduced in master
|
9 years ago |
prabathabey
|
ebefd60533
|
Renaming TenantConfiguration as PlatformConfiguration
|
9 years ago |
ayyoob
|
e8b9f03748
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into apim
|
9 years ago |
Milan Perera
|
4462c353b4
|
Merge pull request #277 from ayyoob/transport
Fixed https://wso2.org/jira/browse/IOTS-177
|
9 years ago |
geethkokila
|
86e564713d
|
Adding the changes for getting activity ids which are changes after a certain time
|
9 years ago |
geethkokila
|
01e3cc4987
|
Fixing the activity related issues
|
9 years ago |
prabathabey
|
6d33d7036b
|
Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt into rest-api-improvements
|
9 years ago |
prabathabey
|
0f5cf86d04
|
Adding the base path to be included in the swagger docs and appending the proper version to the webapp name
|
9 years ago |
ayyoob
|
5532db6dd4
|
Fixed https://wso2.org/jira/browse/IOTS-177
|
9 years ago |
inoshperera
|
aeec472805
|
Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt into rest-api-improvements
|
9 years ago |
inoshperera
|
2959c05e1a
|
adding swagger annotations for device and activity APIs.
|
9 years ago |
mharindu
|
52388ed33d
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into apim
|
9 years ago |
mharindu
|
106be76118
|
Fixed issues of API publishing to gateway
|
9 years ago |
prabathabey
|
7e8f38cf16
|
Fixing conflicts while merging the latest changes in master
|
9 years ago |
prabathabey
|
e7bf0c7658
|
Resolving conflicts caused by merging with the updates in master
|
9 years ago |
prabathabey
|
8b9cf0da85
|
Resolving conflicts caused by merging with the updates in master
|
9 years ago |
prabathabey
|
29b3b965b0
|
Making all CDM-F REST APIs compatible with the REST API specifications
|
9 years ago |
Milan Perera
|
67e5a5a23a
|
Merge pull request #275 from GPrathap/master
added a bundleDef :net.minidev:json-smart
|
9 years ago |
GPrathap
|
78475963e3
|
added entry for websocket url
|
9 years ago |
inoshperera
|
deb4195f7a
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
9 years ago |
inoshperera
|
a40e44899a
|
syncing REST apis of core and product EMM
|
9 years ago |
Ruwan
|
98f8ace1ff
|
Merge pull request #274 from rasika90/master
Adding licence headers for server-side handlebar templates
|
9 years ago |
geethkokila
|
c64a6e0ec5
|
Changing apis to return activity when an operation is added
|
9 years ago |
Rasika Perera
|
d7f4a39075
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
9 years ago |
Rasika Perera
|
b879927dc1
|
Adding licence headers for handlebar templates
|
9 years ago |
geethkokila
|
afba711969
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
9 years ago |
dilanua
|
339512e287
|
Updating comments in dashboard analytics feature
|
9 years ago |
inoshperera
|
d7fe6d5e96
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
9 years ago |
dilanua
|
4663d78060
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
9 years ago |
dilanua
|
47e17e4a51
|
Introducing more detailed exceptions, controlled filter-sets to dashboard analytics feature
|
9 years ago |
mharindu
|
50d35a90f8
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
9 years ago |
mharindu
|
66ccad65cf
|
Partial commit for APIM Gateway migration
|
9 years ago |
inosh
|
1341884957
|
resolving conflicts
|
9 years ago |
inosh
|
60b42715d6
|
syncing admin api from product emm
|
9 years ago |
geethkokila
|
16b809b255
|
Fixing the conflicts
|
9 years ago |
geethkokila
|
1697a7ce85
|
Doing a partial commit for syncing the code base
|
9 years ago |
geethkokila
|
ba25ecc6ef
|
Doing a partial commit for syncing the code base
|
9 years ago |
Prabath Abeysekara
|
830b3fc075
|
Merge pull request #272 from wso2/release-1.1.0
Release 1.1.0 and upgrading the versions
|
9 years ago |
dilanua
|
8c4752ede3
|
Adding more comments to dashboard analytics data service interface
|
9 years ago |
dilanua
|
975a3b915f
|
Properly layering beans and custom exceptions in dashboard analytics feature
|
9 years ago |
dilanua
|
a7c7452e2e
|
Adding final updates to dashboard analytics feature
|
9 years ago |
mharindu
|
3e291c5b13
|
[maven-release-plugin] prepare for next development iteration
|
9 years ago |
mharindu
|
9549ac446b
|
[maven-release-plugin] prepare release v1.1.0
|
9 years ago |
mharindu
|
65612f724f
|
Fixed compile issue
|
9 years ago |
prabathabey
|
9ec80bfe18
|
Fixing build failures caused by changed introduced to Operation Management APIs
|
9 years ago |
dilanua
|
b9a9fb3169
|
Adding class & method comments, constants to dashboard analytics feature
|
9 years ago |
Ace
|
ecd386adf0
|
Fixing IOTS-160
|
9 years ago |
mharindu
|
968cb00f35
|
Fixed conflicts and merged
|
9 years ago |
mharindu
|
83c2a1f0ee
|
Fixed issues in api publishing
|
9 years ago |
prabathabey
|
5e03c5ed30
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
9 years ago |
prabathabey
|
a375252a94
|
Adding pluggable push notification framework
|
9 years ago |
sumedharubasinghe
|
067f0a8050
|
Merge pull request #266 from ayyoob/transport
added api application registration filter
|
9 years ago |
mharindu
|
bca1b4b059
|
Fixed conflicts
|
9 years ago |
mharindu
|
9f93570b29
|
Fixed issues in webapp-publisher
|
9 years ago |
ayyoob
|
ba47af3186
|
added api application registration filter
|
9 years ago |
dilanua
|
7051af8d80
|
Adding relevant contextual names for database view names in dashboard analytics feature
|
9 years ago |
geethkokila
|
958288f8ec
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
9 years ago |
geethkokila
|
c7dd386c94
|
Adding new apis for device informations
|
9 years ago |
dilanua
|
2886ead44b
|
Adding DataAccessLayerException to wrap SQLException in dashboard analytics feature
|
9 years ago |
mharindu
|
49cb4787c0
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into apim
|
9 years ago |
mharindu
|
82b90522a0
|
Migrated to APIM 5.0.4
|
9 years ago |
sumedharubasinghe
|
61ef87c658
|
Merge pull request #265 from rasika90/IOTS-114
Fixing IOTS-114: the user is unable to deselect a child node permissions
|
9 years ago |
Rasika Perera
|
bc3f64a77a
|
Fixing IOTS-114: the user is unable to deselect a child node permissions
|
9 years ago |
charitha
|
075b5a8901
|
Fix for https://wso2.org/jira/browse/IOTS-155 & https://wso2.org/jira/browse/IOTS-164
|
9 years ago |
sumedharubasinghe
|
6a69a3a895
|
Merge pull request #261 from charithag/master
Bug fixes and fix for https://wso2.org/jira/browse/IOTS-158
|
9 years ago |
sumedharubasinghe
|
2f6c1dfbdd
|
Merge pull request #263 from ayyoob/transport
few fixes in JWT client after testing with multi tenancy
|
9 years ago |
ayyoob
|
c0240c5cbc
|
few fixes in JWT client after testing with multi tenancy
|
9 years ago |
charitha
|
aadf87e5d9
|
Bug fixes and fix for https://wso2.org/jira/browse/IOTS-158
|
9 years ago |
Rasika Perera
|
be970bfc9d
|
Fixing IOTS-117 Domain needs to be marked as a mandatory field
|
9 years ago |
mharindu
|
89026c2b7f
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into apim
|
9 years ago |
charitha
|
6dc0a9dd38
|
Fix for https://wso2.org/jira/browse/IOTS-110 multitenanted scenario
|
9 years ago |
mharindu
|
9ebf2ab6d9
|
Merge branch 'apim' of https://github.com/milanperera/carbon-device-mgt
|
9 years ago |
charitha
|
ddc47cd862
|
Fix for https://wso2.org/jira/browse/IOTS-161
|
9 years ago |
charitha
|
0ccaa9fe81
|
Fix for https://wso2.org/jira/browse/IOTS-50 & https://wso2.org/jira/browse/IOTS-112
|
9 years ago |
mharindu
|
5ccc480ddb
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into apim
|
9 years ago |
dilanua
|
d5950afe7a
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
9 years ago |
dilanua
|
c90f4471a8
|
Replacing .equals with .isEmpty empty string check in Detdashboard analytics feature
|
9 years ago |
charitha
|
9480c71522
|
Fixed script error
|
9 years ago |
charitha
|
e0fc7c4018
|
Fix for https://wso2.org/jira/browse/IOTS-110
|
9 years ago |
charitha
|
81524ae32c
|
Fix for https://wso2.org/jira/browse/IOTS-156
|
9 years ago |
charitha
|
3d9ae8d1f6
|
Fix for https://wso2.org/jira/browse/IOTS-152
|
9 years ago |
charitha
|
e7c5ef78d0
|
Removed unnecessary jaggery apis
|
9 years ago |
mharindu
|
b77f5358e8
|
Removed external dependancies from webapp publisher component
|
9 years ago |
mharindu
|
83ec18c38d
|
Removed external dependancies from webapp publisher component
|
9 years ago |
mharindu
|
c68b92c7b4
|
Fixed conflicts
|
9 years ago |
mharindu
|
9a4b904702
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into apim
|
9 years ago |
Ruwan
|
8f0840e3df
|
Merge pull request #254 from ayyoob/transport
updated authentication in api
|
9 years ago |
ayyoob
|
168033b19d
|
updated authentication in api
|
9 years ago |
charitha
|
685c52a453
|
Bug fixes
|
9 years ago |
Ace
|
cbc505c459
|
changing profile name
|
9 years ago |
Ace
|
4517a7f1aa
|
Making API publish destination configurable and other changes
|
9 years ago |
Ace
|
6d9f2f92a4
|
Making API publish destination configurable
|
9 years ago |
ayyoob
|
b3075cf1bc
|
removing application related roles
|
9 years ago |
ayyoob
|
51d46213c2
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into transport
|
9 years ago |
charitha
|
973e1ce40f
|
Fix issues in group api
|
9 years ago |
charitha
|
0a838923cb
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
# Conflicts:
# components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/api/Group.java
|
9 years ago |
Madhawa Perera
|
43648e4692
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
Adding swagger annotations to beans
|
9 years ago |
Madhawa Perera
|
b5741b420c
|
Adding swagger annotations to beans
|
9 years ago |
prabathabey
|
71180e686e
|
Improving swagger annotations
|
9 years ago |
prabathabey
|
a0dbb25824
|
Fixing code conflicts and improving swagger annotations
|
9 years ago |
Madhawa Perera
|
e75afb8020
|
Adding swagger annotations to beans
|
9 years ago |
ayyoob
|
48912a05bb
|
merged with upstream
|
9 years ago |
prabathabey
|
9e4b4d2205
|
Improving swagger annotations
|
9 years ago |
ayyoob
|
bee9a106cc
|
removed method and type from feature
|
9 years ago |
inoshperera
|
50b5661a74
|
Merge pull request #245 from madhawap/master
Added swagger annotations to beans
|
9 years ago |
Madhawa Perera
|
fca80273bc
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
Adding swagger annotations to beans
|
9 years ago |
inosh-perera
|
b2383617e1
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
9 years ago |
inosh-perera
|
0cf0ec6e77
|
adding swagger annotations to APIs
|
9 years ago |
Madhawa Perera
|
6227e93d2f
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
Adding swagger annotations to beans
|
9 years ago |
Madhawa Perera
|
087adafeb7
|
Adding swagger annotations to beans
|
9 years ago |
geethkokila
|
ccea046240
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
9 years ago |
geethkokila
|
4e4e660fa1
|
Adding the swagger documentation to the activity id resource
|
9 years ago |
Madhawa Perera
|
26c10f84ec
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
Adding swagger annotations to beans
|
9 years ago |
Madhawa Perera
|
66c12a8b1c
|
Adding swagger annotations to beans
|
9 years ago |
geethkokila
|
3bec779e0b
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
9 years ago |
geethkokila
|
362cf40d85
|
Fixing the operation activity id issues
|
9 years ago |
inosh-perera
|
797c7a02d0
|
adding swagger annotation to beans
|
9 years ago |
Madhawa
|
07c5362104
|
Adding swagger annotations to beans and some modifications to api interfaces
|
9 years ago |
mharindu
|
ed1eb217ea
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
9 years ago |
inosh-perera
|
c945d63038
|
fixing issues in swagger dependancy
|
9 years ago |
Madhawa
|
85f485df4c
|
Few changes to interfaces with swagger annotations
|
9 years ago |
Madhawa
|
b6e7827920
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
Adding swagger annotations to beans
|
9 years ago |
Madhawa
|
fffc7f3205
|
Adding swagger annotations to beans
|
9 years ago |
Hasunie
|
17f3a10ec4
|
Merge pull request #243 from hasuniea/master
added annotation for ConfigurationEntry
|
9 years ago |
ayyoob
|
ec7727e8bf
|
removed method and type from features
|
9 years ago |
mharindu
|
fd39b31369
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
9 years ago |
mharindu
|
1f21144668
|
Renamed EMM permission to CDMF
|
9 years ago |
hasuniea
|
e633d28013
|
added annotation for ConfigurationEntry
|
9 years ago |
Madhawa
|
ae13f7f889
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
Adding swagger annotations to beans
|
9 years ago |
Madhawa
|
707da02c7e
|
Adding swagger annotations to beans
|
9 years ago |
Kasun Delgolla
|
da1a60615c
|
Merge pull request #239 from charithag/master
Fixed https://wso2.org/jira/browse/IOTS-104
|
9 years ago |
hasuniea
|
e4dfe63548
|
code conflicts
|
9 years ago |
hasuniea
|
1267db52ce
|
added swagger annotations for TenantConfiguration
|
9 years ago |
Milan Perera
|
fb9c824e40
|
Merge pull request #241 from ayyoob/transport
Few fixes after testing
|
9 years ago |
inoshperera
|
97db3e42d6
|
Merge pull request #242 from madhawap/master
Added swagger annotations to the interfaces
|
9 years ago |
inosh-perera
|
5597c752ac
|
Adding sawgger annotations to admin Jax-rs apis.
|
9 years ago |
Madhawa
|
b407797ab0
|
added swagger annotation to the interfaces
|
9 years ago |
ayyoob
|
34f1f4dfe2
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into transport
|
9 years ago |
Madhawa
|
36c3a057dc
|
created interfaces for the api classes in order add swagger definitions
|
9 years ago |
Madhawa
|
f5915cbf5d
|
created interfaces for the api classes in order add swagger definitions
|
9 years ago |
Madhawa
|
46e0c4ea8b
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
Created interfaces for the api classes in order to add swagger definitions.
|
9 years ago |
Madhawa
|
7b04d9f0b0
|
created interfaces for the api classes in order add swagger definitions
|
9 years ago |
ayyoob
|
ac587c3353
|
fixes after testing
|
9 years ago |
dilanua
|
bb3bcdfd2d
|
Adding device-identification attribute for DetailedDeviceEntry in dashboard analytics feature
|
9 years ago |
charitha
|
18957b0110
|
Add required jagerry modules for the app
|
9 years ago |
charitha
|
0c8f1ce770
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
9 years ago |
charitha
|
73222e347b
|
Fixed https://wso2.org/jira/browse/IOTS-104
|
9 years ago |