mharindu
886e2e08f2
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into scope-impl
2016-08-08 18:49:40 +05:30
mharindu
2e79dd290e
Modified scopes
2016-08-08 18:24:44 +05:30
hasuniea
1b07b18678
adding security fixes
2016-08-08 18:05:12 +05:30
harshanl
657e4864fb
Added MSSQL, PostgreSQL and Oracle db support for Notification feature.
2016-08-04 20:40:40 +05:30
mharindu
ed4c762bfd
Refactored scopes
2016-08-04 17:46:46 +05:30
ayyoob
a7074e2e4e
refactored general configuration
2016-08-03 17:23:16 +05:30
Prabath Abeysekara
cc90bef42b
Merge pull request #318 from Securepoint/master
...
Minor bug fixies and code improvements
2016-08-03 14:12:24 +05:30
mharindu
eb5216091e
Fixed conflicts and merged
2016-08-03 12:36:56 +05:30
harshanl
6cc1bb088c
Fixed EMM-1447, EMM-1424
2016-08-01 20:29:21 +05:30
mharindu
6e742ee6ac
Added scope beans
2016-07-26 16:40:04 +05:30
mharindu
564c2b280e
Fixed conflicts and merged
2016-07-26 16:38:51 +05:30
Chatura Dilan
7af8ecc686
Added userstore for role listing
2016-07-26 11:59:10 +05:30
mharindu
b3d309583d
Fixed issues in scope service
2016-07-21 20:13:38 +05:30
mharindu
7f1e2fdf0b
Implemented scope management service
2016-07-21 12:43:21 +05:30
mharindu
bdec8880bb
Fixed conflicts and merged
2016-07-18 20:22:27 +05:30
mharindu
186432e1df
Fixed webapp name resolving issue
2016-07-18 20:08:51 +05:30
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.
2016-07-15 16:25:31 +02:00
Timo Briddigkeit
90910518d6
Fixed null pointer dereferences
2016-07-15 09:26:27 +02:00
Timo Briddigkeit
09020ccb9f
Fixed predictable pseudorandom number generator
2016-07-13 14:35:55 +02:00
mharindu
99664b23c5
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into scope-impl
2016-07-13 11:05:35 +05:30
Dilan U. Ariyaratne
ab5aa3e31c
Merge pull request #315 from madhawap/master
...
Added missing end-point to the permissions.xml
2016-07-12 10:28:38 +05:30
madhawap
0b338a1d25
Added missing end-point to the permissions.xml
2016-07-12 10:24:05 +05:30
mharindu
789086a667
Changed context paths
2016-07-12 01:31:35 +05:30
mharindu
0f904e21d8
Fixed conflicts and merged
2016-07-11 22:12:15 +05:30
Chatura Dilan
4ec11e8c08
[maven-release-plugin] prepare for next development iteration
2016-07-08 19:11:40 +05:30
Chatura Dilan
ffedcac543
[maven-release-plugin] prepare release v1.1.1
2016-07-08 19:09:55 +05:30
mharindu
79a6da82f2
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
2016-07-08 18:39:10 +05:30
mharindu
c7eef634ac
Added send-invitation endpoint
2016-07-08 18:38:00 +05:30
dilanua
c61ef1c98e
Fixing issues of GET /compliance-data API
2016-07-08 18:01:10 +05:30
Ace
58666bc4b0
Adding device name url param for device search
2016-07-08 14:57:43 +05:30
madhawap
c3cbc5b4fb
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
2016-07-08 14:29:53 +05:30
madhawap
0b1e4ad86b
Updated permissions.xml according to new end-points
2016-07-08 14:29:29 +05:30
Ace
d58fb57f4e
Enabling device search for multiple params
2016-07-08 10:09:46 +05:30
madhawap
e52fed0b2d
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
2016-07-07 19:51:57 +05:30
madhawap
34354c032e
Added end-point to get devices enrolled under a specific user
2016-07-07 19:46:22 +05:30
prabathabey
6edfad5fb7
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
2016-07-07 13:10:30 +05:30
prabathabey
9aa54f2ead
Improving policy management functionalities to use deviceType in place of deviceTypeId for persisting policy information
2016-07-07 13:10:19 +05:30
Dilan U. Ariyaratne
73551590b9
Merge pull request #313 from madhawap/master
...
Added end point to get Compliance Data Of a Device
2016-07-07 11:16:09 +05:30
madhawap
09e2d2ecaf
Removing the internal status code added to the compliance data wrapper
2016-07-07 11:14:43 +05:30
madhawap
68b7d304a0
Added end point to get Compliance Data Of a Device
2016-07-06 18:40:49 +05:30
prabathabey
0125310440
Prepending the url template configured for updating notifications with a '/'
2016-07-05 15:39:50 +05:30
prabathabey
78057b2992
Adding an API to return the list of device types registered in the underlying device management platform
2016-07-05 15:09:11 +05:30
mharindu
aa6085ac8c
Added scopes to APIs
2016-07-04 18:01:42 +05:30
mharindu
ff82accb48
added scopes to notification API
2016-07-04 14:11:51 +05:30
mharindu
60659ce15b
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into scope-impl
2016-07-04 14:09:44 +05:30
mharindu
fe28bc25f1
Refactored scopes
2016-07-04 14:06:30 +05:30
madhawap
2136ebbeee
changes to 'updateNotificationStatus' swagger annotations
2016-07-04 13:38:32 +05:30
mharindu
ac75ff1d71
Fixed conflict and merged
2016-07-03 15:09:05 +05:30
mharindu
49623a4693
Implemented scope based authorization
2016-07-03 15:03:47 +05:30
madhawap
b55a164457
added 'updateNotificationStatus' endpoint and minor formattings to swagger annotations
2016-06-30 20:38:04 +05:30
madhawap
dbf938416b
added 'updateNotificationStatus' endpoint and minor formattings to swagger annotations
2016-06-30 20:24:01 +05:30
prabathabey
be7e63c390
merging rest-api-improvements branch to master
2016-06-30 16:40:15 +05:30
prabathabey
ed5d611c35
Code cleanup
2016-06-29 18:05:09 +05:30
prabathabey
37852051ff
Improving Device and Policy Management APIs and cleaning up code of Role and User Management APIs
2016-06-29 17:49:34 +05:30
Chatura Dilan
f100853031
Merge branch 'master' of github.com:wso2/carbon-device-mgt
2016-06-28 16:59:14 +05:30
dilanua
d34f29ab46
Fixing device types not retrieving issue
2016-06-28 16:50:53 +05:30
Chatura Dilan
bb6d2f2012
Fixed user search
2016-06-28 16:47:16 +05:30
madhawap
d9b35c29cd
swagger annotation fix to policy 'apply-changes' end point
2016-06-28 15:04:04 +05:30
madhawap
88feb5a852
Add Pagination to Notification end points
2016-06-28 13:15:06 +05:30
prabathabey
624e7df688
Improving HTTP status code handling and the resource implementations
2016-06-27 16:28:49 +05:30
prabathabey
a23f44e682
Improving AcitivityManagement API implementation with proper error handling, etc
2016-06-27 15:04:15 +05:30
prabathabey
ad6b95ff62
Code cleanup
2016-06-27 14:45:43 +05:30
prabathabey
a46bd9194b
Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt into rest-api-improvements
2016-06-27 14:20:55 +05:30
prabathabey
4236744d39
Improving UserManagement and RoleManagement API implementations to return proper error codes when no role/user exists, etc
2016-06-27 14:20:38 +05:30
Dilan U. Ariyaratne
a278b788d6
Merge pull request #308 from madhawap/rest-api-improvements
...
added priorities end-point to PolicyManagement
2016-06-27 11:45:17 +05:30
madhawap
b50e007897
added /priorities end-point to PolicyManagement
2016-06-27 11:22:42 +05:30
madhawap
9c215c4ac9
added /priorities end-point to PolicyManagement
2016-06-27 10:51:09 +05:30
inoshperera
50009c7ac5
adding apply policy end point
2016-06-24 16:13:50 +05:30
madhawap
ee11bde8b0
Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt into rest-api-improvements
2016-06-24 12:21:53 +05:30
madhawap
235d690f1e
Implemented 'offset' and 'limit' parameters to the 'operation' api
2016-06-24 12:19:32 +05:30
prabathabey
0c54753b34
Cleaning up UserManagementService API implementation
2016-06-22 15:31:55 +05:30
prabathabey
9a7286a84b
Removing DeviceWrapper and all its associated usage, as it appeared to be a redundant element in the precense of 'Device'
2016-06-22 14:52:59 +05:30
prabathabey
aeb4ad3295
Merging rest-api-improvements branch to master
2016-06-21 15:52:35 +05:30
geethkokila
c07914eb36
Adding the activity count for the activty paginantion
2016-06-21 12:56:57 +05:30
geethkokila
a67f432993
Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt into rest-api-improvements
2016-06-20 15:41:59 +05:30
geethkokila
236eb90ce2
Fixing the limit and offset for activity
2016-06-20 15:41:53 +05:30
madhawap
f2ab923df5
fix related to http status code in 'getDevices' endpoint
2016-06-20 12:17:59 +05:30
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
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
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
Ace
016414c076
Bug fixes for role search
2016-06-13 15:43:21 +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
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
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
