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 |
|
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
Removed the GroupManagementService and GroupManagementAdminService references from the APIs and continued adding swagger annotations
|
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
(cherry picked from commit 4ed757f)
|
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
swagger annotations and definition update continued for device type, …
|
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
# 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 |
|
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
swagger annotations and definitions changes for role management, configuration management and application management(admin)
|
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
upgrade product iot to carbon 4.4.9
|
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
# Conflicts:
# features/webapp-authenticator-framework/org.wso2.carbon.webapp.authenticator.framework.server.feature/pom.xml
|
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
# 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 |
|
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 |
