Saad Sahibjan
a72b47f6f7
Fixing incorrect response for remove policy
8 years ago
harshanl
f3aefcca77
Fixed EMM-1450
8 years ago
Chatura Dilan Perera
8b17cbb339
Fix conflicts
8 years ago
Chatura Dilan Perera
654e1d9938
[maven-release-plugin] prepare for next development iteration
8 years ago
Chatura Dilan Perera
aa24821667
[maven-release-plugin] prepare release v1.1.2
8 years ago
harshanl
67942d5c1d
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
8 years ago
dilanua
6b4ab635af
Fixing jiras: EMM-1472, EMM-1505
8 years ago
harshanl
2cb8f0b313
Fixed EMM-1392
8 years ago
Ruwan
6134f94e3c
Merge pull request #332 from ayyoob/com
...
fixing commit issues
8 years ago
hasuniea
282f53bf09
Merge branch 'carbon-kernel-4.4.3' of https://github.com/wso2/carbon-device-mgt into carbon-kernel-4.4.3
8 years ago
hasuniea
c269f35ef2
fixing getAllActivity H2 issue
8 years ago
mharindu
7346313d27
Modified scope management service
8 years ago
ayyoob
442c2b86da
fixed formatting issues
8 years ago
harshanl
a7d7c689e8
Removed unsupported roleName parameter from device API
8 years ago
ayyoob
3b56668af0
merged with upstream
8 years ago
madhawap
ecfe94235f
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
8 years ago
madhawap
c6cc5e8df3
fixes to role updating endpoint
8 years ago
ayyoob
3edc68d204
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into com
8 years ago
ayyoob
058f9e4cfa
merged with origin
8 years ago
harshanl
e80c2f4050
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
8 years ago
dilanua
352643a421
Changing deactivate-policy api method to PUT
8 years ago
harshanl
34e97aeeae
Removed device search using roleName parameter.
8 years ago
mharindu
5bdb4630af
Fixed conflicts and merged
8 years ago
mharindu
886e2e08f2
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into scope-impl
8 years ago
mharindu
2e79dd290e
Modified scopes
8 years ago
hasuniea
1b07b18678
adding security fixes
8 years ago
harshanl
657e4864fb
Added MSSQL, PostgreSQL and Oracle db support for Notification feature.
8 years ago
mharindu
ed4c762bfd
Refactored scopes
8 years ago
ayyoob
a7074e2e4e
refactored general configuration
8 years ago
Prabath Abeysekara
cc90bef42b
Merge pull request #318 from Securepoint/master
...
Minor bug fixies and code improvements
8 years ago
mharindu
eb5216091e
Fixed conflicts and merged
8 years ago
harshanl
6cc1bb088c
Fixed EMM-1447, EMM-1424
8 years ago
mharindu
6e742ee6ac
Added scope beans
8 years ago
mharindu
564c2b280e
Fixed conflicts and merged
8 years ago
Chatura Dilan
7af8ecc686
Added userstore for role listing
8 years ago
mharindu
b3d309583d
Fixed issues in scope service
8 years ago
mharindu
7f1e2fdf0b
Implemented scope management service
8 years ago
mharindu
bdec8880bb
Fixed conflicts and merged
8 years ago
mharindu
186432e1df
Fixed webapp name resolving issue
8 years ago
Timo Briddigkeit
ed07774552
Fixed literal string comparison.
...
This line is in the form of
String str = ...
str.equals("someOtherString");
//or
str.compareTo("someOtherString");
A NullPointerException may occur if the String variable str is null. If instead the code was restructured to
String str = ...
"someOtherString".equals(str);
//or
"someOtherString".compareTo(str);
that is, call equals() or compareTo() on the string literal, passing the variable as an argument, this exception could never happen as both equals() and compareTo() check for null.
8 years ago
Timo Briddigkeit
90910518d6
Fixed null pointer dereferences
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
aa6085ac8c
Added scopes to APIs
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
2136ebbeee
changes to 'updateNotificationStatus' swagger annotations
8 years ago
mharindu
ac75ff1d71
Fixed conflict and merged
8 years ago
mharindu
49623a4693
Implemented scope based authorization
8 years ago
madhawap
b55a164457
added 'updateNotificationStatus' endpoint and minor formattings to swagger annotations
8 years ago
madhawap
dbf938416b
added 'updateNotificationStatus' endpoint and minor formattings to swagger annotations
8 years ago
prabathabey
be7e63c390
merging rest-api-improvements branch to master
8 years ago
prabathabey
ed5d611c35
Code cleanup
8 years ago
prabathabey
37852051ff
Improving Device and Policy Management APIs and cleaning up code of Role and User Management APIs
8 years ago
Chatura Dilan
f100853031
Merge branch 'master' of github.com:wso2/carbon-device-mgt
8 years ago
dilanua
d34f29ab46
Fixing device types not retrieving issue
8 years ago
Chatura Dilan
bb6d2f2012
Fixed user search
8 years ago
madhawap
d9b35c29cd
swagger annotation fix to policy 'apply-changes' end point
8 years ago
madhawap
88feb5a852
Add Pagination to Notification end points
8 years ago
prabathabey
624e7df688
Improving HTTP status code handling and the resource implementations
8 years ago
prabathabey
a23f44e682
Improving AcitivityManagement API implementation with proper error handling, etc
8 years ago
prabathabey
ad6b95ff62
Code cleanup
8 years ago
prabathabey
a46bd9194b
Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt into rest-api-improvements
8 years ago
prabathabey
4236744d39
Improving UserManagement and RoleManagement API implementations to return proper error codes when no role/user exists, etc
8 years ago
Dilan U. Ariyaratne
a278b788d6
Merge pull request #308 from madhawap/rest-api-improvements
...
added priorities end-point to PolicyManagement
8 years ago
madhawap
b50e007897
added /priorities end-point to PolicyManagement
8 years ago
madhawap
9c215c4ac9
added /priorities end-point to PolicyManagement
8 years ago
inoshperera
50009c7ac5
adding apply policy end point
8 years ago
madhawap
ee11bde8b0
Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt into rest-api-improvements
8 years ago
madhawap
235d690f1e
Implemented 'offset' and 'limit' parameters to the 'operation' api
8 years ago
prabathabey
0c54753b34
Cleaning up UserManagementService API implementation
8 years ago
prabathabey
9a7286a84b
Removing DeviceWrapper and all its associated usage, as it appeared to be a redundant element in the precense of 'Device'
8 years ago
prabathabey
aeb4ad3295
Merging rest-api-improvements branch to master
8 years ago
geethkokila
c07914eb36
Adding the activity count for the activty paginantion
8 years ago
geethkokila
a67f432993
Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt into rest-api-improvements
8 years ago
geethkokila
236eb90ce2
Fixing the limit and offset for activity
8 years ago
madhawap
f2ab923df5
fix related to http status code in 'getDevices' endpoint
8 years ago
ayyoob
ebebca8573
Added support for push notification for xmpp, mqtt and few changes to the after testing
8 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
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
Ace
016414c076
Bug fixes for role search
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
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
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
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