Commit Graph

595 Commits (31f91f80b9543646b62ad39c0b3979b523c12840)

Author SHA1 Message Date
WSO2 Builder d206148841 [maven-release-plugin] prepare release v2.0.7 8 years ago
ayyoob 671d931d3e merged with origin after resolving conflicts 8 years ago
Rasika Perera f57de670ea Adding devices:update into /devices scopes list 8 years ago
Rasika Perera e11d2244f5 Fixing scope annotation /enrollment-invite 8 years ago
Rasika Perera 63cb0e1fde Adding swagger annotations and scope for /effective-policy 8 years ago
ayyoob cdd144237f removed unused parameter 8 years ago
ayyoob 2fbaf31b93 fixed permission and assigned environment variables for url context 8 years ago
Rasika Perera 8311828c5d Merge pull request from ayyoob/release-2.0.x 8 years ago
Rasika Perera ef2a1b84a2 IOTS-376 : Fixing cannot delete a device 8 years ago
kamidu 4588cfbed4 Fixing the permission management issue in EMM console 8 years ago
Ace 643acd7827 Adding api for renaming devices 8 years ago
Rasika Perera 83aea1fd01 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into merge-master 8 years ago
WSO2 Builder 5411d93103 [maven-release-plugin] prepare for next development iteration 8 years ago
WSO2 Builder 3ea83b925a [maven-release-plugin] prepare release v2.0.6 8 years ago
Milan Perera 228848075c Fixed conflicts and merged 8 years ago
Milan Perera 637c014866 Refactored scope strings 8 years ago
Milan Perera 157ef998a6 Resolved conflicts and merged 8 years ago
Milan Perera e0ee2fc1e5 Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x 8 years ago
ayyoob b20a2e0997 Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x 8 years ago
GPrathap 5d1435c7bc renamed permission string 8 years ago
Milan Perera 2a4a636eb4 Resolved conflicts and merged 8 years ago
Milan Perera d13dadff08 Renamed prefix of scopes 8 years ago
GPrathap 0bd7b90e9a added scope annotation 8 years ago
ayyoob db2ddc7bed policy manager refactored to support tenancy 8 years ago
Maninda 0fb5a577b8 Fixed some issues found in FindBugs security analysis. 8 years ago
Milan Perera b860be0150 Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x 8 years ago
charitha 295921b289 Fixed following issues: 8 years ago
Milan Perera 02d75b757c Fixed conflicts and merged 8 years ago
WSO2 Builder 6aea6195e9 [maven-release-plugin] prepare for next development iteration 8 years ago
WSO2 Builder 3db5b289ac [maven-release-plugin] prepare release v2.0.5 8 years ago
Rasika Perera acb2c38799 Fixing user is not authorized to view devices 8 years ago
WSO2 Builder ed47094964 [maven-release-plugin] prepare for next development iteration 8 years ago
WSO2 Builder 8d409a7248 [maven-release-plugin] prepare release v2.0.4 8 years ago
charitha 1a93868424 Fixed https://wso2.org/jira/browse/IOTS-335 8 years ago
Ace 674048ab27 Coorecting version import ranges 8 years ago
Ruwan 46c3b015fa Merge pull request from charithag/release-2.0.x-email-invites 8 years ago
Charitha Goonetilleke 5318601df0 Add license header 8 years ago
charitha 2b1d46f45f Finalized enrollment invitations 8 years ago
Ace 64da9479a1 Bumping identity dependencies 8 years ago
Ace 1d2a5dc9ef Updating identity/auth-saml dependencies to latest 8 years ago
charitha 795ccb740c Add backend support for enrollment invitations 8 years ago
Supun94 09572a9977 Removed redundant classes 8 years ago
Supun94 eb1575126f Minor refactoring on policy merging 8 years ago
Supun94 33b79dcbba Adding effective policy service 8 years ago
Rasika Perera 1465c56822 Revert "[WSO2 Release] [Jenkins ] [Release 2.0.4] prepare release v2.0.4" 8 years ago
Ace 47d8baccf7 upgrading to latest version of identity 8 years ago
WSO2 Builder f9b6939cb7 [WSO2 Release] [Jenkins ] [Release 2.0.4] prepare release v2.0.4 8 years ago
Rasika Perera 42930fe8c4 Revert "[WSO2 Release] [Jenkins ] [Release 2.0.4] prepare release v2.0.4" 8 years ago
Harshan Liyanage a2a03a523e Refactored RoleMgtServiceImpl. 8 years ago
Harshan Liyanage de2f85de2e IOTS-337:Fixed permission remove issue when updating role permissions. 8 years ago
WSO2 Builder 78b9052c37 [WSO2 Release] [Jenkins ] [Release 2.0.4] prepare release v2.0.4 8 years ago
Milan Perera bcbf61a886 Fixed conflicts 8 years ago
Milan Perera 36ee55f493 Implemented permission-scope mapping for IoTs 8 years ago
Milan Perera dd353e1bfb Commiting permission-scope mapping improvements 8 years ago
WSO2 Builder a59edee410 [maven-release-plugin] prepare for next development iteration 8 years ago
WSO2 Builder 8f9b21b41b [maven-release-plugin] prepare release v2.0.3 8 years ago
geethkokila d911281ad1 Merging master branch with release-2.0.x 8 years ago
WSO2 Builder 228b24ca79 [maven-release-plugin] prepare for next development iteration 8 years ago
WSO2 Builder 5dbb258f55 [maven-release-plugin] prepare release v2.0.2 8 years ago
Madawa Soysa c61cd484a0 IOTS-296: Adding group selection capability when adding a policy 8 years ago
WSO2 Builder 8431b30ddc [maven-release-plugin] prepare for next development iteration 8 years ago
WSO2 Builder ae2e283f14 [maven-release-plugin] prepare release v2.0.1 8 years ago
Rasika Perera aaade2363c Adding new api to create combined roles 8 years ago
charitha a2db592d69 Updated group management APIs and service 8 years ago
charitha 726bbcd35d Merged with upstream 8 years ago
charitha c07d77b85d Updated group sharing model 8 years ago
ayyoob ec3dbd37dd fixed commit comments 8 years ago
ayyoob e3849ef21e removed feature lifecycle implementation 8 years ago
ayyoob 3fb42ef32e Merge branch 'IoTS-1.0.0' of https://github.com/wso2/carbon-device-mgt into IoTS-1.0.0 8 years ago
ayyoob fede8ec409 few changes after testing with authoriser 8 years ago
GPrathap 6efc5bc1ed removed @API and @Permission annotations 8 years ago
ayyoob fe263efe60 changed device access verification approach 8 years ago
ayyoob 28faf53802 Merge branch 'IoTS-1.0.0' of https://github.com/wso2/carbon-device-mgt into IoTS-1.0.0 8 years ago
ayyoob 59e2a33e4a exposed device access authorisation as a service 8 years ago
WSO2 Builder 19c1b3566d [maven-release-plugin] prepare for next development iteration 8 years ago
WSO2 Builder cff6e242c8 [maven-release-plugin] prepare release v2.0.0 8 years ago
charitha a6064d2561 Update component versions for IoTS-1.0.0 release 8 years ago
sameera910409 02eec1033e add group sharing role create functionality 8 years ago
charitha 4a115e5d3f Merge branch 'IoTS-1.0.0' of https://github.com/wso2/carbon-device-mgt into IoTS-1.0.0 8 years ago
charitha ac30e7eb3e Merge remote-tracking branch 'upstream/master' into IoTS-1.0.0 8 years ago
WSO2 Builder 9517a3d30f [maven-release-plugin] prepare for next development iteration 8 years ago
WSO2 Builder a8568299b9 [maven-release-plugin] prepare release v1.2.6 8 years ago
sameera910409 f8f7dd08cd fixed share groups and group analytics in device grouping 8 years ago
Kamidu Sachith Punchihewa 33874f95b6 Merge pull request from saadsahibjan/master 8 years ago
sameera910409 204a0ed943 fixes for the comments of the PR#404 8 years ago
sameera910409 41f367abfa add group listing and group device listing fixes 8 years ago
charitha 5f68953b11 Merge branch 'master' into IoTS-1.0.0 8 years ago
Harshan Liyanage f961b57f9f EMM-1775:Fixed opleration log issue when multiple enrollments are there for a single device. 8 years ago
Saad Sahibjan 1cb969eb6d Fix incorrect spacing 8 years ago
WSO2 Builder 27a2c9b979 [maven-release-plugin] prepare for next development iteration 8 years ago
WSO2 Builder eae935f91c [maven-release-plugin] prepare release v1.2.5 8 years ago
Kamidu Sachith Punchihewa 7666bbfd05 Merge pull request from Megala21/master 8 years ago
WSO2 Builder 6a55e1be83 [maven-release-plugin] prepare for next development iteration 8 years ago
WSO2 Builder 11c2e59f61 [maven-release-plugin] prepare release v1.2.4 8 years ago
Megala 3416ae78c4 Fixing the problems in displaying user list when the user names has special chracters 8 years ago
Megala 1ff86289fd Fixing the problems that happend when we have special chracters in roles 8 years ago
Megala 4ec6883ec8 Merge remote-tracking branch 'upstream/master' 8 years ago
Megala 4a71be850c Refactoring code 8 years ago
Shavindri 28cb653b06 Added swagger annotations and refined the messages for certificate management, and created the swagger extensions file. 8 years ago
Megala a04f91cddb Fixing issues related to mapping users and roles from different user stores 8 years ago
Megala 87150f5074 Fixing secondary role deletion 8 years ago
Megala 0756294724 Merge remote-tracking branch 'upstream/master' 8 years ago
Megala d8555c34ab Fixing issues related with roles of secondary user store 8 years ago
Kamidu Sachith Punchihewa cce4428a9d Merge pull request from shavidissa/master 8 years ago
Shavindri c64581dc59 Removed the GroupManagementService and GroupManagementAdminService references from the APIs after discussing with the team and continued adding swagger annotations and refining tex 8 years ago
susinda eb20d1fc1c Device delete implemented (only in api level) for iot 8 years ago
charitha 528687bde3 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 8 years ago
charitha 0498c68ca5 Add validation to maximum limit value 8 years ago
Megala 4999b84169 Reformatting code 8 years ago
Megala 5b96e1b849 Fixing EMM-1333 8 years ago
Kamidu Sachith Punchihewa af4989e56d Merge pull request from shavidissa/master 8 years ago
Shavindri 1e32d5f89f Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 8 years ago
Shavindri 0842dcb2bb swagger annotations and definition update continued for device type, device, policy, role, user, group and user management. 8 years ago
ayyoob 93c1725e32 fixed api name for device type 8 years ago
charitha e53b0c3860 Fix group count listing in dashboard 8 years ago
charitha 670ca7c228 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 8 years ago
ayyoob 5727886ea1 few changes after apimgt integration 8 years ago
charitha 94a50584f4 Improve group listing with pagination 8 years ago
madhawap 16b334b0b3 changes to swagger SecurityDefinitionConfigurator and annotations 8 years ago
madhawap 7b8518a9db changes to swagger SecurityDefinitionConfigurator and annotations 8 years ago
charitha ce5d63925a Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 8 years ago
charitha e89b4015b6 Introduced pagination 8 years ago
Kamidu Sachith Punchihewa 06e70c8326 Merge pull request from shavidissa/master 8 years ago
Shavindri f0164b5a01 swagger annotations and definitions changes for role management, configuration management and application management(admin) 8 years ago
charitha 06176898d0 Exposed group id to API level 8 years ago
Megala e77d8b8b29 Adding isEmpty check 8 years ago
Megala 0642cc10d7 Reformatting code 8 years ago
Megala f9204add08 Merge remote-tracking branch 'upstream/master' 8 years ago
charitha f22d392978 Upgrade to comply with latest CDMF changes 8 years ago
Megala b7990b9146 Fixing problems in retriveing data from secondary user store 8 years ago
dilanua dff32af832 Adding initial swagger annotations and permissions to Dashboard APIs 8 years ago
dilanua 1ca5762c44 Uncommenting Dashboard APIs 8 years ago
charitha a0050d8f4d Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 8 years ago
charitha d1d6eefd17 Upgrading grouping backend 8 years ago
harshanl a4538a6d6c Removed unnecessary params from paginated queries 8 years ago
harshanl befb5b0ad8 EMM-1658:Changed the API contract to not to send username parameter. User can only change his own password. 8 years ago
Chatura Dilan Perera c16cc4cae1 [maven-release-plugin] prepare for next development iteration 8 years ago
Chatura Dilan Perera ed4bca7032 [maven-release-plugin] prepare release v1.2.2 8 years ago
Rasika Perera b2eb715fb7 REsolving conflicts 8 years ago
Rasika Perera 5c8c28d28c Merge pull request from warunalakshitha/master 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 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 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 9 years ago
Ruwan 6134f94e3c Merge pull request from ayyoob/com 9 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 9 years ago
hasuniea c269f35ef2 fixing getAllActivity H2 issue 9 years ago
mharindu 7346313d27 Modified scope management service 9 years ago
ayyoob 442c2b86da fixed formatting issues 9 years ago
harshanl a7d7c689e8 Removed unsupported roleName parameter from device API 9 years ago
ayyoob 3b56668af0 merged with upstream 9 years ago
madhawap ecfe94235f Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 9 years ago
madhawap c6cc5e8df3 fixes to role updating endpoint 9 years ago
ayyoob 3edc68d204 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into com 9 years ago
ayyoob 058f9e4cfa merged with origin 9 years ago
harshanl e80c2f4050 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 9 years ago
dilanua 352643a421 Changing deactivate-policy api method to PUT 9 years ago
harshanl 34e97aeeae Removed device search using roleName parameter. 9 years ago
mharindu 5bdb4630af Fixed conflicts and merged 9 years ago
mharindu 886e2e08f2 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into scope-impl 9 years ago
mharindu 2e79dd290e Modified scopes 9 years ago