openmrs-core master

• 

  Daniel Kayiwa 26 May 2014 e92f9579b72bebeba430bdeebc080ba278884be4

  Merge pull request #909 from rpuzdrowski/TRUNK-4004
  TRUNK-4004: Module should be able to say it needs to start before another module
• 

  Daniel Kayiwa 26 May 2014 f8d17ccc6d9a6ac809fbb70725bde1c03c9f20c0

  Doing some file formatting

  • api/src/test/java/org/openmrs/scheduler/SchedulerServiceTest.java (version f8d17ccc6d9a6ac809fbb70725bde1c03c9f20c0)
• 

  Daniel Kayiwa 26 May 2014 794456e6c4a74bf761e2cd9649daf881dc122a55

  Merge pull request #921 from lluismf/TRUNK-4323
  Retired location attributes should not be shown when viewing location hierarchy; they should be marked as retired in the tree view
• 

  Daniel Kayiwa 26 May 2014 66db25dde021274aeefc90d2a525b41016dbf3a3

  Merge pull request #922 from harsha89/TRUNK-4314
  Set defulat as String in to solve empty Format of the Person Attirbute Type TRUNK-4314
• 

  harsha89 <harsz89@gmail.com> 26 May 2014 038aa1c853fbeb82696377a4e7a02edfddcf94f0

  Set defulat as String in to solve empty Format of the Person Attirbute Type TRUNK-4314

  • api/src/main/java/org/openmrs/validator/PersonAttributeTypeValidator.java (version 038aa1c853fbeb82696377a4e7a02edfddcf94f0)
  • api/src/test/java/org/openmrs/api/PersonServiceTest.java (version 038aa1c853fbeb82696377a4e7a02edfddcf94f0)
  • api/src/test/java/org/openmrs/validator/PersonAttributeTypeValidatorTest.java (version 038aa1c853fbeb82696377a4e7a02edfddcf94f0)
  • webapp/src/main/webapp/WEB-INF/messages.properties (version 038aa1c853fbeb82696377a4e7a02edfddcf94f0)
  • webapp/src/main/webapp/WEB-INF/view/admin/person/personAttributeTypeForm.jsp (version 038aa1c853fbeb82696377a4e7a02edfddcf94f0)
• 

  Daniel Kayiwa 26 May 2014 32f2ab602a7799d29199ef92e0d716da8078ee8b

  Merge pull request #919 from harsha89/TRUNK-2448
  Add ability to view uuids to most objects TRUNK-2448
• 

  Daniel Kayiwa 26 May 2014 c588af5eddc2c565a6459e9a5c54926a81073fbb

  Merge pull request #920 from atmohsin/TRUNK-4360
  TRUNK-4360: set the htmlEscape to false
• 

  lluis <lluis@grign-PC> 25 May 2014 4dd545bba33bce01ad4195a8f9d8fd6097eea2b7

  Retired location attributes should not be shown when viewing location hierarchy; they should be marked as retired in the tree view

  • web/src/main/java/org/openmrs/web/controller/query/LocationQueryController.java (version 4dd545bba33bce01ad4195a8f9d8fd6097eea2b7)
• 

  atmohsin <atmohsin@gmail.com> 24 May 2014 b705aa930b9f3038b5124a694f60519659f4031d

  TRUNK-4360: set the htmlEscape to false

  • webapp/src/main/webapp/WEB-INF/view/help.jsp (version b705aa930b9f3038b5124a694f60519659f4031d)
• 

  harsha89 <harsz89@gmail.com> 24 May 2014 6c7cbbaa44367186c702371653f2f105c0541dcc

  Add ability to view uuids to most objects TRUNK-2448

  • webapp/src/main/webapp/WEB-INF/view/admin/concepts/conceptReferenceTermForm.jsp (version 6c7cbbaa44367186c702371653f2f105c0541dcc)
  • webapp/src/main/webapp/WEB-INF/view/admin/visits/visitAttributeTypeForm.jsp (version 6c7cbbaa44367186c702371653f2f105c0541dcc)
• 

  Radek Puzdrowski <radoslaw.puzdrowski@gmail.com> 23 May 2014 359a907a786eca5d08c39921441f222d3989817a

  TRUNK-4004: Module should be able to say it needs to start before another module
  TRUNK-4004: Module should be able to say it needs to start before another module

  • api/src/main/java/org/openmrs/module/Module.java (version 359a907a786eca5d08c39921441f222d3989817a)
  • api/src/main/java/org/openmrs/module/ModuleFactory.java (version 359a907a786eca5d08c39921441f222d3989817a)
  • api/src/main/java/org/openmrs/module/ModuleFileParser.java (version 359a907a786eca5d08c39921441f222d3989817a)
  • api/src/test/java/org/openmrs/module/BaseModuleActivatorTest.java (version 359a907a786eca5d08c39921441f222d3989817a)
  • api/src/test/java/org/openmrs/module/ModuleActivatorTest.java (version 359a907a786eca5d08c39921441f222d3989817a)
  • api/src/test/resources/org/openmrs/module/include/test1-1.0-SNAPSHOT.omod (version 359a907a786eca5d08c39921441f222d3989817a)
  • api/src/test/resources/org/openmrs/module/include/test4-1.0-SNAPSHOT.omod (version 359a907a786eca5d08c39921441f222d3989817a)
  • api/src/test/resources/org/openmrs/module/include/test4-update.rdf (version 359a907a786eca5d08c39921441f222d3989817a)
  • api/src/test/resources/org/openmrs/module/include/test5-1.0-SNAPSHOT.omod (version 359a907a786eca5d08c39921441f222d3989817a)
  • api/src/test/resources/org/openmrs/module/include/test5-update.rdf (version 359a907a786eca5d08c39921441f222d3989817a)