openmrs-core master

• 

  Daniel Kayiwa 02 May 2014 afcae623f9b82eeb04ffa860e749078ebea7969e

  Doing some file formatting

  • api/src/main/java/org/openmrs/util/OpenmrsConstants.java (version afcae623f9b82eeb04ffa860e749078ebea7969e)
  • web/src/main/java/org/openmrs/web/controller/user/UserFormController.java (version afcae623f9b82eeb04ffa860e749078ebea7969e)
  • web/src/test/java/org/openmrs/web/controller/form/FormFormControllerTest.java (version afcae623f9b82eeb04ffa860e749078ebea7969e)
• 

  Daniel Kayiwa 02 May 2014 c8231eccb018f90ef254ea71a7c091fb5936b1c3

  Merging: User secret answer should be required if the question is set - TRUNK-3779 author:shubh

  • web/src/main/java/org/openmrs/web/controller/user/UserFormController.java (version c8231eccb018f90ef254ea71a7c091fb5936b1c3)
  • webapp/src/main/webapp/WEB-INF/messages.properties (version c8231eccb018f90ef254ea71a7c091fb5936b1c3)
• 

  Daniel Kayiwa 02 May 2014 14f394f3ba6d5999ddacb86187e6106fc4995cdb

  Merging last part for: Add error checking to relationship start/end dates on patient dashboard - TRUNK-3293 author:harsha89

  • web/src/main/java/org/openmrs/web/dwr/DWRRelationshipService.java (version 14f394f3ba6d5999ddacb86187e6106fc4995cdb)
  • webapp/src/main/webapp/WEB-INF/messages.properties (version 14f394f3ba6d5999ddacb86187e6106fc4995cdb)
• 

  Daniel Kayiwa 02 May 2014 3f1141eb897c83b3bb78b12a193e8313087516df

  Merge pull request #886 from Fahv/TRUNK-2119-Non-Format
  TRUNK-2119
• 

  Robert Day <robertstanday@gmail.com> 30 Apr 2014 0de8e7bc2161829ab8ae727e45005d391e3f04ec

  All the messages
  Hopefully only changed the single lines
  
  Fixxed the couple issues
  
  More confilicts.....
  
  Fixed merge issues

  • webapp/src/main/webapp/WEB-INF/messages.properties (version 0de8e7bc2161829ab8ae727e45005d391e3f04ec)
  • webapp/src/main/webapp/WEB-INF/view/uncaughtException.jsp (version 0de8e7bc2161829ab8ae727e45005d391e3f04ec)