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
325 Commits 31 Branches 461 Tags 183 MiB
0f5da210a1
Commit Graph

325 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
manoj
10e97b3ae1 License Management 2015-01-23 18:32:21 +05:30
manoj
0135051d84 License Management 2015-01-23 18:17:40 +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
Dulitha Wijewantha
cbec06cd35 Merge branch 'master' of https://github.com/geethkokila/product-cdm 2015-01-20 13:42:44 +05:30
Dulitha Wijewantha
83402a4009 Added the SSO js module feature to the cdm product 2015-01-20 13:42:09 +05:30
Geeth Munasinghe
77016e614c Merge branch 'master' of https://github.com/geethkokila/product-cdm 2015-01-20 12:02:21 +05:30
Geeth Munasinghe
4c6d97a30a Fixing repo conflicts 2015-01-20 12:02:04 +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
Geeth Munasinghe
9f789af79f Fixing git repo issues 2015-01-20 11:41:44 +05:30
Geeth Munasinghe
ce3149bc45 Adding partially completed policy evaluation 2015-01-20 11:10:47 +05:30
manoj
dd9bfdb6a7 Refactor Operations 2015-01-20 07:46:13 +05:30
manoj
da0351ebcd Change device type to device type Id 2015-01-20 07:37:39 +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
Dulitha Wijewantha
f340855916 Merge branch 'master' of https://github.com/geethkokila/product-cdm 2015-01-19 17:59:01 +05:30
Dulitha Wijewantha
adebf34ff2 Refactored the device id to integer. 
Created method to convert dto.device to common.device
Created a bulk method for conversion
Implemented getAllDevices
 2015-01-19 17:54:39 +05:30
DilanUA
e093d53b43 Copyright notices of policy-mgt classes were updated. 2015-01-19 15:46:33 +05:30
DilanUA
cbe13288d0 [1] Copyright notices of policy-mgt component classes were updated. [2] Mispelled getJndiLookupDefinition() of org.wso2.carbon.policy.mgt.core.config.datasource.DataSourceConfig was updated. 2015-01-19 15:08:42 +05:30
Dulitha Wijewantha
250c48a258 Fixed an issue of DeviceType and DeviceIdentifier. Implemented the getDeviceType method 2015-01-19 14:32:10 +05:30