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 |
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 |
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 |
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 |
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 |
Shavindri
|
f0164b5a01
|
swagger annotations and definitions changes for role management, configuration management and application management(admin)
|
8 years ago |
charitha
|
f22d392978
|
Upgrade to comply with latest CDMF changes
|
8 years ago |
charitha
|
d1d6eefd17
|
Upgrading grouping backend
|
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 |
warunalakshitha
|
25ed0cf370
|
Fix build issue with swagger version
|
8 years ago |
warunalakshitha
|
397c1daa2a
|
Fix package import conflicts of org.wso2.carbon.device.mgt.common bundle
|
8 years ago |
amalhub
|
428ce25b6f
|
Fixing issue: https://wso2.org/jira/browse/EMM-1646
|
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 |
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 |
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 |
Rasika Perera
|
d9b25eda08
|
Adding deviceName into notifications
|
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 |
thusithakalugamage
|
0d02e88955
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into theme-migration
|
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 |
mharindu
|
115099c8fe
|
Implemented permission based authorization
|
8 years ago |
mharindu
|
24930b3042
|
Partial commit of migration
|
8 years ago |
kamidu
|
cd77ce692e
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
8 years ago |
kamidu
|
abb3aea9a9
|
fixes for notification isses
|
8 years ago |
harshanl
|
a77564ac2d
|
Added status for each device in Activity response
|
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 |
hasuniea
|
6db619317c
|
fixing app-install issue
|
8 years ago |
mharindu
|
7346313d27
|
Modified scope management service
|
8 years ago |
harshanl
|
671ba46fae
|
Removed unnecessary properties from EnrollmentInfo object
|
8 years ago |
hasuniea
|
349c3bdb63
|
fixing App Version not updating in portal after being initially set
|
8 years ago |
harshanl
|
8fa311e119
|
Removed unnecessary properties from EnrollmentInfo object
|
8 years ago |
harshanl
|
f82ce82648
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
8 years ago |
harshanl
|
08ff70bb3c
|
Refactored CertMgt component
|
8 years ago |
mharindu
|
eb5216091e
|
Fixed conflicts and merged
|
8 years ago |
madhawap
|
d315e739e4
|
fix for the iOS device operations blocker
|
8 years ago |
mharindu
|
564c2b280e
|
Fixed conflicts and merged
|
9 years ago |