7f98d37835
[WSO2 Release] [Jenkins #2122 ] [Release 2.0.19] prepare for next development iteration
8 years ago
b03936ca49
[WSO2 Release] [Jenkins #2122 ] [Release 2.0.19] prepare release v2.0.19
8 years ago
82888e1d20
[WSO2 Release] [Jenkins #2109 ] [Release 2.0.18] prepare for next development iteration
8 years ago
b11c2e451b
[WSO2 Release] [Jenkins #2109 ] [Release 2.0.18] prepare release v2.0.18
8 years ago
67a091ff5a
[WSO2 Release] [Jenkins #2094 ] [Release 2.0.17] prepare for next development iteration
8 years ago
dcc2088455
[WSO2 Release] [Jenkins #2094 ] [Release 2.0.17] prepare release v2.0.17
8 years ago
eb12e5b9f1
Adding commit 'added java doc comments'
8 years ago
3f90b403c0
Adding lakshani's commit 'updated device status button'
8 years ago
927b2d451d
[WSO2 Release] [Jenkins #2092 ] [Release 2.0.16] prepare for next development iteration
8 years ago
dfe9b1ff9c
[WSO2 Release] [Jenkins #2092 ] [Release 2.0.16] prepare release v2.0.16
8 years ago
d2991585aa
Applying charithas commit on IOTS-436
8 years ago
87910bc92b
transferred mutual authenticator to jwt authenticator
8 years ago
b7566f4e4a
added artifact deployment support through UI
8 years ago
0999bb70a0
exposed artefact deployment through api
...
Merged Jasintha’s code
8 years ago
559fe98cc9
Merge pull request #585 from wso2/master
...
Cloud ui fixes and the new master fixes
8 years ago
54a278a1bc
[WSO2 Release] [Jenkins #2086 ] [Release 2.0.15] prepare for next development iteration
8 years ago
3bc46c4d2d
[WSO2 Release] [Jenkins #2086 ] [Release 2.0.15] prepare release v2.0.15
8 years ago
1bc8f5c28d
[WSO2 Release] [Jenkins #2083 ] [Release 2.0.14] prepare for next development iteration
8 years ago
1483503790
[WSO2 Release] [Jenkins #2083 ] [Release 2.0.14] prepare release v2.0.14
8 years ago
54d0d7a5ee
Merge pull request #582 from charithag/master-update-swagger-docs
...
Update swagger docs
8 years ago
a5f41ef734
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into cloud
8 years ago
8e01a98ded
Removed unused Dashboard API
8 years ago
423879bee7
Updated swagger docs
8 years ago
3cf797fba6
Removed hardcoded device types in swagger docs
8 years ago
5dc55bb5b5
[WSO2 Release] [Jenkins #2076 ] [Release 2.0.13] prepare for next development iteration
8 years ago
c7fe9c3a20
[WSO2 Release] [Jenkins #2076 ] [Release 2.0.13] prepare release v2.0.13
8 years ago
26f2e2d2ae
added role query param to getdevices restapis
8 years ago
c17bead1fc
[WSO2 Release] [Jenkins #2069 ] [Release 2.0.12] prepare for next development iteration
8 years ago
14100d3cc8
[WSO2 Release] [Jenkins #2069 ] [Release 2.0.12] prepare release v2.0.12
8 years ago
47e6f6d292
adding username as parameter
8 years ago
b42505c1fe
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into release-2.0.y
8 years ago
cd7e0feaa6
[WSO2 Release] [Jenkins #2062 ] [Release 2.0.11] prepare for next development iteration
8 years ago
abb150d9bd
[WSO2 Release] [Jenkins #2062 ] [Release 2.0.11] prepare release v2.0.11
8 years ago
3423ef025d
merged with upstream
8 years ago
e74b4e23c4
removed apim dependency from cdmf
8 years ago
002fb8719b
[maven-release-plugin] prepare for next development iteration
8 years ago
04f32902fd
[maven-release-plugin] prepare release v2.0.10
8 years ago
704680d68d
Fixing null pointer when roles are not specified on creating new user
8 years ago
d723e22a8c
Fixed roleUpdate issue
8 years ago
5c207897ad
[maven-release-plugin] prepare for next development iteration
8 years ago
233d14edbd
[maven-release-plugin] prepare release v2.0.9
8 years ago
8e6855a203
Adding DEFAULT_DEVICE_USER on adding user
8 years ago
eedecf00ed
[maven-release-plugin] prepare for next development iteration
8 years ago
ef57fc463b
[maven-release-plugin] prepare release v2.0.8
8 years ago
1bec5e5186
fixed user password reset failure issue in iot console
8 years ago
1f5448c2a0
Corrected the caching filter pattern
8 years ago
8aed7c67a9
Added devicemgt web app configs to secure web app
8 years ago
585b9bde4d
[maven-release-plugin] prepare for next development iteration
8 years ago
d206148841
[maven-release-plugin] prepare release v2.0.7
8 years ago
671d931d3e
merged with origin after resolving conflicts
8 years ago
f57de670ea
Adding devices:update into /devices scopes list
8 years ago
e11d2244f5
Fixing scope annotation /enrollment-invite
8 years ago
63cb0e1fde
Adding swagger annotations and scope for /effective-policy
8 years ago
cdd144237f
removed unused parameter
8 years ago
2fbaf31b93
fixed permission and assigned environment variables for url context
8 years ago
8311828c5d
Merge pull request #537 from ayyoob/release-2.0.x
...
updated ui config
8 years ago
ef2a1b84a2
IOTS-376 : Fixing cannot delete a device
8 years ago
4588cfbed4
Fixing the permission management issue in EMM console
8 years ago
643acd7827
Adding api for renaming devices
8 years ago
83aea1fd01
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into merge-master
...
# Conflicts:
# components/apimgt-extensions/org.wso2.carbon.apimgt.annotations/pom.xml
# components/apimgt-extensions/org.wso2.carbon.apimgt.application.extension.api/pom.xml
# components/apimgt-extensions/org.wso2.carbon.apimgt.application.extension/pom.xml
# components/apimgt-extensions/org.wso2.carbon.apimgt.webapp.publisher/pom.xml
# components/apimgt-extensions/org.wso2.carbon.apimgt.webapp.publisher/src/main/java/org/wso2/carbon/apimgt/webapp/publisher/lifecycle/util/AnnotationProcessor.java
# components/apimgt-extensions/org.wso2.carbon.apimgt.webapp.publisher/src/main/java/org/wso2/carbon/apimgt/webapp/publisher/lifecycle/util/ExtendedFileProtocolIteratorFactory.java
# components/apimgt-extensions/pom.xml
# components/certificate-mgt/org.wso2.carbon.certificate.mgt.api/pom.xml
# components/certificate-mgt/org.wso2.carbon.certificate.mgt.cert.admin.api/pom.xml
# components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/pom.xml
# components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/main/java/org/wso2/carbon/certificate/mgt/core/impl/CertificateGenerator.java
# components/certificate-mgt/pom.xml
# components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.gcm/pom.xml
# components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt/pom.xml
# components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.xmpp/pom.xml
# components/device-mgt-extensions/pom.xml
# components/device-mgt/org.wso2.carbon.device.mgt.analytics.dashboard/pom.xml
# components/device-mgt/org.wso2.carbon.device.mgt.analytics.data.publisher/pom.xml
# components/device-mgt/org.wso2.carbon.device.mgt.api/pom.xml
# components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/beans/PasswordResetWrapper.java
# components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/beans/PolicyList.java
# components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/beans/Profile.java
# components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/beans/ProfileFeature.java
# components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/Dashboard.java
# components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/impl/UserManagementServiceImpl.java
# components/device-mgt/org.wso2.carbon.device.mgt.common/pom.xml
# components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/policy/mgt/Policy.java
# components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/policy/mgt/Profile.java
# components/device-mgt/org.wso2.carbon.device.mgt.core/pom.xml
# components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dao/DeviceDAO.java
# components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/search/mgt/dao/SearchDAO.java
# components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/search/mgt/dao/impl/SearchDAOImpl.java
# components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/search/mgt/impl/ProcessorImpl.java
# components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/search/mgt/impl/QueryBuilderImpl.java
# components/device-mgt/org.wso2.carbon.device.mgt.core/src/test/resources/testng.xml
# components/device-mgt/org.wso2.carbon.device.mgt.extensions/pom.xml
# components/device-mgt/org.wso2.carbon.device.mgt.extensions/src/main/java/org/wso2/carbon/device/mgt/extensions/feature/mgt/util/AnnotationProcessor.java
# components/device-mgt/org.wso2.carbon.device.mgt.extensions/src/main/java/org/wso2/carbon/device/mgt/extensions/feature/mgt/util/ExtendedFileProtocolIteratorFactory.java
# components/device-mgt/org.wso2.carbon.device.mgt.extensions/src/main/java/org/wso2/carbon/device/mgt/extensions/feature/mgt/util/ExtendedIteratorFactory.java
# components/device-mgt/org.wso2.carbon.device.mgt.ui/pom.xml
# components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/conf/config.json
# components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/modules/business-controllers/user.js
# components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.sign-in/sign-in.hbs
# components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.ui.header.user-menu/user-menu.hbs
# components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/error-pages/error400.html
# components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/error-pages/error401.html
# components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/error-pages/error403.html
# components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/error-pages/error404.html
# components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/error-pages/error405.html
# components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/error-pages/error500.html
# components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/uuf-template-app/app/pages/uuf.page.sign-in/sign-in.hbs
# components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/uuf-template-app/lib/modules/auth/auth.js
# components/device-mgt/pom.xml
# components/email-sender/org.wso2.carbon.email.sender.core/pom.xml
# components/email-sender/pom.xml
# components/identity-extensions/dynamic-client-registration/dynamic-client-web-proxy/pom.xml
# components/identity-extensions/dynamic-client-registration/dynamic-client-web/pom.xml
# components/identity-extensions/dynamic-client-registration/org.wso2.carbon.dynamic.client.registration/pom.xml
# components/identity-extensions/dynamic-client-registration/org.wso2.carbon.dynamic.client.web.app.registration/pom.xml
# components/identity-extensions/dynamic-client-registration/pom.xml
# components/identity-extensions/org.wso2.carbon.device.mgt.oauth.extensions/pom.xml
# components/identity-extensions/org.wso2.carbon.device.mgt.oauth.extensions/src/main/java/org/wso2/carbon/device/mgt/oauth/extensions/OAuthExtUtils.java
# components/identity-extensions/org.wso2.carbon.device.mgt.oauth.extensions/src/main/java/org/wso2/carbon/device/mgt/oauth/extensions/validators/PermissionBasedScopeValidator.java
# components/identity-extensions/org.wso2.carbon.identity.authenticator.backend.oauth/pom.xml
# components/identity-extensions/org.wso2.carbon.identity.jwt.client.extension/pom.xml
# components/identity-extensions/pom.xml
# components/policy-mgt/org.wso2.carbon.complex.policy.decision.point/pom.xml
# components/policy-mgt/org.wso2.carbon.policy.decision.point/pom.xml
# components/policy-mgt/org.wso2.carbon.policy.information.point/pom.xml
# components/policy-mgt/org.wso2.carbon.policy.mgt.common/pom.xml
# components/policy-mgt/org.wso2.carbon.policy.mgt.core/pom.xml
# components/policy-mgt/pom.xml
# components/webapp-authenticator-framework/org.wso2.carbon.webapp.authenticator.framework/pom.xml
# components/webapp-authenticator-framework/pom.xml
# features/apimgt-extensions/org.wso2.carbon.apimgt.application.extension.feature/pom.xml
# features/apimgt-extensions/org.wso2.carbon.apimgt.webapp.publisher.feature/pom.xml
# features/apimgt-extensions/pom.xml
# features/certificate-mgt/org.wso2.carbon.certificate.mgt.api.feature/pom.xml
# features/certificate-mgt/org.wso2.carbon.certificate.mgt.cert.admin.api.feature/pom.xml
# features/certificate-mgt/org.wso2.carbon.certificate.mgt.server.feature/pom.xml
# features/certificate-mgt/pom.xml
# features/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.gcm.feature/pom.xml
# features/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt.feature/pom.xml
# features/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.xmpp.feature/pom.xml
# features/device-mgt-extensions/pom.xml
# features/device-mgt/org.wso2.carbon.device.mgt.analytics.dashboard.feature/pom.xml
# features/device-mgt/org.wso2.carbon.device.mgt.analytics.data.publisher.feature/pom.xml
# features/device-mgt/org.wso2.carbon.device.mgt.api.feature/pom.xml
# features/device-mgt/org.wso2.carbon.device.mgt.extensions.feature/pom.xml
# features/device-mgt/org.wso2.carbon.device.mgt.feature/pom.xml
# features/device-mgt/org.wso2.carbon.device.mgt.server.feature/pom.xml
# features/device-mgt/org.wso2.carbon.device.mgt.ui.feature/pom.xml
# features/device-mgt/pom.xml
# features/dynamic-client-registration/org.wso2.carbon.dynamic.client.registration.server.feature/pom.xml
# features/dynamic-client-registration/pom.xml
# features/email-sender/org.wso2.carbon.email.sender.feature/pom.xml
# features/email-sender/pom.xml
# features/jwt-client/org.wso2.carbon.identity.jwt.client.extension.feature/pom.xml
# features/jwt-client/pom.xml
# features/oauth-extensions/org.wso2.carbon.device.mgt.oauth.extensions.feature/pom.xml
# features/oauth-extensions/pom.xml
# features/policy-mgt/org.wso2.carbon.policy.mgt.server.feature/pom.xml
# features/policy-mgt/pom.xml
# features/webapp-authenticator-framework/org.wso2.carbon.webapp.authenticator.framework.server.feature/pom.xml
# features/webapp-authenticator-framework/pom.xml
# pom.xml
8 years ago
5411d93103
[maven-release-plugin] prepare for next development iteration
8 years ago
3ea83b925a
[maven-release-plugin] prepare release v2.0.6
8 years ago
228848075c
Fixed conflicts and merged
8 years ago
637c014866
Refactored scope strings
8 years ago
157ef998a6
Resolved conflicts and merged
8 years ago
e0ee2fc1e5
Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x
8 years ago
b20a2e0997
Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x
8 years ago
5d1435c7bc
renamed permission string
8 years ago
2a4a636eb4
Resolved conflicts and merged
8 years ago
d13dadff08
Renamed prefix of scopes
8 years ago
0bd7b90e9a
added scope annotation
8 years ago
db2ddc7bed
policy manager refactored to support tenancy
8 years ago
0fb5a577b8
Fixed some issues found in FindBugs security analysis.
8 years ago
b860be0150
Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x
8 years ago
295921b289
Fixed following issues:
...
https://wso2.org/jira/browse/IOTS-218
https://wso2.org/jira/browse/IOTS-236
https://wso2.org/jira/browse/IOTS-263
https://wso2.org/jira/browse/IOTS-173
8 years ago
02d75b757c
Fixed conflicts and merged
8 years ago
6aea6195e9
[maven-release-plugin] prepare for next development iteration
8 years ago
3db5b289ac
[maven-release-plugin] prepare release v2.0.5
8 years ago
acb2c38799
Fixing user is not authorized to view devices
8 years ago
ed47094964
[maven-release-plugin] prepare for next development iteration
8 years ago
8d409a7248
[maven-release-plugin] prepare release v2.0.4
8 years ago
1a93868424
Fixed https://wso2.org/jira/browse/IOTS-335
8 years ago
674048ab27
Coorecting version import ranges
8 years ago
46c3b015fa
Merge pull request #498 from charithag/release-2.0.x-email-invites
...
Release 2.0.x email invites
8 years ago
5318601df0
Add license header
8 years ago
2b1d46f45f
Finalized enrollment invitations
8 years ago
64da9479a1
Bumping identity dependencies
8 years ago
1d2a5dc9ef
Updating identity/auth-saml dependencies to latest
8 years ago
795ccb740c
Add backend support for enrollment invitations
8 years ago
09572a9977
Removed redundant classes
8 years ago
eb1575126f
Minor refactoring on policy merging
8 years ago
33b79dcbba
Adding effective policy service
8 years ago
1465c56822
Revert "[WSO2 Release] [Jenkins #61 ] [Release 2.0.4] prepare release v2.0.4"
...
This reverts commit f9b6939cb7
8 years ago
47d8baccf7
upgrading to latest version of identity
8 years ago
f9b6939cb7
[WSO2 Release] [Jenkins #61 ] [Release 2.0.4] prepare release v2.0.4
8 years ago
42930fe8c4
Revert "[WSO2 Release] [Jenkins #55 ] [Release 2.0.4] prepare release v2.0.4"
...
This reverts commit 78b9052c37
8 years ago
a2a03a523e
Refactored RoleMgtServiceImpl.
8 years ago
de2f85de2e
IOTS-337:Fixed permission remove issue when updating role permissions.
8 years ago
78b9052c37
[WSO2 Release] [Jenkins #55 ] [Release 2.0.4] prepare release v2.0.4
8 years ago
bcbf61a886
Fixed conflicts
8 years ago
36ee55f493
Implemented permission-scope mapping for IoTs
8 years ago
dd353e1bfb
Commiting permission-scope mapping improvements
8 years ago
a59edee410
[maven-release-plugin] prepare for next development iteration
8 years ago
8f9b21b41b
[maven-release-plugin] prepare release v2.0.3
8 years ago
d911281ad1
Merging master branch with release-2.0.x
8 years ago
228b24ca79
[maven-release-plugin] prepare for next development iteration
8 years ago
5dbb258f55
[maven-release-plugin] prepare release v2.0.2
8 years ago
c61cd484a0
IOTS-296: Adding group selection capability when adding a policy
...
This commit introduces the device group select capabilty and saving the policy when creating and editing policies.
8 years ago
8431b30ddc
[maven-release-plugin] prepare for next development iteration
8 years ago
ae2e283f14
[maven-release-plugin] prepare release v2.0.1
8 years ago
aaade2363c
Adding new api to create combined roles
8 years ago
a2db592d69
Updated group management APIs and service
8 years ago
726bbcd35d
Merged with upstream
8 years ago
c07d77b85d
Updated group sharing model
8 years ago
ec3dbd37dd
fixed commit comments
8 years ago
e3849ef21e
removed feature lifecycle implementation
8 years ago
3fb42ef32e
Merge branch 'IoTS-1.0.0' of https://github.com/wso2/carbon-device-mgt into IoTS-1.0.0
8 years ago
fede8ec409
few changes after testing with authoriser
8 years ago
6efc5bc1ed
removed @API and @Permission annotations
8 years ago
fe263efe60
changed device access verification approach
8 years ago
28faf53802
Merge branch 'IoTS-1.0.0' of https://github.com/wso2/carbon-device-mgt into IoTS-1.0.0
8 years ago
59e2a33e4a
exposed device access authorisation as a service
8 years ago
19c1b3566d
[maven-release-plugin] prepare for next development iteration
8 years ago
cff6e242c8
[maven-release-plugin] prepare release v2.0.0
8 years ago
a6064d2561
Update component versions for IoTS-1.0.0 release
8 years ago
02eec1033e
add group sharing role create functionality
8 years ago
4a115e5d3f
Merge branch 'IoTS-1.0.0' of https://github.com/wso2/carbon-device-mgt into IoTS-1.0.0
8 years ago
ac30e7eb3e
Merge remote-tracking branch 'upstream/master' into IoTS-1.0.0
...
# Conflicts:
# components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.groups/groups.hbs
# components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.groups/public/js/listing.js
8 years ago
9517a3d30f
[maven-release-plugin] prepare for next development iteration
8 years ago
a8568299b9
[maven-release-plugin] prepare release v1.2.6
8 years ago
f8f7dd08cd
fixed share groups and group analytics in device grouping
8 years ago
33874f95b6
Merge pull request #399 from saadsahibjan/master
...
Fix incorrect spacing
8 years ago
204a0ed943
fixes for the comments of the PR#404
8 years ago
41f367abfa
add group listing and group device listing fixes
8 years ago
5f68953b11
Merge branch 'master' into IoTS-1.0.0
...
# Conflicts:
# components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/GroupManagementService.java
# components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/admin/GroupManagementAdminService.java
# components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/impl/GroupManagementServiceImpl.java
# components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/impl/admin/GroupManagementAdminServiceImpl.java
# components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/webapp/WEB-INF/cxf-servlet.xml
8 years ago
f961b57f9f
EMM-1775:Fixed opleration log issue when multiple enrollments are there for a single device.
8 years ago
1cb969eb6d
Fix incorrect spacing
8 years ago
27a2c9b979
[maven-release-plugin] prepare for next development iteration
8 years ago
eae935f91c
[maven-release-plugin] prepare release v1.2.5
8 years ago
7666bbfd05
Merge pull request #395 from Megala21/master
...
Fixing EMM-1752 and EMM-1755
8 years ago
6a55e1be83
[maven-release-plugin] prepare for next development iteration
8 years ago
11c2e59f61
[maven-release-plugin] prepare release v1.2.4
8 years ago
3416ae78c4
Fixing the problems in displaying user list when the user names has special chracters
8 years ago
1ff86289fd
Fixing the problems that happend when we have special chracters in roles
8 years ago
4ec6883ec8
Merge remote-tracking branch 'upstream/master'
8 years ago
4a71be850c
Refactoring code
8 years ago
28cb653b06
Added swagger annotations and refined the messages for certificate management, and created the swagger extensions file.
8 years ago
a04f91cddb
Fixing issues related to mapping users and roles from different user stores
8 years ago
87150f5074
Fixing secondary role deletion
8 years ago
0756294724
Merge remote-tracking branch 'upstream/master'
8 years ago
d8555c34ab
Fixing issues related with roles of secondary user store
8 years ago
cce4428a9d
Merge pull request #390 from shavidissa/master
...
Removed the GroupManagementService and GroupManagementAdminService references from the APIs and continued adding swagger annotations
8 years ago
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
eb20d1fc1c
Device delete implemented (only in api level) for iot
8 years ago
528687bde3
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
8 years ago
0498c68ca5
Add validation to maximum limit value
...
(cherry picked from commit 4ed757f)
8 years ago
4999b84169
Reformatting code
8 years ago
5b96e1b849
Fixing EMM-1333
8 years ago
af4989e56d
Merge pull request #384 from shavidissa/master
...
swagger annotations and definition update continued for device type, …
8 years ago
1e32d5f89f
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
8 years ago
0842dcb2bb
swagger annotations and definition update continued for device type, device, policy, role, user, group and user management.
8 years ago
93c1725e32
fixed api name for device type
8 years ago
e53b0c3860
Fix group count listing in dashboard
8 years ago
670ca7c228
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
...
# Conflicts:
# components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/beans/BasePaginatedResult.java
# components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/GroupManagementService.java
8 years ago
5727886ea1
few changes after apimgt integration
8 years ago
94a50584f4
Improve group listing with pagination
8 years ago
16b334b0b3
changes to swagger SecurityDefinitionConfigurator and annotations
8 years ago
7b8518a9db
changes to swagger SecurityDefinitionConfigurator and annotations
8 years ago
ce5d63925a
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
8 years ago
e89b4015b6
Introduced pagination
8 years ago
06e70c8326
Merge pull request #373 from shavidissa/master
...
swagger annotations and definitions changes for role management, configuration management and application management(admin)
8 years ago
f0164b5a01
swagger annotations and definitions changes for role management, configuration management and application management(admin)
8 years ago
06176898d0
Exposed group id to API level
8 years ago
e77d8b8b29
Adding isEmpty check
8 years ago
0642cc10d7
Reformatting code
8 years ago
f9204add08
Merge remote-tracking branch 'upstream/master'
8 years ago
f22d392978
Upgrade to comply with latest CDMF changes
8 years ago
b7990b9146
Fixing problems in retriveing data from secondary user store
8 years ago
dff32af832
Adding initial swagger annotations and permissions to Dashboard APIs
8 years ago
1ca5762c44
Uncommenting Dashboard APIs
8 years ago
a0050d8f4d
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
8 years ago
d1d6eefd17
Upgrading grouping backend
8 years ago
a4538a6d6c
Removed unnecessary params from paginated queries
8 years ago
befb5b0ad8
EMM-1658:Changed the API contract to not to send username parameter. User can only change his own password.
8 years ago
c16cc4cae1
[maven-release-plugin] prepare for next development iteration
8 years ago
ed4bca7032
[maven-release-plugin] prepare release v1.2.2
8 years ago
b2eb715fb7
REsolving conflicts
8 years ago
5c8c28d28c
Merge pull request #1 from warunalakshitha/master
...
upgrade product iot to carbon 4.4.9
8 years ago
237b9a7078
Creating api endpoint to retrieve features of a device-type
8 years ago
428ce25b6f
Fixing issue: https://wso2.org/jira/browse/EMM-1646
8 years ago
a61be7a7ec
Enable group management api
8 years ago
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
7395c76408
Merge branch 'master' of github.com:wso2/carbon-device-mgt
8 years ago
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
d8e057abdd
Fix for JIRA: https://wso2.org/jira/browse/EMM-1582
8 years ago
87ad1e0e71
Fixing intermittent jackson bind issue
8 years ago
50d8885f8b
[maven-release-plugin] prepare for next development iteration
8 years ago
a00d6aafd4
[maven-release-plugin] prepare release v1.2.1
8 years ago
75df243a33
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
8 years ago
6a8a5cbd5a
Merging with master
8 years ago
4169d3b2bd
Fixed EMM-1554
8 years ago
713c8ac4d8
Changing permissions - /device-mgt/configurations to /device-mgt/platform-configurations
8 years ago
58f8656e94
Changing permissions - /devices/owning to /devices/owning-device
8 years ago
78cab76101
Fixed EMM-1531
8 years ago
1dfb8e22e1
Updating to latest appm/apim/identity dependencies
8 years ago
de23a8cf27
[maven-release-plugin] prepare for next development iteration
8 years ago
8905fae0d9
[maven-release-plugin] prepare release v1.2.0
8 years ago
0eaf33aa5c
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
8 years ago
87a5b09266
Added users/count API
8 years ago
0d02e88955
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into theme-migration
8 years ago
0fdcbae817
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
8 years ago
878daae5c5
Permission modifications
8 years ago
2d5262e21e
[maven-release-plugin] prepare for next development iteration
8 years ago
5ccd752404
[maven-release-plugin] prepare release v1.2.0
8 years ago
7dc93ff010
MSSQL script fixes and added the /users/count REST API
8 years ago
115099c8fe
Implemented permission based authorization
8 years ago
d24ba98643
Updating activate and deactivate policy endpoints from PUT to POST
8 years ago
3575c9a33d
Fix issue in get devices with since parameter.
8 years ago
f29b9e84f2
Fixed 200 returns when activities are empty and since is a future date
8 years ago
9aa5f2793f
return date format as UTC in APIs
8 years ago
475b832c59
Changed return date format to UTC date
8 years ago
0fe827ca9f
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
8 years ago
9246cdcf30
Return empty array when results not found with since parameter
8 years ago
a72b47f6f7
Fixing incorrect response for remove policy
8 years ago
f3aefcca77
Fixed EMM-1450
8 years ago
8b17cbb339
Fix conflicts
8 years ago
654e1d9938
[maven-release-plugin] prepare for next development iteration
8 years ago
aa24821667
[maven-release-plugin] prepare release v1.1.2
8 years ago
67942d5c1d
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
8 years ago
6b4ab635af
Fixing jiras: EMM-1472, EMM-1505
8 years ago
2cb8f0b313
Fixed EMM-1392
8 years ago
6134f94e3c
Merge pull request #332 from ayyoob/com
...
fixing commit issues
8 years ago
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
c269f35ef2
fixing getAllActivity H2 issue
8 years ago
7346313d27
Modified scope management service
8 years ago
442c2b86da
fixed formatting issues
8 years ago
a7d7c689e8
Removed unsupported roleName parameter from device API
8 years ago
3b56668af0
merged with upstream
8 years ago
ecfe94235f
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
8 years ago
c6cc5e8df3
fixes to role updating endpoint
8 years ago
3edc68d204
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into com
8 years ago
058f9e4cfa
merged with origin
8 years ago
e80c2f4050
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
8 years ago
352643a421
Changing deactivate-policy api method to PUT
8 years ago
34e97aeeae
Removed device search using roleName parameter.
8 years ago
5bdb4630af
Fixed conflicts and merged
8 years ago
886e2e08f2
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into scope-impl
8 years ago
2e79dd290e
Modified scopes
8 years ago
1b07b18678
adding security fixes
8 years ago
657e4864fb
Added MSSQL, PostgreSQL and Oracle db support for Notification feature.
8 years ago
ed4c762bfd
Refactored scopes
8 years ago
a7074e2e4e
refactored general configuration
8 years ago
cc90bef42b
Merge pull request #318 from Securepoint/master
...
Minor bug fixies and code improvements
8 years ago
eb5216091e
Fixed conflicts and merged
8 years ago
6cc1bb088c
Fixed EMM-1447, EMM-1424
8 years ago
6e742ee6ac
Added scope beans
8 years ago
564c2b280e
Fixed conflicts and merged
8 years ago
7af8ecc686
Added userstore for role listing
8 years ago
b3d309583d
Fixed issues in scope service
8 years ago
7f1e2fdf0b
Implemented scope management service
8 years ago
bdec8880bb
Fixed conflicts and merged
8 years ago
186432e1df
Fixed webapp name resolving issue
8 years ago
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.
8 years ago
90910518d6
Fixed null pointer dereferences
8 years ago
09020ccb9f
Fixed predictable pseudorandom number generator
8 years ago
99664b23c5
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into scope-impl
8 years ago
ab5aa3e31c
Merge pull request #315 from madhawap/master
...
Added missing end-point to the permissions.xml
8 years ago
0b338a1d25
Added missing end-point to the permissions.xml
8 years ago
789086a667
Changed context paths
8 years ago
0f904e21d8
Fixed conflicts and merged
8 years ago
4ec11e8c08
[maven-release-plugin] prepare for next development iteration
8 years ago
ffedcac543
[maven-release-plugin] prepare release v1.1.1
8 years ago
79a6da82f2
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
8 years ago
c7eef634ac
Added send-invitation endpoint
8 years ago
c61ef1c98e
Fixing issues of GET /compliance-data API
8 years ago
58666bc4b0
Adding device name url param for device search
8 years ago
c3cbc5b4fb
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
8 years ago
0b1e4ad86b
Updated permissions.xml according to new end-points
8 years ago
d58fb57f4e
Enabling device search for multiple params
8 years ago
e52fed0b2d
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
8 years ago
34354c032e
Added end-point to get devices enrolled under a specific user
8 years ago
6edfad5fb7
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
8 years ago
9aa54f2ead
Improving policy management functionalities to use deviceType in place of deviceTypeId for persisting policy information
8 years ago
73551590b9
Merge pull request #313 from madhawap/master
...
Added end point to get Compliance Data Of a Device
8 years ago
09e2d2ecaf
Removing the internal status code added to the compliance data wrapper
8 years ago
68b7d304a0
Added end point to get Compliance Data Of a Device
8 years ago
0125310440
Prepending the url template configured for updating notifications with a '/'
8 years ago
78057b2992
Adding an API to return the list of device types registered in the underlying device management platform
8 years ago
aa6085ac8c
Added scopes to APIs
8 years ago
ff82accb48
added scopes to notification API
8 years ago
60659ce15b
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into scope-impl
8 years ago
fe28bc25f1
Refactored scopes
8 years ago
2136ebbeee
changes to 'updateNotificationStatus' swagger annotations
8 years ago
ac75ff1d71
Fixed conflict and merged
8 years ago
49623a4693
Implemented scope based authorization
8 years ago
b55a164457
added 'updateNotificationStatus' endpoint and minor formattings to swagger annotations
8 years ago
dbf938416b
added 'updateNotificationStatus' endpoint and minor formattings to swagger annotations
8 years ago
be7e63c390
merging rest-api-improvements branch to master
8 years ago
ed5d611c35
Code cleanup
8 years ago
37852051ff
Improving Device and Policy Management APIs and cleaning up code of Role and User Management APIs
8 years ago
WSO2 Builder
lakshani
charitha
ayyoob
Kamidu Sachith Punchihewa
Hasunie
Milan Perera
GPrathap
Rasika Perera
sameera910409
Maninda
Rasika Perera
kamidu
Ace
Milan Perera
Charitha Goonetilleke
Supun94
Harshan Liyanage
geethkokila
Madawa Soysa
Harshan Liyanage
Saad Sahibjan
Megala
Shavindri
susinda
madhawap
dilanua
Chatura Dilan Perera
amalhub
thusithakalugamage
mharindu
Prabath Abeysekara
Timo Briddigkeit
Dilan U. Ariyaratne
prabathabey