community/device-mgt-core
1
0
Fork 0
mirror of https://repository.entgra.net/community/device-mgt-core.git synced 2025-10-06 02:01:45 +00:00
Code Issues Packages Projects Releases Wiki Activity
4,257 Commits 31 Branches 461 Tags 183 MiB
aa0f9e0510
Commit Graph

618 Commits

Author SHA1 Message Date
Megala
f9204add08 Merge remote-tracking branch 'upstream/master' 2016-10-05 10:10:12 +05:30
charitha
f22d392978 Upgrade to comply with latest CDMF changes 2016-10-04 19:03:07 +05:30
Megala
b7990b9146 Fixing problems in retriveing data from secondary user store 2016-10-04 17:22:45 +05:30
dilanua
dff32af832 Adding initial swagger annotations and permissions to Dashboard APIs 2016-10-04 16:25:17 +05:30
dilanua
1ca5762c44 Uncommenting Dashboard APIs 2016-10-04 15:49:29 +05:30
charitha
a0050d8f4d Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-10-04 12:26:29 +05:30
charitha
d1d6eefd17 Upgrading grouping backend 2016-10-04 12:24:40 +05:30
harshanl
a4538a6d6c Removed unnecessary params from paginated queries 2016-10-03 18:27:20 +05:30
harshanl
befb5b0ad8 EMM-1658:Changed the API contract to not to send username parameter. User can only change his own password. 2016-10-03 14:13:06 +05:30
Chatura Dilan Perera
c16cc4cae1 [maven-release-plugin] prepare for next development iteration 2016-09-29 20:33:07 +05:30
Chatura Dilan Perera
ed4bca7032 [maven-release-plugin] prepare release v1.2.2 2016-09-29 20:32:59 +05:30
Rasika Perera
b2eb715fb7 REsolving conflicts 2016-09-29 13:01:01 +05:30
Rasika Perera
5c8c28d28c Merge pull request #1 from warunalakshitha/master 
upgrade product iot to carbon 4.4.9
 2016-09-29 11:24:05 +05:30
Rasika Perera
237b9a7078 Creating api endpoint to retrieve features of a device-type 2016-09-28 23:42:44 +05:30
amalhub
428ce25b6f Fixing issue: https://wso2.org/jira/browse/EMM-1646 2016-09-27 20:46:00 +05:30
Rasika Perera
a61be7a7ec Enable group management api 2016-09-26 14:56:34 +05:30
Ace
154a6082ce Merge remote-tracking branch 'upstream/master' into carbon-kernel-4.4.7 
# Conflicts:
#	features/webapp-authenticator-framework/org.wso2.carbon.webapp.authenticator.framework.server.feature/pom.xml
 2016-09-22 19:08:21 +05:30
Chatura Dilan Perera
7395c76408 Merge branch 'master' of github.com:wso2/carbon-device-mgt 2016-09-20 17:45:24 +05:30
Ace
33d8829540 Merge remote-tracking branch 'upstream/master' into carbon-kernel-4.4.7 
# Conflicts:
#	components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/service/DeviceManagementProviderService.java
 2016-09-20 17:02:28 +05:30
dilanua
d8e057abdd Fix for JIRA: https://wso2.org/jira/browse/EMM-1582 2016-09-20 15:28:45 +05:30
Ace
87ad1e0e71 Fixing intermittent jackson bind issue 2016-09-20 12:07:14 +05:30
Chatura Dilan Perera
50d8885f8b [maven-release-plugin] prepare for next development iteration 2016-09-19 18:54:48 +05:30
Chatura Dilan Perera
a00d6aafd4 [maven-release-plugin] prepare release v1.2.1 2016-09-19 18:54:38 +05:30
harshanl
75df243a33 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-09-19 12:22:08 +05:30
Ace
6a8a5cbd5a Merging with master 2016-09-19 12:21:41 +05:30
harshanl
4169d3b2bd Fixed EMM-1554 2016-09-19 12:08:06 +05:30
dilanua
713c8ac4d8 Changing permissions - /device-mgt/configurations to /device-mgt/platform-configurations 2016-09-18 07:34:14 +05:30
dilanua
58f8656e94 Changing permissions - /devices/owning to /devices/owning-device 2016-09-17 17:22:47 +05:30
harshanl
78cab76101 Fixed EMM-1531 2016-09-15 12:36:55 +05:30
Ace
1dfb8e22e1 Updating to latest appm/apim/identity dependencies 2016-09-14 17:23:09 +05:30
Chatura Dilan Perera
de23a8cf27 [maven-release-plugin] prepare for next development iteration 2016-09-09 20:18:25 +05:30
Chatura Dilan Perera
8905fae0d9 [maven-release-plugin] prepare release v1.2.0 2016-09-09 20:18:12 +05:30
harshanl
0eaf33aa5c Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-09-09 19:16:27 +05:30
harshanl
87a5b09266 Added users/count API 2016-09-09 19:16:00 +05:30
thusithakalugamage
0d02e88955 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into theme-migration 2016-09-09 18:42:46 +05:30
kamidu
0fdcbae817 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-09-09 17:47:49 +05:30
kamidu
878daae5c5 Permission modifications 2016-09-09 17:47:42 +05:30
Chatura Dilan Perera
2d5262e21e [maven-release-plugin] prepare for next development iteration 2016-09-09 17:10:19 +05:30
Chatura Dilan Perera
5ccd752404 [maven-release-plugin] prepare release v1.2.0 2016-09-09 17:10:04 +05:30
harshanl
7dc93ff010 MSSQL script fixes and added the /users/count REST API 2016-09-09 15:06:30 +05:30
mharindu
115099c8fe Implemented permission based authorization 2016-09-09 02:56:21 +05:30
dilanua
d24ba98643 Updating activate and deactivate policy endpoints from PUT to POST 2016-09-07 16:15:26 +05:30
charitha
3575c9a33d Fix issue in get devices with since parameter. 2016-08-31 17:43:13 +05:30
Chatura Dilan Perera
f29b9e84f2 Fixed 200 returns when activities are empty and since is a future date 2016-08-31 13:56:59 +05:30
Chatura Dilan Perera
9aa5f2793f return date format as UTC in APIs 2016-08-30 14:17:06 +05:30
Chatura Dilan Perera
475b832c59 Changed return date format to UTC date 2016-08-29 18:50:23 +05:30
charitha
0fe827ca9f Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-08-25 13:10:48 +05:30
charitha
9246cdcf30 Return empty array when results not found with since parameter 2016-08-25 12:28:55 +05:30
Saad Sahibjan
a72b47f6f7 Fixing incorrect response for remove policy 2016-08-24 19:18:35 +05:30
harshanl
f3aefcca77 Fixed EMM-1450 2016-08-23 17:57:08 +05:30
Chatura Dilan Perera
8b17cbb339 Fix conflicts 2016-08-19 15:00:57 +05:30
Chatura Dilan Perera
654e1d9938 [maven-release-plugin] prepare for next development iteration 2016-08-18 22:09:42 +05:30
Chatura Dilan Perera
aa24821667 [maven-release-plugin] prepare release v1.1.2 2016-08-18 22:09:33 +05:30
harshanl
67942d5c1d Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-08-18 19:45:47 +05:30
dilanua
6b4ab635af Fixing jiras: EMM-1472, EMM-1505 2016-08-18 14:30:53 +05:30
harshanl
2cb8f0b313 Fixed EMM-1392 2016-08-16 18:02:30 +05:30
Ruwan
6134f94e3c Merge pull request #332 from ayyoob/com 
fixing commit issues
 2016-08-16 08:27:17 +05:30
hasuniea
282f53bf09 Merge branch 'carbon-kernel-4.4.3' of https://github.com/wso2/carbon-device-mgt into carbon-kernel-4.4.3 2016-08-15 21:00:23 +05:30
hasuniea
c269f35ef2 fixing getAllActivity H2 issue 2016-08-15 21:00:15 +05:30
mharindu
7346313d27 Modified scope management service 2016-08-15 20:30:45 +05:30
ayyoob
442c2b86da fixed formatting issues 2016-08-15 15:19:18 +05:30
harshanl
a7d7c689e8 Removed unsupported roleName parameter from device API 2016-08-15 13:59:30 +05:30
ayyoob
3b56668af0 merged with upstream 2016-08-13 10:47:18 +05:30
madhawap
ecfe94235f Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-08-12 12:46:27 +05:30
madhawap
c6cc5e8df3 fixes to role updating endpoint 2016-08-12 12:45:58 +05:30
ayyoob
3edc68d204 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into com 2016-08-12 12:27:35 +05:30
ayyoob
058f9e4cfa merged with origin 2016-08-12 10:52:56 +05:30
harshanl
e80c2f4050 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-08-11 17:27:10 +05:30
dilanua
352643a421 Changing deactivate-policy api method to PUT 2016-08-11 15:31:28 +05:30
harshanl
34e97aeeae Removed device search using roleName parameter. 2016-08-11 14:03:09 +05:30
mharindu
5bdb4630af Fixed conflicts and merged 2016-08-08 19:38:49 +05:30
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
inoshperera
ee948abc9d fixing conflicts and improving swagger annotations and validations 2016-06-02 18:44:26 +05:30
inoshperera
5620e38681 adding proper error messages for APIs 2016-06-02 11:04:33 +05:30
prabathabey
d32cd96a74 Fixing merge conflicts 2016-06-02 00:28:47 +05:30
prabathabey
9ebf705323 Re-enabling retrieval of device info 2016-06-02 00:22:46 +05:30
prabathabey
e002ffb54a Re-enabling retrieval of device info 2016-06-02 00:20:14 +05:30
dilanua
dada719486 Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt into rest-api-improvements 2016-06-01 15:59:14 +05:30
dilanua
0bd2a46690 Adding H2/MSSQL/ORACLE/POSTGRESQL support for GET /admin/devices API 2016-06-01 15:58:45 +05:30
ayyoob
aa6298b5e7 updated device management admin api permission 2016-06-01 12:28:10 +05:30
ayyoob
d926bdaa34 removed unused permission from permission.xml 2016-06-01 12:20:18 +05:30
dilanua
07a4a65c7c Fixing permission issues with GET /devices/*/*/features API 2016-06-01 11:14:17 +05:30
dilanua
25e45dc9f1 Fixing issues in GET /operations and /admin/devices APIs 2016-06-01 10:44:08 +05:30
mharindu
7a029743ba Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt into rest-api-improvements 2016-06-01 02:18:53 +05:30
mharindu
81aa298740 Fixed RoleManagementService API issues 2016-06-01 02:18:15 +05:30
prabathabey
3cb9b5bae2 Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt into rest-api-improvements 2016-06-01 01:30:17 +05:30
prabathabey
61beca5048 Fixing getDevice method to support status, ownership, etc as query param filters 2016-06-01 01:30:02 +05:30
ayyoob
9f1de717c5 updated permissions in the permission.xml 2016-06-01 01:23:13 +05:30
mharindu
7aa37ff4d5 Fixed issues in RoleManagementService 2016-06-01 00:31:48 +05:30
mharindu
63ea40eb27 Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt into rest-api-improvements 2016-06-01 00:10:36 +05:30
mharindu
ce557266ec Fixed issues in RoleManagementService 2016-06-01 00:10:30 +05:30
ayyoob
d9c15b62e7 few changes after testing user management api 2016-05-31 23:26:51 +05:30
Prabath Abeysekara
14322d4ba5 Merge pull request #283 from ayyoob/rest-api-improvements 
fixed api issues in policy
 2016-05-31 19:16:25 +05:30
ayyoob
5b8b15f69b fixed api issues in policy 2016-05-31 19:12:58 +05:30
prabathabey
c9a2dc4399 Improving user management API implementation 2016-05-31 19:05:37 +05:30
prabathabey
627d99e913 Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt into rest-api-improvements 2016-05-31 18:36:13 +05:30
prabathabey
00a16ea2bc Improving Role management API implementation 2016-05-31 18:36:00 +05:30
dilanua
4a74ea8100 Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt into rest-api-improvements 2016-05-31 18:34:07 +05:30
dilanua
374d509881 Updating DeviceManagementAdminServiceImpl 2016-05-31 18:34:00 +05:30
prabathabey
3e21c6d50d Improving ceritificate management webapp impl 2016-05-31 17:49:26 +05:30
Ace
ddfd678b2a Adding user management API bug fixes and improvements 2016-05-31 17:26:20 +05:30
Ace
d13368d144 Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt into rest-api-improvements 2016-05-31 17:17:20 +05:30
Ace
bfe215deac Adding changes and bug fixes to UserMgtService 2016-05-31 17:13:11 +05:30
Milan Perera
289fef040b Merge pull request #282 from ayyoob/rest-api-improvements 
Rest api improvements in password reset
 2016-05-31 17:13:11 +05:30
ayyoob
d63e5e876b added password validation error msg 2016-05-31 17:09:34 +05:30
mharindu
cfe24229fc Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into apim 2016-05-31 16:19:03 +05:30
prabathabey
1d4d0b7ae2 Improving certificate management webapp implementation 2016-05-31 16:13:45 +05:30
ayyoob
74a96015a7 Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt into rest-api-improvements 2016-05-31 13:57:54 +05:30
ayyoob
cf1e808cbd refactored after testing UserAdminManangmentService 2016-05-31 13:57:38 +05:30
prabathabey
9f48145614 Improving device admin service impl 2016-05-31 13:12:57 +05:30
prabathabey
697c727801 Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt into rest-api-improvements 2016-05-31 13:00:26 +05:30
prabathabey
fc3d6cccbf Fixing Issues in notification management APIs 2016-05-31 12:49:51 +05:30
charitha
92a732cd41 Moved redundant texts to constants 2016-05-31 11:30:36 +05:30
geethkokila
3defcfe20d Fixing the applicationMgtAdminService for returing activity 2016-05-31 11:25:11 +05:30
charitha
e2c03adec4 FIx for https://wso2.org/jira/browse/IOTS-169 2016-05-31 11:14:37 +05:30
prabathabey
20fd2ec768 Improving application installation/uninstallation handling 2016-05-30 17:46:37 +05:30
prabathabey
5ed982beb4 Adding more improvements to the JAX-RS APIs of CDM-F 2016-05-30 16:40:57 +05:30
prabathabey
fd7a137b07 Improving jax-rs APIS of CDM-F 2016-05-30 13:39:52 +05:30
hasuniea
20343d9349 fixed swagger message issue 2016-05-30 13:03:21 +05:30
prabathabey
726a700528 Improving error handling in checking for monitoring frquency 2016-05-30 11:45:02 +05:30
prabathabey
6e5148a374 Fixing inconsistencies between what's represented via swagger and the real implementation, and bugs found in admin services 2016-05-30 08:21:59 +05:30
mharindu
71eb657e52 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into apim 2016-05-28 21:05:09 +05:30
prabathabey
54f9d02ebb Code cleanup 2016-05-28 11:10:22 +05:30
prabathabey
77d4c167af code cleanup 2016-05-28 08:31:20 +05:30
geethkokila
b7da99a621 Adding activity apis to get the updated once after a given time 2016-05-28 08:25:27 +05:30
prabathabey
6d50ba14b1 Code cleanup 2016-05-28 08:11:51 +05:30
prabathabey
e1dfecb518 Changing the value of If-Modified-Since header as a string 2016-05-28 06:41:26 +05:30
prabathabey
76ec7bdc28 Improving swagger metada 2016-05-28 06:03:47 +05:30
prabathabey
425c0e7498 Improving swagger annotations of CDM-F core APIs further 2016-05-28 04:52:00 +05:30
geethkokila
ed0da9e1d0 Fixing the device informations to get the applications 2016-05-28 03:12:10 +05:30
prabathabey
d92fb53dc9 Annotate APIs with 'Api' element to give users an abstract idea on what these APIs roughly do 2016-05-28 02:04:02 +05:30
geethkokila
ecc8b5e6f2 Fixing the api issues 2016-05-28 02:02:43 +05:30
geethkokila
0221782533 Adding new apis for getting the device location when list of device identifiers are supplied 2016-05-28 01:57:36 +05:30
prabathabey
88cab5abf5 Fixing commit conflicts 2016-05-28 01:01:47 +05:30
prabathabey
37aa05f79c Committing improved swagger annotated cdm-f APIs 2016-05-28 00:55:25 +05:30
inoshperera
3c73217e96 fixing osgi issue related to usage of carbon context. And adding api publishing check from config. 2016-05-27 19:15:46 +05:30
inoshperera
1ffbb2183a adding permissions for DM services 2016-05-27 14:20:10 +05:30
prabathabey
0b9c64594c Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt into rest-api-improvements 2016-05-27 12:29:01 +05:30
prabathabey
32cb32b706 modifying the name of the device management admin api war 2016-05-27 12:28:48 +05:30
inoshperera
4623fa2269 swagger annotations added to APIs 2016-05-27 11:55:58 +05:30
prabathabey
30f6fc53b5 Merging the latest changes introduced in master 2016-05-27 11:44:58 +05:30
prabathabey
ebefd60533 Renaming TenantConfiguration as PlatformConfiguration 2016-05-27 11:22:54 +05:30
ayyoob
e8b9f03748 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into apim 2016-05-27 01:27:32 +05:30
geethkokila
86e564713d Adding the changes for getting activity ids which are changes after a certain time 2016-05-26 21:16:01 +05:30
geethkokila
01e3cc4987 Fixing the activity related issues 2016-05-26 18:44:12 +05:30
prabathabey
6d33d7036b Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt into rest-api-improvements 2016-05-26 18:02:12 +05:30
prabathabey
0f5cf86d04 Adding the base path to be included in the swagger docs and appending the proper version to the webapp name 2016-05-26 18:00:45 +05:30
inoshperera
aeec472805 Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt into rest-api-improvements 2016-05-26 12:53:20 +05:30
inoshperera
2959c05e1a adding swagger annotations for device and activity APIs. 2016-05-26 12:52:49 +05:30
mharindu
52388ed33d Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into apim 2016-05-26 12:44:36 +05:30
mharindu
106be76118 Fixed issues of API publishing to gateway 2016-05-26 12:41:20 +05:30
prabathabey
7e8f38cf16 Fixing conflicts while merging the latest changes in master 2016-05-25 17:59:12 +05:30
prabathabey
e7bf0c7658 Resolving conflicts caused by merging with the updates in master 2016-05-25 17:45:37 +05:30
prabathabey
8b9cf0da85 Resolving conflicts caused by merging with the updates in master 2016-05-25 17:37:21 +05:30
prabathabey
29b3b965b0 Making all CDM-F REST APIs compatible with the REST API specifications 2016-05-25 16:26:29 +05:30
inoshperera
deb4195f7a Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-05-25 13:54:42 +05:30
inoshperera
a40e44899a syncing REST apis of core and product EMM 2016-05-25 12:38:24 +05:30
inosh
1341884957 resolving conflicts 2016-05-23 14:14:05 +05:30
inosh
60b42715d6 syncing admin api from product emm 2016-05-23 14:11:25 +05:30
geethkokila
16b809b255 Fixing the conflicts 2016-05-23 11:21:48 +05:30
geethkokila
1697a7ce85 Doing a partial commit for syncing the code base 2016-05-23 11:19:37 +05:30
geethkokila
ba25ecc6ef Doing a partial commit for syncing the code base 2016-05-23 11:19:22 +05:30
mharindu
3e291c5b13 [maven-release-plugin] prepare for next development iteration 2016-05-20 16:43:16 +05:30
mharindu
9549ac446b [maven-release-plugin] prepare release v1.1.0 2016-05-20 16:43:02 +05:30
mharindu
65612f724f Fixed compile issue 2016-05-20 16:02:56 +05:30
prabathabey
9ec80bfe18 Fixing build failures caused by changed introduced to Operation Management APIs 2016-05-20 12:43:47 +05:30
mharindu
968cb00f35 Fixed conflicts and merged 2016-05-19 00:42:14 +05:30
mharindu
83c2a1f0ee Fixed issues in api publishing 2016-05-19 00:30:41 +05:30
prabathabey
a375252a94 Adding pluggable push notification framework 2016-05-19 00:20:45 +05:30
mharindu
bca1b4b059 Fixed conflicts 2016-05-18 22:01:38 +05:30
mharindu
9f93570b29 Fixed issues in webapp-publisher 2016-05-18 22:00:16 +05:30
geethkokila
c7dd386c94 Adding new apis for device informations 2016-05-18 14:56:46 +05:30
mharindu
49cb4787c0 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into apim 2016-05-18 11:49:35 +05:30
mharindu
82b90522a0 Migrated to APIM 5.0.4 2016-05-18 11:49:20 +05:30
charitha
aadf87e5d9 Bug fixes and fix for https://wso2.org/jira/browse/IOTS-158 2016-05-17 23:33:33 +05:30
mharindu
9ebf2ab6d9 Merge branch 'apim' of https://github.com/milanperera/carbon-device-mgt 2016-05-17 15:33:17 +05:30
charitha
0ccaa9fe81 Fix for https://wso2.org/jira/browse/IOTS-50 & https://wso2.org/jira/browse/IOTS-112 2016-05-17 13:57:47 +05:30
mharindu
9a4b904702 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into apim 2016-05-16 11:55:35 +05:30
charitha
685c52a453 Bug fixes 2016-05-15 13:13:30 +05:30
ayyoob
b3075cf1bc removing application related roles 2016-05-14 00:10:39 +05:30
charitha
973e1ce40f Fix issues in group api 2016-05-13 13:52:35 +05:30
prabathabey
71180e686e Improving swagger annotations 2016-05-13 07:39:09 +05:30
prabathabey
a0dbb25824 Fixing code conflicts and improving swagger annotations 2016-05-13 07:12:03 +05:30
Madhawa Perera
e75afb8020 Adding swagger annotations to beans 2016-05-13 07:07:55 +05:30
prabathabey
9e4b4d2205 Improving swagger annotations 2016-05-13 04:02:42 +05:30
inoshperera
50b5661a74 Merge pull request #245 from madhawap/master 
Added swagger annotations to beans
 2016-05-13 01:57:46 +05:30
Madhawa Perera
fca80273bc Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 
Adding swagger annotations to beans
 2016-05-13 01:39:43 +05:30
inosh-perera
b2383617e1 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-05-13 01:30:22 +05:30
inosh-perera
0cf0ec6e77 adding swagger annotations to APIs 2016-05-13 01:30:17 +05:30
Madhawa Perera
6227e93d2f Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 
Adding swagger annotations to beans
 2016-05-13 01:25:44 +05:30
Madhawa Perera
087adafeb7 Adding swagger annotations to beans 2016-05-13 01:25:29 +05:30
geethkokila
ccea046240 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-05-13 01:10:10 +05:30
geethkokila
4e4e660fa1 Adding the swagger documentation to the activity id resource 2016-05-13 01:09:56 +05:30
Madhawa Perera
26c10f84ec Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 
Adding swagger annotations to beans
 2016-05-13 00:34:54 +05:30
inosh-perera
797c7a02d0 adding swagger annotation to beans 2016-05-13 00:24:59 +05:30
Madhawa
07c5362104 Adding swagger annotations to beans and some modifications to api interfaces 2016-05-12 23:11:23 +05:30
Madhawa
85f485df4c Few changes to interfaces with swagger annotations 2016-05-12 22:19:17 +05:30
mharindu
fd39b31369 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-05-12 22:00:24 +05:30
Madhawa
707da02c7e Adding swagger annotations to beans 2016-05-12 21:58:23 +05:30
inoshperera
97db3e42d6 Merge pull request #242 from madhawap/master 
Added swagger annotations to the interfaces
 2016-05-12 20:24:42 +05:30
inosh-perera
5597c752ac Adding sawgger annotations to admin Jax-rs apis. 2016-05-12 20:17:20 +05:30
Madhawa
b407797ab0 added swagger annotation to the interfaces 2016-05-12 20:16:52 +05:30
Madhawa
36c3a057dc created interfaces for the api classes in order add swagger definitions 2016-05-12 11:25:20 +05:30
Madhawa
f5915cbf5d created interfaces for the api classes in order add swagger definitions 2016-05-12 10:32:49 +05:30
Madhawa
7b04d9f0b0 created interfaces for the api classes in order add swagger definitions 2016-05-12 09:51:43 +05:30
prabathabey
bc894f2517 Adding Swagger-annotation dependency to carbon-device-mgt 2016-05-11 12:38:15 +05:30
mharindu
5ad8d2938e Fixed issues of publishing APIs to synapse gateway 2016-05-11 10:50:32 +05:30
Charitha Goonetilleke
ca62c2ef73 Fix grouped device listing 2016-05-04 02:47:45 +05:30
Charitha Goonetilleke
e01b62086f Fix parameter mismatch 2016-05-04 01:47:50 +05:30
Charitha Goonetilleke
92784120bd Add group sharing UI functionality 2016-05-03 23:28:26 +05:30
Rasika Perera
33eed1f6cd Adding permissions for roles updating 2016-05-03 19:52:52 +05:30
Rasika Perera
4eb588ac60 Group Constants moved to common 2016-05-03 14:37:34 +05:30
charithag
b1683c1ccb Add capability to assign device in to a group and bug fixes 2016-04-28 08:01:46 +05:30
charithag
f6281c8ef0 Add jax-rs endpoints to modify and remove devices. 
Update clientside js to work with secured apis
 2016-04-26 20:50:39 +05:30
charithag
42d11b9d78 Add tenant aware dynamic units routing 2016-04-26 18:56:41 +05:30
charithag
61b43ce5d8 Rename packages in device mgt jax-rs apis 2016-04-26 11:42:51 +05:30
charithag
dfb7e9a9c8 Fix permissions 2016-04-25 22:36:41 +05:30
charithag
516155dae5 Moved devicemgt_admin jax-rs to device-mgt from carbon-devicemgt-plugins 2016-04-18 16:39:35 +05:30
Kasun Delgolla
4e57e5bc85 Committing restructuring mdm-admin + UI merging style fixes 2016-04-07 10:42:56 +05:30