openmrs-core master

• 

  Daniel Kayiwa 28 Feb 2017 4f5dcd1adb0c6eaf63cdfa3326874b6c4543079b

  Merge pull request #2024 from HVFrancis/TRUNK-4928
  TRUNK-4928: Removed "TODO:Support localized names and descriptions" from
• 

  HVFrancis <howardfrancis@upike.edu> 28 Feb 2017 e5fb0bcf8bcdc0081b1e584fbf183bbccb234829

  TRUNK-4928: Removed "TODO:Support localized names and descriptions" from comments

  • api/src/main/java/org/openmrs/OpenmrsMetadata.java (version e5fb0bcf8bcdc0081b1e584fbf183bbccb234829)
• 

  Daniel Kayiwa 28 Feb 2017 2b58fba37a79e4df451bd82622b6f0df3b21b6fe

  Merge pull request #2023 from teleivo/TRUNK-5080
  TRUNK-5080 Reorganize checkstyle
• 

  teleivo <mrteleivo@gmail.com> 28 Feb 2017 dc3c44dd1874d3bacecfae3446e811ffabe4f159

  TRUNK-5080 Reorganize checkstyle
  * remove webapp-checkstyle.xml since it only contained one rule which was applied to JSP files which have all been deleted.
  * remove the webapp/pom.xml config for checkstyle since
  webapp-checkstyle.xml is deleted
  * rename/move the openmrs-checkstyle.xml to the root of the repository
  as checkstyle.xml
  * inline the openmrs-checkstyle.properties values into checkstyle.xml
  since they are only used in this file. this way they can also be read
  be cloud providers such as codacy and codeclimate
  * adapt the root pom's checkstyle config to point to the new file
  locations
  * add a suppression rule to excempt test classes from checkstyle rule MethodNames since they contain undersores in the method names
  * remove the checkstyle-license-header.txt since we are checking
  license headers with the mycilla maven plugin already

  • checkstyle-suppressions.xml (version dc3c44dd1874d3bacecfae3446e811ffabe4f159)
  • checkstyle.xml (version dc3c44dd1874d3bacecfae3446e811ffabe4f159)
  • pom.xml (version dc3c44dd1874d3bacecfae3446e811ffabe4f159)
  • tools/src/main/resources/checkstyle/checkstyle-suppressions.xml (version dc3c44dd1874d3bacecfae3446e811ffabe4f159)
  • tools/src/main/resources/checkstyle/license-header.txt (version dc3c44dd1874d3bacecfae3446e811ffabe4f159)
  • tools/src/main/resources/checkstyle/openmrs-checkstyle.properties (version dc3c44dd1874d3bacecfae3446e811ffabe4f159)
  • tools/src/main/resources/checkstyle/openmrs-checkstyle.xml (version dc3c44dd1874d3bacecfae3446e811ffabe4f159)
  • tools/src/main/resources/checkstyle/webapp-checkstyle.xml (version dc3c44dd1874d3bacecfae3446e811ffabe4f159)
  • webapp/pom.xml (version dc3c44dd1874d3bacecfae3446e811ffabe4f159)
• 

  Ivo Ulrich <teleivo@users.noreply.github.com> 28 Feb 2017 f20b57d275721b27715c56e078748573b34d7785

  Merge pull request #2022 from teleivo/TRUNK-5078
  TRUNK-5078 Remove velocity.log files
• 

  teleivo <mrteleivo@gmail.com> 28 Feb 2017 80234c679f046475f87edfe06ce6ba59722cae6d

  TRUNK-5078 Remove velocity.log files
  remove velocity.log files which were unintentionally added and ignore
  .log files via .gitignore

  • .gitignore (version 80234c679f046475f87edfe06ce6ba59722cae6d)
  • velocity.log (version 80234c679f046475f87edfe06ce6ba59722cae6d)
  • webapp/velocity.log (version 80234c679f046475f87edfe06ce6ba59722cae6d)
• 

  Daniel Kayiwa 28 Feb 2017 bb984630defa435fd40ce7167372be543ba9eaae

  Merge pull request #2019 from reubenvarghese1/master
  TRUNK-4018 Initial Setup (installer) sits at 100% too long before actually finishing
• 

  dkayiwa <kayiwadaniel@gmail.com> 28 Feb 2017 a3b384a5da6f55220485e18ae2668900774319ac

  Fix HL7UtilTest failure on OpenJDK 7 - TRUNK-5079 (cherry picked from commit 193a73da2bfda9dbc131d2c28be81fe3b4b0b5bd)

  • api/src/test/java/org/openmrs/hl7/HL7UtilTest.java (version a3b384a5da6f55220485e18ae2668900774319ac)
• 

  Darius Jazayeri <jazayeri@alum.mit.edu> 28 Feb 2017 5909737aaef6ee76e7dfad88c9a007aa0629eda1

  TRUNK-4869, TRUNK-4867 - Use OpenmrsUtil.compare instead of Date.before/after (in case of comparing to Timestamps from the DB). Cleaned up @verifies

  • api/src/main/java/org/openmrs/validator/PersonValidator.java (version 5909737aaef6ee76e7dfad88c9a007aa0629eda1)
  • api/src/test/java/org/openmrs/validator/PersonValidatorTest.java (version 5909737aaef6ee76e7dfad88c9a007aa0629eda1)
• 

  reubenvarghese1 <reubenvarghese1@gmail.com> 26 Feb 2017 299710d65bea9bf5dd49daed9eb7fc23b0f5f2f3 m

  TRUNK-4018 Initial Setup (installer) sits at 100% too long before actually finishing

  • web/src/main/resources/org/openmrs/web/filter/initialization/progress.vm (version 299710d65bea9bf5dd49daed9eb7fc23b0f5f2f3)