Commit Graph

22 Commits

Author SHA1 Message Date
harshanL
e40424c758 Added copying mobile db scripts to bin.xml & refactored code 2015-01-23 19:44:16 +05:30
manoj
329f956f3d License Management 2015-01-23 18:19:21 +05:30
manoj
4974d49320 License Management 2015-01-23 13:49:27 +05:30
manoj
b702a72b2f Merge remote-tracking branch 'upstream/master' 2015-01-23 11:04:05 +05:30
manoj
b96d561ef0 License Manaproduct/modules/mobileservices/agents/android/jax-rs/src/main/java/org/wso2/cdmserver/mobileservices/android/util/AndroidAPIUtils.javagement 2015-01-23 11:02:25 +05:30
harshanL
2b3ee5e4f2 Added package-info.java 2015-01-22 22:33:26 +05:30
harshanL
163fe58120 Added new changes in operation management 2015-01-22 22:04:51 +05:30
Geeth Munasinghe
737eee4270 Merge branch 'master' of https://github.com/asokaravinda/product-mdm into asokaravinda-master 2015-01-22 19:16:54 +05:30
asok
2947e6fd21 commiting windows plugin 2015-01-22 19:12:40 +05:30
Dulitha Wijewantha
99f7cd25e8 Merging left over changes from MDM. Most of the changes are from @harshahL. 2015-01-22 10:43:36 +05:30
Geeth Munasinghe
bc93ff08a4 Changing cdm to mdm 2015-01-21 20:14:55 +05:30
asok
ebe0aa2663 commiting windows plugin 2015-01-21 16:34:03 +05:30
asok
eb52073e37 commiting windows plugin 2015-01-21 16:29:24 +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