Commit Graph

73 Commits

Author SHA1 Message Date
prabathabey
f296fb763e Configuring product.name and product.version variables to be replaced with appropriate filter properties 2015-01-23 21:36:02 +05:30
prabathabey
b17b514d11 Resolving conflicts 2015-01-23 21:08:58 +05:30
prabathabey
da34270a61 Fixing API Manager related issues 2015-01-23 20:53:50 +05:30
harshanL
e40424c758 Added copying mobile db scripts to bin.xml & refactored code 2015-01-23 19:44:16 +05:30
Geeth Munasinghe
1cdbfd84e0 Merge branch 'master' of https://github.com/manojgunayadev/product-mdm 2015-01-23 18:55:03 +05:30
manoj
329f956f3d License Management 2015-01-23 18:19:21 +05:30
Geeth Munasinghe
cf8eaaef41 Merge branch 'master' of https://github.com/dulichan/product-mdm 2015-01-23 14:13:54 +05:30
Dulitha Wijewantha
f1193b5647 Fixed indentation. UI module changes 2015-01-23 12:47:25 +05:30
Geeth Munasinghe
20a228992f Adding org.wso2.carbon.identity.self.registration.server.feature to p2 profile gen 2015-01-23 12:29:17 +05:30
harshanL
ad3f748e0b Fixed merge conflicts 2015-01-22 22:24:52 +05:30
harshanL
163fe58120 Added new changes in operation management 2015-01-22 22:04:51 +05:30
Dulitha Wijewantha
d5c00a2e1e Merge branch 'master' of github.com:wso2/product-mdm 2015-01-22 21:20:36 +05:30
Dulitha Wijewantha
9f71408001 * Fixed the JNDI bug
* Added a device module method and apis for a single device
* UI improvement to the device page
2015-01-22 21:20:08 +05:30
Geeth Munasinghe
fd814c7e24 Fixing version issues and changing cdm to mdm 2015-01-22 16:41:34 +05:30
Dulitha Wijewantha
90402107f6 Included the UI improvements to cdm jaggery app. Included the sso jaggery module dependency. 2015-01-22 15:51:09 +05:30
Geeth Munasinghe
bc93ff08a4 Changing cdm to mdm 2015-01-21 20:14:55 +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
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
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
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
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
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
3f6d5daa16 Fixing start-up issues of CDM distribution 2015-01-11 22:02:37 +05:30
harshanL
0cd90fc349 Added device type to DB when registering the plugin 2014-12-22 16:47:32 +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
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
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
8fa2f38f37 remove EMM DB scripts file 2014-12-15 11:23:06 +05:30
Geeth Munasinghe
3996e4b95a Fixing android webapp getting changed by the filtered key word 2014-12-12 17:25:23 +05:30