Rasika Perera
5c8c28d28c
Merge pull request #1 from warunalakshitha/master
...
upgrade product iot to carbon 4.4.9
8 years ago
Rasika Perera
237b9a7078
Creating api endpoint to retrieve features of a device-type
8 years ago
amalhub
428ce25b6f
Fixing issue: https://wso2.org/jira/browse/EMM-1646
8 years ago
Rasika Perera
a61be7a7ec
Enable group management api
8 years ago
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
8 years ago
Chatura Dilan Perera
7395c76408
Merge branch 'master' of github.com:wso2/carbon-device-mgt
8 years ago
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
8 years ago
dilanua
d8e057abdd
Fix for JIRA: https://wso2.org/jira/browse/EMM-1582
8 years ago
Ace
87ad1e0e71
Fixing intermittent jackson bind issue
8 years ago
Chatura Dilan Perera
50d8885f8b
[maven-release-plugin] prepare for next development iteration
8 years ago
Chatura Dilan Perera
a00d6aafd4
[maven-release-plugin] prepare release v1.2.1
8 years ago
harshanl
75df243a33
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
8 years ago
Ace
6a8a5cbd5a
Merging with master
8 years ago
harshanl
4169d3b2bd
Fixed EMM-1554
8 years ago
dilanua
713c8ac4d8
Changing permissions - /device-mgt/configurations to /device-mgt/platform-configurations
8 years ago
dilanua
58f8656e94
Changing permissions - /devices/owning to /devices/owning-device
8 years ago
harshanl
78cab76101
Fixed EMM-1531
8 years ago
Ace
1dfb8e22e1
Updating to latest appm/apim/identity dependencies
8 years ago
Chatura Dilan Perera
de23a8cf27
[maven-release-plugin] prepare for next development iteration
8 years ago
Chatura Dilan Perera
8905fae0d9
[maven-release-plugin] prepare release v1.2.0
8 years ago
harshanl
0eaf33aa5c
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
8 years ago
harshanl
87a5b09266
Added users/count API
8 years ago
thusithakalugamage
0d02e88955
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into theme-migration
8 years ago
kamidu
0fdcbae817
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
8 years ago
kamidu
878daae5c5
Permission modifications
8 years ago
Chatura Dilan Perera
2d5262e21e
[maven-release-plugin] prepare for next development iteration
8 years ago
Chatura Dilan Perera
5ccd752404
[maven-release-plugin] prepare release v1.2.0
8 years ago
harshanl
7dc93ff010
MSSQL script fixes and added the /users/count REST API
8 years ago
mharindu
115099c8fe
Implemented permission based authorization
8 years ago
dilanua
d24ba98643
Updating activate and deactivate policy endpoints from PUT to POST
8 years ago
charitha
3575c9a33d
Fix issue in get devices with since parameter.
8 years ago
Chatura Dilan Perera
f29b9e84f2
Fixed 200 returns when activities are empty and since is a future date
8 years ago
Chatura Dilan Perera
9aa5f2793f
return date format as UTC in APIs
8 years ago
Chatura Dilan Perera
475b832c59
Changed return date format to UTC date
8 years ago
charitha
0fe827ca9f
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
8 years ago
charitha
9246cdcf30
Return empty array when results not found with since parameter
8 years ago
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.
9 years ago
mharindu
ed4c762bfd
Refactored scopes
9 years ago
ayyoob
a7074e2e4e
refactored general configuration
9 years ago
Prabath Abeysekara
cc90bef42b
Merge pull request #318 from Securepoint/master
...
Minor bug fixies and code improvements
9 years ago
mharindu
eb5216091e
Fixed conflicts and merged
9 years ago
harshanl
6cc1bb088c
Fixed EMM-1447, EMM-1424
9 years ago
mharindu
6e742ee6ac
Added scope beans
9 years ago
mharindu
564c2b280e
Fixed conflicts and merged
9 years ago
Chatura Dilan
7af8ecc686
Added userstore for role listing
9 years ago
mharindu
b3d309583d
Fixed issues in scope service
9 years ago
mharindu
7f1e2fdf0b
Implemented scope management service
9 years ago
mharindu
bdec8880bb
Fixed conflicts and merged
9 years ago
mharindu
186432e1df
Fixed webapp name resolving issue
9 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.
9 years ago
Timo Briddigkeit
90910518d6
Fixed null pointer dereferences
9 years ago
Timo Briddigkeit
09020ccb9f
Fixed predictable pseudorandom number generator
9 years ago
mharindu
99664b23c5
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into scope-impl
9 years ago
Dilan U. Ariyaratne
ab5aa3e31c
Merge pull request #315 from madhawap/master
...
Added missing end-point to the permissions.xml
9 years ago
madhawap
0b338a1d25
Added missing end-point to the permissions.xml
9 years ago
mharindu
789086a667
Changed context paths
9 years ago
mharindu
0f904e21d8
Fixed conflicts and merged
9 years ago
Chatura Dilan
4ec11e8c08
[maven-release-plugin] prepare for next development iteration
9 years ago
Chatura Dilan
ffedcac543
[maven-release-plugin] prepare release v1.1.1
9 years ago
mharindu
79a6da82f2
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
mharindu
c7eef634ac
Added send-invitation endpoint
9 years ago
dilanua
c61ef1c98e
Fixing issues of GET /compliance-data API
9 years ago
Ace
58666bc4b0
Adding device name url param for device search
9 years ago
madhawap
c3cbc5b4fb
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
madhawap
0b1e4ad86b
Updated permissions.xml according to new end-points
9 years ago
Ace
d58fb57f4e
Enabling device search for multiple params
9 years ago
madhawap
e52fed0b2d
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
madhawap
34354c032e
Added end-point to get devices enrolled under a specific user
9 years ago
prabathabey
6edfad5fb7
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
prabathabey
9aa54f2ead
Improving policy management functionalities to use deviceType in place of deviceTypeId for persisting policy information
9 years ago
Dilan U. Ariyaratne
73551590b9
Merge pull request #313 from madhawap/master
...
Added end point to get Compliance Data Of a Device
9 years ago
madhawap
09e2d2ecaf
Removing the internal status code added to the compliance data wrapper
9 years ago
madhawap
68b7d304a0
Added end point to get Compliance Data Of a Device
9 years ago
prabathabey
0125310440
Prepending the url template configured for updating notifications with a '/'
9 years ago
prabathabey
78057b2992
Adding an API to return the list of device types registered in the underlying device management platform
9 years ago
mharindu
aa6085ac8c
Added scopes to APIs
9 years ago
mharindu
ff82accb48
added scopes to notification API
9 years ago
mharindu
60659ce15b
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into scope-impl
9 years ago
mharindu
fe28bc25f1
Refactored scopes
9 years ago
madhawap
2136ebbeee
changes to 'updateNotificationStatus' swagger annotations
9 years ago
mharindu
ac75ff1d71
Fixed conflict and merged
9 years ago
mharindu
49623a4693
Implemented scope based authorization
9 years ago
madhawap
b55a164457
added 'updateNotificationStatus' endpoint and minor formattings to swagger annotations
9 years ago
madhawap
dbf938416b
added 'updateNotificationStatus' endpoint and minor formattings to swagger annotations
9 years ago
prabathabey
be7e63c390
merging rest-api-improvements branch to master
9 years ago
prabathabey
ed5d611c35
Code cleanup
9 years ago
prabathabey
37852051ff
Improving Device and Policy Management APIs and cleaning up code of Role and User Management APIs
9 years ago
Chatura Dilan
f100853031
Merge branch 'master' of github.com:wso2/carbon-device-mgt
9 years ago
dilanua
d34f29ab46
Fixing device types not retrieving issue
9 years ago
Chatura Dilan
bb6d2f2012
Fixed user search
9 years ago
madhawap
d9b35c29cd
swagger annotation fix to policy 'apply-changes' end point
9 years ago
madhawap
88feb5a852
Add Pagination to Notification end points
9 years ago
prabathabey
624e7df688
Improving HTTP status code handling and the resource implementations
9 years ago
prabathabey
a23f44e682
Improving AcitivityManagement API implementation with proper error handling, etc
9 years ago
prabathabey
ad6b95ff62
Code cleanup
9 years ago
prabathabey
a46bd9194b
Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt into rest-api-improvements
9 years ago
prabathabey
4236744d39
Improving UserManagement and RoleManagement API implementations to return proper error codes when no role/user exists, etc
9 years ago
Dilan U. Ariyaratne
a278b788d6
Merge pull request #308 from madhawap/rest-api-improvements
...
added priorities end-point to PolicyManagement
9 years ago
madhawap
b50e007897
added /priorities end-point to PolicyManagement
9 years ago
madhawap
9c215c4ac9
added /priorities end-point to PolicyManagement
9 years ago
inoshperera
50009c7ac5
adding apply policy end point
9 years ago
madhawap
ee11bde8b0
Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt into rest-api-improvements
9 years ago
madhawap
235d690f1e
Implemented 'offset' and 'limit' parameters to the 'operation' api
9 years ago
prabathabey
0c54753b34
Cleaning up UserManagementService API implementation
9 years ago
prabathabey
9a7286a84b
Removing DeviceWrapper and all its associated usage, as it appeared to be a redundant element in the precense of 'Device'
9 years ago
prabathabey
aeb4ad3295
Merging rest-api-improvements branch to master
9 years ago
geethkokila
c07914eb36
Adding the activity count for the activty paginantion
9 years ago
geethkokila
a67f432993
Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt into rest-api-improvements
9 years ago
geethkokila
236eb90ce2
Fixing the limit and offset for activity
9 years ago
madhawap
f2ab923df5
fix related to http status code in 'getDevices' endpoint
9 years ago
ayyoob
ebebca8573
Added support for push notification for xmpp, mqtt and few changes to the after testing
9 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
prabathabey
3e21c6d50d
Improving ceritificate management webapp impl
9 years ago
Ace
ddfd678b2a
Adding user management API bug fixes and improvements
9 years ago
Ace
d13368d144
Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt into rest-api-improvements
9 years ago
Ace
bfe215deac
Adding changes and bug fixes to UserMgtService
9 years ago
Milan Perera
289fef040b
Merge pull request #282 from ayyoob/rest-api-improvements
...
Rest api improvements in password reset
9 years ago
ayyoob
d63e5e876b
added password validation error msg
9 years ago
mharindu
cfe24229fc
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into apim
9 years ago
prabathabey
1d4d0b7ae2
Improving certificate management webapp implementation
9 years ago
ayyoob
74a96015a7
Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt into rest-api-improvements
9 years ago
ayyoob
cf1e808cbd
refactored after testing UserAdminManangmentService
9 years ago
prabathabey
9f48145614
Improving device admin service impl
9 years ago
prabathabey
697c727801
Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt into rest-api-improvements
9 years ago
prabathabey
fc3d6cccbf
Fixing Issues in notification management APIs
9 years ago
charitha
92a732cd41
Moved redundant texts to constants
9 years ago
geethkokila
3defcfe20d
Fixing the applicationMgtAdminService for returing activity
9 years ago
charitha
e2c03adec4
FIx for https://wso2.org/jira/browse/IOTS-169
9 years ago
prabathabey
20fd2ec768
Improving application installation/uninstallation handling
9 years ago
prabathabey
5ed982beb4
Adding more improvements to the JAX-RS APIs of CDM-F
9 years ago
prabathabey
fd7a137b07
Improving jax-rs APIS of CDM-F
9 years ago
hasuniea
20343d9349
fixed swagger message issue
9 years ago
prabathabey
726a700528
Improving error handling in checking for monitoring frquency
9 years ago
prabathabey
6e5148a374
Fixing inconsistencies between what's represented via swagger and the real implementation, and bugs found in admin services
9 years ago
mharindu
71eb657e52
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into apim
9 years ago
prabathabey
54f9d02ebb
Code cleanup
9 years ago
prabathabey
77d4c167af
code cleanup
9 years ago
geethkokila
b7da99a621
Adding activity apis to get the updated once after a given time
9 years ago
prabathabey
6d50ba14b1
Code cleanup
9 years ago
prabathabey
e1dfecb518
Changing the value of If-Modified-Since header as a string
9 years ago
prabathabey
76ec7bdc28
Improving swagger metada
9 years ago
prabathabey
425c0e7498
Improving swagger annotations of CDM-F core APIs further
9 years ago
geethkokila
ed0da9e1d0
Fixing the device informations to get the applications
9 years ago
prabathabey
d92fb53dc9
Annotate APIs with 'Api' element to give users an abstract idea on what these APIs roughly do
9 years ago
geethkokila
ecc8b5e6f2
Fixing the api issues
9 years ago
geethkokila
0221782533
Adding new apis for getting the device location when list of device identifiers are supplied
9 years ago
prabathabey
88cab5abf5
Fixing commit conflicts
9 years ago
prabathabey
37aa05f79c
Committing improved swagger annotated cdm-f APIs
9 years ago
inoshperera
3c73217e96
fixing osgi issue related to usage of carbon context. And adding api publishing check from config.
9 years ago
inoshperera
1ffbb2183a
adding permissions for DM services
9 years ago
prabathabey
0b9c64594c
Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt into rest-api-improvements
9 years ago
prabathabey
32cb32b706
modifying the name of the device management admin api war
9 years ago
inoshperera
4623fa2269
swagger annotations added to APIs
9 years ago
prabathabey
30f6fc53b5
Merging the latest changes introduced in master
9 years ago
prabathabey
ebefd60533
Renaming TenantConfiguration as PlatformConfiguration
9 years ago
ayyoob
e8b9f03748
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into apim
9 years ago
geethkokila
86e564713d
Adding the changes for getting activity ids which are changes after a certain time
9 years ago
geethkokila
01e3cc4987
Fixing the activity related issues
9 years ago
prabathabey
6d33d7036b
Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt into rest-api-improvements
9 years ago
prabathabey
0f5cf86d04
Adding the base path to be included in the swagger docs and appending the proper version to the webapp name
9 years ago
inoshperera
aeec472805
Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt into rest-api-improvements
9 years ago
inoshperera
2959c05e1a
adding swagger annotations for device and activity APIs.
9 years ago
mharindu
52388ed33d
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into apim
9 years ago
mharindu
106be76118
Fixed issues of API publishing to gateway
9 years ago
prabathabey
7e8f38cf16
Fixing conflicts while merging the latest changes in master
9 years ago
prabathabey
e7bf0c7658
Resolving conflicts caused by merging with the updates in master
9 years ago
prabathabey
8b9cf0da85
Resolving conflicts caused by merging with the updates in master
9 years ago
prabathabey
29b3b965b0
Making all CDM-F REST APIs compatible with the REST API specifications
9 years ago
inoshperera
deb4195f7a
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
inoshperera
a40e44899a
syncing REST apis of core and product EMM
9 years ago
inosh
1341884957
resolving conflicts
9 years ago
inosh
60b42715d6
syncing admin api from product emm
9 years ago
geethkokila
16b809b255
Fixing the conflicts
9 years ago
geethkokila
1697a7ce85
Doing a partial commit for syncing the code base
9 years ago
geethkokila
ba25ecc6ef
Doing a partial commit for syncing the code base
9 years ago
mharindu
3e291c5b13
[maven-release-plugin] prepare for next development iteration
9 years ago
mharindu
9549ac446b
[maven-release-plugin] prepare release v1.1.0
9 years ago
mharindu
65612f724f
Fixed compile issue
9 years ago
prabathabey
9ec80bfe18
Fixing build failures caused by changed introduced to Operation Management APIs
9 years ago
mharindu
968cb00f35
Fixed conflicts and merged
9 years ago
mharindu
83c2a1f0ee
Fixed issues in api publishing
9 years ago
prabathabey
a375252a94
Adding pluggable push notification framework
9 years ago
mharindu
bca1b4b059
Fixed conflicts
9 years ago
mharindu
9f93570b29
Fixed issues in webapp-publisher
9 years ago
geethkokila
c7dd386c94
Adding new apis for device informations
9 years ago
mharindu
49cb4787c0
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into apim
9 years ago
mharindu
82b90522a0
Migrated to APIM 5.0.4
9 years ago
charitha
aadf87e5d9
Bug fixes and fix for https://wso2.org/jira/browse/IOTS-158
9 years ago
mharindu
9ebf2ab6d9
Merge branch 'apim' of https://github.com/milanperera/carbon-device-mgt
9 years ago
charitha
0ccaa9fe81
Fix for https://wso2.org/jira/browse/IOTS-50 & https://wso2.org/jira/browse/IOTS-112
9 years ago
mharindu
9a4b904702
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into apim
9 years ago
charitha
685c52a453
Bug fixes
9 years ago
ayyoob
b3075cf1bc
removing application related roles
9 years ago
charitha
973e1ce40f
Fix issues in group api
9 years ago
prabathabey
71180e686e
Improving swagger annotations
9 years ago
prabathabey
a0dbb25824
Fixing code conflicts and improving swagger annotations
9 years ago
Madhawa Perera
e75afb8020
Adding swagger annotations to beans
9 years ago
prabathabey
9e4b4d2205
Improving swagger annotations
9 years ago
inoshperera
50b5661a74
Merge pull request #245 from madhawap/master
...
Added swagger annotations to beans
9 years ago
Madhawa Perera
fca80273bc
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
...
Adding swagger annotations to beans
9 years ago
inosh-perera
b2383617e1
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
inosh-perera
0cf0ec6e77
adding swagger annotations to APIs
9 years ago
Madhawa Perera
6227e93d2f
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
...
Adding swagger annotations to beans
9 years ago
Madhawa Perera
087adafeb7
Adding swagger annotations to beans
9 years ago
geethkokila
ccea046240
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
geethkokila
4e4e660fa1
Adding the swagger documentation to the activity id resource
9 years ago
Madhawa Perera
26c10f84ec
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
...
Adding swagger annotations to beans
9 years ago
inosh-perera
797c7a02d0
adding swagger annotation to beans
9 years ago
Madhawa
07c5362104
Adding swagger annotations to beans and some modifications to api interfaces
9 years ago
Madhawa
85f485df4c
Few changes to interfaces with swagger annotations
9 years ago
mharindu
fd39b31369
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
Madhawa
707da02c7e
Adding swagger annotations to beans
9 years ago
inoshperera
97db3e42d6
Merge pull request #242 from madhawap/master
...
Added swagger annotations to the interfaces
9 years ago
inosh-perera
5597c752ac
Adding sawgger annotations to admin Jax-rs apis.
9 years ago
Madhawa
b407797ab0
added swagger annotation to the interfaces
9 years ago
Madhawa
36c3a057dc
created interfaces for the api classes in order add swagger definitions
9 years ago
Madhawa
f5915cbf5d
created interfaces for the api classes in order add swagger definitions
9 years ago
Madhawa
7b04d9f0b0
created interfaces for the api classes in order add swagger definitions
9 years ago
prabathabey
bc894f2517
Adding Swagger-annotation dependency to carbon-device-mgt
9 years ago
mharindu
5ad8d2938e
Fixed issues of publishing APIs to synapse gateway
9 years ago
Charitha Goonetilleke
ca62c2ef73
Fix grouped device listing
9 years ago
Charitha Goonetilleke
e01b62086f
Fix parameter mismatch
9 years ago
Charitha Goonetilleke
92784120bd
Add group sharing UI functionality
9 years ago
Rasika Perera
33eed1f6cd
Adding permissions for roles updating
9 years ago
Rasika Perera
4eb588ac60
Group Constants moved to common
9 years ago
charithag
b1683c1ccb
Add capability to assign device in to a group and bug fixes
9 years ago
charithag
f6281c8ef0
Add jax-rs endpoints to modify and remove devices.
...
Update clientside js to work with secured apis
9 years ago
charithag
42d11b9d78
Add tenant aware dynamic units routing
9 years ago
charithag
61b43ce5d8
Rename packages in device mgt jax-rs apis
9 years ago
charithag
dfb7e9a9c8
Fix permissions
9 years ago
charithag
516155dae5
Moved devicemgt_admin jax-rs to device-mgt from carbon-devicemgt-plugins
9 years ago
Kasun Delgolla
4e57e5bc85
Committing restructuring mdm-admin + UI merging style fixes
9 years ago