Build #166

Plan branch:
Sonar metrics for OpenMRS Core Master

Build: #166 failed Manual run by OpenMRS Administrator

Code commits

Showing 96 of 4,206 code changes

Git

  • Wyclif Luyima

    Wyclif Luyima 991bed4169a047f7d2f4203f5813039ce8780742

    Added @Transaction annotation to ProviderServiceImpl.getUnknownProvider() to make it read only - TRUNK-4402

    • api/src/main/java/org/openmrs/api/impl/ProviderServiceImpl.java (version 991bed4169a047f7d2f4203f5813039ce8780742)
  • Daniel Kayiwa

    Daniel Kayiwa 28eacef7a2eb603cb0d0e93690ae51849a24a3e2

    Merge pull request #969 from rpuzdrowski/TRUNK-4260
    TRUNK-4260: Error while submitting empty form in the page: openmrs/admin/concepts/conceptSource.form

  • Daniel Kayiwa

    Daniel Kayiwa 31b54245a0211aea1d2c6707ebd89fd515b71297

    Merge pull request #971 from vencik/master
    TRUNK-3625: Fixed web image handler

  • Wyclif Luyima

    Wyclif Luyima a64a372fc4ccf2921d47f17e566da8f0725b6464

    Changed upgrade scripts to look up unknown provider by a global property and not name, also added ProviderService.getUnknownProvider - TRUNK-4402

    • api/src/main/java/org/openmrs/api/ProviderService.java (version a64a372fc4ccf2921d47f17e566da8f0725b6464)
    • api/src/main/java/org/openmrs/api/impl/ProviderServiceImpl.java (version a64a372fc4ccf2921d47f17e566da8f0725b6464)
    • api/src/main/java/org/openmrs/util/OpenmrsConstants.java (version a64a372fc4ccf2921d47f17e566da8f0725b6464)
    • api/src/main/java/org/openmrs/util/databasechange/ConvertOrderersToProviders.java (version a64a372fc4ccf2921d47f17e566da8f0725b6464)
    • api/src/main/resources/liquibase-update-to-latest.xml (version a64a372fc4ccf2921d47f17e566da8f0725b6464)
    • api/src/test/java/org/openmrs/api/ProviderServiceTest.java (version a64a372fc4ccf2921d47f17e566da8f0725b6464)
    • api/src/test/java/org/openmrs/util/databasechange/Database1_9_7UpgradeTest.java (version a64a372fc4ccf2921d47f17e566da8f0725b6464)
    • api/src/test/resources/org/openmrs/util/databasechange/standardTest-1.9.7-dataSet.xml (version a64a372fc4ccf2921d47f17e566da8f0725b6464)
  • Wyclif Luyima

    Wyclif Luyima a4aacf4b4fea4e463ca5159ddd572c17587b6902

    Follow to undo stray edit - TRUNK-4400

    • api/src/main/java/org/openmrs/util/PrivilegeConstants.java (version a4aacf4b4fea4e463ca5159ddd572c17587b6902)
  • Wyclif Luyima

    Wyclif Luyima 420feb379e3a3bf0b95d2983ba57cd12e352918b

    Follow to rename the actual privilege names to match the constant names - TRUNK-4400

    • api/src/main/java/org/openmrs/util/PrivilegeConstants.java (version 420feb379e3a3bf0b95d2983ba57cd12e352918b)
  • Wyclif Luyima

    Wyclif Luyima 53a24d9d6626bac2a79c7cf352888f30257d959d

    Rename view privileges in OrderService TRUNK-4400
    Follow up to rename VIEW privileges for order frequency and care setting to GET - TRUNK-4400

    Follow up to add missing privileges and fix invalid ones - TRUNK-4400

    • api/src/main/java/org/openmrs/api/ConceptService.java (version 53a24d9d6626bac2a79c7cf352888f30257d959d)
    • api/src/main/java/org/openmrs/api/OrderService.java (version 53a24d9d6626bac2a79c7cf352888f30257d959d)
    • api/src/main/java/org/openmrs/util/PrivilegeConstants.java (version 53a24d9d6626bac2a79c7cf352888f30257d959d)
  • Wyclif Luyima

    Wyclif Luyima ae9883c9c74bbe002d167557b852e12fed085019

    Upgrade should fail if there are discontinued orders with null discontinued_date or discontinued_by values - TRUNK-4401

    • api/src/main/resources/liquibase-update-to-latest.xml (version ae9883c9c74bbe002d167557b852e12fed085019)
  • Wyclif Luyima

    Wyclif Luyima b0e54b8c4d8f8a58d987bdf7bdcae3ef56c84469

    Hibernate queries in HibernatePatientSetDAO should use new order entry fields TRUNK-4407

    • api/src/main/java/org/openmrs/api/db/hibernate/HibernatePatientSetDAO.java (version b0e54b8c4d8f8a58d987bdf7bdcae3ef56c84469)
  • Wyclif Luyima

    Wyclif Luyima 1a563248f395acf626db68039f3e91d9fdc2e238

    Add a setDosing method to DrugOrder that takes a DosingInstruction type TRUNK-4388
    Applied auto format changes - TRUNK-4388

    • api/src/main/java/org/openmrs/DosingInstructions.java (version 1a563248f395acf626db68039f3e91d9fdc2e238)
    • api/src/main/java/org/openmrs/DrugOrder.java (version 1a563248f395acf626db68039f3e91d9fdc2e238)
    • api/src/main/java/org/openmrs/FreeTextDosingInstructions.java (version 1a563248f395acf626db68039f3e91d9fdc2e238)
    • api/src/main/java/org/openmrs/SimpleDosingInstructions.java (version 1a563248f395acf626db68039f3e91d9fdc2e238)
  • Wyclif Luyima

    Wyclif Luyima dcbf02a3a0e64ba6288251b8d3d08b20c99d1b3d

    Fixed failing unit test - TRUNK-4402

    • api/src/test/java/org/openmrs/util/databasechange/Database1_9_7UpgradeTest.java (version dcbf02a3a0e64ba6288251b8d3d08b20c99d1b3d)
  • Wyclif Luyima

    Wyclif Luyima 4acea48aa97ccad2e6482f484c9c4cb97d42f2b7

    Follow up to fix liquibase changeset comment - TRUNK-4402

    • api/src/main/resources/liquibase-update-to-latest.xml (version 4acea48aa97ccad2e6482f484c9c4cb97d42f2b7)
  • vencik <vencik@razdva.cz>

    vencik <vencik@razdva.cz> 3050ef692469f2e606ae5dafa2cfd1de25883b14

    TRUNK-3625: Fixed web image handler
    org.openmrs.web.controller.observation.handler.WebImageHandler#getObs
    must pass valid java.util.Locale object to org.openmrs.Obs#getValueAsString.
    Locale is now obtained from Context.

    See TRUNK-3625">https://issues.openmrs.org/browse/TRUNK-3625

    • web/src/main/java/org/openmrs/web/controller/observation/handler/WebImageHandler.java (version 3050ef692469f2e606ae5dafa2cfd1de25883b14)
  • Rafal Korytkowski

    Rafal Korytkowski 2fefe9576c8a5fb60fa92e1ad36f9d6aeafe3333

    TRUNK-4403 Blank drug order frequencies and dosing units should be converted to null during upgrade

    • api/src/main/java/org/openmrs/util/databasechange/CheckDrugOrderUnitAndFrequencyTextNotMappedToConcepts.java (version 2fefe9576c8a5fb60fa92e1ad36f9d6aeafe3333)
    • api/src/main/java/org/openmrs/util/databasechange/CreateCodedOrderFrequencyForDrugOrderFrequencyChangeset.java (version 2fefe9576c8a5fb60fa92e1ad36f9d6aeafe3333)
    • api/src/main/java/org/openmrs/util/databasechange/MigrateDrugOrderFrequencyToCodedOrderFrequencyChangeset.java (version 2fefe9576c8a5fb60fa92e1ad36f9d6aeafe3333)
    • api/src/main/java/org/openmrs/util/databasechange/MigrateDrugOrderUnitsToCodedDoseUnitsChangeset.java (version 2fefe9576c8a5fb60fa92e1ad36f9d6aeafe3333)
    • api/src/test/java/org/openmrs/util/databasechange/Database1_9_7UpgradeTest.java (version 2fefe9576c8a5fb60fa92e1ad36f9d6aeafe3333)
    • api/src/test/java/org/openmrs/util/databasechange/DatabaseUpgradeTestUtil.java (version 2fefe9576c8a5fb60fa92e1ad36f9d6aeafe3333)
    • api/src/test/resources/org/openmrs/util/databasechange/UpgradeTest-orderWithBlankUnitsOrFrequency.xml (version 2fefe9576c8a5fb60fa92e1ad36f9d6aeafe3333)
  • Radek Puzdrowski <radoslaw.puzdrowski@gmail.com>

    Radek Puzdrowski <radoslaw.puzdrowski@gmail.com> 720103a929963c999625effab7d2de43a1b6465f

    TRUNK-4260: Error while submitting empty form in the page: openmrs/admin/concepts/conceptSource.form

    • api/src/main/java/org/openmrs/validator/ConceptSourceValidator.java (version 720103a929963c999625effab7d2de43a1b6465f)
    • api/src/main/resources/applicationContext-service.xml (version 720103a929963c999625effab7d2de43a1b6465f)
    • api/src/test/java/org/openmrs/validator/ConceptSourceValidatorTest.java (version 720103a929963c999625effab7d2de43a1b6465f)
    • web/src/main/resources/openmrs-servlet.xml (version 720103a929963c999625effab7d2de43a1b6465f)
    • webapp/src/main/webapp/WEB-INF/view/admin/concepts/conceptSourceForm.jsp (version 720103a929963c999625effab7d2de43a1b6465f)
  • Daniel Kayiwa

    Daniel Kayiwa c4e351cd2f1b24951e93d0ee7bfe73cf5768a8db

    Patient dashboard issue when using french locale - TRUNK-4251

    • webapp/src/main/webapp/WEB-INF/view/portlets/patientVisits.jsp (version c4e351cd2f1b24951e93d0ee7bfe73cf5768a8db)
  • Wyclif Luyima

    Wyclif Luyima 310c1012e8b5d0fa043d3ec248cb9b3fc958e404

    Upgrade to 1.10 fails if there are orders with orderers that have no provider accounts - TRUNK-4402

    • api/src/main/java/org/openmrs/util/databasechange/ConvertOrderersToProviders.java (version 310c1012e8b5d0fa043d3ec248cb9b3fc958e404)
    • api/src/main/resources/liquibase-update-to-latest.xml (version 310c1012e8b5d0fa043d3ec248cb9b3fc958e404)
    • api/src/test/java/org/openmrs/util/databasechange/Database1_9_7UpgradeTest.java (version 310c1012e8b5d0fa043d3ec248cb9b3fc958e404)
    • api/src/test/resources/org/openmrs/util/databasechange/UpgradeTest-convertOrdererToProvider.xml (version 310c1012e8b5d0fa043d3ec248cb9b3fc958e404)
    • api/src/test/resources/org/openmrs/util/databasechange/UpgradeTest-orderWithOrdererThatIsNotAProvider.xml (version 310c1012e8b5d0fa043d3ec248cb9b3fc958e404)
    • api/src/test/resources/org/openmrs/util/databasechange/standardTest-1.9.7-dataSet.xml (version 310c1012e8b5d0fa043d3ec248cb9b3fc958e404)
  • Rafal Korytkowski

    Rafal Korytkowski c69384cc631ccc831484463556211658067de6bf

    Fixed formatting

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

    Daniel Kayiwa 23a18c6e806570e0db007a7feb20669313f906b3

    Merge pull request #961 from geoff-wasilwa/TRUNK-4315
    TRUNK-4315: Validate on client side (javascript)

  • geoff-wasilwa <geoffreywanjala@gmail.com>

    geoff-wasilwa <geoffreywanjala@gmail.com> a801800972e9ba6706ac1327863a776e106c78f3

    TRUNK-4315: Validate on client side (javascript)
    Decided to validate on client side because on server side calling provider.getName()
    when person is set will return person's full name and so it is not possible to tell if
    this was set on the client side.

    TRUNK-4315 - Removed commented out code

    TRUNK-4315 - Ammended method for checking whether person or provider name is provided

    TRUNK-4315: Added a span tag to hold error message from both client and server

    • api/src/main/java/org/openmrs/validator/ProviderValidator.java (version a801800972e9ba6706ac1327863a776e106c78f3)
    • api/src/test/java/org/openmrs/validator/ProviderValidatorTest.java (version a801800972e9ba6706ac1327863a776e106c78f3)
    • webapp/src/main/webapp/WEB-INF/messages.properties (version a801800972e9ba6706ac1327863a776e106c78f3)
    • webapp/src/main/webapp/WEB-INF/view/admin/provider/providerForm.jsp (version a801800972e9ba6706ac1327863a776e106c78f3)
  • Daniel Kayiwa

    Daniel Kayiwa d601e73032064e51ad487dac257cd7da1b685e99

    Merge pull request #963 from vencik/master
    TRUNK-4109: Get observations by accession number

  • vencik <vencik@razdva.cz>

    vencik <vencik@razdva.cz> 2859347d5280cab76fef6ed849f65d2ef93056c9

    TRUNK-4109: Get observations by accession number
    org.openmrs.api.ObsService#getObservations and
    org.openmrs.api.ObsService#getObservationCount are now overloaded to support
    specification of accession number.
    If specified, only observations (or their count) with matching accession
    number are returned.

    See TRUNK-4109">https://issues.openmrs.org/browse/TRUNK-4109

    Unit tests for org.openmrs.api.ObsService#getObservations and
    org.openmrs.api.ObsService#getObservationCount now use the new
    (and most general) methods.

    • api/src/main/java/org/openmrs/api/ObsService.java (version 2859347d5280cab76fef6ed849f65d2ef93056c9)
  • Wyclif Luyima

    Wyclif Luyima 2a25bd8759e216b3bb65f473a1f32dc2b0eb1bf7

    Fixed length of DrugOrder.dispenseAsWritten field in the hbm file - TRUNK-4379

    • api/src/main/resources/org/openmrs/api/db/hibernate/Order.hbm.xml (version 2a25bd8759e216b3bb65f473a1f32dc2b0eb1bf7)
  • Daniel Kayiwa

    Daniel Kayiwa 108a08a92cb99e75b72d4953e3144d6a0d52a746

    Merge pull request #960 from anotherdave/TRUNK-4380
    Fix TRUNK-4380 Location parent not displayed:

  • David Churcher <anotherdave@users.noreply.github.com>

    David Churcher <anotherdave@users.noreply.github.com> 2fe8f21b10964ccbf9486f71da9b24b7eb99ef58

    Fix TRUNK-4380 Location parent not displayed: OpenmrsMessageTag was ignoring the text attribute

    • api/src/main/java/org/openmrs/messagesource/impl/MessageSourceServiceImpl.java (version 2fe8f21b10964ccbf9486f71da9b24b7eb99ef58)
  • Daniel Kayiwa

    Daniel Kayiwa 9ead141cc76d890629e36544d883b6f9e196f944

    removing autogenerated file - trunk-4297

    • web/WEB-INF/dwr-modules.xml (version 9ead141cc76d890629e36544d883b6f9e196f944)
  • Daniel Kayiwa

    Daniel Kayiwa 2883290e0b38205f734c9a58748c7cbdf8be41b3

    Merge pull request #955 from ujjwalarora/TRUNK-4297
    Trunk-4297 : Invalid Error Message for Blank Password

  • Daniel Kayiwa

    Daniel Kayiwa f77d6da3ff3696468404e61adeefe4245899d3ba

    Merge pull request #952 from geoff-wasilwa/TRUNK-4338
    TRUNK-4338: Added "Manage Providers" privileges to prevent unauthorized access

  • Daniel Kayiwa

    Daniel Kayiwa d0177149170ec15f331d13fcaa91960c49e836b3

    Merge pull request #959 from vencik/master
    TRUNK-4109: Get observations by accession number

  • Daniel Kayiwa

    Daniel Kayiwa d79a166b8d0c8eeb57e4fdfdaa02e6e9ca691c6e

    Ignoring another dwr-modules.xml

    • .gitignore (version d79a166b8d0c8eeb57e4fdfdaa02e6e9ca691c6e)
  • vencik <vencik@razdva.cz>

    vencik <vencik@razdva.cz> 05e0e30c2ca912f544baa116e76f7acd07630c8d

    TRUNK-4109: Get observations by accession number
    org.openmrs.api.ObsService#getObservations and
    org.openmrs.api.ObsService#getObservationCount are now overloaded to support
    specification of accession number.
    If specified, only observations (or their count) with matching accession
    number are returned.

    See TRUNK-4109">https://issues.openmrs.org/browse/TRUNK-4109

    Unit tests for org.openmrs.api.ObsService#getObservations and
    org.openmrs.api.ObsService#getObservationCount now use the new
    (and most general) methods.

    • api/src/main/java/org/openmrs/api/ObsService.java (version 05e0e30c2ca912f544baa116e76f7acd07630c8d)
    • api/src/main/java/org/openmrs/api/db/ObsDAO.java (version 05e0e30c2ca912f544baa116e76f7acd07630c8d)
    • api/src/main/java/org/openmrs/api/db/hibernate/HibernateObsDAO.java (version 05e0e30c2ca912f544baa116e76f7acd07630c8d)
    • api/src/main/java/org/openmrs/api/impl/ObsServiceImpl.java (version 05e0e30c2ca912f544baa116e76f7acd07630c8d)
    • api/src/test/java/org/openmrs/api/ObsServiceTest.java (version 05e0e30c2ca912f544baa116e76f7acd07630c8d)
    • api/src/test/java/org/openmrs/api/db/hibernate/HibernateObsDAOTest.java (version 05e0e30c2ca912f544baa116e76f7acd07630c8d)
    • api/src/test/resources/org/openmrs/api/include/ObsServiceTest-initial.xml (version 05e0e30c2ca912f544baa116e76f7acd07630c8d)
  • Daniel Kayiwa

    Daniel Kayiwa acdc29bbcfb2fa3462a7a669d96ef385008f6a9b

    Cannot create runtime properties during first installation - TRUNK-4320

    • api/src/main/java/org/openmrs/util/OpenmrsUtil.java (version acdc29bbcfb2fa3462a7a669d96ef385008f6a9b)
  • ujjwalarora <ujjwalarora1992@gmail.com>

    ujjwalarora <ujjwalarora1992@gmail.com> 4ab8562b2b00567670b0c314282a8fa7e5e1ad5b

    trunk-4297

    • web/WEB-INF/dwr-modules.xml (version 4ab8562b2b00567670b0c314282a8fa7e5e1ad5b)
    • webapp/run.bat (version 4ab8562b2b00567670b0c314282a8fa7e5e1ad5b)
  • ujjwalarora <ujjwalarora1992@gmail.com>

    ujjwalarora <ujjwalarora1992@gmail.com> 4f6bc29cc8950d6382bf4d175d2acee8e3b9a445

    trunk-4297

    • web/src/main/java/org/openmrs/web/controller/user/UserFormController.java (version 4f6bc29cc8950d6382bf4d175d2acee8e3b9a445)
    • webapp/run.bat (version 4f6bc29cc8950d6382bf4d175d2acee8e3b9a445)
  • Wyclif Luyima

    Wyclif Luyima 8d7d25b284c25e86aa53d16ab9dd7a7c629dd3ac

    Deleted unused test dataset file

    • api/src/test/resources/org/openmrs/api/include/OrderServiceTest-drugOrdersList.xml (version 8d7d25b284c25e86aa53d16ab9dd7a7c629dd3ac)
  • Wyclif Luyima

    Wyclif Luyima eec722d09399e1b289d66d7b4f53fc4844ad2543

    Support for prescribing brand medicines - TRUNK-4379

    • api/src/main/java/org/openmrs/DrugOrder.java (version eec722d09399e1b289d66d7b4f53fc4844ad2543)
    • api/src/main/resources/liquibase-update-to-latest.xml (version eec722d09399e1b289d66d7b4f53fc4844ad2543)
    • api/src/main/resources/org/openmrs/api/db/hibernate/Order.hbm.xml (version eec722d09399e1b289d66d7b4f53fc4844ad2543)
    • api/src/test/resources/org/openmrs/api/include/OrderServiceTest-drugOrdersList.xml (version eec722d09399e1b289d66d7b4f53fc4844ad2543)
    • api/src/test/resources/org/openmrs/api/include/OrderServiceTest-reviseDiscontinuedOrders.xml (version eec722d09399e1b289d66d7b4f53fc4844ad2543)
    • api/src/test/resources/org/openmrs/include/standardTestDataset.xml (version eec722d09399e1b289d66d7b4f53fc4844ad2543)
    • api/src/test/resources/org/openmrs/reporting/include/PatientFilterTest.xml (version eec722d09399e1b289d66d7b4f53fc4844ad2543)
  • Wyclif Luyima

    Wyclif Luyima 8aad02f327b69e08ca0063c0041935a1279180d0

    Remove changeset that adds lab test order type - TRUNK-4409

    • api/src/main/resources/liquibase-core-data.xml (version 8aad02f327b69e08ca0063c0041935a1279180d0)
  • ujjwalarora <ujjwalarora1992@gmail.com>

    ujjwalarora <ujjwalarora1992@gmail.com> 8e0546a98d7b30b3610a015bb72b35273ad94a85

    trunk-4297

    • web/WEB-INF/dwr-modules.xml (version 8e0546a98d7b30b3610a015bb72b35273ad94a85)
    • web/src/main/java/org/openmrs/web/controller/user/UserFormController.java (version 8e0546a98d7b30b3610a015bb72b35273ad94a85)
    • webapp/src/main/webapp/WEB-INF/messages.properties (version 8e0546a98d7b30b3610a015bb72b35273ad94a85)
  • Wyclif Luyima

    Wyclif Luyima 92b319075d38b0c1ee2600904a0465138332f752

    Converted the tinyurls to those generated on the openmrs wiki - TRUNK-4396

    • api/src/main/resources/liquibase-update-to-latest.xml (version 92b319075d38b0c1ee2600904a0465138332f752)
  • Wyclif Luyima

    Wyclif Luyima d26c7b0f4cf8577940d48a384cf239fd5332e843

    Fixed failing unit tests in Database1_9_7UpgradeTest

    • api/src/test/java/org/openmrs/util/databasechange/Database1_9_7UpgradeTest.java (version d26c7b0f4cf8577940d48a384cf239fd5332e843)
  • Wyclif Luyima

    Wyclif Luyima a5d64128ca02fab97f6895971d5eda84cc97c24b

    deleted patientRegimen patientRegimenCurrent and patientRegimenCompleted jsp pages and DrugSetItem class

    • web/src/main/java/org/openmrs/web/dwr/DrugSetItem.java (version a5d64128ca02fab97f6895971d5eda84cc97c24b)
    • webapp/src/main/webapp/WEB-INF/dwr.xml (version a5d64128ca02fab97f6895971d5eda84cc97c24b)
    • webapp/src/main/webapp/WEB-INF/view/portlets/patientRegimen.jsp (version a5d64128ca02fab97f6895971d5eda84cc97c24b)
    • webapp/src/main/webapp/WEB-INF/view/portlets/patientRegimenCompleted.jsp (version a5d64128ca02fab97f6895971d5eda84cc97c24b)
    • webapp/src/main/webapp/WEB-INF/view/portlets/patientRegimenCurrent.jsp (version a5d64128ca02fab97f6895971d5eda84cc97c24b)
  • Wyclif Luyima

    Wyclif Luyima 8371e8a9c619ccab6f5f826e654bdee45b0f8163

    Blocking changesets when upgrading to 1.10 should direct to better explanations - TRUNK-4396

    • api/src/main/resources/liquibase-update-to-latest.xml (version 8371e8a9c619ccab6f5f826e654bdee45b0f8163)
  • Daniel Kayiwa

    Daniel Kayiwa 05292d9845584ec82eae55fc947e987f0e3ed279

    Doing some file formatting for TRUNK-3877

    • web/src/test/java/org/openmrs/web/controller/OptionsFormControllerTest.java (version 05292d9845584ec82eae55fc947e987f0e3ed279)
  • Daniel Kayiwa

    Daniel Kayiwa 1a03f0ce08ee15528028785bc7ec84a3a47b69d2

    Merge pull request #938 from rpuzdrowski/TRUNK-3877
    TRUNK-3877: Changing login password deletes secret answer

  • Radek Puzdrowski <radoslaw.puzdrowski@gmail.com>

    Radek Puzdrowski <radoslaw.puzdrowski@gmail.com> 210b467fcdd2c94390294cf22bd50394405feced

    TRUNK-3877: Changing login password deletes secret answer

    • web/src/main/java/org/openmrs/web/OptionsForm.java (version 210b467fcdd2c94390294cf22bd50394405feced)
    • web/src/main/java/org/openmrs/web/controller/OptionsFormController.java (version 210b467fcdd2c94390294cf22bd50394405feced)
    • web/src/test/java/org/openmrs/web/controller/OptionsFormControllerTest.java (version 210b467fcdd2c94390294cf22bd50394405feced)
  • Wyclif Luyima

    Wyclif Luyima ee2335addcd405650b093143e14f0d06d2d3670f

    Add missing foreign key constraint on order_type.parent column - TRUNK-4395

    • api/src/main/resources/liquibase-update-to-latest.xml (version ee2335addcd405650b093143e14f0d06d2d3670f)
  • Wyclif Luyima

    Wyclif Luyima 1691e9cad178796a910b45e48df4e119602f838a

    Moved 1.10.x changesets to come before those in master

    • api/src/main/resources/liquibase-update-to-latest.xml (version 1691e9cad178796a910b45e48df4e119602f838a)
  • Wyclif Luyima

    Wyclif Luyima dcf417c18c7aa24d8cd1bdaa808dc0fce94235bd

    Merge branch 'master-merged'

  • Wyclif Luyima

    Wyclif Luyima ab1f64d53b292469dbb328bba7034abbace32d01

    Applying auto format changes after merging 1.10.x into master

    • api/src/main/java/org/openmrs/Order.java (version ab1f64d53b292469dbb328bba7034abbace32d01)
    • api/src/main/java/org/openmrs/aop/RequiredDataAdvice.java (version ab1f64d53b292469dbb328bba7034abbace32d01)
    • api/src/main/java/org/openmrs/api/ConceptService.java (version ab1f64d53b292469dbb328bba7034abbace32d01)
    • api/src/main/java/org/openmrs/api/PatientService.java (version ab1f64d53b292469dbb328bba7034abbace32d01)
    • api/src/main/java/org/openmrs/api/db/ConceptDAO.java (version ab1f64d53b292469dbb328bba7034abbace32d01)
    • api/src/main/java/org/openmrs/api/db/hibernate/HibernateConceptDAO.java (version ab1f64d53b292469dbb328bba7034abbace32d01)
    • api/src/main/java/org/openmrs/api/db/hibernate/HibernateOrderDAO.java (version ab1f64d53b292469dbb328bba7034abbace32d01)
    • api/src/main/java/org/openmrs/api/db/hibernate/HibernatePatientSetDAO.java (version ab1f64d53b292469dbb328bba7034abbace32d01)
    • api/src/main/java/org/openmrs/api/db/hibernate/HibernateUtil.java (version ab1f64d53b292469dbb328bba7034abbace32d01)
    • api/src/main/java/org/openmrs/api/impl/ConceptServiceImpl.java (version ab1f64d53b292469dbb328bba7034abbace32d01)
    • api/src/main/java/org/openmrs/api/impl/EncounterServiceImpl.java (version ab1f64d53b292469dbb328bba7034abbace32d01)
    • api/src/main/java/org/openmrs/module/ModuleClassLoader.java (version ab1f64d53b292469dbb328bba7034abbace32d01)
    • api/src/main/java/org/openmrs/order/OrderUtil.java (version ab1f64d53b292469dbb328bba7034abbace32d01)
    • api/src/main/java/org/openmrs/util/OpenmrsConstants.java (version ab1f64d53b292469dbb328bba7034abbace32d01)
    • api/src/main/java/org/openmrs/util/PrivilegeConstants.java (version ab1f64d53b292469dbb328bba7034abbace32d01)
    • api/src/test/java/org/openmrs/api/AdministrationServiceTest.java (version ab1f64d53b292469dbb328bba7034abbace32d01)
    • web/src/main/java/org/openmrs/web/controller/patient/MergePatientsFormController.java (version ab1f64d53b292469dbb328bba7034abbace32d01)
  • Wyclif Luyima

    Wyclif Luyima abfc53ae3cf7c9dc4704afbda1ec5533592c2495

    Follow up to fix failing tests after merging 1.10.x into master

    • api/src/main/java/org/openmrs/Drug.java (version abfc53ae3cf7c9dc4704afbda1ec5533592c2495)
    • api/src/main/java/org/openmrs/Provider.java (version abfc53ae3cf7c9dc4704afbda1ec5533592c2495)
    • api/src/test/java/org/openmrs/api/ConceptServiceTest.java (version abfc53ae3cf7c9dc4704afbda1ec5533592c2495)
    • api/src/test/java/org/openmrs/api/PatientServiceTest.java (version abfc53ae3cf7c9dc4704afbda1ec5533592c2495)
    • api/src/test/java/org/openmrs/api/db/hibernate/HibernatePatientDAOTest.java (version abfc53ae3cf7c9dc4704afbda1ec5533592c2495)
    • api/src/test/java/org/openmrs/api/impl/ConceptServiceImplTest.java (version abfc53ae3cf7c9dc4704afbda1ec5533592c2495)
    • api/src/test/resources/org/openmrs/api/db/hibernate/include/HibernateConceptTestDataSet.xml (version abfc53ae3cf7c9dc4704afbda1ec5533592c2495)
    • api/src/test/resources/org/openmrs/include/standardTestDataset.xml (version abfc53ae3cf7c9dc4704afbda1ec5533592c2495)
  • Wyclif Luyima

    Wyclif Luyima 167641532cd82e2b38d9658a5e1b3b449c748ebb

    Merge branch '1.10.x' into master-merged
    Conflicts:
            .gitignore
            api/pom.xml
            api/src/main/java/org/openmrs/BaseOpenmrsObject.java
            api/src/main/java/org/openmrs/Concept.java
            api/src/main/java/org/openmrs/ConceptMap.java
            api/src/main/java/org/openmrs/ConceptReferenceTerm.java
            api/src/main/java/org/openmrs/Drug.java
            api/src/main/java/org/openmrs/Encounter.java
            api/src/main/java/org/openmrs/FormResource.java
            api/src/main/java/org/openmrs/GlobalProperty.java
            api/src/main/java/org/openmrs/Obs.java
            api/src/main/java/org/openmrs/Order.java
            api/src/main/java/org/openmrs/OrderType.java
            api/src/main/java/org/openmrs/Person.java
            api/src/main/java/org/openmrs/Role.java
            api/src/main/java/org/openmrs/TestOrder.java
            api/src/main/java/org/openmrs/annotation/DisableHandlers.java
            api/src/main/java/org/openmrs/annotation/OpenmrsProfileExcludeFilter.java
            api/src/main/java/org/openmrs/aop/AuthorizationAdvice.java
            api/src/main/java/org/openmrs/aop/LoggingAdvice.java
            api/src/main/java/org/openmrs/aop/RequiredDataAdvice.java
            api/src/main/java/org/openmrs/api/AdministrationService.java
            api/src/main/java/org/openmrs/api/ConceptService.java
            api/src/main/java/org/openmrs/api/EncounterService.java
            api/src/main/java/org/openmrs/api/EventListeners.java
            api/src/main/java/org/openmrs/api/FormService.java
            api/src/main/java/org/openmrs/api/LocationService.java
            api/src/main/java/org/openmrs/api/OrderService.java
            api/src/main/java/org/openmrs/api/PatientService.java
            api/src/main/java/org/openmrs/api/PatientSetService.java
            api/src/main/java/org/openmrs/api/PersonService.java
            api/src/main/java/org/openmrs/api/ProviderService.java
            api/src/main/java/org/openmrs/api/UserService.java
            api/src/main/java/org/openmrs/api/context/Context.java
            api/src/main/java/org/openmrs/api/context/Daemon.java
            api/src/main/java/org/openmrs/api/context/ServiceContext.java
            api/src/main/java/org/openmrs/api/context/UserContext.java
            api/src/main/java/org/openmrs/api/db/ConceptDAO.java
            api/src/main/java/org/openmrs/api/db/OrderDAO.java
            api/src/main/java/org/openmrs/api/db/PatientDAO.java
            api/src/main/java/org/openmrs/api/db/hibernate/AuditableInterceptor.java
            api/src/main/java/org/openmrs/api/db/hibernate/HibernateAdministrationDAO.java
            api/src/main/java/org/openmrs/api/db/hibernate/HibernateConceptDAO.java
            api/src/main/java/org/openmrs/api/db/hibernate/HibernateEncounterDAO.java
            api/src/main/java/org/openmrs/api/db/hibernate/HibernateFormDAO.java
            api/src/main/java/org/openmrs/api/db/hibernate/HibernateLocationDAO.java
            api/src/main/java/org/openmrs/api/db/hibernate/HibernateOrderDAO.java
            api/src/main/java/org/openmrs/api/db/hibernate/HibernatePatientDAO.java
            api/src/main/java/org/openmrs/api/db/hibernate/HibernatePatientSetDAO.java
            api/src/main/java/org/openmrs/api/db/hibernate/HibernatePersonDAO.java
            api/src/main/java/org/openmrs/api/db/hibernate/HibernateProviderDAO.java
            api/src/main/java/org/openmrs/api/db/hibernate/HibernateSessionFactoryBean.java
            api/src/main/java/org/openmrs/api/db/hibernate/HibernateUtil.java
            api/src/main/java/org/openmrs/api/db/hibernate/HibernateVisitDAO.java
            api/src/main/java/org/openmrs/api/db/hibernate/PatientSearchCriteria.java
            api/src/main/java/org/openmrs/api/handler/ConceptReferenceTermSaveHandler.java
            api/src/main/java/org/openmrs/api/impl/AdministrationServiceImpl.java
            api/src/main/java/org/openmrs/api/impl/CohortServiceImpl.java
            api/src/main/java/org/openmrs/api/impl/ConceptServiceImpl.java
            api/src/main/java/org/openmrs/api/impl/DatatypeServiceImpl.java
            api/src/main/java/org/openmrs/api/impl/EncounterServiceImpl.java
            api/src/main/java/org/openmrs/api/impl/FormServiceImpl.java
            api/src/main/java/org/openmrs/api/impl/LocationServiceImpl.java
            api/src/main/java/org/openmrs/api/impl/OrderServiceImpl.java
            api/src/main/java/org/openmrs/api/impl/PatientServiceImpl.java
            api/src/main/java/org/openmrs/api/impl/PersonServiceImpl.java
            api/src/main/java/org/openmrs/api/impl/ProviderServiceImpl.java
            api/src/main/java/org/openmrs/api/impl/UserServiceImpl.java
            api/src/main/java/org/openmrs/api/impl/VisitServiceImpl.java
            api/src/main/java/org/openmrs/attribute/BaseAttribute.java
            api/src/main/java/org/openmrs/customdatatype/CustomDatatypeUtil.java
            api/src/main/java/org/openmrs/customdatatype/SerializingCustomDatatype.java
            api/src/main/java/org/openmrs/customdatatype/datatype/BooleanDatatype.java
            api/src/main/java/org/openmrs/customdatatype/datatype/DateDatatype.java
            api/src/main/java/org/openmrs/customdatatype/datatype/LongFreeTextDatatype.java
            api/src/main/java/org/openmrs/hl7/handler/ORUR01Handler.java
            api/src/main/java/org/openmrs/migration/MigrationHelper.java
            api/src/main/java/org/openmrs/module/Module.java
            api/src/main/java/org/openmrs/module/ModuleClassLoader.java
            api/src/main/java/org/openmrs/module/ModuleConstants.java
            api/src/main/java/org/openmrs/module/ModuleFactory.java
            api/src/main/java/org/openmrs/module/ModuleFileParser.java
            api/src/main/java/org/openmrs/module/ModuleUtil.java
            api/src/main/java/org/openmrs/module/UpdateFileParser.java
            api/src/main/java/org/openmrs/notification/Note.java
            api/src/main/java/org/openmrs/order/OrderUtil.java
            api/src/main/java/org/openmrs/person/PersonMergeLogData.java
            api/src/main/java/org/openmrs/reporting/export/DataExportFunctions.java
            api/src/main/java/org/openmrs/scheduler/tasks/AutoCloseVisitsTask.java
            api/src/main/java/org/openmrs/util/DatabaseUpdater.java
            api/src/main/java/org/openmrs/util/ExceptionUtil.java
            api/src/main/java/org/openmrs/util/HibernateEnumType.java
            api/src/main/java/org/openmrs/util/HttpClient.java
            api/src/main/java/org/openmrs/util/LocaleUtility.java
            api/src/main/java/org/openmrs/util/OpenmrsClassLoader.java
            api/src/main/java/org/openmrs/util/OpenmrsConstants.java
            api/src/main/java/org/openmrs/util/OpenmrsSecurityManager.java
            api/src/main/java/org/openmrs/util/OpenmrsUtil.java
            api/src/main/java/org/openmrs/util/PrivilegeConstants.java
            api/src/main/java/org/openmrs/validator/BaseCustomizableValidator.java
            api/src/main/java/org/openmrs/validator/ConceptReferenceTermValidator.java
            api/src/main/java/org/openmrs/validator/ConceptValidator.java
            api/src/main/java/org/openmrs/validator/DrugOrderValidator.java
            api/src/main/java/org/openmrs/validator/EncounterRoleValidator.java
            api/src/main/java/org/openmrs/validator/EncounterValidator.java
            api/src/main/java/org/openmrs/validator/LocationValidator.java
            api/src/main/java/org/openmrs/validator/ObsValidator.java
            api/src/main/java/org/openmrs/validator/OrderValidator.java
            api/src/main/java/org/openmrs/validator/PatientProgramValidator.java
            api/src/main/java/org/openmrs/validator/PatientValidator.java
            api/src/main/java/org/openmrs/validator/PersonAttributeTypeValidator.java
            api/src/main/java/org/openmrs/validator/ProgramValidator.java
            api/src/main/java/org/openmrs/validator/RelationshipTypeValidator.java
            api/src/main/java/org/openmrs/validator/UserValidator.java
            api/src/main/java/org/openmrs/validator/ValidateUtil.java
            api/src/main/java/org/openmrs/validator/VisitValidator.java
            api/src/main/resources/hibernate.cfg.xml
            api/src/main/resources/liquibase-schema-only.xml
            api/src/main/resources/liquibase-update-to-latest.xml
            api/src/main/resources/org/openmrs/api/db/hibernate/ConceptSetDerived.hbm.xml
            api/src/main/resources/org/openmrs/api/db/hibernate/Encounter.hbm.xml
            api/src/main/resources/org/openmrs/api/db/hibernate/FormResource.hbm.xml
            api/src/main/resources/org/openmrs/api/db/hibernate/Order.hbm.xml
            api/src/main/resources/org/openmrs/api/db/hibernate/OrderType.hbm.xml
            api/src/test/java/org/openmrs/ConceptNumericTest.java
            api/src/test/java/org/openmrs/EncounterTest.java
            api/src/test/java/org/openmrs/ObsTest.java
            api/src/test/java/org/openmrs/PatientProgramTest.java
            api/src/test/java/org/openmrs/PersonNameTest.java
            api/src/test/java/org/openmrs/ProviderTest.java
            api/src/test/java/org/openmrs/annotation/OpenmrsProfileExcludeFilterTest.java
            api/src/test/java/org/openmrs/aop/AuthorizationAdviceTest.java
            api/src/test/java/org/openmrs/aop/RequiredDataAdviceTest.java
            api/src/test/java/org/openmrs/api/AdministrationServiceTest.java
            api/src/test/java/org/openmrs/api/ConceptServiceTest.java
            api/src/test/java/org/openmrs/api/EncounterServiceTest.java
            api/src/test/java/org/openmrs/api/FormServiceTest.java
            api/src/test/java/org/openmrs/api/LocationServiceTest.java
            api/src/test/java/org/openmrs/api/ObsServiceTest.java
            api/src/test/java/org/openmrs/api/OrderServiceTest.java
            api/src/test/java/org/openmrs/api/PatientServiceTest.java
            api/src/test/java/org/openmrs/api/PersonServiceTest.java
            api/src/test/java/org/openmrs/api/ProgramWorkflowServiceTest.java
            api/src/test/java/org/openmrs/api/ProviderServiceTest.java
            api/src/test/java/org/openmrs/api/UserServiceTest.java
            api/src/test/java/org/openmrs/api/VisitServiceTest.java
            api/src/test/java/org/openmrs/api/context/DaemonTest.java
            api/src/test/java/org/openmrs/api/db/ConceptDAOTest.java
            api/src/test/java/org/openmrs/api/db/PatientDAOTest.java
            api/src/test/java/org/openmrs/api/db/UserDAOTest.java
            api/src/test/java/org/openmrs/api/db/hibernate/AuditableInterceptorTest.java
            api/src/test/java/org/openmrs/hl7/handler/ORUR01HandlerTest.java
            api/src/test/java/org/openmrs/module/BaseModuleActivatorTest.java
            api/src/test/java/org/openmrs/module/ModuleActivatorTest.java
            api/src/test/java/org/openmrs/module/ModuleUtilTest.java
            api/src/test/java/org/openmrs/scheduler/SchedulerServiceTest.java
            api/src/test/java/org/openmrs/test/BaseContextSensitiveTest.java
            api/src/test/java/org/openmrs/util/HttpClientTest.java
            api/src/test/java/org/openmrs/util/databasechange/Database1_9_7UpgradeTest.java
            api/src/test/java/org/openmrs/util/databasechange/DatabaseUpgradeTestUtil.java
            api/src/test/java/org/openmrs/validator/ConceptValidatorTest.java
            api/src/test/java/org/openmrs/validator/DrugOrderValidatorTest.java
            api/src/test/java/org/openmrs/validator/LocationValidatorTest.java
            api/src/test/java/org/openmrs/validator/PatientProgramValidatorTest.java
            api/src/test/java/org/openmrs/validator/PatientValidatorTest.java
            api/src/test/java/org/openmrs/validator/PersonAttributeTypeValidatorTest.java
            api/src/test/java/org/openmrs/validator/PersonNameValidatorTest.java
            api/src/test/java/org/openmrs/validator/ProgramValidatorTest.java
            api/src/test/java/org/openmrs/validator/ProviderValidatorTest.java
            api/src/test/java/org/openmrs/validator/RelationshipTypeValidatorTest.java
            api/src/test/java/org/openmrs/validator/ValidateUtilTest.java
            api/src/test/java/org/openmrs/validator/VisitValidatorTest.java
            api/src/test/resources/org/openmrs/api/include/ConceptServiceTest-words.xml
            api/src/test/resources/org/openmrs/api/include/EncounterServiceTest-initialData.xml
            api/src/test/resources/org/openmrs/api/include/OrderServiceTest-deleteObsThatReference.xml
            api/src/test/resources/org/openmrs/include/initialInMemoryTestDataSet.xml
            api/src/test/resources/org/openmrs/include/standardTestDataset.xml
            api/src/test/resources/org/openmrs/module/include/test1-1.0-SNAPSHOT.omod
            api/src/test/resources/org/openmrs/module/include/test1-2.0-SNAPSHOT.omod
            api/src/test/resources/org/openmrs/module/include/test2-1.0-SNAPSHOT.omod
            api/src/test/resources/org/openmrs/module/include/test3-1.0-SNAPSHOT.omod
            api/src/test/resources/org/openmrs/module/include/test3-2.0-SNAPSHOT.omod
            api/src/test/resources/org/openmrs/validator/include/VisitValidatorTest.xml
            pom.xml
            test/pom.xml
            tools/pom.xml
            web/pom.xml
            web/src/main/java/org/openmrs/module/web/WebModuleUtil.java
            web/src/main/java/org/openmrs/module/web/controller/ModuleListController.java
            web/src/main/java/org/openmrs/web/Listener.java
            web/src/main/java/org/openmrs/web/WebDaemon.java
            web/src/main/java/org/openmrs/web/attribute/handler/LongFreeTextTextareaHandler.java
            web/src/main/java/org/openmrs/web/controller/ConceptFormController.java
            web/src/main/java/org/openmrs/web/controller/ConceptFormValidator.java
            web/src/main/java/org/openmrs/web/controller/OptionsFormController.java
            web/src/main/java/org/openmrs/web/controller/PortletController.java
            web/src/main/java/org/openmrs/web/controller/RegimenPortletController.java
            web/src/main/java/org/openmrs/web/controller/concept/ConceptProposalFormController.java
            web/src/main/java/org/openmrs/web/controller/concept/ConceptSourceListController.java
            web/src/main/java/org/openmrs/web/controller/customdatatype/CustomValueController.java
            web/src/main/java/org/openmrs/web/controller/form/FieldTypeListController.java
            web/src/main/java/org/openmrs/web/controller/form/FormFormController.java
            web/src/main/java/org/openmrs/web/controller/observation/ObsFormController.java
            web/src/main/java/org/openmrs/web/controller/order/OrderDrugFormController.java
            web/src/main/java/org/openmrs/web/controller/order/OrderDrugListController.java
            web/src/main/java/org/openmrs/web/controller/order/OrderFormController.java
            web/src/main/java/org/openmrs/web/controller/order/OrderListByPatientController.java
            web/src/main/java/org/openmrs/web/controller/order/OrderListController.java
            web/src/main/java/org/openmrs/web/controller/patient/MergePatientsFormController.java
            web/src/main/java/org/openmrs/web/controller/patient/PatientDashboardController.java
            web/src/main/java/org/openmrs/web/controller/patient/PatientIdentifierTypeFormController.java
            web/src/main/java/org/openmrs/web/controller/patient/ShortPatientFormController.java
            web/src/main/java/org/openmrs/web/controller/patient/ShortPatientFormValidator.java
            web/src/main/java/org/openmrs/web/controller/person/AddPersonController.java
            web/src/main/java/org/openmrs/web/controller/program/PatientProgramFormController.java
            web/src/main/java/org/openmrs/web/controller/visit/ConfigureVisitsFormController.java
            web/src/main/java/org/openmrs/web/controller/visit/VisitFormController.java
            web/src/main/java/org/openmrs/web/controller/visit/VisitListController.java
            web/src/main/java/org/openmrs/web/dwr/ConceptListItem.java
            web/src/main/java/org/openmrs/web/dwr/DWRConceptService.java
            web/src/main/java/org/openmrs/web/dwr/DWREncounterService.java
            web/src/main/java/org/openmrs/web/dwr/DWROrderService.java
            web/src/main/java/org/openmrs/web/dwr/DWRPatientService.java
            web/src/main/java/org/openmrs/web/dwr/DWRProviderService.java
            web/src/main/java/org/openmrs/web/dwr/DrugOrderListItem.java
            web/src/main/java/org/openmrs/web/filter/StartupFilter.java
            web/src/main/java/org/openmrs/web/filter/initialization/InitializationFilter.java
            web/src/main/java/org/openmrs/web/filter/initialization/TestInstallUtil.java
            web/src/main/java/org/openmrs/web/filter/update/UpdateFilter.java
            web/src/main/java/org/openmrs/web/filter/update/UpdateFilterModel.java
            web/src/main/java/org/openmrs/web/filter/util/FilterUtil.java
            web/src/main/java/org/openmrs/web/filter/util/LocalizationTool.java
            web/src/main/java/org/openmrs/web/form/visit/ConfigureVisitsForm.java
            web/src/main/java/org/openmrs/web/taglib/FormatTag.java
            web/src/main/java/org/openmrs/web/taglib/PortletTag.java
            web/src/main/java/org/openmrs/web/taglib/RequireTag.java
            web/src/main/java/org/openmrs/web/taglib/fieldgen/DrugOrderDiscontinuedReasonHandler.java
            web/src/main/resources/openmrs-servlet.xml
            web/src/main/resources/org/openmrs/web/filter/initialization/installmethod.vm
            web/src/main/resources/org/openmrs/web/filter/initialization/remotedetails.vm
            web/src/test/java/org/openmrs/module/web/WebModuleUtilTest.java
            web/src/test/java/org/openmrs/scheduler/web/controller/SchedulerFormControllerTest.java
            web/src/test/java/org/openmrs/web/WebUtilTest.java
            web/src/test/java/org/openmrs/web/controller/ConceptFormControllerTest.java
            web/src/test/java/org/openmrs/web/controller/concept/ConceptProposalFormControllerTest.java
            web/src/test/java/org/openmrs/web/controller/form/FieldFormControllerTest.java
            web/src/test/java/org/openmrs/web/controller/person/AddPersonControllerTest.java
            web/src/test/java/org/openmrs/web/controller/user/RoleFormControllerTest.java
            web/src/test/java/org/openmrs/web/dwr/DWRPatientServiceTest.java
            web/src/test/java/org/openmrs/web/taglib/FormatTagTest.java
            web/src/test/java/org/openmrs/web/test/TestContextLoader.java
            webapp/pom.xml
            webapp/src/main/resources/liquibase-demo-data.zip
            webapp/src/main/webapp/WEB-INF/messages.properties
            webapp/src/main/webapp/WEB-INF/messages_es.properties
            webapp/src/main/webapp/WEB-INF/messages_fa.properties
            webapp/src/main/webapp/WEB-INF/messages_hi.properties
            webapp/src/main/webapp/WEB-INF/messages_in_ID.properties
            webapp/src/main/webapp/WEB-INF/messages_pt.properties
            webapp/src/main/webapp/WEB-INF/taglibs/openmrs.tld
            webapp/src/main/webapp/WEB-INF/tags/errorNotify.tag
            webapp/src/main/webapp/WEB-INF/template/banner.jsp
            webapp/src/main/webapp/WEB-INF/template/gutter.jsp
            webapp/src/main/webapp/WEB-INF/template/headerFull.jsp
            webapp/src/main/webapp/WEB-INF/template/headerMinimal.jsp
            webapp/src/main/webapp/WEB-INF/view/admin/concepts/conceptClassForm.jsp
            webapp/src/main/webapp/WEB-INF/view/admin/concepts/conceptDatatypeForm.jsp
            webapp/src/main/webapp/WEB-INF/view/admin/concepts/conceptDrugForm.jsp
            webapp/src/main/webapp/WEB-INF/view/admin/concepts/conceptDrugList.jsp
            webapp/src/main/webapp/WEB-INF/view/admin/concepts/conceptProposalForm.jsp
            webapp/src/main/webapp/WEB-INF/view/admin/concepts/conceptSetDerivedForm.jsp
            webapp/src/main/webapp/WEB-INF/view/admin/concepts/conceptSourceForm.jsp
            webapp/src/main/webapp/WEB-INF/view/admin/concepts/conceptSourceList.jsp
            webapp/src/main/webapp/WEB-INF/view/admin/concepts/conceptStopWordForm.jsp
            webapp/src/main/webapp/WEB-INF/view/admin/concepts/localHeader.jsp
            webapp/src/main/webapp/WEB-INF/view/admin/encounters/encounterForm.jsp
            webapp/src/main/webapp/WEB-INF/view/admin/encounters/encounterRoleForm.jsp
            webapp/src/main/webapp/WEB-INF/view/admin/encounters/encounterTypeForm.jsp
            webapp/src/main/webapp/WEB-INF/view/admin/encounters/localHeader.jsp
            webapp/src/main/webapp/WEB-INF/view/admin/forms/fieldForm.jsp
            webapp/src/main/webapp/WEB-INF/view/admin/forms/fieldTypeForm.jsp
            webapp/src/main/webapp/WEB-INF/view/admin/forms/fieldTypeList.jsp
            webapp/src/main/webapp/WEB-INF/view/admin/forms/formEditForm.jsp
            webapp/src/main/webapp/WEB-INF/view/admin/forms/formList.jsp
            webapp/src/main/webapp/WEB-INF/view/admin/forms/formResources.jsp
            webapp/src/main/webapp/WEB-INF/view/admin/forms/include/fieldEdit.jsp
            webapp/src/main/webapp/WEB-INF/view/admin/forms/localHeader.jsp
            webapp/src/main/webapp/WEB-INF/view/admin/hl7/hl7InArchiveMigration.jsp
            webapp/src/main/webapp/WEB-INF/view/admin/hl7/hl7SourceForm.jsp
            webapp/src/main/webapp/WEB-INF/view/admin/hl7/localHeader.jsp
            webapp/src/main/webapp/WEB-INF/view/admin/index.jsp
            webapp/src/main/webapp/WEB-INF/view/admin/locations/addressTemplate.jsp
            webapp/src/main/webapp/WEB-INF/view/admin/locations/localHeader.jsp
            webapp/src/main/webapp/WEB-INF/view/admin/locations/locationAttributeType.jsp
            webapp/src/main/webapp/WEB-INF/view/admin/locations/locationForm.jsp
            webapp/src/main/webapp/WEB-INF/view/admin/locations/locationTag.jsp
            webapp/src/main/webapp/WEB-INF/view/admin/locations/locationTagEdit.jsp
            webapp/src/main/webapp/WEB-INF/view/admin/maintenance/globalPropsForm.jsp
            webapp/src/main/webapp/WEB-INF/view/admin/maintenance/implementationIdForm.jsp
            webapp/src/main/webapp/WEB-INF/view/admin/maintenance/localHeader.jsp
            webapp/src/main/webapp/WEB-INF/view/admin/modules/localHeader.jsp
            webapp/src/main/webapp/WEB-INF/view/admin/modules/moduleList.jsp
            webapp/src/main/webapp/WEB-INF/view/admin/observations/localHeader.jsp
            webapp/src/main/webapp/WEB-INF/view/admin/observations/obsForm.jsp
            webapp/src/main/webapp/WEB-INF/view/admin/orders/choosePatient.jsp
            webapp/src/main/webapp/WEB-INF/view/admin/orders/localHeader.jsp
            webapp/src/main/webapp/WEB-INF/view/admin/orders/orderDrugForm.jsp
            webapp/src/main/webapp/WEB-INF/view/admin/orders/orderDrugList.jsp
            webapp/src/main/webapp/WEB-INF/view/admin/orders/orderForm.jsp
            webapp/src/main/webapp/WEB-INF/view/admin/orders/orderList.jsp
            webapp/src/main/webapp/WEB-INF/view/admin/orders/orderListByPatient.jsp
            webapp/src/main/webapp/WEB-INF/view/admin/orders/orderTypeForm.jsp
            webapp/src/main/webapp/WEB-INF/view/admin/orders/orderTypeList.jsp
            webapp/src/main/webapp/WEB-INF/view/admin/patients/findDuplicatePatients.jsp
            webapp/src/main/webapp/WEB-INF/view/admin/patients/include/editPatientIdentifier.jsp
            webapp/src/main/webapp/WEB-INF/view/admin/patients/localHeader.jsp
            webapp/src/main/webapp/WEB-INF/view/admin/patients/mergePatientsForm.jsp
            webapp/src/main/webapp/WEB-INF/view/admin/patients/patientForm.jsp
            webapp/src/main/webapp/WEB-INF/view/admin/patients/patientIdentifierTypeForm.jsp
            webapp/src/main/webapp/WEB-INF/view/admin/patients/shortPatientForm.jsp
            webapp/src/main/webapp/WEB-INF/view/admin/person/addPerson.jsp
            webapp/src/main/webapp/WEB-INF/view/admin/person/include/editPersonInfo.jsp
            webapp/src/main/webapp/WEB-INF/view/admin/person/include/showPersonInfo.jsp
            webapp/src/main/webapp/WEB-INF/view/admin/person/localHeader.jsp
            webapp/src/main/webapp/WEB-INF/view/admin/person/personAttributeTypeForm.jsp
            webapp/src/main/webapp/WEB-INF/view/admin/person/personForm.jsp
            webapp/src/main/webapp/WEB-INF/view/admin/person/relationshipTypeForm.jsp
            webapp/src/main/webapp/WEB-INF/view/admin/programs/conversionForm.jsp
            webapp/src/main/webapp/WEB-INF/view/admin/programs/localHeader.jsp
            webapp/src/main/webapp/WEB-INF/view/admin/programs/programForm.jsp
            webapp/src/main/webapp/WEB-INF/view/admin/programs/programList.jsp
            webapp/src/main/webapp/WEB-INF/view/admin/programs/workflowForm.jsp
            webapp/src/main/webapp/WEB-INF/view/admin/provider/localHeader.jsp
            webapp/src/main/webapp/WEB-INF/view/admin/provider/providerAttributeTypeForm.jsp
            webapp/src/main/webapp/WEB-INF/view/admin/provider/providerForm.jsp
            webapp/src/main/webapp/WEB-INF/view/admin/scheduler/localHeader.jsp
            webapp/src/main/webapp/WEB-INF/view/admin/scheduler/schedulerForm.jsp
            webapp/src/main/webapp/WEB-INF/view/admin/scheduler/schedulerList.jsp
            webapp/src/main/webapp/WEB-INF/view/admin/users/alertForm.jsp
            webapp/src/main/webapp/WEB-INF/view/admin/users/alertList.jsp
            webapp/src/main/webapp/WEB-INF/view/admin/users/localHeader.jsp
            webapp/src/main/webapp/WEB-INF/view/admin/users/privilegeForm.jsp
            webapp/src/main/webapp/WEB-INF/view/admin/users/roleForm.jsp
            webapp/src/main/webapp/WEB-INF/view/admin/users/roleList.jsp
            webapp/src/main/webapp/WEB-INF/view/admin/users/userForm.jsp
            webapp/src/main/webapp/WEB-INF/view/admin/visits/configureVisits.jsp
            webapp/src/main/webapp/WEB-INF/view/admin/visits/localHeader.jsp
            webapp/src/main/webapp/WEB-INF/view/admin/visits/visitAttributeTypeForm.jsp
            webapp/src/main/webapp/WEB-INF/view/admin/visits/visitForm.jsp
            webapp/src/main/webapp/WEB-INF/view/admin/visits/visitTypeForm.jsp
            webapp/src/main/webapp/WEB-INF/view/dictionary/concept.jsp
            webapp/src/main/webapp/WEB-INF/view/dictionary/conceptForm.jsp
            webapp/src/main/webapp/WEB-INF/view/dictionary/conceptStatsForm.jsp
            webapp/src/main/webapp/WEB-INF/view/dictionary/index.jsp
            webapp/src/main/webapp/WEB-INF/view/help.jsp
            webapp/src/main/webapp/WEB-INF/view/optionsForm.jsp
            webapp/src/main/webapp/WEB-INF/view/patientDashboardForm.jsp
            webapp/src/main/webapp/WEB-INF/view/portlets/addPersonForm.jsp
            webapp/src/main/webapp/WEB-INF/view/portlets/addressLayout.jsp
            webapp/src/main/webapp/WEB-INF/view/portlets/cohort.jsp
            webapp/src/main/webapp/WEB-INF/view/portlets/customMostRecentObs.jsp
            webapp/src/main/webapp/WEB-INF/view/portlets/findPatient.jsp
            webapp/src/main/webapp/WEB-INF/view/portlets/nameLayout.jsp
            webapp/src/main/webapp/WEB-INF/view/portlets/patientDemographics.jsp
            webapp/src/main/webapp/WEB-INF/view/portlets/patientEncounters.jsp
            webapp/src/main/webapp/WEB-INF/view/portlets/patientGraphs.jsp
            webapp/src/main/webapp/WEB-INF/view/portlets/patientHeader.jsp
            webapp/src/main/webapp/WEB-INF/view/portlets/patientOverview.jsp
            webapp/src/main/webapp/WEB-INF/view/portlets/patientPrograms.jsp
            webapp/src/main/webapp/WEB-INF/view/portlets/patientRegimen.jsp
            webapp/src/main/webapp/WEB-INF/view/portlets/patientRegimenCurrent.jsp
            webapp/src/main/webapp/WEB-INF/view/portlets/patientVisits.jsp
            webapp/src/main/webapp/WEB-INF/view/portlets/personRelationships.jsp
            webapp/src/main/webapp/WEB-INF/view/portlets/welcome.jsp
            webapp/src/main/webapp/WEB-INF/view/scripts/calendar/calendar.js
            webapp/src/main/webapp/WEB-INF/view/scripts/drugOrder.js.withjstl
            webapp/src/main/webapp/WEB-INF/view/scripts/jquery-ui/js/jquery-ui-datepicker-i18n.js
            webapp/src/main/webapp/WEB-INF/view/scripts/jquery-ui/js/openmrsSearch.js
            webapp/src/main/webapp/WEB-INF/view/scripts/jquery/autocomplete/OpenmrsAutoComplete.js
            webapp/src/main/webapp/WEB-INF/view/scripts/openmrsmessages.js.withjstl
            webapp/src/main/webapp/WEB-INF/view/scripts/timepicker/timepicker.js
            webapp/src/main/webapp/WEB-INF/web.xml
            webapp/src/main/webapp/admin/orders/index.jsp
            webapp/src/main/webapp/dictionary/conceptForm.js
            webapp/src/main/webapp/errorhandler.jsp
            webapp/src/main/webapp/openmrs.css
            webapp/src/main/webapp/openmrs.js

  • Daniel Kayiwa

    Daniel Kayiwa 564990ca12b6d25adaa50085dd8bff78e7dc9a07

    The delete button in the person form results into purging of person - TRUNK-4316

    • webapp/src/main/webapp/WEB-INF/messages.properties (version 564990ca12b6d25adaa50085dd8bff78e7dc9a07)
  • geoff-wasilwa <geoffreywanjala@gmail.com>

    geoff-wasilwa <geoffreywanjala@gmail.com> 557b92d5baf143a840b6aafccdede0e62d30e424

    TRUNK-4338: Added "Manage Providers" privileges to prevent unauthorized access
    Added "Manage Providers" privilege to "Add Provider" link and changed privilege of providerForm.jsp to only allow users with "Manage Providers" privilege to view it

    • webapp/src/main/webapp/WEB-INF/view/admin/provider/index.jsp (version 557b92d5baf143a840b6aafccdede0e62d30e424)
    • webapp/src/main/webapp/WEB-INF/view/admin/provider/providerForm.jsp (version 557b92d5baf143a840b6aafccdede0e62d30e424)
  • Wyclif Luyima

    Wyclif Luyima 7b8309de81cfc27e018fef0d7e92caf55905ddb8

    Reverting all order entry related commits previously made prior to 1.10
    Revert "A few formatting changes made by the autoformatter..."

    This reverts commit 8560389ac9e5cfee5495036078b4331ff4c28e5e.

    Conflicts:
            api/src/main/java/org/openmrs/api/OrderService.java

    Revert "Add @since 1.10 to OrderService methods - TRUNK-3503"

    This reverts commit df653a2908fb1950fd9393dffc7e75a63d730f02.

    Revert "Added readonly transactional and privilege checks to OrderService"

    This reverts commit e4172b74bc397123cf55ca613a781b91c631b85f.

    Conflicts:
            api/src/main/java/org/openmrs/api/OrderService.java

    Revert "Merging order-entry branch to trunk rev:28043"

    This reverts commit f1ff17ad989a327f5e4abddeaba553821cd23bd3.

    Conflicts:
            api/src/test/java/org/openmrs/api/OrderServiceTest.java
            api/src/test/resources/org/openmrs/api/include/OrderServiceTest-drugOrdersList.xml
            api/src/test/resources/org/openmrs/api/include/OrderServiceTest-ordersList.xml

    Fixed missed code when resolving conflicts for previous reverts

    Revert "Merging order-entry to trunk rev:20830 - rev:28000"

    This reverts commit e617b404d5f2b70187331158dcd7db08311a2b1f.

    Conflicts:
            api/src/main/java/org/openmrs/BaseOrderable.java
            api/src/main/java/org/openmrs/Drug.java
            api/src/main/java/org/openmrs/GenericDrug.java
            api/src/main/java/org/openmrs/Order.java
            api/src/main/java/org/openmrs/TestOrder.java
            api/src/main/java/org/openmrs/api/OrderService.java
            api/src/main/java/org/openmrs/api/db/hibernate/HibernateOrderDAO.java
            api/src/main/java/org/openmrs/api/handler/OrderSaveHandler.java
            api/src/main/java/org/openmrs/api/impl/OrderServiceImpl.java
            api/src/main/java/org/openmrs/order/OrderUtil.java
            api/src/main/java/org/openmrs/util/OpenmrsConstants.java
            api/src/main/java/org/openmrs/validator/DrugOrderValidator.java
            api/src/main/java/org/openmrs/validator/OrderValidator.java
            api/src/main/resources/liquibase-update-to-latest.xml
            api/src/main/resources/org/openmrs/api/db/hibernate/Order.hbm.xml
            api/src/test/java/org/openmrs/api/OrderServiceTest.java
            api/src/test/resources/org/openmrs/api/include/EncounterServiceTest-initialData.xml
            api/src/test/resources/org/openmrs/include/standardTestDataset.xml
            api/src/test/resources/org/openmrs/reporting/include/PatientFilterTest.xml
            web/src/main/java/org/openmrs/web/dwr/DWROrderService.java
            web/src/main/java/org/openmrs/web/dwr/DrugOrderListItem.java
            webapp/src/main/webapp/WEB-INF/messages.properties
            webapp/src/main/webapp/WEB-INF/tags/orderableField.tag
            webapp/src/main/webapp/WEB-INF/view/admin/orders/orderDrugForm.jsp
            webapp/src/main/webapp/WEB-INF/view/admin/orders/orderForm.jsp
            webapp/src/main/webapp/WEB-INF/view/admin/orders/orderList.jsp
            webapp/src/main/webapp/WEB-INF/view/portlets/patientRegimen.jsp
            webapp/src/main/webapp/WEB-INF/view/scripts/drugOrder.js.withjstl

    Fixed failing test due to test data set that doesn't match the data model

    Applying auto format changes

    Removed un needed changeset related to order entry since we reverted order entry work committed in master before 1.10

    • api/src/main/java/META-INF/MANIFEST.MF (version 7b8309de81cfc27e018fef0d7e92caf55905ddb8)
    • api/src/main/java/org/openmrs/BaseOrderable.java (version 7b8309de81cfc27e018fef0d7e92caf55905ddb8)
    • api/src/main/java/org/openmrs/ConceptClass.java (version 7b8309de81cfc27e018fef0d7e92caf55905ddb8)
    • api/src/main/java/org/openmrs/Drug.java (version 7b8309de81cfc27e018fef0d7e92caf55905ddb8)
    • api/src/main/java/org/openmrs/DrugOrder.java (version 7b8309de81cfc27e018fef0d7e92caf55905ddb8)
    • api/src/main/java/org/openmrs/GenericDrug.java (version 7b8309de81cfc27e018fef0d7e92caf55905ddb8)
    • api/src/main/java/org/openmrs/Order.java (version 7b8309de81cfc27e018fef0d7e92caf55905ddb8)
    • api/src/main/java/org/openmrs/Orderable.java (version 7b8309de81cfc27e018fef0d7e92caf55905ddb8)
    • api/src/main/java/org/openmrs/api/OrderService.java (version 7b8309de81cfc27e018fef0d7e92caf55905ddb8)
    • api/src/main/java/org/openmrs/api/db/OrderDAO.java (version 7b8309de81cfc27e018fef0d7e92caf55905ddb8)
    • api/src/main/java/org/openmrs/api/db/hibernate/HibernateOrderDAO.java (version 7b8309de81cfc27e018fef0d7e92caf55905ddb8)
    • api/src/main/java/org/openmrs/api/db/hibernate/HibernatePatientSetDAO.java (version 7b8309de81cfc27e018fef0d7e92caf55905ddb8)
    • api/src/main/java/org/openmrs/api/handler/OrderSaveHandler.java (version 7b8309de81cfc27e018fef0d7e92caf55905ddb8)
    • api/src/main/java/org/openmrs/api/handler/PatientDataUnvoidHandler.java (version 7b8309de81cfc27e018fef0d7e92caf55905ddb8)
    • api/src/main/java/org/openmrs/api/impl/OrderServiceImpl.java (version 7b8309de81cfc27e018fef0d7e92caf55905ddb8)
    • api/src/main/java/org/openmrs/order/OrderUtil.java (version 7b8309de81cfc27e018fef0d7e92caf55905ddb8)
    • api/src/main/java/org/openmrs/propertyeditor/OrderTypeEditor.java (version 7b8309de81cfc27e018fef0d7e92caf55905ddb8)
    • api/src/main/java/org/openmrs/util/OpenmrsConstants.java (version 7b8309de81cfc27e018fef0d7e92caf55905ddb8)
    • api/src/main/java/org/openmrs/util/PrivilegeConstants.java (version 7b8309de81cfc27e018fef0d7e92caf55905ddb8)
    • api/src/main/java/org/openmrs/validator/DrugOrderValidator.java (version 7b8309de81cfc27e018fef0d7e92caf55905ddb8)
    • api/src/main/java/org/openmrs/validator/OrderTypeValidator.java (version 7b8309de81cfc27e018fef0d7e92caf55905ddb8)
    • api/src/main/java/org/openmrs/validator/OrderValidator.java (version 7b8309de81cfc27e018fef0d7e92caf55905ddb8)
    • api/src/main/resources/applicationContext-service.xml (version 7b8309de81cfc27e018fef0d7e92caf55905ddb8)
    • api/src/main/resources/hibernate.cfg.xml (version 7b8309de81cfc27e018fef0d7e92caf55905ddb8)
    • api/src/main/resources/liquibase-update-to-latest.xml (version 7b8309de81cfc27e018fef0d7e92caf55905ddb8)
    • api/src/main/resources/org/openmrs/api/db/hibernate/Order.hbm.xml (version 7b8309de81cfc27e018fef0d7e92caf55905ddb8)
    • api/src/test/java/org/openmrs/DrugTest.java (version 7b8309de81cfc27e018fef0d7e92caf55905ddb8)
    • api/src/test/java/org/openmrs/GenericDrugTest.java (version 7b8309de81cfc27e018fef0d7e92caf55905ddb8)
    • api/src/test/java/org/openmrs/api/EncounterServiceTest.java (version 7b8309de81cfc27e018fef0d7e92caf55905ddb8)
    • api/src/test/java/org/openmrs/api/OrderServiceTest.java (version 7b8309de81cfc27e018fef0d7e92caf55905ddb8)
    • api/src/test/java/org/openmrs/api/PatientServiceTest.java (version 7b8309de81cfc27e018fef0d7e92caf55905ddb8)
    • api/src/test/java/org/openmrs/api/db/OrderDAOTest.java (version 7b8309de81cfc27e018fef0d7e92caf55905ddb8)
    • api/src/test/java/org/openmrs/api/db/SerializedObjectDAOTest.java (version 7b8309de81cfc27e018fef0d7e92caf55905ddb8)
    • api/src/test/java/org/openmrs/api/handler/OrderSaveHandlerTest.java (version 7b8309de81cfc27e018fef0d7e92caf55905ddb8)
    • api/src/test/java/org/openmrs/api/handler/PatientDataUnvoidHandlerTest.java (version 7b8309de81cfc27e018fef0d7e92caf55905ddb8)
    • api/src/test/java/org/openmrs/propertyeditor/OrderTypeEditorTest.java (version 7b8309de81cfc27e018fef0d7e92caf55905ddb8)
    • api/src/test/java/org/openmrs/test/CreateInitialDataSet.java (version 7b8309de81cfc27e018fef0d7e92caf55905ddb8)
    • api/src/test/java/org/openmrs/validator/DrugOrderValidatorTest.java (version 7b8309de81cfc27e018fef0d7e92caf55905ddb8)
    • api/src/test/java/org/openmrs/validator/OrderTypeValidatorTest.java (version 7b8309de81cfc27e018fef0d7e92caf55905ddb8)
    • api/src/test/java/org/openmrs/validator/OrderValidatorTest.java (version 7b8309de81cfc27e018fef0d7e92caf55905ddb8)
    • api/src/test/java/org/openmrs/validator/RequireNameValidatorTest.java (version 7b8309de81cfc27e018fef0d7e92caf55905ddb8)
    • api/src/test/resources/org/openmrs/api/include/ConceptServiceTest-numerics.xml (version 7b8309de81cfc27e018fef0d7e92caf55905ddb8)
    • api/src/test/resources/org/openmrs/api/include/EncounterServiceTest-initialData.xml (version 7b8309de81cfc27e018fef0d7e92caf55905ddb8)
    • api/src/test/resources/org/openmrs/api/include/OrderServiceTest-drugOrdersList.xml (version 7b8309de81cfc27e018fef0d7e92caf55905ddb8)
    • api/src/test/resources/org/openmrs/api/include/OrderServiceTest-orderSetsTestDataset.xml (version 7b8309de81cfc27e018fef0d7e92caf55905ddb8)
    • api/src/test/resources/org/openmrs/api/include/OrderServiceTest-ordersList.xml (version 7b8309de81cfc27e018fef0d7e92caf55905ddb8)
    • api/src/test/resources/org/openmrs/api/include/OrderServiceTest-simpleOrderEntryTestDataset.xml (version 7b8309de81cfc27e018fef0d7e92caf55905ddb8)
    • api/src/test/resources/org/openmrs/include/standardTestDataset.xml (version 7b8309de81cfc27e018fef0d7e92caf55905ddb8)
    • api/src/test/resources/org/openmrs/reporting/include/PatientFilterTest.xml (version 7b8309de81cfc27e018fef0d7e92caf55905ddb8)
    • web/src/main/java/org/openmrs/web/OpenmrsBindingInitializer.java (version 7b8309de81cfc27e018fef0d7e92caf55905ddb8)
    • web/src/main/java/org/openmrs/web/controller/order/OrderByUserListController.java (version 7b8309de81cfc27e018fef0d7e92caf55905ddb8)
    • web/src/main/java/org/openmrs/web/controller/order/OrderDrugFormController.java (version 7b8309de81cfc27e018fef0d7e92caf55905ddb8)
    • web/src/main/java/org/openmrs/web/controller/order/OrderDrugListController.java (version 7b8309de81cfc27e018fef0d7e92caf55905ddb8)
    • web/src/main/java/org/openmrs/web/controller/order/OrderFormController.java (version 7b8309de81cfc27e018fef0d7e92caf55905ddb8)
    • web/src/main/java/org/openmrs/web/controller/order/OrderListByPatientController.java (version 7b8309de81cfc27e018fef0d7e92caf55905ddb8)
    • web/src/main/java/org/openmrs/web/controller/order/OrderListController.java (version 7b8309de81cfc27e018fef0d7e92caf55905ddb8)
    • web/src/main/java/org/openmrs/web/controller/order/OrderTypeFormController.java (version 7b8309de81cfc27e018fef0d7e92caf55905ddb8)
    • web/src/main/java/org/openmrs/web/controller/order/OrderTypeListController.java (version 7b8309de81cfc27e018fef0d7e92caf55905ddb8)
    • web/src/main/java/org/openmrs/web/controller/order/OrderTypeValidator.java (version 7b8309de81cfc27e018fef0d7e92caf55905ddb8)
    • web/src/main/java/org/openmrs/web/dwr/DWROrderService.java (version 7b8309de81cfc27e018fef0d7e92caf55905ddb8)
    • web/src/main/java/org/openmrs/web/dwr/DrugOrderListItem.java (version 7b8309de81cfc27e018fef0d7e92caf55905ddb8)
    • web/src/main/java/org/openmrs/web/dwr/OrderableListItem.java (version 7b8309de81cfc27e018fef0d7e92caf55905ddb8)
    • web/src/main/java/org/openmrs/web/taglib/fieldgen/OrderTypeHandler.java (version 7b8309de81cfc27e018fef0d7e92caf55905ddb8)
    • web/src/main/java/org/openmrs/web/taglib/fieldgen/OrderableHandler.java (version 7b8309de81cfc27e018fef0d7e92caf55905ddb8)
    • web/src/main/resources/openmrs-servlet.xml (version 7b8309de81cfc27e018fef0d7e92caf55905ddb8)
    • webapp/src/main/webapp/WEB-INF/dwr.xml (version 7b8309de81cfc27e018fef0d7e92caf55905ddb8)
    • webapp/src/main/webapp/WEB-INF/messages.properties (version 7b8309de81cfc27e018fef0d7e92caf55905ddb8)
    • webapp/src/main/webapp/WEB-INF/tags/orderableField.tag (version 7b8309de81cfc27e018fef0d7e92caf55905ddb8)
    • webapp/src/main/webapp/WEB-INF/view/admin/orders/localHeader.jsp (version 7b8309de81cfc27e018fef0d7e92caf55905ddb8)
    • webapp/src/main/webapp/WEB-INF/view/admin/orders/orderDrugForm.jsp (version 7b8309de81cfc27e018fef0d7e92caf55905ddb8)
    • webapp/src/main/webapp/WEB-INF/view/admin/orders/orderForm.jsp (version 7b8309de81cfc27e018fef0d7e92caf55905ddb8)
    • webapp/src/main/webapp/WEB-INF/view/admin/orders/orderList.jsp (version 7b8309de81cfc27e018fef0d7e92caf55905ddb8)
    • webapp/src/main/webapp/WEB-INF/view/fieldGen/orderable.jsp (version 7b8309de81cfc27e018fef0d7e92caf55905ddb8)
    • webapp/src/main/webapp/WEB-INF/view/portlets/patientRegimen.jsp (version 7b8309de81cfc27e018fef0d7e92caf55905ddb8)
    • webapp/src/main/webapp/WEB-INF/view/scripts/drugOrder.js.withjstl (version 7b8309de81cfc27e018fef0d7e92caf55905ddb8)
    • webapp/src/main/webapp/WEB-INF/view/scripts/jquery/autocomplete/OpenmrsAutoComplete.js (version 7b8309de81cfc27e018fef0d7e92caf55905ddb8)
  • Daniel Kayiwa

    Daniel Kayiwa 1a20b84d1e661bcce377c4b9a4c1fa6aef55a10d

    Revert "TRUNK4391 - Have Xforms show form in Internet Explorer (IE) 9 and 10"
    This reverts commit 5bd90b2ab41ca8a793b8d3c738d7494243ef588b.

    • webapp/src/main/webapp/WEB-INF/template/headerFull.jsp (version 1a20b84d1e661bcce377c4b9a4c1fa6aef55a10d)
    • webapp/src/main/webapp/WEB-INF/template/headerMinimal.jsp (version 1a20b84d1e661bcce377c4b9a4c1fa6aef55a10d)
  • Daniel Kayiwa

    Daniel Kayiwa c4d96e456d26f766d8db92995a81d83852e8dd7d

    Merge pull request #948 from citigoDev1/master
    TRUNK4391 - Have Xforms show form in Internet Explorer (IE) 9 and 10

  • citigodev1 <citigo@ehs.cl>

    citigodev1 <citigo@ehs.cl> 5bd90b2ab41ca8a793b8d3c738d7494243ef588b

    TRUNK4391 - Have Xforms show form in Internet Explorer (IE) 9 and 10

    • webapp/src/main/webapp/WEB-INF/template/headerFull.jsp (version 5bd90b2ab41ca8a793b8d3c738d7494243ef588b)
    • webapp/src/main/webapp/WEB-INF/template/headerMinimal.jsp (version 5bd90b2ab41ca8a793b8d3c738d7494243ef588b)
  • Daniel Kayiwa

    Daniel Kayiwa 392802e73b9e1eb30f1b3fa4c365d8a0d4a902f6

    Merge pull request #944 from rpuzdrowski/TRUNK-4114
    TRUNK-4114: Deletion of referenced role throws exception

  • Rafal Korytkowski

    Rafal Korytkowski 0dc65364404be1e673fbdec80556ebb0ac79add0

    TRUNK-4392 Added nullsafe check

    • api/src/main/java/org/openmrs/api/impl/OrderServiceImpl.java (version 0dc65364404be1e673fbdec80556ebb0ac79add0)
  • Rafal Korytkowski

    Rafal Korytkowski 5b04b21fe7daef79cfc9af8d4d989334d3b4857d

    TRUNK-4392 Correct setting concept on drug order

    • api/src/main/java/org/openmrs/api/impl/OrderServiceImpl.java (version 5b04b21fe7daef79cfc9af8d4d989334d3b4857d)
  • Radek Puzdrowski <radoslaw.puzdrowski@gmail.com>

    Radek Puzdrowski <radoslaw.puzdrowski@gmail.com> 902543bcde32c35b36d002ffcebb5c5efa97dd2b

    TRUNK-4114: Deletion of referenced role throws exception

    • api/src/main/java/org/openmrs/api/CannotDeleteRoleWithChildrenException.java (version 902543bcde32c35b36d002ffcebb5c5efa97dd2b)
    • api/src/main/java/org/openmrs/api/impl/UserServiceImpl.java (version 902543bcde32c35b36d002ffcebb5c5efa97dd2b)
    • api/src/test/java/org/openmrs/api/UserServiceTest.java (version 902543bcde32c35b36d002ffcebb5c5efa97dd2b)
    • web/src/main/java/org/openmrs/web/controller/user/RoleListController.java (version 902543bcde32c35b36d002ffcebb5c5efa97dd2b)
    • webapp/src/main/webapp/WEB-INF/messages.properties (version 902543bcde32c35b36d002ffcebb5c5efa97dd2b)
    • webapp/src/main/webapp/WEB-INF/template/headerFull.jsp (version 902543bcde32c35b36d002ffcebb5c5efa97dd2b)
  • Daniel Kayiwa

    Daniel Kayiwa e42282378ac480d6a13627e2f305ba7bd954bfef

    Merge pull request #942 from rpuzdrowski/TRUNK-4171
    TRUNK-4171: Retired locations can be selected as a parent

  • Rafal Korytkowski

    Rafal Korytkowski a766da1b13781f91b086f9beca5ffd20e4bb4798

    Corrected uuid of drug order type to match liquibase

    • api/src/test/java/org/openmrs/api/OrderServiceTest.java (version a766da1b13781f91b086f9beca5ffd20e4bb4798)
    • api/src/test/resources/org/openmrs/include/standardTestDataset.xml (version a766da1b13781f91b086f9beca5ffd20e4bb4798)
  • Daniel Kayiwa

    Daniel Kayiwa dce7e3aef3428566529d37869bd814066229405a

    Merge pull request #931 from dsurrao/TRUNK-4116
    Trunk 4116

  • Radek Puzdrowski <radoslaw.puzdrowski@gmail.com>

    Radek Puzdrowski <radoslaw.puzdrowski@gmail.com> 59e924ce45cefa8a6b0e7dc4f8021902024b9fd7

    TRUNK-4171: Retired locations can be selected as a parent

    • webapp/src/main/webapp/WEB-INF/messages.properties (version 59e924ce45cefa8a6b0e7dc4f8021902024b9fd7)
    • webapp/src/main/webapp/WEB-INF/tags/locationField.tag (version 59e924ce45cefa8a6b0e7dc4f8021902024b9fd7)
  • Daniel Kayiwa

    Daniel Kayiwa f85327aeb5f06de0218607ab6496d1ea29b0bd5c

    Merge pull request #941 from felipeq/TRUNK-3967
    [Trunk-3967] Need to have option to unvoid Person on UI

  • Filip Biedrzycki <fbiedrzycki@soldevelo.com>

    Filip Biedrzycki <fbiedrzycki@soldevelo.com> a37f9df620166dad47edfdbd486d812d66813e63

    Fixed refreshing Include Deleted + CSS

    • webapp/src/main/webapp/WEB-INF/view/admin/person/index.jsp (version a37f9df620166dad47edfdbd486d812d66813e63)
    • webapp/src/main/webapp/openmrs.css (version a37f9df620166dad47edfdbd486d812d66813e63)
  • Filip Biedrzycki <fbiedrzycki@soldevelo.com>

    Filip Biedrzycki <fbiedrzycki@soldevelo.com> e96a807fa531793f61cacb1b2606b0869b9389be

    wip

    • webapp/src/main/webapp/WEB-INF/view/admin/person/index.jsp (version e96a807fa531793f61cacb1b2606b0869b9389be)
    • webapp/src/main/webapp/openmrs.css (version e96a807fa531793f61cacb1b2606b0869b9389be)
  • Dominic Surrao <dsurrao@dominicrraosmbp.partners.org>

    Dominic Surrao <dsurrao@dominicrraosmbp.partners.org> 85eefcc2922967bcea063484dec4cc372ff153eb

    TRUNK-4116: Concept Service getDrugs(String phrase) should not return retired drugs

    • api/src/main/java/org/openmrs/api/ConceptService.java (version 85eefcc2922967bcea063484dec4cc372ff153eb)
    • api/src/main/java/org/openmrs/api/db/hibernate/HibernateConceptDAO.java (version 85eefcc2922967bcea063484dec4cc372ff153eb)
    • api/src/test/java/org/openmrs/api/ConceptServiceTest.java (version 85eefcc2922967bcea063484dec4cc372ff153eb)
    • api/src/test/java/org/openmrs/api/db/hibernate/HibernateConceptDAOTest.java (version 85eefcc2922967bcea063484dec4cc372ff153eb)
    • api/src/test/resources/org/openmrs/api/db/hibernate/include/HibernateConceptTestDataSet.xml (version 85eefcc2922967bcea063484dec4cc372ff153eb)
    • api/src/test/resources/org/openmrs/include/standardTestDataset.xml (version 85eefcc2922967bcea063484dec4cc372ff153eb)
  • Daniel Kayiwa

    Daniel Kayiwa 0f9c419fe66676f2c4f33c319558698ee0b843f9

    Merge pull request #930 from harsha89/TRUNK-3483_4322
    issue cannot enroll patient in a program more than once TRUNK-3483 and 4322 solution

  • Daniel Kayiwa

    Daniel Kayiwa 0476d048f7d3d76f99e0570d70349d2c756cd15f

    Merge pull request #936 from kkaczmarczyk/TRUNK-4036-1.10.x
    Trunk 4036 1.10.x

  • Daniel Kayiwa

    Daniel Kayiwa b4e05ea2ff43a3d8cf7418a44484b9fb86712c48

    Merge pull request #937 from rpuzdrowski/TRUNK-4031
    TRUNK-4031: locking mechanism for patient_identifier_type

  • Daniel Kayiwa

    Daniel Kayiwa fb5beee42de0310cd997d05aa416a1b207f0b2e5

    Merge pull request #935 from harsha89/TRUNK-4314-add
    added empty option to the selection list TRUNK-4314

  • Radek Puzdrowski <radoslaw.puzdrowski@gmail.com>

    Radek Puzdrowski <radoslaw.puzdrowski@gmail.com> a475deab165d32783affa9f24fb5cec8b60915b8

    TRUNK-4031: locking mechanism for patient_identifier_type

    • api/src/main/java/org/openmrs/api/PatientIdentifierTypeLockedException.java (version a475deab165d32783affa9f24fb5cec8b60915b8)
    • api/src/main/java/org/openmrs/api/PatientService.java (version a475deab165d32783affa9f24fb5cec8b60915b8)
    • api/src/main/java/org/openmrs/api/impl/PatientServiceImpl.java (version a475deab165d32783affa9f24fb5cec8b60915b8)
    • api/src/main/java/org/openmrs/util/OpenmrsConstants.java (version a475deab165d32783affa9f24fb5cec8b60915b8)
    • api/src/test/java/org/openmrs/api/PatientServiceTest.java (version a475deab165d32783affa9f24fb5cec8b60915b8)
    • web/src/main/java/org/openmrs/web/controller/patient/PatientIdentifierTypeFormController.java (version a475deab165d32783affa9f24fb5cec8b60915b8)
    • web/src/test/java/org/openmrs/web/controller/patient/PatientIdentifierTypeFormControllerTest.java (version a475deab165d32783affa9f24fb5cec8b60915b8)
    • web/src/test/resources/org/openmrs/web/patient/include/PatientIdentifierTypeFormControllerTest.xml (version a475deab165d32783affa9f24fb5cec8b60915b8)
    • webapp/src/main/webapp/WEB-INF/messages.properties (version a475deab165d32783affa9f24fb5cec8b60915b8)
    • webapp/src/main/webapp/WEB-INF/view/admin/patients/patientIdentifierTypeForm.jsp (version a475deab165d32783affa9f24fb5cec8b60915b8)
  • Krzysztof Kaczmarczyk <kkaczmarczyk@soldevelo.com>

    Krzysztof Kaczmarczyk <kkaczmarczyk@soldevelo.com> 7699e3617231300f17340fc4d2dbd4097ac07759

    Filled out Independent annotation description

    • api/src/main/java/org/openmrs/annotation/Independent.java (version 7699e3617231300f17340fc4d2dbd4097ac07759)
  • Krzysztof Kaczmarczyk <kkaczmarczyk@soldevelo.com>

    Krzysztof Kaczmarczyk <kkaczmarczyk@soldevelo.com> 2c0e06fcc5a15c0c15d7f420d326102284f34449

    TRUNK-4036: Retiring a Location also retires the location tag

    • api/src/main/java/org/openmrs/Location.java (version 2c0e06fcc5a15c0c15d7f420d326102284f34449)
    • api/src/main/java/org/openmrs/OrderType.java (version 2c0e06fcc5a15c0c15d7f420d326102284f34449)
    • api/src/main/java/org/openmrs/annotation/Independent.java (version 2c0e06fcc5a15c0c15d7f420d326102284f34449)
    • api/src/main/java/org/openmrs/aop/RequiredDataAdvice.java (version 2c0e06fcc5a15c0c15d7f420d326102284f34449)
    • api/src/test/java/org/openmrs/api/LocationServiceTest.java (version 2c0e06fcc5a15c0c15d7f420d326102284f34449)
    • api/src/test/java/org/openmrs/api/OrderServiceTest.java (version 2c0e06fcc5a15c0c15d7f420d326102284f34449)
  • harsha89 <harsz89@gmail.com>

    harsha89 <harsz89@gmail.com> 47509d989546fac654ce8e8982c5657dde4c73a9

    added empty option to the selection list

    • webapp/src/main/webapp/WEB-INF/view/admin/person/personAttributeTypeForm.jsp (version 47509d989546fac654ce8e8982c5657dde4c73a9)
  • harsha89 <harsz89@gmail.com>

    harsha89 <harsz89@gmail.com> ff5aba8c8f088000c0bdb3d7df2e306555b5be1e

    changes done as per comment made in the pull request

    • api/src/main/java/org/openmrs/validator/PatientProgramValidator.java (version ff5aba8c8f088000c0bdb3d7df2e306555b5be1e)
    • api/src/test/java/org/openmrs/validator/PatientProgramValidatorTest.java (version ff5aba8c8f088000c0bdb3d7df2e306555b5be1e)
  • Wyclif Luyima

    Wyclif Luyima c09b4d7186bfd6eaba7c5dc4f721696313516593

    TRUNK-2694 Fix Performance hog: Maps and sets of URLs
    (cherry picked from commit 358de98ed9954c3eb0b9b31031f7dffe0ee8a9b1)

    manually added missing imports

    • api/src/main/java/org/openmrs/module/ModuleClassLoader.java (version c09b4d7186bfd6eaba7c5dc4f721696313516593)
    • api/src/main/java/org/openmrs/util/OpenmrsClassLoader.java (version c09b4d7186bfd6eaba7c5dc4f721696313516593)
  • Wyclif Luyima

    Wyclif Luyima 9637ed494d6987559a4bc7eade842b6e3fc7bb29

    Revert "[TRUNK-3982] SchedulerUtil locks out openmrs user with false log in attempts."
    This reverts commit 117eaed29198ccca156bda508022acf3f69b9e78.

    • web/src/main/java/org/openmrs/web/filter/initialization/InitializationFilter.java (version 9637ed494d6987559a4bc7eade842b6e3fc7bb29)
  • Wyclif Luyima

    Wyclif Luyima 2038b0a41bb1ea09297fb85f7007335c3ddd2951

    Revert "[TRUNK-3982] SchedulerUtil locks out openmrs user with false log in attempts."
    This reverts commit 117eaed29198ccca156bda508022acf3f69b9e78.

    • web/src/main/java/org/openmrs/web/filter/initialization/InitializationFilter.java (version 2038b0a41bb1ea09297fb85f7007335c3ddd2951)
  • Wyclif Luyima

    Wyclif Luyima 117eaed29198ccca156bda508022acf3f69b9e78

    [TRUNK-3982] SchedulerUtil locks out openmrs user with false log in attempts.

    • web/src/main/java/org/openmrs/web/filter/initialization/InitializationFilter.java (version 117eaed29198ccca156bda508022acf3f69b9e78)
  • Wyclif Luyima

    Wyclif Luyima 4294fc6bcb5158bf2d231505cb706ff8b57bd55c

    Cleaned up PatientServiceTest

    • api/src/main/java/org/openmrs/api/PatientService.java (version 4294fc6bcb5158bf2d231505cb706ff8b57bd55c)
    • api/src/test/java/org/openmrs/api/PatientServiceTest.java (version 4294fc6bcb5158bf2d231505cb706ff8b57bd55c)
  • Wyclif Luyima

    Wyclif Luyima d957fac5037200f248b9d0527a06419690b42312

    Revert "Revert "ConceptNumeric(concept) incorrectly copies collections - TRUNK-3974""
    This reverts commit d41e15b52a124e5c64da1c5b90b527c647e3cd0d.

    • api/src/main/java/org/openmrs/ConceptNumeric.java (version d957fac5037200f248b9d0527a06419690b42312)
    • api/src/test/java/org/openmrs/ConceptNumericTest.java (version d957fac5037200f248b9d0527a06419690b42312)
  • Wyclif Luyima

    Wyclif Luyima d41e15b52a124e5c64da1c5b90b527c647e3cd0d

    Revert "ConceptNumeric(concept) incorrectly copies collections - TRUNK-3974"
    This reverts commit 75a01e8c3d9f06e5395f9d23f30a194392eed1b3.

    • api/src/main/java/org/openmrs/ConceptNumeric.java (version d41e15b52a124e5c64da1c5b90b527c647e3cd0d)
    • api/src/test/java/org/openmrs/ConceptNumericTest.java (version d41e15b52a124e5c64da1c5b90b527c647e3cd0d)
  • Daniel Kayiwa

    Daniel Kayiwa e59fe43f99ade8302f55603ffa3a4d3f8620d889

    Merge pull request #934 from rpuzdrowski/TRUNK-4032
    TRUNK-4032:locking mechanism for person_attribute_type

  • Radek Puzdrowski <radoslaw.puzdrowski@gmail.com>

    Radek Puzdrowski <radoslaw.puzdrowski@gmail.com> 7e7ca9d5fc6c2aa75f0b923d0d69bfdbb505eaed

    TRUNK-4032:locking mechanism for person_attribute_type

    • webapp/src/main/webapp/WEB-INF/messages.properties (version 7e7ca9d5fc6c2aa75f0b923d0d69bfdbb505eaed)
  • Daniel Kayiwa

    Daniel Kayiwa c85119b17a27e1d99a9aa24a9ff5c93d6845efc4

    Merge pull request #933 from rpuzdrowski/TRUNK-4032
    TRUNK-4032: locking mechanism for person_attribute_type

  • Radek Puzdrowski <radoslaw.puzdrowski@gmail.com>

    Radek Puzdrowski <radoslaw.puzdrowski@gmail.com> f2557b18be4f70e26c690e8479b35c6837f0fbda

    TRUNK-4032: locking mechanism for person_attribute_type

    • api/src/main/java/org/openmrs/api/PersonAttributeTypeLockedException.java (version f2557b18be4f70e26c690e8479b35c6837f0fbda)
    • api/src/main/java/org/openmrs/api/PersonService.java (version f2557b18be4f70e26c690e8479b35c6837f0fbda)
    • api/src/main/java/org/openmrs/api/impl/PersonServiceImpl.java (version f2557b18be4f70e26c690e8479b35c6837f0fbda)
    • api/src/main/java/org/openmrs/util/OpenmrsConstants.java (version f2557b18be4f70e26c690e8479b35c6837f0fbda)
    • api/src/test/java/org/openmrs/api/PersonServiceTest.java (version f2557b18be4f70e26c690e8479b35c6837f0fbda)
    • web/src/main/java/org/openmrs/web/controller/person/PersonAttributeTypeFormController.java (version f2557b18be4f70e26c690e8479b35c6837f0fbda)
    • web/src/test/java/org/openmrs/web/controller/person/PersonAttributeTypeFormControllerTest.java (version f2557b18be4f70e26c690e8479b35c6837f0fbda)
    • web/src/test/resources/org/openmrs/web/controller/include/PersonAttributeTypeFormControllerTest.xml (version f2557b18be4f70e26c690e8479b35c6837f0fbda)
    • webapp/src/main/webapp/WEB-INF/messages.properties (version f2557b18be4f70e26c690e8479b35c6837f0fbda)
    • webapp/src/main/webapp/WEB-INF/view/admin/person/personAttributeTypeForm.jsp (version f2557b18be4f70e26c690e8479b35c6837f0fbda)
  • harsha89 <harsz89@gmail.com>

    harsha89 <harsz89@gmail.com> c2af66d65b68f4356e681feac8888921a2550740

    issue cannot enroll patient in a program more than once TRUNK-3483 and 4322 solution

    • api/src/main/java/org/openmrs/validator/PatientProgramValidator.java (version c2af66d65b68f4356e681feac8888921a2550740)
    • api/src/test/java/org/openmrs/validator/PatientProgramValidatorTest.java (version c2af66d65b68f4356e681feac8888921a2550740)
    • web/src/main/java/org/openmrs/web/controller/program/PatientProgramFormController.java (version c2af66d65b68f4356e681feac8888921a2550740)
    • webapp/src/main/webapp/WEB-INF/messages.properties (version c2af66d65b68f4356e681feac8888921a2550740)
    • webapp/src/main/webapp/WEB-INF/view/portlets/patientPrograms.jsp (version c2af66d65b68f4356e681feac8888921a2550740)
  • Daniel Kayiwa

    Daniel Kayiwa 8f05c8ad04c3dfd04d906d7b974656ed129351ff

    Merge pull request #927 from felipeq/TRUNK-3967
    TRUNK-3967: Added option to unvoid Person on UI

  • Daniel Kayiwa

    Daniel Kayiwa 3c1a3b7d1867ea138377005ae6365ee5d3379dc1

    Merge pull request #929 from anotherdave/TRUNK-4212-2
    TRUNK-4212: SchedulerServiceTest.shouldSaveLastExecutionTime failing

  • David Churcher <anotherdave@users.noreply.github.com>

    David Churcher <anotherdave@users.noreply.github.com> 35b27e8d9490a3dcc4297f7a9536e6914b3ab16a

    TRUNK-4212: SchedulerServiceTest.shouldSaveLastExecutionTime failing occasionally

    • api/src/test/java/org/openmrs/scheduler/SchedulerServiceTest.java (version 35b27e8d9490a3dcc4297f7a9536e6914b3ab16a)
  • Rafal Korytkowski

    Rafal Korytkowski aecc9d6087dd35176a9b01f4ab1a992fdbff1832

    TRUNK-4378 Modules using conditional loading should not fail on older versions
    (cherry picked from commit adc56e8a12fa61b65c8437326fd15d03fdf98819)

    • api/src/main/java/org/openmrs/annotation/OpenmrsComponent.java (version aecc9d6087dd35176a9b01f4ab1a992fdbff1832)
    • api/src/main/java/org/openmrs/annotation/OpenmrsComponentIncludeFilter.java (version aecc9d6087dd35176a9b01f4ab1a992fdbff1832)
    • api/src/main/java/org/openmrs/annotation/OpenmrsProfile.java (version aecc9d6087dd35176a9b01f4ab1a992fdbff1832)
    • api/src/main/java/org/openmrs/annotation/OpenmrsProfileIncludeFilter.java (version aecc9d6087dd35176a9b01f4ab1a992fdbff1832)
    • api/src/main/resources/applicationContext-service.xml (version aecc9d6087dd35176a9b01f4ab1a992fdbff1832)
    • api/src/test/java/org/openmrs/annotation/OpenmrsComponent1_6To1_7.java (version aecc9d6087dd35176a9b01f4ab1a992fdbff1832)
    • api/src/test/java/org/openmrs/annotation/OpenmrsComponent1_8.java (version aecc9d6087dd35176a9b01f4ab1a992fdbff1832)
    • api/src/test/java/org/openmrs/annotation/OpenmrsComponentIncludeFilterTest.java (version aecc9d6087dd35176a9b01f4ab1a992fdbff1832)
    • api/src/test/java/org/openmrs/annotation/OpenmrsProfileIncludeFilterTest.java (version aecc9d6087dd35176a9b01f4ab1a992fdbff1832)
  • Rafal Korytkowski

    Rafal Korytkowski adc56e8a12fa61b65c8437326fd15d03fdf98819

    TRUNK-4378 Modules using conditional loading should not fail on older versions

    • api/src/main/java/org/openmrs/annotation/OpenmrsComponent.java (version adc56e8a12fa61b65c8437326fd15d03fdf98819)
    • api/src/main/java/org/openmrs/annotation/OpenmrsComponentIncludeFilter.java (version adc56e8a12fa61b65c8437326fd15d03fdf98819)
    • api/src/main/java/org/openmrs/annotation/OpenmrsProfile.java (version adc56e8a12fa61b65c8437326fd15d03fdf98819)
    • api/src/main/java/org/openmrs/annotation/OpenmrsProfileIncludeFilter.java (version adc56e8a12fa61b65c8437326fd15d03fdf98819)
    • api/src/main/resources/applicationContext-service.xml (version adc56e8a12fa61b65c8437326fd15d03fdf98819)
    • api/src/test/java/org/openmrs/annotation/OpenmrsComponent1_6To1_7.java (version adc56e8a12fa61b65c8437326fd15d03fdf98819)
    • api/src/test/java/org/openmrs/annotation/OpenmrsComponent1_8.java (version adc56e8a12fa61b65c8437326fd15d03fdf98819)
    • api/src/test/java/org/openmrs/annotation/OpenmrsComponentIncludeFilterTest.java (version adc56e8a12fa61b65c8437326fd15d03fdf98819)
    • api/src/test/java/org/openmrs/annotation/OpenmrsProfileIncludeFilterTest.java (version adc56e8a12fa61b65c8437326fd15d03fdf98819)
  • Daniel Kayiwa

    Daniel Kayiwa cb77f997ff13d7311a09b6c9f560ec87f75204fd

    Doing some file formatting

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