asok
|
877ef213e1
|
Merge branch 'master' of https://github.com/geethkokila/product-cdm
Conflicts:
product/modules/mobileservices/agents/windows/jax-rs/src/main/java/cdm/api/windows/DiscoveryService.java
product/modules/mobileservices/agents/windows/jax-rs/src/main/java/cdm/api/windows/EnrolmentService.java
product/modules/mobileservices/agents/windows/jax-rs/src/main/java/cdm/api/windows/impl/DiscoveryServiceImpl.java
product/modules/mobileservices/agents/windows/jax-rs/src/main/java/cdm/api/windows/impl/EnrolmentServiceImpl.java
product/modules/mobileservices/agents/windows/jax-rs/src/main/java/cdm/api/windows/util/CertificateSigningService.java
product/modules/mobileservices/agents/windows/jax-rs/src/main/java/cdm/api/windows/util/WindowsAPIUtil.java
product/modules/mobileservices/agents/windows/jax-rs/src/main/resources/applicationContext.xml
product/modules/mobileservices/agents/windows/jax-rs/src/main/resources/ca_cert.pem
product/modules/mobileservices/agents/windows/jax-rs/src/main/resources/ca_private.key
product/modules/mobileservices/agents/windows/jax-rs/src/main/resources/discover-service.xml
product/modules/mobileservices/agents/windows/jax-rs/src/main/resources/enrollment-service.xml
product/modules/mobileservices/agents/windows/jax-rs/src/main/resources/log4j.xml
product/modules/mobileservices/agents/windows/jax-rs/src/main/resources/policy-service.xml
product/modules/mobileservices/agents/windows/jax-rs/src/main/resources/wap-provisioning.xml
product/modules/mobileservices/agents/windows/jax-rs/src/main/resources/windows-mdm-server.properties
|
2015-01-21 10:51:53 +05:30 |
|
inosh-perera
|
1f489c8d62
|
Merge branch 'master' of https://github.com/geethkokila/product-cdm
|
2015-01-20 13:49:38 +05:30 |
|
harshanL
|
5cb85e2069
|
Fixed merge conflicts
|
2015-01-20 11:47:22 +05:30 |
|
harshanL
|
193eca9e2d
|
Added operation persistance logic & refactored the code
|
2015-01-20 11:44:31 +05:30 |
|
manoj
|
17457bf6d3
|
Refactor Agents module
|
2015-01-20 11:42:32 +05:30 |
|
manoj
|
dd9bfdb6a7
|
Refactor Operations
|
2015-01-20 07:46:13 +05:30 |
|
manoj
|
72a3df080b
|
Merge branch 'master' of https://github.com/geethkokila/product-cdm
Conflicts:
components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/DeviceManagementRepository.java
components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/internal/DeviceManagementServiceComponent.java
product/modules/mobileservices/agents/android/jax-rs/src/main/java/org/wso2/cdmserver/mobileservices/android/util/AndroidAPIUtils.java
product/pom.xml
|
2015-01-20 07:29:16 +05:30 |
|
manoj
|
aa50bf96ed
|
Add License Mgt
|
2015-01-19 21:39:06 +05:30 |
|
manoj
|
50a17eb33d
|
Refactor add new mobile service module to as parent to agent module
|
2015-01-19 21:38:41 +05:30 |
|
manoj
|
6703f590f3
|
Merge Changes
|
2015-01-19 21:37:08 +05:30 |
|