Commit Graph

1499 Commits (7e4cc36977c20878160644ffde1d9a119632358f)

Author SHA1 Message Date
WSO2 Builder b9e614e383 [WSO2 Release] [Jenkins #2222] [Release 2.0.43] prepare for next development iteration
8 years ago
WSO2 Builder d37951ef3f [WSO2 Release] [Jenkins #2222] [Release 2.0.43] prepare release v2.0.43
8 years ago
megala21 2360b338d8 Fixing the role creation problem
8 years ago
WSO2 Builder fc15f43b31 [WSO2 Release] [Jenkins #2210] [Release 2.0.42] prepare for next development iteration
8 years ago
WSO2 Builder 27b84bfc22 [WSO2 Release] [Jenkins #2210] [Release 2.0.42] prepare release v2.0.42
8 years ago
WSO2 Builder 5496159f9d [WSO2 Release] [Jenkins #2206] [Release 2.0.41] prepare for next development iteration
8 years ago
WSO2 Builder ef94e90366 [WSO2 Release] [Jenkins #2206] [Release 2.0.41] prepare release v2.0.41
8 years ago
megala21 2b92676191 Fixes https://github.com/wso2/product-iots/issues/346
8 years ago
WSO2 Builder a826370019 [WSO2 Release] [Jenkins #2204] [Release 2.0.40] prepare for next development iteration
8 years ago
WSO2 Builder 4654a4db45 [WSO2 Release] [Jenkins #2204] [Release 2.0.40] prepare release v2.0.40
8 years ago
WSO2 Builder 8b7e458592 [WSO2 Release] [Jenkins #2201] [Release 2.0.39] prepare for next development iteration
8 years ago
WSO2 Builder 6297993560 [WSO2 Release] [Jenkins #2201] [Release 2.0.39] prepare release v2.0.39
8 years ago
WSO2 Builder 802c83de39 [WSO2 Release] [Jenkins #2193] [Release 2.0.38] prepare for next development iteration
8 years ago
WSO2 Builder 98dda03784 [WSO2 Release] [Jenkins #2193] [Release 2.0.38] prepare release v2.0.38
8 years ago
WSO2 Builder f3e119cd78 [WSO2 Release] [Jenkins #2190] [Release 2.0.37] prepare for next development iteration
8 years ago
WSO2 Builder a8f8a49a80 [WSO2 Release] [Jenkins #2190] [Release 2.0.37] prepare release v2.0.37
8 years ago
WSO2 Builder 0e5895ec78 [WSO2 Release] [Jenkins #2183] [Release 2.0.36] prepare for next development iteration
8 years ago
WSO2 Builder d6080159cb [WSO2 Release] [Jenkins #2183] [Release 2.0.36] prepare release v2.0.36
8 years ago
Amal Gunatilake e9c2f3e72d Merge branch 'master' into cloud-3.1.0
8 years ago
WSO2 Builder 3f8f8b3ab9 [WSO2 Release] [Jenkins #2180] [Release 2.0.35] prepare for next development iteration
8 years ago
WSO2 Builder 6a9a5ba9c8 [WSO2 Release] [Jenkins #2180] [Release 2.0.35] prepare release v2.0.35
8 years ago
kamidu cda0dd417f fixing the role filtering api issues
8 years ago
kamidu 73ab0a38bf adding get location api witch was missing from previous emm versions
8 years ago
kamidu a6f5c002a9 adding get location api witch was missing from previous emm versions
8 years ago
kamidu a77794f81a adding role filtering for device cloud via api
8 years ago
kamidu fc6c8e0290 adding get location api witch was missing from previous emm versions
8 years ago
WSO2 Builder e8ee33e7a4 [WSO2 Release] [Jenkins #2177] [Release 2.0.34] prepare for next development iteration
8 years ago
WSO2 Builder 6cc898d2ab [WSO2 Release] [Jenkins #2177] [Release 2.0.34] prepare release v2.0.34
8 years ago
WSO2 Builder a26a4bb539 [WSO2 Release] [Jenkins #2175] [Release 2.0.33] prepare for next development iteration
8 years ago
WSO2 Builder 000601911f [WSO2 Release] [Jenkins #2175] [Release 2.0.33] prepare release v2.0.33
8 years ago
WSO2 Builder 50c9eb9ba4 [WSO2 Release] [Jenkins #2172] [Release 2.0.32] prepare for next development iteration
8 years ago
WSO2 Builder ca79804c5c [WSO2 Release] [Jenkins #2172] [Release 2.0.32] prepare release v2.0.32
8 years ago
WSO2 Builder a35205c480 [WSO2 Release] [Jenkins #2169] [Release 2.0.31] prepare for next development iteration
8 years ago
WSO2 Builder ac379c9bf9 [WSO2 Release] [Jenkins #2169] [Release 2.0.31] prepare release v2.0.31
8 years ago
WSO2 Builder de25f3afe3 [WSO2 Release] [Jenkins #2163] [Release 2.0.30] prepare for next development iteration
8 years ago
WSO2 Builder 55ecafe7f4 [WSO2 Release] [Jenkins #2163] [Release 2.0.30] prepare release v2.0.30
8 years ago
WSO2 Builder 15d57f71ad [WSO2 Release] [Jenkins #2161] [Release 2.0.29] prepare for next development iteration
8 years ago
WSO2 Builder 3af9e1729a [WSO2 Release] [Jenkins #2161] [Release 2.0.29] prepare release v2.0.29
8 years ago
WSO2 Builder 322f39596e [WSO2 Release] [Jenkins #2158] [Release 2.0.28] prepare for next development iteration
8 years ago
WSO2 Builder 18244d6c96 [WSO2 Release] [Jenkins #2158] [Release 2.0.28] prepare release v2.0.28
8 years ago
WSO2 Builder 12f21868dc [WSO2 Release] [Jenkins #2157] [Release 2.0.27] prepare for next development iteration
8 years ago
WSO2 Builder 4328c3c39d [WSO2 Release] [Jenkins #2157] [Release 2.0.27] prepare release v2.0.27
8 years ago
WSO2 Builder c6bb8e0128 [WSO2 Release] [Jenkins #2154] [Release 2.0.26] prepare for next development iteration
8 years ago
WSO2 Builder da9002ba9f [WSO2 Release] [Jenkins #2154] [Release 2.0.26] prepare release v2.0.26
8 years ago
WSO2 Builder 6114f4b2d5 [WSO2 Release] [Jenkins #2152] [Release 2.0.25] prepare for next development iteration
8 years ago
WSO2 Builder ea8f19f26d [WSO2 Release] [Jenkins #2152] [Release 2.0.25] prepare release v2.0.25
8 years ago
WSO2 Builder d433525145 [WSO2 Release] [Jenkins #2150] [Release 2.0.24] prepare for next development iteration
8 years ago
WSO2 Builder 35ee3eca3a [WSO2 Release] [Jenkins #2150] [Release 2.0.24] prepare release v2.0.24
8 years ago
WSO2 Builder 4e0afb7d39 [WSO2 Release] [Jenkins #2146] [Release 2.0.23] prepare for next development iteration
8 years ago
WSO2 Builder 33f1448c82 [WSO2 Release] [Jenkins #2146] [Release 2.0.23] prepare release v2.0.23
8 years ago
WSO2 Builder e95e96f06c [WSO2 Release] [Jenkins #2141] [Release 2.0.22] prepare for next development iteration
8 years ago
WSO2 Builder 5d55413e02 [WSO2 Release] [Jenkins #2141] [Release 2.0.22] prepare release v2.0.22
8 years ago
WSO2 Builder ae3300afde [WSO2 Release] [Jenkins #2134] [Release 2.0.21] prepare for next development iteration
8 years ago
WSO2 Builder 6646c0c56f [WSO2 Release] [Jenkins #2134] [Release 2.0.21] prepare release v2.0.21
8 years ago
WSO2 Builder 21cdcdd21a [WSO2 Release] [Jenkins #2133] [Release 2.0.20] prepare for next development iteration
8 years ago
WSO2 Builder 23be60ebd0 [WSO2 Release] [Jenkins #2133] [Release 2.0.20] prepare release v2.0.20
8 years ago
WSO2 Builder 7f98d37835 [WSO2 Release] [Jenkins #2122] [Release 2.0.19] prepare for next development iteration
8 years ago
WSO2 Builder b03936ca49 [WSO2 Release] [Jenkins #2122] [Release 2.0.19] prepare release v2.0.19
8 years ago
WSO2 Builder 82888e1d20 [WSO2 Release] [Jenkins #2109] [Release 2.0.18] prepare for next development iteration
8 years ago
WSO2 Builder b11c2e451b [WSO2 Release] [Jenkins #2109] [Release 2.0.18] prepare release v2.0.18
8 years ago
WSO2 Builder 67a091ff5a [WSO2 Release] [Jenkins #2094] [Release 2.0.17] prepare for next development iteration
8 years ago
WSO2 Builder dcc2088455 [WSO2 Release] [Jenkins #2094] [Release 2.0.17] prepare release v2.0.17
8 years ago
lakshani eb12e5b9f1 Adding commit 'added java doc comments'
8 years ago
lakshani 3f90b403c0 Adding lakshani's commit 'updated device status button'
8 years ago
WSO2 Builder 927b2d451d [WSO2 Release] [Jenkins #2092] [Release 2.0.16] prepare for next development iteration
8 years ago
WSO2 Builder dfe9b1ff9c [WSO2 Release] [Jenkins #2092] [Release 2.0.16] prepare release v2.0.16
8 years ago
charitha d2991585aa Applying charithas commit on IOTS-436
8 years ago
ayyoob 87910bc92b transferred mutual authenticator to jwt authenticator
8 years ago
ayyoob b7566f4e4a added artifact deployment support through UI
8 years ago
ayyoob 0999bb70a0 exposed artefact deployment through api
8 years ago
Kamidu Sachith Punchihewa 559fe98cc9 Merge pull request #585 from wso2/master
8 years ago
WSO2 Builder 54a278a1bc [WSO2 Release] [Jenkins #2086] [Release 2.0.15] prepare for next development iteration
8 years ago
WSO2 Builder 3bc46c4d2d [WSO2 Release] [Jenkins #2086] [Release 2.0.15] prepare release v2.0.15
8 years ago
WSO2 Builder 1bc8f5c28d [WSO2 Release] [Jenkins #2083] [Release 2.0.14] prepare for next development iteration
8 years ago
WSO2 Builder 1483503790 [WSO2 Release] [Jenkins #2083] [Release 2.0.14] prepare release v2.0.14
8 years ago
Hasunie 54d0d7a5ee Merge pull request #582 from charithag/master-update-swagger-docs
8 years ago
Milan Perera a5f41ef734 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into cloud
8 years ago
charitha 8e01a98ded Removed unused Dashboard API
8 years ago
charitha 423879bee7 Updated swagger docs
8 years ago
charitha 3cf797fba6 Removed hardcoded device types in swagger docs
8 years ago
WSO2 Builder 5dc55bb5b5 [WSO2 Release] [Jenkins #2076] [Release 2.0.13] prepare for next development iteration
8 years ago
WSO2 Builder c7fe9c3a20 [WSO2 Release] [Jenkins #2076] [Release 2.0.13] prepare release v2.0.13
8 years ago
lakshani 26f2e2d2ae added role query param to getdevices restapis
8 years ago
WSO2 Builder c17bead1fc [WSO2 Release] [Jenkins #2069] [Release 2.0.12] prepare for next development iteration
8 years ago
WSO2 Builder 14100d3cc8 [WSO2 Release] [Jenkins #2069] [Release 2.0.12] prepare release v2.0.12
8 years ago
GPrathap 47e6f6d292 adding username as parameter
8 years ago
ayyoob b42505c1fe Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into release-2.0.y
8 years ago
WSO2 Builder cd7e0feaa6 [WSO2 Release] [Jenkins #2062] [Release 2.0.11] prepare for next development iteration
8 years ago
WSO2 Builder abb150d9bd [WSO2 Release] [Jenkins #2062] [Release 2.0.11] prepare release v2.0.11
8 years ago
ayyoob 3423ef025d merged with upstream
8 years ago
ayyoob e74b4e23c4 removed apim dependency from cdmf
8 years ago
WSO2 Builder 002fb8719b [maven-release-plugin] prepare for next development iteration
8 years ago
WSO2 Builder 04f32902fd [maven-release-plugin] prepare release v2.0.10
8 years ago
Rasika Perera 704680d68d Fixing null pointer when roles are not specified on creating new user
8 years ago
Rasika Perera d723e22a8c Fixed roleUpdate issue
8 years ago
WSO2 Builder 5c207897ad [maven-release-plugin] prepare for next development iteration
8 years ago
WSO2 Builder 233d14edbd [maven-release-plugin] prepare release v2.0.9
8 years ago
Rasika Perera 8e6855a203 Adding DEFAULT_DEVICE_USER on adding user
8 years ago
WSO2 Builder eedecf00ed [maven-release-plugin] prepare for next development iteration
8 years ago
WSO2 Builder ef57fc463b [maven-release-plugin] prepare release v2.0.8
8 years ago
sameera910409 1bec5e5186 fixed user password reset failure issue in iot console
8 years ago
Maninda 1f5448c2a0 Corrected the caching filter pattern
8 years ago
Maninda 8aed7c67a9 Added devicemgt web app configs to secure web app
8 years ago
WSO2 Builder 585b9bde4d [maven-release-plugin] prepare for next development iteration
8 years ago
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 #537 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 #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
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 #373 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 #1 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
8 years ago
Ruwan 6134f94e3c Merge pull request #332 from ayyoob/com
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.
8 years ago
mharindu ed4c762bfd Refactored scopes
8 years ago
ayyoob a7074e2e4e refactored general configuration
8 years ago
Prabath Abeysekara cc90bef42b Merge pull request #318 from Securepoint/master
8 years ago
mharindu eb5216091e Fixed conflicts and merged
8 years ago
harshanl 6cc1bb088c Fixed EMM-1447, EMM-1424
8 years ago
mharindu 6e742ee6ac Added scope beans
8 years ago
mharindu 564c2b280e Fixed conflicts and merged
8 years ago
Chatura Dilan 7af8ecc686 Added userstore for role listing
8 years ago
mharindu b3d309583d Fixed issues in scope service
8 years ago
mharindu 7f1e2fdf0b Implemented scope management service
8 years ago
mharindu bdec8880bb Fixed conflicts and merged
8 years ago
mharindu 186432e1df Fixed webapp name resolving issue
8 years ago
Timo Briddigkeit ed07774552 Fixed literal string comparison.
8 years ago
Timo Briddigkeit 90910518d6 Fixed null pointer dereferences
8 years ago
Timo Briddigkeit 09020ccb9f Fixed predictable pseudorandom number generator
8 years ago
mharindu 99664b23c5 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into scope-impl
8 years ago
Dilan U. Ariyaratne ab5aa3e31c Merge pull request #315 from madhawap/master
8 years ago
madhawap 0b338a1d25 Added missing end-point to the permissions.xml
8 years ago
mharindu 789086a667 Changed context paths
8 years ago
mharindu 0f904e21d8 Fixed conflicts and merged
8 years ago
Chatura Dilan 4ec11e8c08 [maven-release-plugin] prepare for next development iteration
8 years ago
Chatura Dilan ffedcac543 [maven-release-plugin] prepare release v1.1.1
8 years ago
mharindu 79a6da82f2 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
8 years ago
mharindu c7eef634ac Added send-invitation endpoint
8 years ago
dilanua c61ef1c98e Fixing issues of GET /compliance-data API
8 years ago
Ace 58666bc4b0 Adding device name url param for device search
8 years ago
madhawap c3cbc5b4fb Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
8 years ago
madhawap 0b1e4ad86b Updated permissions.xml according to new end-points
8 years ago
Ace d58fb57f4e Enabling device search for multiple params
8 years ago
madhawap e52fed0b2d Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
8 years ago
madhawap 34354c032e Added end-point to get devices enrolled under a specific user
8 years ago
prabathabey 6edfad5fb7 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
8 years ago
prabathabey 9aa54f2ead Improving policy management functionalities to use deviceType in place of deviceTypeId for persisting policy information
8 years ago
Dilan U. Ariyaratne 73551590b9 Merge pull request #313 from madhawap/master
8 years ago
madhawap 09e2d2ecaf Removing the internal status code added to the compliance data wrapper
8 years ago
madhawap 68b7d304a0 Added end point to get Compliance Data Of a Device
8 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
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
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
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
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
9 years ago
Madhawa Perera fca80273bc Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
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
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
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
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.
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