Geeth Munasinghe
ed538551e2
Resolving conflicts
2015-02-09 11:49:16 +05:30
Geeth Munasinghe
0fd9875342
[maven-release-plugin] prepare for next development iteration
2015-02-08 12:30:55 +05:30
Geeth Munasinghe
ab92119231
[maven-release-plugin] prepare release wso2cdm-1.0.0-M2
2015-02-08 12:30:44 +05:30
Geeth Munasinghe
3e8591cccd
Fixing issues in the pom for release purposes
2015-02-08 12:09:09 +05:30
Geeth Munasinghe
c3b26b3f1c
[maven-release-plugin] prepare for next development iteration
2015-02-08 11:58:59 +05:30
Geeth Munasinghe
12e49a0b1a
[maven-release-plugin] prepare release wso2cdm-1.0.0-M2
2015-02-08 11:58:49 +05:30
Geeth Munasinghe
4c30dfb9d8
[maven-release-plugin] rollback the release of wso2cdm-1.0.0-M2
2015-02-08 11:54:54 +05:30
Geeth Munasinghe
aad4c8d244
[maven-release-plugin] prepare release wso2cdm-1.0.0-M2
2015-02-08 11:54:06 +05:30
Geeth Munasinghe
17acce9458
[maven-release-plugin] rollback the release of wso2cdm-1.0.0-M2
2015-02-06 20:32:24 +05:30
Geeth Munasinghe
5254511f5e
[maven-release-plugin] prepare release wso2cdm-1.0.0-M2
2015-02-06 20:31:01 +05:30
Geeth Munasinghe
84fbde538e
Fixing pom issues for release works
2015-02-06 20:27:32 +05:30
Geeth Munasinghe
c88ac79541
[maven-release-plugin] prepare for next development iteration
2015-02-05 19:22:54 +05:30
Geeth Munasinghe
8482d4cf27
[maven-release-plugin] prepare release wso2cdm-1.0.0-M2
2015-02-05 19:22:45 +05:30
Geeth Munasinghe
f67eee625a
Changing the version to 1.0.0-SNAPSHOT
2015-02-05 19:04:32 +05:30
Geeth Munasinghe
da9443a065
[maven-release-plugin] prepare for next development iteration
2015-02-05 16:56:52 +05:30
Geeth Munasinghe
7418cb8d4d
[maven-release-plugin] prepare release 1.1.0
2015-02-05 16:56:42 +05:30
Geeth Munasinghe
dbcd7db88b
Removing mvn clean plugins
2015-02-05 16:51:29 +05:30
Geeth Munasinghe
1942fd68b1
[maven-release-plugin] rollback the release of wso2cdm-parent-1.0.0
2015-02-05 16:50:24 +05:30
Geeth Munasinghe
ae4e56c9d6
[maven-release-plugin] prepare for next development iteration
2015-02-05 16:40:38 +05:30
Geeth Munasinghe
d57c56e36d
[maven-release-plugin] prepare release wso2cdm-parent-1.0.0
2015-02-05 16:40:26 +05:30
Geeth Munasinghe
1cd3dc7315
Removing the mvn clean plugin
2015-02-05 16:36:34 +05:30
Geeth Munasinghe
071618fb5e
Removing the mvn clean plugin
2015-02-05 16:35:18 +05:30
Geeth Munasinghe
02d1a259df
[maven-release-plugin] rollback the release of 1.0.0
2015-02-05 16:18:34 +05:30
Geeth Munasinghe
462e53070c
[maven-release-plugin] prepare for next development iteration
2015-02-05 15:58:47 +05:30
Geeth Munasinghe
0d81d60c99
[maven-release-plugin] prepare release 1.0.0
2015-02-05 15:58:37 +05:30
Geeth Munasinghe
ac609f9996
Changing the version to 1.0.0-SNAPSHOT
2015-02-05 14:55:27 +05:30
Geeth Munasinghe
b20bdc1625
A mistake happend to release on the master branch, I am reverting the changes
2015-02-05 12:49:46 +05:30
prabathabey
e3ea0db9c7
Fixing all remaining SNAPSHOT versions except of that of Jaggery SSO feature
2015-02-03 14:49:47 +05:30
harshanL
65fa0fcd61
Fixed the issues in build
2015-02-02 21:49:24 +05:30
prabathabey
d6a22b06ff
Fixing more SNAPSHOT versions, used in carbon-governance, carbon-deployment related components
2015-02-02 21:13:52 +05:30
prabathabey
355babd9d5
Changing Carbon commons version to 4.3.2 and Carbon deployment version to 4.3.0
2015-02-01 23:44:43 +05:30
prabathabey
36358ea0b2
More pom clean-ups
2015-01-31 22:31:09 +05:30
prabathabey
3fb094b094
More refactorings in poms
2015-01-31 19:05:31 +05:30
prabathabey
5d9fb3b803
Refactoring the poms to remove SNAPSHOT versions of certain dependencies and test clean up
2015-01-31 18:49:56 +05:30
prabathabey
381ef5d688
Pom refactoring
2015-01-30 16:51:32 +05:30
Geeth Munasinghe
f44b4597db
Fixing group ids of the pom files
2015-01-29 20:03:04 +05:30
Geeth Munasinghe
88060442bc
Merge branch 'master' of https://github.com/wso2/product-cdm
2015-01-23 22:27:03 +05:30
Geeth Munasinghe
831cd121a9
fixing filter properties
2015-01-23 22:26:40 +05:30
manoj
a51057d07f
features/device-mgt/org.wso2.carbon.device.mgt.server.feature/src/main/resources/rxts/license.rxt
2015-01-23 20:58:52 +05:30
manoj
32137186ce
features/device-mgt/org.wso2.carbon.device.mgt.server.feature/src/main/resources/p2.inf
...
RXT file copy with server feature
2015-01-23 20:20:01 +05:30
manoj
0135051d84
License Management
2015-01-23 18:17:40 +05:30
Dulitha Wijewantha
b870490ea3
Merge branch 'master' of github.com:wso2/product-cdm
2015-01-22 21:23:08 +05:30
Dulitha Wijewantha
a3dc5d07e5
* Commented cdm app copying
...
* Implemented the getDevice()
* Added documentation
* Added a method to deviceDAO to get the device by a DeviceIdentifier
2015-01-22 21:14:35 +05:30
harshanL
793786f020
Added a new operation to the operation manager
2015-01-22 21:14:19 +05:30
Dulitha Wijewantha
773fba11bf
Merge branch 'master' of github.com:wso2/product-cdm
2015-01-22 09:41:50 +05:30
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
2015-01-22 09:41:03 +05:30
Geeth Munasinghe
462045eac9
Changing the version to 1.0.0
2015-01-21 20:14:04 +05:30
Dulitha Wijewantha
93a82676e3
* Created a utility js to hold the utility functions
...
* Created the UI APIs for mobile
* Fixed a bug and changed the implementation to work with the properties Map instead of the List
* Changed method signature and implementation to accept DeviceType for the conversion
* UI level changes and license headers
2015-01-21 17:08:12 +05:30
Dulitha Wijewantha
6eabb80e47
Merge branch 'master' of https://github.com/geethkokila/product-cdm
2015-01-21 13:46:09 +05:30
harshanL
eb0fd6dc31
Added operation support for Android
2015-01-21 12:29:06 +05:30
