Build #291

Plan branch:

Build: #291 was successful Scheduled with changes by 6 people

Code commits

openmrs-core master

  • Daniel Kayiwa

    Daniel Kayiwa 2d21e297b35059a577f6e111614bbebef3505632

    Merge pull request #1098 from jbuczynski/TRUNK-3335
    TRUNK-3335 - Retired Provider Attribute Types should not be shown when adding/editing providers

  • Daniel Kayiwa

    Daniel Kayiwa 8354f51f9107162e68b58605339d29e83f5d03c4

    Merge pull request #1101 from jkondrat/TRUNK-2888
    TRUNK-2888 - Retired states should not appear on the patient dashboard

  • Daniel Kayiwa

    Daniel Kayiwa 6ec9f7359545cc413f560401396b276523b9584d

    Merge pull request #1102 from jkondrat/TRUNK-2030
    TRUNK-2030 - Changed the labels for retire and delete sections

  • Daniel Kayiwa

    Daniel Kayiwa 990fb0239e84297a10caa6ace0739ee11e7a74a9

    Merge pull request #1061 from vencik/upstream
    TRUNK-2136: proposed solution

  • Jakub Kondrat <jkondrat@soldevelo.com>

    Jakub Kondrat <jkondrat@soldevelo.com> 654057c5727b2e8a0a14643ec623a810f4f41ea0

    TRUNK-2030 - Changed the labels for retire and delete sections

    • webapp/src/main/webapp/WEB-INF/messages.properties (version 654057c5727b2e8a0a14643ec623a810f4f41ea0)
    • webapp/src/main/webapp/WEB-INF/view/admin/concepts/conceptSourceForm.jsp (version 654057c5727b2e8a0a14643ec623a810f4f41ea0)
  • Wyclif Luyima

    Wyclif Luyima 91146e1a93384c49543f93111a9ba359705fe3fd

    Move application level privileges from api to web subproject - TRUNK-3367

    • api/src/main/java/org/openmrs/util/OpenmrsClassScanner.java (version 91146e1a93384c49543f93111a9ba359705fe3fd)
    • api/src/main/java/org/openmrs/util/OpenmrsUtil.java (version 91146e1a93384c49543f93111a9ba359705fe3fd)
  • Daniel Kayiwa

    Daniel Kayiwa 94580cf28567503eac076feded6ed3851ee3d5bd

    Merge pull request #1095 from SharonVarghese/TRUNK-4467
    TRUNK-4467:HTML displayed when viewing Scheduled Tasks

  • Jakub Kondrat <jkondrat@soldevelo.com>

    Jakub Kondrat <jkondrat@soldevelo.com> 7a662fb31d05986e71a2899dcc4bcdee82c71c63

    TRUNK-2888 - Retired states should not appear on the patient dashboard

    • webapp/src/main/webapp/WEB-INF/view/portlets/patientPrograms.jsp (version 7a662fb31d05986e71a2899dcc4bcdee82c71c63)
  • jbuczynski <jbuczynski@soldevelo.com>

    jbuczynski <jbuczynski@soldevelo.com> 1fb1de0cd8008d64284da71f49d56c435f7d153b

    TRUNK-3335 - Retired Provider Attribute Types should not be shown when adding/editing providers

    • web/src/main/java/org/openmrs/web/controller/provider/ProviderFormController.java (version 1fb1de0cd8008d64284da71f49d56c435f7d153b)
    • webapp/src/main/webapp/WEB-INF/tags/attributesForType.tag (version 1fb1de0cd8008d64284da71f49d56c435f7d153b)
  • SharonVarghese <SharonVarghese@github.com>

    SharonVarghese <SharonVarghese@github.com> e144f640e1308d065282bc2b2cd01833cdeb57e8

    TRUNK-4467:HTML displayed when viewing Scheduled Tasks

    • webapp/src/main/webapp/WEB-INF/view/admin/scheduler/schedulerList.jsp (version e144f640e1308d065282bc2b2cd01833cdeb57e8)
  • vencik <vencik@razdva.cz>

    vencik <vencik@razdva.cz> 9fb5b017e698ea8831d3d8226c9cd974e48204c4

    TRUNK-2136: draft for pre-view
    org.openmrs.obs.ComplexObsHandler#getSupportedViews() and
    org.openmrs.obs.ComplexObsHandler#supportsView() introduced
    and implemented in existing handlers.
    5 suggested views defined in ComplexObsHandler interface.

    TRUNK-2136: merge & cleanup of 2nd round commit

    TRUNK-2136: draft for pre-view

    org.openmrs.obs.ComplexObsHandler#getSupportedViews() and
    org.openmrs.obs.ComplexObsHandler#supportsView() introduced
    and implemented in existing handlers.
    5 suggested views defined in ComplexObsHandler interface.

    TRUNK-2136: merge & cleanup of 2nd round commit

    TRUNK-2136: draft for pre-view

    org.openmrs.obs.ComplexObsHandler#getSupportedViews() and
    org.openmrs.obs.ComplexObsHandler#supportsView() introduced
    and implemented in existing handlers.
    5 suggested views defined in ComplexObsHandler interface.

    TRUNK-2136: merge & cleanup of 2nd round commit

    TRUNK-2136: draft for pre-view

    org.openmrs.obs.ComplexObsHandler#getSupportedViews() and
    org.openmrs.obs.ComplexObsHandler#supportsView() introduced
    and implemented in existing handlers.
    5 suggested views defined in ComplexObsHandler interface.

    TRUNK-2136: merge & cleanup of 2nd round commit

    TRUNK-2136: draft for pre-view

    org.openmrs.obs.ComplexObsHandler#getSupportedViews() and
    org.openmrs.obs.ComplexObsHandler#supportsView() introduced
    and implemented in existing handlers.
    5 suggested views defined in ComplexObsHandler interface.

    TRUNK-2136: merge & cleanup of 2nd round commit

    TRUNK-2136: draft for pre-view

    org.openmrs.obs.ComplexObsHandler#getSupportedViews() and
    org.openmrs.obs.ComplexObsHandler#supportsView() introduced
    and implemented in existing handlers.
    5 suggested views defined in ComplexObsHandler interface.

    TRUNK-2136: merge & cleanup of 2nd round commit

    TRUNK-2136: draft for pre-view

    org.openmrs.obs.ComplexObsHandler#getSupportedViews() and
    org.openmrs.obs.ComplexObsHandler#supportsView() introduced
    and implemented in existing handlers.
    5 suggested views defined in ComplexObsHandler interface.

    TRUNK-2136: merge & cleanup of 2nd round commit

    TRUNK-2136: draft for pre-view

    org.openmrs.obs.ComplexObsHandler#getSupportedViews() and
    org.openmrs.obs.ComplexObsHandler#supportsView() introduced
    and implemented in existing handlers.
    5 suggested views defined in ComplexObsHandler interface.

    TRUNK-2136: merge & cleanup of 2nd round commit

    TRUNK-2136: merge & cleanup of 2nd round commit

    TRUNK-2136: draft for pre-view

    org.openmrs.obs.ComplexObsHandler#getSupportedViews() and
    org.openmrs.obs.ComplexObsHandler#supportsView() introduced
    and implemented in existing handlers.
    5 suggested views defined in ComplexObsHandler interface.

    TRUNK-2136: merge & cleanup of 2nd round commit

    CRLF line terminators for a few files

    (To keep the file conventions.)

    TRUNK-2136: supported views

    Changes based on this discussion:
    https://talk.openmrs.org/t/what-views-should-be-suggested-by-the-complexobshandler-interface/416

    TRUNK-2136: draft for pre-view

    org.openmrs.obs.ComplexObsHandler#getSupportedViews() and
    org.openmrs.obs.ComplexObsHandler#supportsView() introduced
    and implemented in existing handlers.
    5 suggested views defined in ComplexObsHandler interface.

    TRUNK-2136: merge & cleanup of 2nd round commit

    TRUNK-2136: draft for pre-view

    org.openmrs.obs.ComplexObsHandler#getSupportedViews() and
    org.openmrs.obs.ComplexObsHandler#supportsView() introduced
    and implemented in existing handlers.
    5 suggested views defined in ComplexObsHandler interface.

    TRUNK-2136: merge & cleanup of 2nd round commit

    TRUNK-2136: draft for pre-view

    org.openmrs.obs.ComplexObsHandler#getSupportedViews() and
    org.openmrs.obs.ComplexObsHandler#supportsView() introduced
    and implemented in existing handlers.
    5 suggested views defined in ComplexObsHandler interface.

    TRUNK-2136: merge & cleanup of 2nd round commit

    TRUNK-2136: draft for pre-view

    org.openmrs.obs.ComplexObsHandler#getSupportedViews() and
    org.openmrs.obs.ComplexObsHandler#supportsView() introduced
    and implemented in existing handlers.
    5 suggested views defined in ComplexObsHandler interface.

    TRUNK-2136: merge & cleanup of 2nd round commit

    TRUNK-2136: draft for pre-view

    org.openmrs.obs.ComplexObsHandler#getSupportedViews() and
    org.openmrs.obs.ComplexObsHandler#supportsView() introduced
    and implemented in existing handlers.
    5 suggested views defined in ComplexObsHandler interface.

    TRUNK-2136: merge & cleanup of 2nd round commit

    TRUNK-2136: draft for pre-view

    org.openmrs.obs.ComplexObsHandler#getSupportedViews() and
    org.openmrs.obs.ComplexObsHandler#supportsView() introduced
    and implemented in existing handlers.
    5 suggested views defined in ComplexObsHandler interface.

    TRUNK-2136: merge & cleanup of 2nd round commit

    TRUNK-2136: draft for pre-view

    org.openmrs.obs.ComplexObsHandler#getSupportedViews() and
    org.openmrs.obs.ComplexObsHandler#supportsView() introduced
    and implemented in existing handlers.
    5 suggested views defined in ComplexObsHandler interface.

    TRUNK-2136: merge & cleanup of 2nd round commit

    TRUNK-2136: draft for pre-view

    org.openmrs.obs.ComplexObsHandler#getSupportedViews() and
    org.openmrs.obs.ComplexObsHandler#supportsView() introduced
    and implemented in existing handlers.
    5 suggested views defined in ComplexObsHandler interface.

    TRUNK-2136: merge & cleanup of 2nd round commit

    TRUNK-2136: merge & cleanup of 2nd round commit

    TRUNK-2136: draft for pre-view

    org.openmrs.obs.ComplexObsHandler#getSupportedViews() and
    org.openmrs.obs.ComplexObsHandler#supportsView() introduced
    and implemented in existing handlers.
    5 suggested views defined in ComplexObsHandler interface.

    TRUNK-2136: merge & cleanup of 2nd round commit

    CRLF line terminators for a few files

    (To keep the file conventions.)

    TRUNK-2136: supported views

    Changes based on this discussion:
    https://talk.openmrs.org/t/what-views-should-be-suggested-by-the-complexobshandler-interface/416

    TRUNK-2136: draft for pre-view

    org.openmrs.obs.ComplexObsHandler#getSupportedViews() and
    org.openmrs.obs.ComplexObsHandler#supportsView() introduced
    and implemented in existing handlers.
    5 suggested views defined in ComplexObsHandler interface.

    TRUNK-2136: merge & cleanup of 2nd round commit

    TRUNK-2136: draft for pre-view

    org.openmrs.obs.ComplexObsHandler#getSupportedViews() and
    org.openmrs.obs.ComplexObsHandler#supportsView() introduced
    and implemented in existing handlers.
    5 suggested views defined in ComplexObsHandler interface.

    TRUNK-2136: merge & cleanup of 2nd round commit

    TRUNK-2136: supported views

    Changes based on this discussion:
    https://talk.openmrs.org/t/what-views-should-be-suggested-by-the-complexobshandler-interface/416

    TRUNK-2136: supported views

    Changes based on this discussion:
    https://talk.openmrs.org/t/what-views-should-be-suggested-by-the-complexobshandler-interface/416

    • api/src/main/java/org/openmrs/api/ObsService.java (version 9fb5b017e698ea8831d3d8226c9cd974e48204c4)
    • api/src/main/java/org/openmrs/api/impl/ObsServiceImpl.java (version 9fb5b017e698ea8831d3d8226c9cd974e48204c4)
    • api/src/main/java/org/openmrs/obs/ComplexData.java (version 9fb5b017e698ea8831d3d8226c9cd974e48204c4)
    • api/src/main/java/org/openmrs/obs/ComplexObsHandler.java (version 9fb5b017e698ea8831d3d8226c9cd974e48204c4)
    • api/src/main/java/org/openmrs/obs/handler/AbstractHandler.java (version 9fb5b017e698ea8831d3d8226c9cd974e48204c4)
    • api/src/main/java/org/openmrs/obs/handler/BinaryDataHandler.java (version 9fb5b017e698ea8831d3d8226c9cd974e48204c4)
    • api/src/main/java/org/openmrs/obs/handler/BinaryStreamHandler.java (version 9fb5b017e698ea8831d3d8226c9cd974e48204c4)
    • api/src/main/java/org/openmrs/obs/handler/ImageHandler.java (version 9fb5b017e698ea8831d3d8226c9cd974e48204c4)
    • api/src/main/java/org/openmrs/obs/handler/TextHandler.java (version 9fb5b017e698ea8831d3d8226c9cd974e48204c4)
    • api/src/main/java/org/openmrs/util/OpenmrsConstants.java (version 9fb5b017e698ea8831d3d8226c9cd974e48204c4)
    • api/src/test/java/org/openmrs/api/FormServiceTest.java (version 9fb5b017e698ea8831d3d8226c9cd974e48204c4)
    • api/src/test/java/org/openmrs/api/ObsServiceTest.java (version 9fb5b017e698ea8831d3d8226c9cd974e48204c4)
    • api/src/test/java/org/openmrs/hl7/handler/ORUR01HandlerTest.java (version 9fb5b017e698ea8831d3d8226c9cd974e48204c4)
    • web/src/main/java/org/openmrs/web/WebConstants.java (version 9fb5b017e698ea8831d3d8226c9cd974e48204c4)
    • web/src/main/java/org/openmrs/web/controller/observation/ObsFormController.java (version 9fb5b017e698ea8831d3d8226c9cd974e48204c4)
    • web/src/main/java/org/openmrs/web/controller/observation/handler/WebBinaryDataHandler.java (version 9fb5b017e698ea8831d3d8226c9cd974e48204c4)
    • web/src/main/java/org/openmrs/web/controller/observation/handler/WebBinaryStreamHandler.java (version 9fb5b017e698ea8831d3d8226c9cd974e48204c4)
    • web/src/main/java/org/openmrs/web/controller/observation/handler/WebHandlerUtils.java (version 9fb5b017e698ea8831d3d8226c9cd974e48204c4)
    • web/src/main/java/org/openmrs/web/controller/observation/handler/WebImageHandler.java (version 9fb5b017e698ea8831d3d8226c9cd974e48204c4)
    • web/src/main/java/org/openmrs/web/controller/observation/handler/WebTextHandler.java (version 9fb5b017e698ea8831d3d8226c9cd974e48204c4)
    • web/src/main/java/org/openmrs/web/servlet/ComplexObsServlet.java (version 9fb5b017e698ea8831d3d8226c9cd974e48204c4)
    • web/src/main/resources/openmrs-servlet.xml (version 9fb5b017e698ea8831d3d8226c9cd974e48204c4)
    • webapp/src/main/webapp/WEB-INF/messages.properties (version 9fb5b017e698ea8831d3d8226c9cd974e48204c4)
    • webapp/src/main/webapp/WEB-INF/view/admin/observations/obsForm.jsp (version 9fb5b017e698ea8831d3d8226c9cd974e48204c4)