Build #299

Plan branch:

Build: #299 was successful Scheduled with changes by 4 people

Code commits

openmrs-core master

  • Wyclif Luyima

    Wyclif Luyima a8047ad3abc15d9b885dcefb2698620ee3a9c281

    Beautified the html in the search widgets - TRUNK-3833

    • webapp/src/main/webapp/WEB-INF/view/scripts/jquery-ui/js/openmrsSearch.js (version a8047ad3abc15d9b885dcefb2698620ee3a9c281)
  • Wyclif Luyima

    Wyclif Luyima a08d63322e92a77d2787e56c4488428c3f9c1995

    Edited the search widget to sanitize the html for page info before displaying it - TRUNK-3940

    • web/src/main/java/org/openmrs/web/dwr/DWRConceptService.java (version a08d63322e92a77d2787e56c4488428c3f9c1995)
    • webapp/src/main/webapp/WEB-INF/template/headerFull.jsp (version a08d63322e92a77d2787e56c4488428c3f9c1995)
    • webapp/src/main/webapp/WEB-INF/template/headerMinimal.jsp (version a08d63322e92a77d2787e56c4488428c3f9c1995)
    • webapp/src/main/webapp/WEB-INF/view/scripts/html-sanitizer-min.js (version a08d63322e92a77d2787e56c4488428c3f9c1995)
    • webapp/src/main/webapp/WEB-INF/view/scripts/jquery-ui/js/openmrsSearch.js (version a08d63322e92a77d2787e56c4488428c3f9c1995)
    • webapp/src/main/webapp/openmrs.js (version a08d63322e92a77d2787e56c4488428c3f9c1995)
  • Wyclif Luyima

    Wyclif Luyima b9efb3c0af627bd4131a4a6719ed132ea0d2cc1f

    Reverted changes in openmrsSearch made in the fix for TRUNK-3833

    • webapp/src/main/webapp/WEB-INF/view/scripts/jquery-ui/js/openmrsSearch.js (version b9efb3c0af627bd4131a4a6719ed132ea0d2cc1f)
  • Daniel Kayiwa

    Daniel Kayiwa f9b9664e4eb226ae5526ef69c8589c969fa399f3

    Merge pull request #1071 from harsha89/TRUNK-4293-additional
    revert changes to allow multiple identifiers with same identifier types TRUNK-4293

  • harsha89 <harsz89@gmail.com>

    harsha89 <harsz89@gmail.com> 33b173009f2b55679db3f08974b2891b9a4a7c5c

    added warning for short patient form and patient form

    • webapp/src/main/webapp/WEB-INF/messages.properties (version 33b173009f2b55679db3f08974b2891b9a4a7c5c)
    • webapp/src/main/webapp/WEB-INF/view/admin/patients/include/editPatientIdentifier.jsp (version 33b173009f2b55679db3f08974b2891b9a4a7c5c)
    • webapp/src/main/webapp/WEB-INF/view/admin/patients/patientForm.jsp (version 33b173009f2b55679db3f08974b2891b9a4a7c5c)
    • webapp/src/main/webapp/WEB-INF/view/admin/patients/shortPatientForm.jsp (version 33b173009f2b55679db3f08974b2891b9a4a7c5c)
  • Daniel Kayiwa

    Daniel Kayiwa 807501a66ebc63596a918a457f2e9a0b7938d04f

    Merge pull request #1125 from jbuczynski/TRUNK-3856
    TRUNK-3856 More indentation on location hierarchy simple widget

  • jbuczynski <jbuczynski@soldevelo.com>

    jbuczynski <jbuczynski@soldevelo.com> 6a6c767c9a20a716cbb440ea66bd79a807a4adcb

    TRUNK-3856 More indentation on location hierarchy simple widget

    • webapp/src/main/webapp/WEB-INF/tags/locationField.tag (version 6a6c767c9a20a716cbb440ea66bd79a807a4adcb)
  • harsha89 <harsz89@gmail.com>

    harsha89 <harsz89@gmail.com> 7924ae0b4e9f693e5877e12fce02b854c478c91d

    revert changes to allow multiple identifiers with same identifier types TRUNK-4293

    • api/src/main/java/org/openmrs/validator/PatientIdentifierValidator.java (version 7924ae0b4e9f693e5877e12fce02b854c478c91d)
    • api/src/main/java/org/openmrs/validator/PatientValidator.java (version 7924ae0b4e9f693e5877e12fce02b854c478c91d)
    • api/src/test/java/org/openmrs/validator/PatientValidatorTest.java (version 7924ae0b4e9f693e5877e12fce02b854c478c91d)
    • web/src/main/java/org/openmrs/web/controller/patient/ShortPatientFormValidator.java (version 7924ae0b4e9f693e5877e12fce02b854c478c91d)
    • web/src/test/java/org/openmrs/web/controller/patient/ShortPatientFormValidatorTest.java (version 7924ae0b4e9f693e5877e12fce02b854c478c91d)