Prabath Abeysekara
|
22f1f5d9b4
|
Merge pull request #8 from manojgunayadev/master
Licence Management Refactor
|
10 years ago |
manoj
|
505b87a655
|
Merge remote-tracking branch 'upstream/master'
Conflicts:
components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/DeviceManagerImpl.java
|
10 years ago |
manoj
|
428554cfe8
|
Unit test change to prepared statement
|
10 years ago |
manoj
|
f907684a0b
|
license constants Refactor
|
10 years ago |
manoj
|
2eadf11eaf
|
Refactor license constants
|
10 years ago |
manoj
|
79261210f2
|
Refactor license constants
|
10 years ago |
manoj
|
62f858d606
|
License Management Refactor
|
10 years ago |
prabathabey
|
d439691a01
|
Fixing formatting issues
|
10 years ago |
manoj
|
6e262cb60b
|
set active status for enroll device
|
10 years ago |
Prabath Abeysekara
|
a4ffdf1aa5
|
Merge pull request #7 from manojgunayadev/master
set active status for enroll device
|
10 years ago |
manoj
|
60e539b583
|
set active status for enroll device
|
10 years ago |
manoj
|
b56e42792a
|
set active status for enroll device
|
10 years ago |
Geeth Munasinghe
|
88060442bc
|
Merge branch 'master' of https://github.com/wso2/product-cdm
|
10 years ago |
Geeth Munasinghe
|
831cd121a9
|
fixing filter properties
|
10 years ago |
Geeth Munasinghe
|
4c690f32ab
|
Merge branch 'master' of https://github.com/dulichan/product-cdm
|
10 years ago |
Geeth Munasinghe
|
641dcdd2d5
|
Merge branch 'master' of https://github.com/manojgunayadev/product-cdm
|
10 years ago |
Dulitha Wijewantha
|
c8d510eea7
|
Merge branch 'master' of github.com:wso2/product-cdm
|
10 years ago |
Dulitha Wijewantha
|
7f3516b2a6
|
* Added a description to the feature object
* Added the COMMAND enum to the Operation class
|
10 years ago |
prabathabey
|
4fd229357a
|
Enabling logging for test case implementations
|
10 years ago |
manoj
|
119dbdf405
|
Remove unnecessary folder
|
10 years ago |
manoj
|
a51057d07f
|
features/device-mgt/org.wso2.carbon.device.mgt.server.feature/src/main/resources/rxts/license.rxt
|
10 years ago |
manoj
|
0f5da210a1
|
Move rxt file to server feature
|
10 years ago |
manoj
|
32137186ce
|
features/device-mgt/org.wso2.carbon.device.mgt.server.feature/src/main/resources/p2.inf
RXT file copy with server feature
|
10 years ago |
Dulitha Wijewantha
|
9e68b5fdb8
|
Merge branch 'master' of github.com:wso2/product-cdm
|
10 years ago |
manoj
|
10e97b3ae1
|
License Management
|
10 years ago |
Geeth Munasinghe
|
1ce417f203
|
Merge branch 'manojgunayadev-master'
|
10 years ago |
Geeth Munasinghe
|
7718a4cb84
|
Merge branch 'master' of https://github.com/manojgunayadev/product-cdm into manojgunayadev-master
|
10 years ago |
Dulitha Wijewantha
|
277f0341b1
|
* Add device type to the feature
* Added method to operation manager to get features by type
* Added an exception for feature management
|
10 years ago |
Geeth Munasinghe
|
5fed717491
|
Merge branch 'master' of https://github.com/manojgunayadev/product-cdm into manojgunayadev-master
|
10 years ago |
manoj
|
0135051d84
|
License Management
|
10 years ago |
Geeth Munasinghe
|
38e1892333
|
gMerge branch 'master' of https://github.com/wso2/product-cdm
|
10 years ago |
Geeth Munasinghe
|
94905bdc77
|
Changing the read me file
|
10 years ago |
Geeth Munasinghe
|
b3caf026a9
|
Merging changes of dulitha
Merge branch 'dulichan-master'
|
10 years ago |
Dulitha Wijewantha
|
49a46ca909
|
Fixed indentation
|
10 years ago |
Dulitha Wijewantha
|
2360d1ae8c
|
Merge branch 'master' of github.com:dulichan/product-cdm
|
10 years ago |
Dulitha Wijewantha
|
6f2053995d
|
Changed the Map implementations to List since Map implementations are not very well supported by CXF
|
10 years ago |
Dulitha Wijewantha
|
394d841d4b
|
Changed the Map implementations to List since Map implementations are not very well supported by CFX
|
10 years ago |
manoj
|
87e272a823
|
Merge remote-tracking branch 'upstream/master'
|
10 years ago |
manoj
|
f4e9f1f15b
|
License Management
|
10 years ago |
manoj
|
0e96d82968
|
License Managemnt
|
10 years ago |
Prabath Abeysekara
|
0ffa15f463
|
Merge pull request #2 from dulichan/master
Implements the getDevice method of DeviceManager
|
10 years ago |
Dulitha Wijewantha
|
5e68735625
|
Removed the exception. It has to be handled in a different layer
|
10 years ago |
Dulitha Wijewantha
|
315603481d
|
Fixed line spacing issues
|
10 years ago |
Dulitha Wijewantha
|
b870490ea3
|
Merge branch 'master' of github.com:wso2/product-cdm
|
10 years ago |
Dulitha Wijewantha
|
a3dc5d07e5
|
* Commented cdm app copying
* Implemented the getDevice()
* Added documentation
* Added a method to deviceDAO to get the device by a DeviceIdentifier
|
10 years ago |
harshanL
|
793786f020
|
Added a new operation to the operation manager
|
10 years ago |
Geeth
|
25ab5f1fdc
|
Merge pull request #1 from dulichan/master
Improvements to the UI and various merges - By Dulitha
|
10 years ago |
Dulitha Wijewantha
|
773fba11bf
|
Merge branch 'master' of github.com:wso2/product-cdm
|
10 years ago |
Dulitha Wijewantha
|
49c490a183
|
Merge branch 'master' of github.com:dulichan/product-cdm
Conflicts:
components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/config/datasource/MobileDataSourceConfig.java
components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/dao/MobileDeviceManagementDAOFactory.java
components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/dao/impl/MobileDeviceOperationDAOImpl.java
components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/dao/impl/MobileOperationDAOImpl.java
components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/dao/util/MobileDeviceManagementDAOUtil.java
components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/impl/android/AndroidMobileOperationManager.java
components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/internal/MobileDeviceManagementServiceComponent.java
components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/util/MobileDeviceManagementUtil.java
product/modules/mobileservices/agents/android/jax-rs/src/main/java/org/wso2/cdmserver/mobileservices/android/Enrollment.java
product/modules/mobileservices/agents/android/jax-rs/src/main/webapp/WEB-INF/cxf-servlet.xml
product/modules/mobileservices/agents/windows/jax-rs/pom.xml
product/modules/mobileservices/agents/windows/jax-rs/src/main/webapp/WEB-INF/cxf-servlet.xml
product/modules/mobileservices/agents/windows/jax-rs/src/main/webapp/WEB-INF/web.xml
product/modules/p2-profile-gen/pom.xml
|
10 years ago |
Geeth Munasinghe
|
462045eac9
|
Changing the version to 1.0.0
|
10 years ago |