OpenMRS

Timestamp:

07/16/08 12:29:31 (4 months ago)

Author:

bwolfe

Message:

Merging trunk to the 1.3.x branch (sideporting) to get bug fixes into an RC5 release [4745]:[4946]

Files:

• openmrs/branches/1.3.x/.project (modified) (view diffs)
• openmrs/branches/1.3.x/build.xml (modified) (view diffs)
• openmrs/branches/1.3.x/metadata/api/log4j/log4j.xml (modified) (view diffs)
• openmrs/branches/1.3.x/metadata/model/1.3.0-schema-only.sql (modified) (view diffs)
• openmrs/branches/1.3.x/metadata/model/update-to-latest-db.mysqldiff.sql (modified) (view diffs)
• openmrs/branches/1.3.x/metadata/model/util/update-scripts-to-latest.sh (modified) (view diffs)
• openmrs/branches/1.3.x/src/api/org/openmrs/Person.java (modified) (view diffs)
• openmrs/branches/1.3.x/src/api/org/openmrs/api/EncounterService.java (modified) (view diffs)
• openmrs/branches/1.3.x/src/api/org/openmrs/api/PersonService.java (modified) (view diffs)
• openmrs/branches/1.3.x/src/api/org/openmrs/api/db/EncounterDAO.java (modified) (view diffs)
• openmrs/branches/1.3.x/src/api/org/openmrs/api/db/PersonDAO.java (modified) (view diffs)
• openmrs/branches/1.3.x/src/api/org/openmrs/api/db/hibernate/HibernateContextDAO.java (modified) (view diffs)
• openmrs/branches/1.3.x/src/api/org/openmrs/api/db/hibernate/HibernateEncounterDAO.java (modified) (view diffs)
• openmrs/branches/1.3.x/src/api/org/openmrs/api/db/hibernate/HibernatePersonDAO.java (modified) (view diffs)
• openmrs/branches/1.3.x/src/api/org/openmrs/api/impl/ConceptServiceImpl.java (modified) (view diffs)
• openmrs/branches/1.3.x/src/api/org/openmrs/api/impl/EncounterServiceImpl.java (modified) (view diffs)
• openmrs/branches/1.3.x/src/api/org/openmrs/api/impl/PatientServiceImpl.java (modified) (view diffs)
• openmrs/branches/1.3.x/src/api/org/openmrs/api/impl/PersonServiceImpl.java (modified) (view diffs)
• openmrs/branches/1.3.x/src/api/org/openmrs/api/impl/ProgramWorkflowServiceImpl.java (modified) (view diffs)
• openmrs/branches/1.3.x/src/api/org/openmrs/reporting/export/DataExportFunctions.java (modified) (view diffs)
• openmrs/branches/1.3.x/src/api/org/openmrs/util/OpenmrsConstants.java (modified) (view diffs)
• openmrs/branches/1.3.x/src/web/org/openmrs/web/controller/RegimenPortletController.java (modified) (view diffs)
• openmrs/branches/1.3.x/src/web/org/openmrs/web/controller/patient/NewPatientFormController.java (modified) (view diffs)
• openmrs/branches/1.3.x/src/web/org/openmrs/web/dwr/DWRRelationshipService.java (modified) (view diffs)
• openmrs/branches/1.3.x/src/web/org/openmrs/web/dwr/DrugOrderListItem.java (modified) (view diffs)
• openmrs/branches/1.3.x/test/api/org/openmrs/test/api/PersonServiceTest.java (modified) (view diffs)
• openmrs/branches/1.3.x/web/WEB-INF/tags/personField.tag (modified) (view diffs)
• openmrs/branches/1.3.x/web/WEB-INF/view/admin/encounters/encounterForm.jsp (modified) (view diffs)
• openmrs/branches/1.3.x/web/WEB-INF/view/portlets/patientHeader.jsp (modified) (view diffs)
• openmrs/branches/1.3.x/web/WEB-INF/view/portlets/patientRegimenCompleted.jsp (modified) (view diffs)
• openmrs/branches/1.3.x/web/WEB-INF/view/portlets/patientRegimenCurrent.jsp (modified) (view diffs)
• openmrs/branches/1.3.x/web/WEB-INF/view/portlets/personRelationships.jsp (modified) (view diffs)
• openmrs/branches/1.3.x/web/scripts/drugOrder.js.withjstl (modified) (view diffs)