Commit Graph

1832 Commits

Author SHA1 Message Date
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
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
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
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
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