Ace
|
15ae91d1c5
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2016-07-15 11:59:42 +05:30 |
|
Ace
|
ca10ad53bb
|
Adding emm apis as common modules
|
2016-07-15 11:59:15 +05:30 |
|
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
|
2016-07-14 01:24:00 +05:30 |
|
Timo Briddigkeit
|
b674304087
|
Made constants real constant using final
|
2016-07-13 15:57:12 +02:00 |
|
Timo Briddigkeit
|
ee5b077e6a
|
Fixed various XML External Entity (XXE) attack vulnerabilities
|
2016-07-13 15:02:11 +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
|
68fbfaf346
|
Merge branch 'certmgt-postgresql'
|
2016-07-07 14:10:48 +05:30 |
|
prabathabey
|
ce2a801934
|
Fixing https://wso2.org/jira/browse/EMM-1448 which fixes issues while persisting certificates when PostgreSQL is used as the underlying certificate management repository database
|
2016-07-07 14:10:03 +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
|
d3982c9797
|
Modified API definitions
|
2016-07-04 19:26:15 +05:30 |
|
mharindu
|
cc5f677165
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into scope-impl
|
2016-07-04 18:01:55 +05:30 |
|
mharindu
|
aa6085ac8c
|
Added scopes to APIs
|
2016-07-04 18:01:42 +05:30 |
|
hasuniea
|
282ac72249
|
adding SCEPManagerService to scep manager compenent
|
2016-07-04 17:58:14 +05:30 |
|
hasuniea
|
bbbbb28795
|
removing unused packages
|
2016-07-04 16:51:36 +05:30 |
|
hasuniea
|
911d5b5257
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2016-07-04 16:46:23 +05:30 |
|
hasuniea
|
bf58c0bec3
|
add package changes to appAuthenticatorFrameworkServiceComponent.java
|
2016-07-04 16:45:36 +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
|
c17dda082d
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2016-07-04 13:38:55 +05:30 |
|
madhawap
|
2136ebbeee
|
changes to 'updateNotificationStatus' swagger annotations
|
2016-07-04 13:38:32 +05:30 |
|
hasuniea
|
646e8b68d8
|
remove unwanted package
|
2016-07-04 12:40:48 +05:30 |
|
hasuniea
|
54498f41cd
|
modifying scep utils
|
2016-07-04 12:24:28 +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 |
|
Chatura Dilan
|
2befefc967
|
Added OS build date
|
2016-07-01 15:45:59 +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
|
49ce42b797
|
Code cleanup
|
2016-06-30 18:19:11 +05:30 |
|
prabathabey
|
be7e63c390
|
merging rest-api-improvements branch to master
|
2016-06-30 16:40:15 +05:30 |
|
Chatura Dilan
|
23f5ca2ca5
|
Merge branch 'master' of github.com:wso2/carbon-device-mgt
|
2016-06-30 15:12:01 +05:30 |
|
prabathabey
|
ed5d611c35
|
Code cleanup
|
2016-06-29 18:05:09 +05:30 |
|
prabathabey
|
f33ac36bfa
|
Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt into rest-api-improvements
|
2016-06-29 17:49:48 +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
|
24b462f4f4
|
Added is-active field to the Application
|
2016-06-29 17:41:45 +05:30 |
|
mharindu
|
59028f9f09
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2016-06-28 17:23:47 +05:30 |
|
mharindu
|
5de4993319
|
Fixed URL tampering issue
|
2016-06-28 17:23:39 +05:30 |
|
Ace
|
cf887a2e93
|
Merging emm module changes to devicemgt iot app
|
2016-06-28 17:00:02 +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 |
|
Ruwan
|
6ce7f8c65a
|
Merge pull request #307 from ayyoob/transport
Few changes added after testing with the cluster
|
2016-06-27 09:39:17 +05:30 |
|
ayyoob
|
ba6e202442
|
Few changes added after testing with the cluster
|
2016-06-27 00:12:46 +05:30 |
|
inoshperera
|
50009c7ac5
|
adding apply policy end point
|
2016-06-24 16:13:50 +05:30 |
|
inoshperera
|
16edca2aea
|
fixing ios enrollment issue by fetching the identity certificate from the header.
|
2016-06-24 13:57:48 +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
|
f1eca17991
|
Code cleanup
|
2016-06-22 14:57:12 +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
|
3813856be8
|
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:19 +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 |
|
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 |
|