Commit Graph

  • 5b68949c41 Merge branch 'master' of github.com:wso2/product-mdm Dulitha Wijewantha 2015-01-23 22:03:18 +0530
  • 3f7b93163b * Added a description to the feature implementation * Added the feature insert, changed the feature_id to int and added device_type to features * Included the updated database file * Developed the feature to view device features * Developed the implementation to call the Operation Manager from the UI Dulitha Wijewantha 2015-01-23 22:03:01 +0530
  • 7fb84d4a04 Merge branch 'master' of https://github.com/wso2/product-mdm Geeth Munasinghe 2015-01-23 21:37:27 +0530
  • 9a89aa8112 Adding the sso features and changing the filter.properties Geeth Munasinghe 2015-01-23 21:37:16 +0530
  • f296fb763e Configuring product.name and product.version variables to be replaced with appropriate filter properties prabathabey 2015-01-23 21:36:02 +0530
  • e9ebd88445 Configuring logging for test cases prabathabey 2015-01-23 21:29:32 +0530
  • 7dc6a987c7 Remove license rxt file from MDM manoj 2015-01-23 21:19:26 +0530
  • bdb522d0e5 Delete license rxt manoj 2015-01-23 21:18:54 +0530
  • b17b514d11 Resolving conflicts prabathabey 2015-01-23 21:08:58 +0530
  • da34270a61 Fixing API Manager related issues prabathabey 2015-01-23 20:53:50 +0530
  • e40424c758 Added copying mobile db scripts to bin.xml & refactored code harshanL 2015-01-23 19:44:16 +0530
  • 69a822c8d1 Merge branch 'master' of github.com:wso2/product-mdm Dulitha Wijewantha 2015-01-23 19:07:52 +0530
  • 899662c5d5 Merge branch 'master' of github.com:wso2/product-mdm Dulitha Wijewantha 2015-01-23 19:07:21 +0530
  • b03443a30f Merging the changes of Manoj Merge branch 'manojgunayadev-master' Geeth Munasinghe 2015-01-23 18:55:26 +0530
  • 1cdbfd84e0 Merge branch 'master' of https://github.com/manojgunayadev/product-mdm Geeth Munasinghe 2015-01-23 18:55:03 +0530
  • 8a3ab46c0d Merge branch 'master' of https://github.com/manojgunayadev/product-mdm into manojgunayadev-master Geeth Munasinghe 2015-01-23 18:41:43 +0530
  • df09c4bd3c * Added method to the mobile feature DAO to get features by type * Changed method - getFeaturePropertyOfFeature to accept a string * Added Device Type to the Feature DAO implementations * Changed Device Feature properties DAO for Int * Implemented the get feature by type to android operation manager Dulitha Wijewantha 2015-01-23 18:39:28 +0530
  • 329f956f3d License Management manoj 2015-01-23 18:19:21 +0530
  • 54e827ce68 Added unit-tests & refactored the code harshanL 2015-01-23 15:58:06 +0530
  • 845c9f8998 changing the read me file Geeth Munasinghe 2015-01-23 14:45:14 +0530
  • f4a40a2fd1 changing the read me file Geeth Munasinghe 2015-01-23 14:43:45 +0530
  • fd631f9563 Nerging Dulitha's changes Merge branch 'dulichan-master' Geeth Munasinghe 2015-01-23 14:14:38 +0530
  • cf8eaaef41 Merge branch 'master' of https://github.com/dulichan/product-mdm Geeth Munasinghe 2015-01-23 14:13:54 +0530
  • 46c1218259 Merge branch 'master' of https://github.com/dulichan/product-mdm into dulichan-master Geeth Munasinghe 2015-01-23 13:56:36 +0530
  • 40489f986d Merge remote-tracking branch 'upstream/master' manoj 2015-01-23 13:54:27 +0530
  • 4974d49320 License Management manoj 2015-01-23 13:49:27 +0530
  • f1193b5647 Fixed indentation. UI module changes Dulitha Wijewantha 2015-01-23 12:47:25 +0530
  • 20a228992f Adding org.wso2.carbon.identity.self.registration.server.feature to p2 profile gen Geeth Munasinghe 2015-01-23 12:29:17 +0530
  • ba8f6621a4 Merge branch 'master' of github.com:dulichan/product-mdm Dulitha Wijewantha 2015-01-23 11:42:11 +0530
  • 24184b48a7 Reverted changes back to the list implementation. The Map conversion is not properly supported in CXF Dulitha Wijewantha 2015-01-23 11:29:33 +0530
  • dcf222d2c1 Reverted changes back to the list implementation. The Map conversion is not properly supported in CFX Dulitha Wijewantha 2015-01-23 11:29:33 +0530
  • b702a72b2f Merge remote-tracking branch 'upstream/master' manoj 2015-01-23 11:04:05 +0530
  • b96d561ef0 License Manaproduct/modules/mobileservices/agents/android/jax-rs/src/main/java/org/wso2/cdmserver/mobileservices/android/util/AndroidAPIUtils.javagement manoj 2015-01-23 11:02:25 +0530
  • 2b3ee5e4f2 Added package-info.java harshanL 2015-01-22 22:33:26 +0530
  • ad3f748e0b Fixed merge conflicts harshanL 2015-01-22 22:24:52 +0530
  • 163fe58120 Added new changes in operation management harshanL 2015-01-22 22:04:51 +0530
  • 7fc4244259 Fixing issues in package-info.java prabathabey 2015-01-22 21:59:36 +0530
  • 4c1d4a01a5 Merge pull request #4 from dulichan/master Prabath Abeysekara 2015-01-22 21:23:58 +0530
  • d5c00a2e1e Merge branch 'master' of github.com:wso2/product-mdm Dulitha Wijewantha 2015-01-22 21:20:36 +0530
  • 9f71408001 * Fixed the JNDI bug * Added a device module method and apis for a single device * UI improvement to the device page Dulitha Wijewantha 2015-01-22 21:20:08 +0530
  • 2883f0dda2 Merge branch 'master' of https://github.com/wso2/product-mdm Geeth Munasinghe 2015-01-22 19:23:19 +0530
  • 118ee37998 Adding changes of asok Geeth Munasinghe 2015-01-22 19:22:12 +0530
  • 8e3d4e11e3 Adding org.wso2.carbon.um.ws.service.client.feature.group feature required for API management related dependencies prabathabey 2015-01-22 19:20:57 +0530
  • 737eee4270 Merge branch 'master' of https://github.com/asokaravinda/product-mdm into asokaravinda-master Geeth Munasinghe 2015-01-22 19:16:54 +0530
  • 2947e6fd21 commiting windows plugin asok 2015-01-22 19:12:40 +0530
  • 1bf1f5d09d Merge pull request #2 from dulichan/master Geeth 2015-01-22 19:12:38 +0530
  • fd814c7e24 Fixing version issues and changing cdm to mdm Geeth Munasinghe 2015-01-22 16:41:34 +0530
  • 90402107f6 Included the UI improvements to cdm jaggery app. Included the sso jaggery module dependency. Dulitha Wijewantha 2015-01-22 15:51:09 +0530
  • 99f7cd25e8 Merging left over changes from MDM. Most of the changes are from @harshahL. Dulitha Wijewantha 2015-01-22 10:43:36 +0530
  • bc93ff08a4 Changing cdm to mdm Geeth Munasinghe 2015-01-21 20:14:55 +0530
  • ebe0aa2663 commiting windows plugin asok 2015-01-21 16:34:03 +0530
  • eb52073e37 commiting windows plugin asok 2015-01-21 16:29:24 +0530
  • 5e3ebc141c As discussed in the product counsil, the MDM will be the mobile solution built upon CDM framework Geeth Munasinghe 2015-01-21 12:44:51 +0530
  • 715d242b22 Resolving conflicts in README.md and .gitignore prabathabey 2015-01-20 14:07:50 +0530
  • e506ed0cdc Resolving conflicts in .gitignore prabathabey 2015-01-20 14:00:56 +0530
  • 1f489c8d62 Merge branch 'master' of https://github.com/geethkokila/product-cdm inosh-perera 2015-01-20 13:49:38 +0530
  • 2663ee014c xml element name changes of UI inosh-perera 2015-01-20 13:49:33 +0530
  • 8de9a702d7 added authentication response handler, comment fixes inosh-perera 2015-01-20 13:48:20 +0530
  • 77016e614c Merge branch 'master' of https://github.com/geethkokila/product-cdm Geeth Munasinghe 2015-01-20 12:02:21 +0530
  • 4c6d97a30a Fixing repo conflicts Geeth Munasinghe 2015-01-20 12:02:04 +0530
  • 5cb85e2069 Fixed merge conflicts harshanL 2015-01-20 11:47:22 +0530
  • 193eca9e2d Added operation persistance logic & refactored the code harshanL 2015-01-20 11:44:31 +0530
  • 17457bf6d3 Refactor Agents module manoj 2015-01-20 11:42:32 +0530
  • 9f789af79f Fixing git repo issues Geeth Munasinghe 2015-01-20 11:41:44 +0530
  • ce3149bc45 Adding partially completed policy evaluation Geeth Munasinghe 2015-01-20 11:10:47 +0530
  • dd9bfdb6a7 Refactor Operations manoj 2015-01-20 07:46:13 +0530
  • da0351ebcd Change device type to device type Id manoj 2015-01-20 07:37:39 +0530
  • 72a3df080b Merge branch 'master' of https://github.com/geethkokila/product-cdm manoj 2015-01-20 07:29:16 +0530
  • aa50bf96ed Add License Mgt manoj 2015-01-19 21:39:06 +0530
  • 50a17eb33d Refactor add new mobile service module to as parent to agent module manoj 2015-01-19 21:38:41 +0530
  • 6703f590f3 Merge Changes manoj 2015-01-19 21:37:08 +0530
  • f340855916 Merge branch 'master' of https://github.com/geethkokila/product-cdm Dulitha Wijewantha 2015-01-19 17:59:01 +0530
  • adebf34ff2 Refactored the device id to integer. Created method to convert dto.device to common.device Created a bulk method for conversion Implemented getAllDevices Dulitha Wijewantha 2015-01-19 17:54:39 +0530
  • e093d53b43 Copyright notices of policy-mgt classes were updated. DilanUA 2015-01-19 15:46:33 +0530
  • 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. DilanUA 2015-01-19 15:08:42 +0530
  • 250c48a258 Fixed an issue of DeviceType and DeviceIdentifier. Implemented the getDeviceType method Dulitha Wijewantha 2015-01-19 14:32:10 +0530
  • 9f7f3a32a1 Initial commit maheshika 2015-01-19 13:06:01 +0530
  • 85f0fb262e Initial commit maheshika 2015-01-19 13:05:10 +0530
  • 771575c408 Fixed conflicts in merge harshanL 2015-01-19 09:24:52 +0530
  • 207a51a269 Added license headers with changes harshanL 2015-01-19 09:20:53 +0530
  • 74b8a32be3 Fixing exception getting swallowed in activate method of the service component prabathabey 2015-01-19 01:04:35 +0530
  • 043bfb7742 Code cleanup prabathabey 2015-01-19 00:58:41 +0530
  • b331f708dd Adding default H2 database related file contents to be packed during the phase where the final distribution is created prabathabey 2015-01-19 00:54:57 +0530
  • 07e3dc9644 Fixing exception getting swallowed in deactivate method of the service component prabathabey 2015-01-19 00:53:42 +0530
  • 83c9ae42b5 Fixing NPE thrown at server startup as a result of APIManagerConfigurationService not being available while the JAX-RS services are registered as APIs prabathabey 2015-01-19 00:48:19 +0530
  • 3c425ab0eb Configuring device management related schemas to be copied to dbscripts directory during the feature installation prabathabey 2015-01-19 00:46:04 +0530
  • 9b57455bcc Renaming data source names prabathabey 2015-01-19 00:43:22 +0530
  • c6cdf85c11 Fixing start up issues caused by not having proper API management related database schemas available prabathabey 2015-01-18 18:48:02 +0530
  • a4b022edd4 Excluding unnecessary transtive dependencies getting downloaded prabathabey 2015-01-18 17:58:37 +0530
  • b7984c18b6 Code cleanup prabathabey 2015-01-18 14:34:26 +0530
  • 29bfc6f09f More code cleanups prabathabey 2015-01-18 14:16:27 +0530
  • 5f242d6165 code cleanup prabathabey 2015-01-18 13:57:36 +0530
  • 9e695ecc85 Adding test cases to test unregistering a device management service from the device management repository prabathabey 2015-01-18 13:53:26 +0530
  • 233f9e8d1f Renaming DeviceMgtDAOTestSuite.java to DeviceManagementDAOTests.java prabathabey 2015-01-18 13:27:23 +0530
  • daa13e3732 Fixing licensing headers prabathabey 2015-01-18 13:25:32 +0530
  • 2b1a5dd6c4 code cleanup prabathabey 2015-01-18 12:58:14 +0530
  • f2a80d3ede Merge branch 'master' of https://github.com/geethkokila/product-cdm prabathabey 2015-01-18 12:46:55 +0530
  • a31767d114 Adding test cases for device repository handling and device management config initialization prabathabey 2015-01-18 12:46:14 +0530
  • b7ca60d802 Merge branch 'master' of https://github.com/geethkokila/product-cdm inosh-perera 2015-01-16 20:16:34 +0530
  • 40ee310f42 returning auto incremented id inosh-perera 2015-01-16 20:14:48 +0530