community/device-mgt-core
1
0
Fork 0
mirror of https://repository.entgra.net/community/device-mgt-core.git synced 2025-10-06 02:01:45 +00:00
Code Issues Packages Projects Releases Wiki Activity
10,745 Commits 31 Branches 461 Tags 183 MiB
f0fafde0d2
Commit Graph

10745 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Geeth Munasinghe
831cd121a9 fixing filter properties 2015-01-23 22:26:40 +05:30
Geeth Munasinghe
4c690f32ab Merge branch 'master' of https://github.com/dulichan/product-cdm 2015-01-23 22:13:48 +05:30
Geeth Munasinghe
641dcdd2d5 Merge branch 'master' of https://github.com/manojgunayadev/product-cdm 2015-01-23 22:08:49 +05:30
Dulitha Wijewantha
c8d510eea7 Merge branch 'master' of github.com:wso2/product-cdm 2015-01-23 22:03:24 +05:30
Dulitha Wijewantha
7f3516b2a6 * Added a description to the feature object 
* Added the COMMAND enum to the Operation class
 2015-01-23 21:52:00 +05:30
prabathabey
4fd229357a Enabling logging for test case implementations 2015-01-23 21:24:02 +05:30
manoj
119dbdf405 Remove unnecessary folder 2015-01-23 21:15:45 +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
0f5da210a1 Move rxt file to server feature 2015-01-23 20:58:17 +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
Dulitha Wijewantha
9e68b5fdb8 Merge branch 'master' of github.com:wso2/product-cdm 2015-01-23 18:40:23 +05:30
manoj
10e97b3ae1 License Management 2015-01-23 18:32:21 +05:30
Geeth Munasinghe
1ce417f203 Merge branch 'manojgunayadev-master' 2015-01-23 18:32:09 +05:30
Geeth Munasinghe
7718a4cb84 Merge branch 'master' of https://github.com/manojgunayadev/product-cdm into manojgunayadev-master 2015-01-23 18:29:58 +05:30
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
 2015-01-23 18:29:28 +05:30
Geeth Munasinghe
5fed717491 Merge branch 'master' of https://github.com/manojgunayadev/product-cdm into manojgunayadev-master 2015-01-23 18:25:16 +05:30
manoj
0135051d84 License Management 2015-01-23 18:17:40 +05:30
Geeth Munasinghe
38e1892333 gMerge branch 'master' of https://github.com/wso2/product-cdm 2015-01-23 14:47:33 +05:30
Geeth Munasinghe
94905bdc77 Changing the read me file 2015-01-23 14:47:24 +05:30
Geeth Munasinghe
b3caf026a9 Merging changes of dulitha 
Merge branch 'dulichan-master'
 2015-01-23 13:43:16 +05:30
Dulitha Wijewantha
49a46ca909 Fixed indentation 2015-01-23 12:46:35 +05:30
Dulitha Wijewantha
2360d1ae8c Merge branch 'master' of github.com:dulichan/product-cdm 2015-01-23 11:41:53 +05:30
Dulitha Wijewantha
6f2053995d Changed the Map implementations to List since Map implementations are not very well supported by CXF 2015-01-23 11:40:36 +05:30
Dulitha Wijewantha
394d841d4b Changed the Map implementations to List since Map implementations are not very well supported by CFX 2015-01-23 11:22:34 +05:30
manoj
87e272a823 Merge remote-tracking branch 'upstream/master' 2015-01-23 10:09:53 +05:30
manoj
f4e9f1f15b License Management 2015-01-23 10:08:42 +05:30
manoj
0e96d82968 License Managemnt 2015-01-23 10:04:41 +05:30
Prabath Abeysekara
0ffa15f463 Merge pull request #2 from dulichan/master 
Implements the getDevice method of DeviceManager
 2015-01-23 06:01:43 +05:30
Dulitha Wijewantha
5e68735625 Removed the exception. It has to be handled in a different layer 2015-01-22 22:06:37 +05:30
Dulitha Wijewantha
315603481d Fixed line spacing issues 2015-01-22 21:51: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
Geeth
25ab5f1fdc Merge pull request #1 from dulichan/master 
Improvements to the UI and various merges - By Dulitha
 2015-01-22 17:30:07 +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
a195844042 Changed the properties implementation to a Map from List. Removed unnecessary utility methods. Changed the conversion util methods. 2015-01-21 16:55:37 +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
Manoj Gunawardena
b9bb9486e6 Merge pull request #1 from wso2/master 
As discussed in the product counsil, creating a seperate product for dev...
 2015-01-21 11:45:42 +05:30
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
asok
ad303e4611 committing 2015-01-21 10:46:56 +05:30
Dulitha Wijewantha
9fc79868aa Added a tabbed layout for the device list UI 2015-01-20 18:48:07 +05:30
Geeth Munasinghe
23226cc48e As discussed in the product counsil, creating a seperate product for device management framework, this will hold only the core fuctionalities of device management, If some one wants to use this for their device type, they have to use this and write the plugins, uis 2015-01-20 17:30:36 +05:30
prabathabey
e506ed0cdc Resolving conflicts in .gitignore 2015-01-20 14:00:56 +05:30
inosh-perera
1f489c8d62 Merge branch 'master' of https://github.com/geethkokila/product-cdm 2015-01-20 13:49:38 +05:30
inosh-perera
2663ee014c xml element name changes of UI 2015-01-20 13:49:33 +05:30
inosh-perera
8de9a702d7 added authentication response handler, comment fixes 2015-01-20 13:48:20 +05:30