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
412 Commits 31 Branches 461 Tags 183 MiB
dee5dcd8b8
Commit Graph

181 Commits

Author SHA1 Message Date
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
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
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
prabathabey
b331f708dd Adding default H2 database related file contents to be packed during the phase where the final distribution is created 2015-01-19 00:54:57 +05:30
prabathabey
9b57455bcc Renaming data source names 2015-01-19 00:43:22 +05:30
prabathabey
c6cdf85c11 Fixing start up issues caused by not having proper API management related database schemas available 2015-01-18 18:48:02 +05:30
prabathabey
a4b022edd4 Excluding unnecessary transtive dependencies getting downloaded 2015-01-18 17:58:37 +05:30
Asok
8157f26401 updating windows plugin 2015-01-18 12:10:35 +05:30
inosh-perera
40ee310f42 returning auto incremented id 2015-01-16 20:14:48 +05:30
harshanL
92503ac0fe Added CDM-REST APIs 2015-01-16 17:52:31 +05:30
manoj
7feb390cef Add governance and registry features 2015-01-15 10:59:56 +05:30
manoj
d0603f3e0b Merge branch 'master' of https://github.com/geethkokila/product-cdm 
Conflicts:
	product/modules/p2-profile-gen/pom.xml
 2015-01-14 18:42:47 +05:30
Dulitha Wijewantha
c884cfae23 Code formatting 2015-01-14 16:32:12 +05:30
Dulitha Wijewantha
9012737b08 Created a basic cdm app with device view and device list view 2015-01-14 13:57:18 +05:30
Dulitha Wijewantha
bee24366eb Added the jaggery feature. Also added copying of the jaggeryapps directory to deployments 2015-01-14 13:56:00 +05:30
manoj
b2f89320f7 Android JAX RS Refactor 2015-01-13 10:59:10 +05:30
manoj
1db2b40790 Android Services Refactor 2015-01-13 10:43:59 +05:30
Geeth Munasinghe
9004f2cd36 Merge branch 'master' of https://github.com/geethkokila/product-cdm 2015-01-12 16:47:05 +05:30
Geeth Munasinghe
745f83b9ed Fixing pom issues 2015-01-12 16:46:38 +05:30
inosh-perera
08583243e8 plugin database script added 2015-01-12 16:42:36 +05:30
prabathabey
717fa6dea8 Restructuring plugin config hierarchy 2015-01-11 23:58:12 +05:30
prabathabey
d336980b27 Fixing versioning related issues and adding an ant task to distribution pom.xml to create IDP management related schemas during packaging the distribution up 2015-01-11 23:44:27 +05:30
prabathabey
d50f043a55 Removing WSO2 prefix out of all CDM specific data source configurations and assigning more meaningful names 2015-01-11 23:42:42 +05:30
prabathabey
d999279520 Removing test configurations added into cxf-servlet.xml of Android agent JAX-RS service 2015-01-11 23:41:10 +05:30
prabathabey
72dfc1ea14 Fixing more server start-up issues caused by not having proper package exports configured in org.wso2.carbon.device.mgt.mobile.impl as well as not having application-authentication.xml copied into CDM_HOME/repository/conf/security directory 2015-01-11 22:23:24 +05:30
prabathabey
05ee9455ae Merge branch 'master' of https://github.com/geethkokila/product-cdm 2015-01-11 22:17:15 +05:30
prabathabey
3f6d5daa16 Fixing start-up issues of CDM distribution 2015-01-11 22:02:37 +05:30
inosh-perera
4f16f32269 Merge branch 'master' of https://github.com/geethkokila/product-cdm 2015-01-06 18:59:23 +05:30
inosh-perera
b02d6ecea0 changes in local notification 2015-01-06 18:59:10 +05:30
Geeth Munasinghe
e29d863a2e Fixing build problems 2015-01-06 14:04:31 +05:30
Geeth Munasinghe
ff859eaf19 Merge branch 'master' of https://github.com/geethkokila/product-cdm 2015-01-06 10:08:36 +05:30
manoj
704afe78ae Delete test classes 2015-01-05 15:31:47 +05:30
manoj
3eafd0fc45 change copy right text and refactor error handling 2015-01-05 13:05:54 +05:30
Geeth Munasinghe
9bddb9407b Fixing pom issues 2014-12-23 15:03:40 +05:30
manoj
f50cdef0b1 JAX-RS Refractor 2014-12-22 20:47:58 +05:30
manoj
ff2ac51ea3 JAX-RS refractor 2014-12-22 20:47:29 +05:30
harshanL
0cd90fc349 Added device type to DB when registering the plugin 2014-12-22 16:47:32 +05:30
prabathabey
fea3486084 adding API Everywhere related changes to device-mgt component 2014-12-22 11:12:07 +05:30
prabathabey
231d6f394a adding API manager related features to p2-profile 2014-12-18 21:11:33 +05:30
harshanL
e60e7b6d7f Fixed issues in Android JAX-RS app 2014-12-18 17:07:10 +05:30
harshanL
0ad9d1bd16 Added device type insert query to h2 database script 2014-12-18 10:52:51 +05:30
harshanL
9ba2c0198c Fixed issues in enrollment process 2014-12-17 18:33:22 +05:30
Geeth Munasinghe
624d6eb6ef adding dbconsole ui to the product - this should be removed when releasing the product 2014-12-17 17:34:58 +05:30
Geeth Munasinghe
29247f7b50 Removing the unnessacary files from distribution target folder and changing the policy 2014-12-17 15:55:02 +05:30
harshanL
ad10426c11 Added mobile device management service with db schema 2014-12-17 15:43:31 +05:30
Geeth Munasinghe
78cc3b0070 Removing white spaces from the policy management and making data time fileds long 2014-12-16 18:13:06 +05:30
manoj
3ee767f1b2 merge after JAX-RS changes 2014-12-16 16:53:46 +05:30
manoj
6836bb1d9b JAX-RS Refractor 2014-12-16 15:14:02 +05:30
manoj
37a47ec347 JAX-RS Refractor 2014-12-16 15:13:09 +05:30
Geeth Munasinghe
e268660540 Merge branch 'master' of https://github.com/geethkokila/product-cdm 2014-12-15 20:11:29 +05:30
Geeth Munasinghe
bd5971d263 Comminying policy management related code 2014-12-15 20:11:19 +05:30
harshanL
4a419f3ebf Added mobile device management related db classes 2014-12-15 20:09:39 +05:30
harshanL
a5018afadf Making the plugin resolution optional for the core component 2014-12-15 18:43:56 +05:30
manoj
69c730d147 Merge branch 'master' of https://github.com/geethkokila/product-cdm 2014-12-15 11:23:33 +05:30
manoj
8fa2f38f37 remove EMM DB scripts file 2014-12-15 11:23:06 +05:30
prabathabey
fceccb3280 Fixing build issues introduced by introducing a static inner class to keep track of device related properties 2014-12-15 11:19:42 +05:30
harshanL
6489ea1168 Added json response to license. 2014-12-15 09:17:20 +05:30
Geeth Munasinghe
172ab10ac0 Merge branch 'master' of https://github.com/geethkokila/product-cdm 2014-12-12 17:49:22 +05:30
Geeth Munasinghe
3996e4b95a Fixing android webapp getting changed by the filtered key word 2014-12-12 17:25:23 +05:30
Asok
8d67673198 Merge branch 'master' of https://github.com/geethkokila/product-cdm 
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
 2014-12-12 17:16:43 +05:30
Asok
608e552c07 removing java.nio 2014-12-12 17:15:07 +05:30
Geeth Munasinghe
274d9ec37e Adding the feature management service and android application to webapps 2014-12-12 14:45:24 +05:30
harshanL
d352daf626 Refactored Android-REST API code 2014-12-12 12:07:28 +05:30
Asok
7282465b12 Adding Windows module and pom changes 2014-12-12 11:55:43 +05:30
Asok
9ac8b17be2 Adding windows plugin 2014-12-12 11:44:00 +05:30
harshanL
e45e19c5e8 Fixed issues in device management APIs 2014-12-11 18:29:11 +05:30
harshanL
f091ce70c6 Added new APIs to device management 2014-12-11 17:49:36 +05:30
harshanL
80334ef00d Added new APIs to enrollment 2014-12-11 17:22:32 +05:30
harshanL
dacd16b852 Added validations to json objects in Android-REST apis 2014-12-11 15:48:59 +05:30
harshanL
6d5ea7f586 Added JSON to Device object conversion 2014-12-11 15:21:18 +05:30
Geeth Munasinghe
8cc549d762 Merge branch 'master' of https://github.com/geethkokila/product-cdm 2014-12-10 20:01:12 +05:30
Geeth Munasinghe
fd374b16a1 Fixing datasouce configurations 2014-12-10 20:00:12 +05:30
inosh-perera
13b96d9b93 Merge branch 'master' of https://github.com/geethkokila/product-cdm 2014-12-10 19:39:55 +05:30
Geeth Munasinghe
3b79c98335 Adding the cdm-datasources.xml to bin xml 2014-12-10 18:47:50 +05:30
Geeth Munasinghe
e1c9856e1e Adding cdm-datasources.xml 2014-12-10 18:46:02 +05:30
Geeth Munasinghe
14a3429a19 Fixing cdm-config file adding 2014-12-10 18:04:29 +05:30
inosh-perera
ac3bd52260 alert dialogs are invoked from the decleared once in dialog util 2014-12-10 17:59:10 +05:30
prabathabey
5ec8f20baf adding device management mobile feature into CDM p2-profile 2014-12-10 16:54:11 +05:30
harshanL
efdaf6e7a5 Added parent pom info 2014-12-10 16:41:16 +05:30
harshanL
ac484d06fa Merge branch 'master' of https://github.com/geethkokila/product-cdm 2014-12-10 15:32:39 +05:30
harshanL
963e426e04 added super-tenant flow 2014-12-10 15:31:44 +05:30
Geeth Munasinghe
1deb634f92 Fixing conflicts issue 2014-12-10 15:09:55 +05:30
Geeth Munasinghe
65433dda57 Fixing pom issues 2014-12-10 15:08:31 +05:30
harshanL
7c7768101f Modified Android enrollment APIs and changed isRegistered to isEnrolled 2014-12-10 14:53:15 +05:30
harshanL
7eb5b960a9 Fixed issues in pom file 2014-12-10 14:11:37 +05:30
harshanL
3f0f4ffeae Fixed issues in pom file & enrollment 2014-12-10 14:10:04 +05:30