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 |
ayyoob
|
44ac6b13b5
|
changes in UI after refactoring
|
8 years ago |
ayyoob
|
33bb9b5a14
|
merged with IoTS-1.0.0 branch
|
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 |
charitha
|
1bfba25c5e
|
Remove user list and role list attributes from group object
Move group components to same devicemgt package levels
|
8 years ago |
Harshan Liyanage
|
72522ad759
|
Fixed SQL syntax issue
|
8 years ago |
Harshan Liyanage
|
9bf5ca94fb
|
Fixed SQL syntax issue
|
8 years ago |
kamidu
|
1c2d339fed
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
8 years ago |
kamidu
|
7212e969d8
|
Fix for SQL query issue in mysql
|
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 |
ayyoob
|
d17241e51e
|
added comments and license
|
8 years ago |
ayyoob
|
45c0d2d2f5
|
added logs if device type registration failed
|
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 |
harshanl
|
6e1fdabaad
|
EMM-1342:Added policy revoke operation
|
8 years ago |
harshanl
|
a89b50197f
|
EMM-1757:Fixed admin device-detail view issue
|
8 years ago |
harshanl
|
24c38602b8
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
8 years ago |
harshanl
|
51910ee67a
|
EMM-1675:Added policy revoke operation
|
8 years ago |
hasuniea
|
2128f08658
|
fixing EMM-1750
|
8 years ago |
charitha
|
a2c0526b40
|
Fix typo
|
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 |
Megala
|
235e9797d4
|
Fixing EMM-1717
|
8 years ago |
ayyoob
|
5727886ea1
|
few changes after apimgt integration
|
8 years ago |
hasuniea
|
05e95e2675
|
fix the EMM-1702
|
8 years ago |
harshanl
|
4ce9c95044
|
Changed getOperations API to return operation list of removed devices
|
8 years ago |
charitha
|
664b3d4d43
|
Fix issue in duplicate mapping
|
8 years ago |
charitha
|
94a50584f4
|
Improve group listing with pagination
|
8 years ago |
charitha
|
e89b4015b6
|
Introduced pagination
|
8 years ago |
charitha
|
06176898d0
|
Exposed group id to API level
|
8 years ago |
charitha
|
f22d392978
|
Upgrade to comply with latest CDMF changes
|
8 years ago |
harshanl
|
672de3a09e
|
Device status change fix for iOS
|
8 years ago |
harshanl
|
399ef2fc06
|
Windows getOpending operations fix
|
8 years ago |
harshanl
|
9d31590e83
|
Windows getPending operations fix
|
8 years ago |
harshanl
|
10f8b12b88
|
OperationManagerImpl Code refactored
|
8 years ago |
harshanl
|
f9ba45f439
|
Fixed the device status changing issue when there are multiple enrollments for the same device
|
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
|
3b68ccb4ba
|
Merge pull request #365 from rasika/iots-ga
Merge iot-ga branch
|
8 years ago |
Megala
|
400199e965
|
Merge remote-tracking branch 'upstream/master'
|
8 years ago |
Megala
|
38677f84e8
|
Fixing SQL syntax problem
|
8 years ago |
Harshan Liyanage
|
cd06637546
|
Merge pull request #364 from Megala21/master
Correcting the problem related with oracle syntax
|
8 years ago |
Megala
|
12aed521e5
|
Refactoring code
|
8 years ago |
Megala
|
2cdaf5aa21
|
Reverting changes made to generic implementations and moving them to oracle specific ones
|
8 years ago |
Megala
|
ecc87f370c
|
Fixing oracle error
|
8 years ago |