Commit Graph

481 Commits (ed7b67dd24310773e650835a30459765d801aaf7)

Author SHA1 Message Date
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 #498 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 #61] [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 #61] [Release 2.0.4] prepare release v2.0.4
8 years ago
Rasika Perera 42930fe8c4 Revert "[WSO2 Release] [Jenkins #55] [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 #55] [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 #399 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 #395 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 #390 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 #384 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