Commit Graph

  • 5fb9c42027 Merge branch 'master' of https://github.com/wso2/product-mdm prabathabey 2015-01-31 19:10:40 +0530
  • 36274deeb1 Fixed MDM-295 issue harshanL 2015-01-30 17:07:30 +0530
  • 61663b430b Fixing pom files - moving dependencies to parent pom, corretly propertizing the versions Geeth Munasinghe 2015-01-30 16:41:44 +0530
  • d167daef78 Changing the group id of the cdm and mdm products, and gropuing the dependencies Geeth Munasinghe 2015-01-30 11:52:16 +0530
  • 1a6e27ae2d Merge branch 'master' of https://github.com/wso2/product-mdm prabathabey 2015-01-28 01:37:05 +0530
  • 8dd2bc337b added libs to android project harshanL 2015-01-28 01:36:39 +0530
  • 570a86eb16 added build xml harshanL 2015-01-28 01:33:00 +0530
  • 8af06d335d added build xml harshanL 2015-01-28 01:32:35 +0530
  • 0d76bfe436 Merge branch 'master' of https://github.com/wso2/product-mdm prabathabey 2015-01-28 01:26:21 +0530
  • 6c9375826d Added mvn archetype harshanL 2015-01-28 01:24:55 +0530
  • 74a9713a13 removed mvn archetype harshanL 2015-01-28 01:22:27 +0530
  • 8c37ca5c21 Merge branch 'master' of https://github.com/wso2/product-mdm prabathabey 2015-01-28 01:22:11 +0530
  • f63b8f04a0 Modifying INSTALL.txt and README.txt prabathabey 2015-01-28 01:21:52 +0530
  • 73359d4b95 Added changes to the maven archetype harshanL 2015-01-28 00:32:40 +0530
  • 73e73e8f53 Merge pull request #12 from dulichan/master Prabath Abeysekara 2015-01-28 00:26:57 +0530
  • 0a9eec723a Added the sso scripts Dulitha Wijewantha 2015-01-28 00:25:22 +0530
  • 3094e35be5 moving files to mobileservices inosh-perera 2015-01-27 23:45:02 +0530
  • ffd82f2a4f moved agent code to mobileservices folder inosh-perera 2015-01-27 23:43:16 +0530
  • 88cd9826df Merge branch 'master' of https://github.com/wso2/product-mdm inosh-perera 2015-01-27 23:32:57 +0530
  • 4a26b86460 fixed operations flow inosh-perera 2015-01-27 23:32:12 +0530
  • 99abc5fafd Merge pull request #11 from dulichan/master Lakshitha Harshan 2015-01-27 23:31:02 +0530
  • e76608187b * Fixed issue in escape * Added unspecified filter * Reverting back to old sso module Dulitha Wijewantha 2015-01-27 23:21:13 +0530
  • b6f7998db7 Fixing encoding issue Dulitha Wijewantha 2015-01-27 21:17:56 +0530
  • 3b4742046b Merge pull request #10 from dulichan/master Prabath Abeysekara 2015-01-27 20:11:15 +0530
  • c11eeaaccc Added i18n module. Copied some modules from distribution. Dulitha Wijewantha 2015-01-27 20:07:32 +0530
  • 68bff9c21c Merge pull request #9 from dulichan/master Prabath Abeysekara 2015-01-27 17:26:09 +0530
  • 3a803df3d6 Removed the inundated fields and changed the sample data. Dulitha Wijewantha 2015-01-27 17:25:09 +0530
  • e108dc3e9b Added dynamic icon loading and changed the image file name Dulitha Wijewantha 2015-01-27 13:30:07 +0530
  • ccd778160f Merge branch 'master' of github.com:wso2/product-mdm Dulitha Wijewantha 2015-01-27 12:33:00 +0530
  • c6a25475b0 Removed unnecessary logs Dulitha Wijewantha 2015-01-27 12:32:06 +0530
  • 84b40f802f Unit test code changes harshanL 2015-01-27 10:33:05 +0530
  • 8e32f3e478 * Added license headers to files * Removed a unnecessary file Dulitha Wijewantha 2015-01-27 09:34:05 +0530
  • 0deffc8ed2 Merge branch 'master' of github.com:wso2/product-mdm Dulitha Wijewantha 2015-01-27 09:31:02 +0530
  • 6b0909f810 * Added auth routes to con * Supported login/logout and assertion consumer url * Implemented the auth header * Included the auth header on pages * Added logout button to UI * Added related configs and a lib to read configs efficiently Dulitha Wijewantha 2015-01-27 09:29:15 +0530
  • c4b255b751 Changed the archetype readme to add prerequisites harshanL 2015-01-27 09:06:16 +0530
  • 67f0f31baa Code cleanup prabathabey 2015-01-27 00:21:54 +0530
  • 733ae8ed10 Adding proper dependency exclusions to poms, making MobileFeatureDAOTestSuite use jdbc pooling instead of dbcp and making testdbconfig.xml to be compliant with platform naming standards prabathabey 2015-01-26 23:57:06 +0530
  • 1a78ae08c2 Added latest IS configuration to the SSO service section. Dulitha Wijewantha 2015-01-26 22:51:03 +0530
  • 746e5209df * Added copying tasks for the authentication endpoint web app, sso-config, identity configs * Added claim mgt feature * Added relevant configuration files Dulitha Wijewantha 2015-01-26 22:49:04 +0530
  • 5b49fd0976 Added the maven archetype to create android mdm-agent project harshanL 2015-01-26 18:30:13 +0530
  • 3017d53432 Adding saml sso feature Geeth Munasinghe 2015-01-23 23:49:16 +0530
  • 6a74d401e1 Merge branch 'master' of https://github.com/wso2/product-mdm inosh-perera 2015-01-23 22:55:33 +0530
  • 6ac5cb1438 fixing cdm jaggery app not ddploying issue Geeth Munasinghe 2015-01-23 22:52:07 +0530
  • 53c2abd574 Merge branch 'master' of https://github.com/wso2/product-mdm inosh-perera 2015-01-23 22:48:30 +0530
  • 8e4e434d0d added adroid code from old repository, oauth basic login fixed inosh-perera 2015-01-23 22:46:43 +0530
  • 5883944e23 Merge branch 'master' of https://github.com/wso2/product-mdm Geeth Munasinghe 2015-01-23 22:34:53 +0530
  • 19adb9482f Merge branch 'master' of https://github.com/wso2/product-mdm prabathabey 2015-01-23 22:31:47 +0530
  • 95e538c324 Fixing issues related to copying API manager publisher and store related jaggery webapps prabathabey 2015-01-23 22:31:34 +0530
  • 38b839a4a9 Merge branch 'master' of https://github.com/dulichan/product-mdm Geeth Munasinghe 2015-01-23 22:31:17 +0530
  • c93f99d970 Merge branch 'master' of https://github.com/wso2/product-mdm Geeth Munasinghe 2015-01-23 22:22:31 +0530
  • 57482a7ae3 Merge branch 'master' of https://github.com/manojgunayadev/product-mdm Geeth Munasinghe 2015-01-23 22:19:19 +0530
  • dec7419e41 Fixing self-registration feature installation related issues prabathabey 2015-01-23 22:17:26 +0530
  • fb72682da0 Adding API Publisher and Store Features to p2-profile prabathabey 2015-01-23 22:06:06 +0530
  • 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