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"
This reverts commit f9b6939cb7 .
|
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"
This reverts commit 78b9052c37 .
|
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 |
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
This commit introduces the device group select capabilty and saving the policy when creating and editing policies.
|
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
# 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 |
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
Fix incorrect spacing
|
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
# 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 |
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
Fixing EMM-1752 and EMM-1755
|
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 |