Stages & jobs

Build and Test
- Build and Test
Deploy
- Deploy

Code commits

Showing 100 of 152 code changes

Git

Rafal Korytkowski 22 Jul 2014 ab2c1abe57f87b9386dc6084185e20ee10f6a533

Set version to 1.11.x
- api/pom.xml (version ab2c1abe57f87b9386dc6084185e20ee10f6a533)
- api/src/main/java/org/openmrs/api/ObsService.java (version ab2c1abe57f87b9386dc6084185e20ee10f6a533)
- pom.xml (version ab2c1abe57f87b9386dc6084185e20ee10f6a533)
- release-test/pom.xml (version ab2c1abe57f87b9386dc6084185e20ee10f6a533)
- test/pom.xml (version ab2c1abe57f87b9386dc6084185e20ee10f6a533)
- tools/pom.xml (version ab2c1abe57f87b9386dc6084185e20ee10f6a533)
- web/pom.xml (version ab2c1abe57f87b9386dc6084185e20ee10f6a533)
- webapp/pom.xml (version ab2c1abe57f87b9386dc6084185e20ee10f6a533)
Rafal Korytkowski 22 Jul 2014 d6d061c3e4f0d2555406ce84b2de818aa068c2bc

Merge branch 'master' into 1.11.x
Conflicts:
        api/src/main/java/org/openmrs/api/impl/ConceptServiceImpl.java
        api/src/main/java/org/openmrs/util/DoubleRange.java
        api/src/main/java/org/openmrs/util/OpenmrsConstants.java
        api/src/main/java/org/openmrs/util/OpenmrsUtil.java
        api/src/test/java/org/openmrs/api/ConceptServiceTest.java
        api/src/test/java/org/openmrs/api/impl/ConceptServiceImplTest.java
Daniel Kayiwa 21 Jul 2014 461a7ab37dd8893921ed37b91170aafc4fe16030

Merge pull request #989 from anotherdave/TRUNK-4212-3
TRUNK-4212: Fix divide by zero error when repeatInterval=0, possible cau...
anotherdave <anotherdave@users.noreply.github.com> 21 Jul 2014 5ff41cdcbbcddf83a885ed55045fd33c25671453

TRUNK-4212: Fix divide by zero error when repeatInterval=0, possible cause for test failure
TRUNK-4212: Commit task addition to database, possible cause of SchedulerServiceTest failure

TRUNK-4212: Turn on debug logging for the duration of SchedulerServiceTest, to try to diagnose intermittent test failures
- api/src/main/java/org/openmrs/scheduler/SchedulerUtil.java (version 5ff41cdcbbcddf83a885ed55045fd33c25671453)
- api/src/test/java/org/openmrs/scheduler/SchedulerServiceTest.java (version 5ff41cdcbbcddf83a885ed55045fd33c25671453)
- api/src/test/java/org/openmrs/scheduler/timer/TimerSchedulerServiceImplTest.java (version 5ff41cdcbbcddf83a885ed55045fd33c25671453)
Daniel Kayiwa 21 Jul 2014 3a9c0ecbc2d9543976498ddd59ef2d1e662d4900

Merge pull request #988 from jkantorjunk/master
Trunk-4404: Make getDruge method case insensitive
Jeffrey Kantor <jkantorjunk@yahoo.com> 20 Jul 2014 56d23e9d6ace7c989d826ae4d38c7f3f43891baa

Trunk-4404: Make getDruge method case insensitive
- api/src/main/java/org/openmrs/api/db/hibernate/HibernateConceptDAO.java (version 56d23e9d6ace7c989d826ae4d38c7f3f43891baa)
- api/src/test/java/org/openmrs/api/db/hibernate/HibernateConceptDAOTest.java (version 56d23e9d6ace7c989d826ae4d38c7f3f43891baa)
Rafal Korytkowski 18 Jul 2014 4c8b0f2e95449c173f18bf188184fd3fb82bc01b

Merge branch 'hibernate-search'
Rafal Korytkowski 18 Jul 2014 14c3557ac151ba04dcec1650f2361f889572ed8d

TRUNK-2999 Removed update concept index task
- api/src/main/resources/liquibase-update-to-latest.xml (version 14c3557ac151ba04dcec1650f2361f889572ed8d)
Rafal Korytkowski 18 Jul 2014 2d28a621105d69188a286d0b560e0993fdfdf887

TRUNK-2999 Post review fixes
- api/src/main/java/org/openmrs/api/ConceptService.java (version 2d28a621105d69188a286d0b560e0993fdfdf887)
- api/src/main/java/org/openmrs/api/impl/ConceptServiceImpl.java (version 2d28a621105d69188a286d0b560e0993fdfdf887)
- api/src/main/java/org/openmrs/util/OpenmrsConstants.java (version 2d28a621105d69188a286d0b560e0993fdfdf887)
- api/src/main/java/org/openmrs/util/OpenmrsUtil.java (version 2d28a621105d69188a286d0b560e0993fdfdf887)
- api/src/test/java/org/openmrs/test/BaseContextSensitiveTest.java (version 2d28a621105d69188a286d0b560e0993fdfdf887)
- web/src/main/java/org/openmrs/web/Listener.java (version 2d28a621105d69188a286d0b560e0993fdfdf887)
- web/src/main/java/org/openmrs/web/filter/initialization/TestInstallUtil.java (version 2d28a621105d69188a286d0b560e0993fdfdf887)
Rafal Korytkowski 17 Jul 2014 75c9931645b4c908328b2f7758f5bbd32b825172

TRUNK-3951 Follow up improvements
- api/src/test/java/org/openmrs/test/BaseContextSensitiveTest.java (version 75c9931645b4c908328b2f7758f5bbd32b825172)
- api/src/test/java/org/openmrs/test/StartModuleExecutionListener.java (version 75c9931645b4c908328b2f7758f5bbd32b825172)
Daniel Kayiwa 17 Jul 2014 c3a11776a6cf07324f599ba869776c9f3ef9a601

Merge pull request #987 from geoff-wasilwa/TRUNK-3654
TRUNK-3654: Removed max revision variable.
geoff-wasilwa <geoffreywanjala@gmail.com> 17 Jul 2014 ce831848e26a42ab82b7ae90f873f08b350a9ed2

TRUNK-3654: Removed max revision variable.
- api/src/main/java/org/openmrs/module/ModuleUtil.java (version ce831848e26a42ab82b7ae90f873f08b350a9ed2)
Rafal Korytkowski 16 Jul 2014 a690116fc0c51b2938d7527051b765f149b3b2a8

TRUNK-3644 Fixed build short numeric only version
- pom.xml (version a690116fc0c51b2938d7527051b765f149b3b2a8)
Rafal Korytkowski 16 Jul 2014 d33440c84616c9e3b0a7433cb45477dda6f233fb

TRUNK-3644 Fixed build short version
- pom.xml (version d33440c84616c9e3b0a7433cb45477dda6f233fb)
Daniel Kayiwa 16 Jul 2014 237ee60a3359f091c7885839ff88082585bb5c49

Merge pull request #985 from akolodziejski/TRUNK-4285
TRUNK-4285: Incorrect behavior of Person.getPersonName() and getPersonAd...
Arkadiusz Kolodziejski <arkadiusz.kolodziejski@gmail.com> 15 Jul 2014 1b210fefbf6c076ce506cd308d98d920584a776f

TRUNK-4285: Incorrect behavior of Person.getPersonName() and getPersonAddress() for a voided Person
- api/src/main/java/org/openmrs/Person.java (version 1b210fefbf6c076ce506cd308d98d920584a776f)
- api/src/test/java/org/openmrs/PersonTest.java (version 1b210fefbf6c076ce506cd308d98d920584a776f)
Rafal Korytkowski 15 Jul 2014 4ab3ef0cbf5a6ce9b3ff4b5f5b04ac5a87310ff9

TRUNK-2999 Removed ConceptWord class and table
- api/src/main/java/org/openmrs/ConceptWord.java (version 4ab3ef0cbf5a6ce9b3ff4b5f5b04ac5a87310ff9)
- api/src/main/resources/liquibase-update-to-latest.xml (version 4ab3ef0cbf5a6ce9b3ff4b5f5b04ac5a87310ff9)
Rafal Korytkowski 15 Jul 2014 bbf8d5e5d4a570c04f288f8984b59a21091d28bf

TRUNK-2999 Updated since to 1.11
- api/src/main/java/org/openmrs/api/ConceptService.java (version bbf8d5e5d4a570c04f288f8984b59a21091d28bf)
- api/src/main/java/org/openmrs/api/context/Context.java (version bbf8d5e5d4a570c04f288f8984b59a21091d28bf)
- api/src/main/java/org/openmrs/api/db/hibernate/search/CriteriaQuery.java (version bbf8d5e5d4a570c04f288f8984b59a21091d28bf)
- api/src/main/java/org/openmrs/api/db/hibernate/search/LuceneQuery.java (version bbf8d5e5d4a570c04f288f8984b59a21091d28bf)
- api/src/main/java/org/openmrs/api/db/hibernate/search/SearchQuery.java (version bbf8d5e5d4a570c04f288f8984b59a21091d28bf)
- api/src/main/java/org/openmrs/collection/CollectionPart.java (version bbf8d5e5d4a570c04f288f8984b59a21091d28bf)
- api/src/main/java/org/openmrs/collection/ListPart.java (version bbf8d5e5d4a570c04f288f8984b59a21091d28bf)
Rafal Korytkowski 15 Jul 2014 93d60c17438361cff4445f48af7b273cff93a162

TRUNK-4425 Preferred name matches should be sorted above synonym matches
- api/src/main/java/org/openmrs/ConceptName.java (version 93d60c17438361cff4445f48af7b273cff93a162)
- api/src/main/java/org/openmrs/api/ConceptService.java (version 93d60c17438361cff4445f48af7b273cff93a162)
- api/src/main/java/org/openmrs/api/db/hibernate/HibernateConceptDAO.java (version 93d60c17438361cff4445f48af7b273cff93a162)
- api/src/test/java/org/openmrs/api/ConceptServiceTest.java (version 93d60c17438361cff4445f48af7b273cff93a162)
- api/src/test/java/org/openmrs/test/OpenmrsMatchers.java (version 93d60c17438361cff4445f48af7b273cff93a162)
Rafal Korytkowski 15 Jul 2014 ba5d4636896e1f651821c0096f8bf48eb2ffef42

TRUNK-4424 Added missing class
- api/src/main/java/org/openmrs/api/db/hibernate/search/ConceptNameSimilarity.java (version ba5d4636896e1f651821c0096f8bf48eb2ffef42)
Rafal Korytkowski 15 Jul 2014 4b24bd0ff12a20b9ca459ad11937621512061cd3

TRUNK-4424 Score shorter matches higher
- api/src/main/java/org/openmrs/ConceptName.java (version 4b24bd0ff12a20b9ca459ad11937621512061cd3)
- api/src/main/java/org/openmrs/api/db/hibernate/HibernateConceptDAO.java (version 4b24bd0ff12a20b9ca459ad11937621512061cd3)
- api/src/main/java/org/openmrs/util/OpenmrsConstants.java (version 4b24bd0ff12a20b9ca459ad11937621512061cd3)
- api/src/test/java/org/openmrs/api/ConceptServicePT.java (version 4b24bd0ff12a20b9ca459ad11937621512061cd3)
Daniel Kayiwa 15 Jul 2014 67e63972324e5742c8ba17ea1edf6d12e762b502

Merge pull request #980 from geoff-wasilwa/TRUNK-3654
TRUNK-3654: ModuleUtil should not treat SNAPSHOT as 999.
Daniel Kayiwa 15 Jul 2014 41da0f6467a6c9a03f1cfc35b9269c0a24136171

Merge pull request #983 from chocobar/master
TRUNK-4411 Relaxed ProviderValidator to accept duplicate identifiers.
Daniel Kayiwa 15 Jul 2014 1e2a4d1a7fd9c3857aadd36d6a50ad4c108c7f36

Merge pull request #984 from harsha89/TRUNK-3483-add
added completed date to dialog box
harsha89 <harsz89@gmail.com> 14 Jul 2014 55c0ca893617189cfccab7dce3954b73869285ce

added completed date to dialog box
- webapp/src/main/webapp/WEB-INF/view/portlets/patientPrograms.jsp (version 55c0ca893617189cfccab7dce3954b73869285ce)
geoff-wasilwa <geoffreywanjala@gmail.com> 14 Jul 2014 688f5d6a57faf76cb77da7144ae93f5502e93a4a

TRUNK-3654: ModuleUtil should not treat SNAPSHOT as 999.
Changed max revision number to Integer.MAX_VALUE and added some test for this change

Added back the lines that stipped off modifiers/qualifiers in the loop

Added back isVersionWithQualifiers() method
- api/src/main/java/org/openmrs/module/ModuleUtil.java (version 688f5d6a57faf76cb77da7144ae93f5502e93a4a)
- api/src/test/java/org/openmrs/module/ModuleUtilTest.java (version 688f5d6a57faf76cb77da7144ae93f5502e93a4a)
Rafal Korytkowski 14 Jul 2014 adccb94b51697edf0374ecbaaec5b9ff99c4c4b5

TRUNK-4422 Store index version
- api/src/main/java/org/openmrs/api/db/ContextDAO.java (version adccb94b51697edf0374ecbaaec5b9ff99c4c4b5)
- api/src/main/java/org/openmrs/api/db/hibernate/HibernateContextDAO.java (version adccb94b51697edf0374ecbaaec5b9ff99c4c4b5)
- api/src/main/java/org/openmrs/util/OpenmrsConstants.java (version adccb94b51697edf0374ecbaaec5b9ff99c4c4b5)
Rafal Korytkowski 14 Jul 2014 0272020d89fc0975c6547a7f4743c0a6ff6b0264

TRUNK-4421 Update performance test
- api/src/test/java/org/openmrs/api/ConceptServicePT.java (version 0272020d89fc0975c6547a7f4743c0a6ff6b0264)
- api/src/test/java/org/openmrs/test/CreateConceptDictionaryDataSet.java (version 0272020d89fc0975c6547a7f4743c0a6ff6b0264)
- pom.xml (version 0272020d89fc0975c6547a7f4743c0a6ff6b0264)
Rafal Korytkowski 14 Jul 2014 5a9ecce3b7078f4c00ee34c1bf5c54b210c98acb

Merge branch 'master' of https://github.com/openmrs/openmrs-core into hibernate-search
Conflicts:
        api/pom.xml
        api/src/main/java/org/openmrs/api/ConceptService.java
        api/src/main/java/org/openmrs/api/impl/ConceptServiceImpl.java
        api/src/test/java/org/openmrs/api/impl/ConceptServiceImplTest.java
        api/src/test/java/org/openmrs/test/BaseContextSensitiveTest.java
Daniel Kayiwa 14 Jul 2014 9e9f586fd4cba6fa8bd96fb7d51c09bd6a1421cc

Merge pull request #951 from rpuzdrowski/TRUNK-3771
TRUNK-3771: Select Multi should only be enabled for coded datatype in Edit FormField
Radoslaw Puzdrowski <radoslaw.puzdrowski@gmail.com> 14 Jul 2014 5e345a94e0ab52b1afe9674b99145c87490e2b4a

TRUNK 3771: Select Multi should only be enabled for coded datatype in Edit FormField
- web/src/main/java/org/openmrs/web/dwr/ConceptListItem.java (version 5e345a94e0ab52b1afe9674b99145c87490e2b4a)
- web/src/main/java/org/openmrs/web/dwr/DWRFormService.java (version 5e345a94e0ab52b1afe9674b99145c87490e2b4a)
- webapp/src/main/webapp/WEB-INF/view/admin/forms/fieldForm.jsp (version 5e345a94e0ab52b1afe9674b99145c87490e2b4a)
- webapp/src/main/webapp/WEB-INF/view/scripts/dojo/src/widget/openmrs/OpenmrsPopup.js (version 5e345a94e0ab52b1afe9674b99145c87490e2b4a)
- webapp/src/main/webapp/admin/forms/formSchemaDesign.js (version 5e345a94e0ab52b1afe9674b99145c87490e2b4a)
Priya Chandran <prichand@thoughtworks.com> 14 Jul 2014 ca072594e00a59a3e92f2b6a1f2936e4913ac4b2

TRUNK-4411 Relaxed ProviderValidator to accept duplicate identifiers. Updated test names and should annotations.
- Made them more consistent.
- api/src/main/java/org/openmrs/validator/ProviderValidator.java (version ca072594e00a59a3e92f2b6a1f2936e4913ac4b2)
- api/src/test/java/org/openmrs/validator/ProviderValidatorTest.java (version ca072594e00a59a3e92f2b6a1f2936e4913ac4b2)
Priya Chandran <prichand@thoughtworks.com> 14 Jul 2014 eaac3ab6b5a97b8bfa94e3b781a4e992f8327fbe

TRUNK-4411 Relaxed ProviderValidator to accept duplicate identifiers.
- Removed the uniqueness check in the validator.
- Fixed ambiguous java docs (and fixed an error in the documentation).
- The validator only checks for the presence of a retired identifier(with reason for retiring).
- Removed test for unique checks as this behaviour is no longer supported..
- Renamed and fixed tests to accept duplicate entries for Provider identifier.
- api/src/main/java/org/openmrs/validator/ProviderValidator.java (version eaac3ab6b5a97b8bfa94e3b781a4e992f8327fbe)
- api/src/test/java/org/openmrs/validator/ProviderValidatorTest.java (version eaac3ab6b5a97b8bfa94e3b781a4e992f8327fbe)
Rafal Korytkowski 11 Jul 2014 21bcb6f4716a1681660357de916cf137c4b0562a

TRUNK-4415 Updated sonar properties to the latest version
- pom.xml (version 21bcb6f4716a1681660357de916cf137c4b0562a)
Wyclif Luyima 11 Jul 2014 73921ead06fa8d5d6b3fb9ac25d18b93d6f97a52

Removed OrderUtil.discontinueAllOrders - TRUNK-4398
- api/src/main/java/org/openmrs/order/OrderUtil.java (version 73921ead06fa8d5d6b3fb9ac25d18b93d6f97a52)
Rafal Korytkowski 11 Jul 2014 fe6f121ac860ca5eff16a36d7fa706d2f14beb77

TRUNK-4415 Added console summary
- api/pom.xml (version fe6f121ac860ca5eff16a36d7fa706d2f14beb77)
- pom.xml (version fe6f121ac860ca5eff16a36d7fa706d2f14beb77)
Wyclif Luyima 11 Jul 2014 2cbd7ffd79603bd4a705b4bddc73950df4e0ddb2

Revert "Implement OrderUtil.discontinueAllOrders - TRUNK-4398"
This reverts commit 5b649f625650aa762638b4399e431583980d54ea.
- api/src/main/java/org/openmrs/api/PatientService.java (version 2cbd7ffd79603bd4a705b4bddc73950df4e0ddb2)
- api/src/main/java/org/openmrs/api/ProgramWorkflowService.java (version 2cbd7ffd79603bd4a705b4bddc73950df4e0ddb2)
- api/src/main/java/org/openmrs/api/impl/PatientServiceImpl.java (version 2cbd7ffd79603bd4a705b4bddc73950df4e0ddb2)
- api/src/main/java/org/openmrs/api/impl/ProgramWorkflowServiceImpl.java (version 2cbd7ffd79603bd4a705b4bddc73950df4e0ddb2)
- api/src/test/java/org/openmrs/api/PatientServiceTest.java (version 2cbd7ffd79603bd4a705b4bddc73950df4e0ddb2)
- api/src/test/java/org/openmrs/api/ProgramWorkflowServiceTest.java (version 2cbd7ffd79603bd4a705b4bddc73950df4e0ddb2)
- web/src/main/java/org/openmrs/web/controller/PortletController.java (version 2cbd7ffd79603bd4a705b4bddc73950df4e0ddb2)
- web/src/main/java/org/openmrs/web/dwr/DWRPatientService.java (version 2cbd7ffd79603bd4a705b4bddc73950df4e0ddb2)
- webapp/src/main/webapp/WEB-INF/view/portlets/patientOverview.jsp (version 2cbd7ffd79603bd4a705b4bddc73950df4e0ddb2)
Wyclif Luyima 11 Jul 2014 f581267fc31b1e2b588ee620f7d75f35fb6ba17a

After review: Implement OrderUtil.discontinueAllOrders - TRUNK-4398
- api/src/main/java/org/openmrs/api/PatientService.java (version f581267fc31b1e2b588ee620f7d75f35fb6ba17a)
- api/src/main/java/org/openmrs/api/ProgramWorkflowService.java (version f581267fc31b1e2b588ee620f7d75f35fb6ba17a)
- api/src/main/java/org/openmrs/api/impl/PatientServiceImpl.java (version f581267fc31b1e2b588ee620f7d75f35fb6ba17a)
- api/src/main/java/org/openmrs/order/OrderUtil.java (version f581267fc31b1e2b588ee620f7d75f35fb6ba17a)
- web/src/main/java/org/openmrs/web/controller/PortletController.java (version f581267fc31b1e2b588ee620f7d75f35fb6ba17a)
- webapp/src/main/webapp/WEB-INF/view/portlets/patientOverview.jsp (version f581267fc31b1e2b588ee620f7d75f35fb6ba17a)
Rafal Korytkowski 11 Jul 2014 ca74e955a5ba6d642bd2021eef6abc8200208a18

TRUNK-4419 Change Dabase1_9_7UpgradeTest to integration test, corrected integration test and performance test setup
- api/pom.xml (version ca74e955a5ba6d642bd2021eef6abc8200208a18)
- api/src/test/java/org/openmrs/OpenmrsTestsTest.java (version ca74e955a5ba6d642bd2021eef6abc8200208a18)
- api/src/test/java/org/openmrs/api/ConceptServicePT.java (version ca74e955a5ba6d642bd2021eef6abc8200208a18)
- api/src/test/java/org/openmrs/api/ConceptServicePerformanceIT.java (version ca74e955a5ba6d642bd2021eef6abc8200208a18)
- api/src/test/java/org/openmrs/module/ModuleUtilIT.java (version ca74e955a5ba6d642bd2021eef6abc8200208a18)
- api/src/test/java/org/openmrs/util/UpgradeUtilTest.java (version ca74e955a5ba6d642bd2021eef6abc8200208a18)
- api/src/test/java/org/openmrs/util/databasechange/Database1_9_7UpgradeIT.java (version ca74e955a5ba6d642bd2021eef6abc8200208a18)
- api/src/test/java/org/openmrs/util/databasechange/Database1_9_7UpgradeTest.java (version ca74e955a5ba6d642bd2021eef6abc8200208a18)
- pom.xml (version ca74e955a5ba6d642bd2021eef6abc8200208a18)
- release-test/pom.xml (version ca74e955a5ba6d642bd2021eef6abc8200208a18)
Wyclif Luyima 10 Jul 2014 565d71bea8a7ded6029b02b8c677c50fe6e49f72

Cleaned database upgrade tests from 1.9.7 to use ExpectedException
- api/src/test/java/org/openmrs/util/databasechange/Database1_9_7UpgradeTest.java (version 565d71bea8a7ded6029b02b8c677c50fe6e49f72)
Wyclif Luyima 10 Jul 2014 4918359a6ba4fd5980610e902077c12e260455cc

API should have a convenience method for getting orderable concepts TRUNK-4387
Follow up - TRUNK-4387
- api/src/main/java/org/openmrs/api/ConceptService.java (version 4918359a6ba4fd5980610e902077c12e260455cc)
- api/src/main/java/org/openmrs/api/impl/ConceptServiceImpl.java (version 4918359a6ba4fd5980610e902077c12e260455cc)
- api/src/test/java/org/openmrs/api/ConceptServiceTest.java (version 4918359a6ba4fd5980610e902077c12e260455cc)
- api/src/test/java/org/openmrs/api/impl/ConceptServiceImplTest.java (version 4918359a6ba4fd5980610e902077c12e260455cc)
Daniel Kayiwa 10 Jul 2014 7b023764dfb38b6e84c3abc34617a5f5ebe84c8b

Merge pull request #979 from akolodziejski/TRUNK-4267
TRUNK-4267 :AlertServiceImpl.notifySuperUsers throws exception for excep...
Wyclif Luyima 09 Jul 2014 5b649f625650aa762638b4399e431583980d54ea

Implement OrderUtil.discontinueAllOrders - TRUNK-4398
- api/src/main/java/org/openmrs/api/PatientService.java (version 5b649f625650aa762638b4399e431583980d54ea)
- api/src/main/java/org/openmrs/api/ProgramWorkflowService.java (version 5b649f625650aa762638b4399e431583980d54ea)
- api/src/main/java/org/openmrs/api/impl/PatientServiceImpl.java (version 5b649f625650aa762638b4399e431583980d54ea)
- api/src/main/java/org/openmrs/api/impl/ProgramWorkflowServiceImpl.java (version 5b649f625650aa762638b4399e431583980d54ea)
- api/src/test/java/org/openmrs/api/PatientServiceTest.java (version 5b649f625650aa762638b4399e431583980d54ea)
- api/src/test/java/org/openmrs/api/ProgramWorkflowServiceTest.java (version 5b649f625650aa762638b4399e431583980d54ea)
- web/src/main/java/org/openmrs/web/controller/PortletController.java (version 5b649f625650aa762638b4399e431583980d54ea)
- web/src/main/java/org/openmrs/web/dwr/DWRPatientService.java (version 5b649f625650aa762638b4399e431583980d54ea)
- webapp/src/main/webapp/WEB-INF/view/portlets/patientOverview.jsp (version 5b649f625650aa762638b4399e431583980d54ea)
Wyclif Luyima 09 Jul 2014 59c1b7b58c7032ce261a96e992a9358a848f5c0c

Improve OpenMRS 1.10 database upgrade script - TRUNK-4390
- api/src/main/resources/liquibase-update-to-latest.xml (version 59c1b7b58c7032ce261a96e992a9358a848f5c0c)
- api/src/test/java/org/openmrs/util/databasechange/Database1_9_7UpgradeTest.java (version 59c1b7b58c7032ce261a96e992a9358a848f5c0c)
Wyclif Luyima 08 Jul 2014 0dc1822e9d8646516dc545887b89218ed503b69a

Moved up the code that checks the java type of an order that it matches that of the order type - TRUNK-4389
- api/src/main/java/org/openmrs/api/impl/OrderServiceImpl.java (version 0dc1822e9d8646516dc545887b89218ed503b69a)
Arkadiusz Kolodziejski <arkadiusz.kolodziejski@gmail.com> 08 Jul 2014 8e73bdc88c7ad2610583a14f2719b6e71638c6bc

TRUNK-4267 :AlertServiceImpl.notifySuperUsers throws exception for exceptions with short stack traces
- api/src/main/java/org/openmrs/notification/AlertService.java (version 8e73bdc88c7ad2610583a14f2719b6e71638c6bc)
- api/src/main/java/org/openmrs/notification/impl/AlertServiceImpl.java (version 8e73bdc88c7ad2610583a14f2719b6e71638c6bc)
- api/src/test/java/org/openmrs/notification/AlertServiceTest.java (version 8e73bdc88c7ad2610583a14f2719b6e71638c6bc)
Wyclif Luyima 08 Jul 2014 6aa04b8638347f800891195485c5704d5fa02670

TRUNK-4392 Correct setting concept on drug order
- api/src/main/java/org/openmrs/DrugOrder.java (version 6aa04b8638347f800891195485c5704d5fa02670)
- api/src/main/java/org/openmrs/api/impl/OrderServiceImpl.java (version 6aa04b8638347f800891195485c5704d5fa02670)
- api/src/main/java/org/openmrs/validator/DrugOrderValidator.java (version 6aa04b8638347f800891195485c5704d5fa02670)
- api/src/main/resources/org/openmrs/api/db/hibernate/Order.hbm.xml (version 6aa04b8638347f800891195485c5704d5fa02670)
- api/src/test/java/org/openmrs/DrugOrderTest.java (version 6aa04b8638347f800891195485c5704d5fa02670)
- api/src/test/java/org/openmrs/OrderTest.java (version 6aa04b8638347f800891195485c5704d5fa02670)
- api/src/test/java/org/openmrs/api/OrderServiceTest.java (version 6aa04b8638347f800891195485c5704d5fa02670)
- api/src/test/java/org/openmrs/validator/DrugOrderValidatorTest.java (version 6aa04b8638347f800891195485c5704d5fa02670)
Wyclif Luyima 08 Jul 2014 72695858672f14c214f9ad8336788afcfe44aae4

Renamed unknownProvider GP name - TRUNK-4402
- api/src/main/java/org/openmrs/util/OpenmrsConstants.java (version 72695858672f14c214f9ad8336788afcfe44aae4)
- api/src/main/resources/liquibase-update-to-latest.xml (version 72695858672f14c214f9ad8336788afcfe44aae4)
- api/src/test/resources/org/openmrs/util/databasechange/standardTest-1.9.7-dataSet.xml (version 72695858672f14c214f9ad8336788afcfe44aae4)
Rafal Korytkowski 08 Jul 2014 35727217df1e878f19fcf5e625a9dac1260c4b7d

TRUNK-3951 NotTransactional not working correctly
- api/src/test/java/org/openmrs/api/context/ContextMockHelper.java (version 35727217df1e878f19fcf5e625a9dac1260c4b7d)
- api/src/test/java/org/openmrs/test/BaseContextMockTest.java (version 35727217df1e878f19fcf5e625a9dac1260c4b7d)
- api/src/test/java/org/openmrs/test/BaseContextSensitiveTest.java (version 35727217df1e878f19fcf5e625a9dac1260c4b7d)
- api/src/test/java/org/openmrs/validator/BaseAttributeTypeValidatorTest.java (version 35727217df1e878f19fcf5e625a9dac1260c4b7d)
- api/src/test/java/org/openmrs/validator/EncounterRoleValidatorTest.java (version 35727217df1e878f19fcf5e625a9dac1260c4b7d)
- api/src/test/java/org/openmrs/validator/EncounterTypeValidatorTest.java (version 35727217df1e878f19fcf5e625a9dac1260c4b7d)
- web/src/test/java/org/openmrs/web/controller/user/RoleFormControllerTest.java (version 35727217df1e878f19fcf5e625a9dac1260c4b7d)
- web/src/test/java/org/openmrs/web/test/WebTestHelper.java (version 35727217df1e878f19fcf5e625a9dac1260c4b7d)
Daniel Kayiwa 08 Jul 2014 8155a771f2a5aed52078eca21ac2f8382f36ab08

Ignoring the randomly failing ModuleActivatorTest method - TRUNK-4418
- api/src/test/java/org/openmrs/module/ModuleActivatorTest.java (version 8155a771f2a5aed52078eca21ac2f8382f36ab08)
Daniel Kayiwa 08 Jul 2014 e217ac34cdfb000f6cfc341f5e4c68067a264458

Merge pull request #976 from akolodziejski/TRUNK-3064
TRUNK-3064: Create unit test for duplicate messages
Rafal Korytkowski 07 Jul 2014 08e0bc1ddac0499972d491103d72c313aef77128

TRUNK-4389 Added orderType check
- api/src/main/java/org/openmrs/api/impl/OrderServiceImpl.java (version 08e0bc1ddac0499972d491103d72c313aef77128)
- api/src/test/java/org/openmrs/OrderEntryIntegrationTest.java (version 08e0bc1ddac0499972d491103d72c313aef77128)
- api/src/test/java/org/openmrs/OrderTest.java (version 08e0bc1ddac0499972d491103d72c313aef77128)
- api/src/test/java/org/openmrs/api/OrderServiceTest.java (version 08e0bc1ddac0499972d491103d72c313aef77128)
Arkadiusz Kolodziejski <arkadiusz.kolodziejski@gmail.com> 07 Jul 2014 dce7d1a7c4ac81a4bb7fe978b7c0f0a375a1cdca

TRUNK-3064: Create unit test for duplicate messages
TRUNK-3064: Create unit test for duplicate messages

TRUNK-3064: Create unit test for duplicate messages

TRUNK-3064: Create unit test for duplicate messages
- webapp/pom.xml (version dce7d1a7c4ac81a4bb7fe978b7c0f0a375a1cdca)
- webapp/src/test/java/com/openmrs/MessagePropertiesFilesTest.java (version dce7d1a7c4ac81a4bb7fe978b7c0f0a375a1cdca)
- webapp/src/test/java/com/openmrs/MessagePropertiesHelper.java (version dce7d1a7c4ac81a4bb7fe978b7c0f0a375a1cdca)
- webapp/src/test/java/com/openmrs/PropertiesFileValidator.java (version dce7d1a7c4ac81a4bb7fe978b7c0f0a375a1cdca)
Daniel Kayiwa 07 Jul 2014 ebd30d3b2bee221c764d5ee88f061212915c40ef

Merge pull request #978 from akolodziejski/TRUNK-4406
TRUNK-4406: Remove duplicate keys from message resource files
Rafal Korytkowski 07 Jul 2014 648a64ea6a36778dd19407386a53eb1e6784282e

Fixed tests when running with sonar
- api/src/test/java/org/openmrs/OrderTest.java (version 648a64ea6a36778dd19407386a53eb1e6784282e)
Rafal Korytkowski 07 Jul 2014 108d2bfd4d619ed861a36709bb2775763ed6b9ab

TRUNK-4389 Fixed tests and formatting
- api/src/main/java/org/openmrs/OrderType.java (version 108d2bfd4d619ed861a36709bb2775763ed6b9ab)
- api/src/main/java/org/openmrs/api/OrderService.java (version 108d2bfd4d619ed861a36709bb2775763ed6b9ab)
- api/src/main/java/org/openmrs/api/impl/OrderServiceImpl.java (version 108d2bfd4d619ed861a36709bb2775763ed6b9ab)
- api/src/main/java/org/openmrs/module/Module.java (version 108d2bfd4d619ed861a36709bb2775763ed6b9ab)
- api/src/main/java/org/openmrs/util/DoubleRange.java (version 108d2bfd4d619ed861a36709bb2775763ed6b9ab)
- api/src/test/java/org/openmrs/api/OrderServiceTest.java (version 108d2bfd4d619ed861a36709bb2775763ed6b9ab)
Rafal Korytkowski 07 Jul 2014 1343c372d8bb2f0b57968e694346e71b1a223ae1

TRUNK-4389: Added DRUG_ORDER_TYPE_UUID & TEST_ORDER_TYPE_UUID constants to OrderType class, Added unit test method saveOrder_shouldSetOrderTypeOfDrugOrderToDrugOrderIfNotSetAndConceptNotMapped to OrderServiceTest, Added unit tests and code to set order type of drug/test order to drug/test order respectively if not set and concept not mapped in saveOrder() method
(cherry picked from commit cdb90e75c2fae11492fba94121c05ea3968143f5)
- api/src/main/java/org/openmrs/OrderType.java (version 1343c372d8bb2f0b57968e694346e71b1a223ae1)
- api/src/main/java/org/openmrs/api/OrderService.java (version 1343c372d8bb2f0b57968e694346e71b1a223ae1)
- api/src/main/java/org/openmrs/api/impl/OrderServiceImpl.java (version 1343c372d8bb2f0b57968e694346e71b1a223ae1)
- api/src/test/java/org/openmrs/api/OrderServiceTest.java (version 1343c372d8bb2f0b57968e694346e71b1a223ae1)
Rafal Korytkowski 07 Jul 2014 312c26b5ea90296a0cbfae20e4dd40d2c749e7f7

Merge pull request #972 from vinayvenu/TRUNK-4414
TRUNK-4414 - Ensure message correctly reflects validation error
Arkadiusz Kolodziejski <arkadiusz.kolodziejski@gmail.com> 05 Jul 2014 f6528709e0ce21205bc9418f7f5ed401f3361055

TRUNK-4406: Remove duplicate keys from message resource files
TRUNK-4406: Remove duplicate keys from message resource files - hindi

TRUNK-4406: Remove duplicate keys from message resource files hi

TRUNK-3064: Create unit test for duplicate messages
- webapp/src/main/webapp/WEB-INF/messages.properties (version f6528709e0ce21205bc9418f7f5ed401f3361055)
- webapp/src/main/webapp/WEB-INF/messages_es.properties (version f6528709e0ce21205bc9418f7f5ed401f3361055)
- webapp/src/main/webapp/WEB-INF/messages_fa.properties (version f6528709e0ce21205bc9418f7f5ed401f3361055)
- webapp/src/main/webapp/WEB-INF/messages_hi.properties (version f6528709e0ce21205bc9418f7f5ed401f3361055)
- webapp/src/main/webapp/WEB-INF/messages_it.properties (version f6528709e0ce21205bc9418f7f5ed401f3361055)
- webapp/src/main/webapp/WEB-INF/messages_kh.properties (version f6528709e0ce21205bc9418f7f5ed401f3361055)
Daniel Kayiwa 04 Jul 2014 672850c45af8822be70ebd25643c111bfd51d51c

Merge pull request #666 from mylesbarros/master
TRUNK-3848 when upload a new module the tasks stop working
Rafal Korytkowski 04 Jul 2014 7539e27a56a23cb772949837059dcaeeabf63379

TRUNK-4417 Added missing hashCode methods
- api/src/main/java/org/openmrs/logic/result/Result.java (version 7539e27a56a23cb772949837059dcaeeabf63379)
- api/src/main/java/org/openmrs/module/Module.java (version 7539e27a56a23cb772949837059dcaeeabf63379)
- api/src/main/java/org/openmrs/util/DoubleRange.java (version 7539e27a56a23cb772949837059dcaeeabf63379)
Rafal Korytkowski 04 Jul 2014 01fec049c0fb6b1c326d802687f3093b502123e0

TRUNK-4416 Throwable and Error classes should not be caught
- api/src/main/java/org/openmrs/api/context/Daemon.java (version 01fec049c0fb6b1c326d802687f3093b502123e0)
- api/src/main/java/org/openmrs/scheduler/timer/TimerSchedulerTask.java (version 01fec049c0fb6b1c326d802687f3093b502123e0)
- api/src/main/java/org/openmrs/util/OpenmrsClassLoader.java (version 01fec049c0fb6b1c326d802687f3093b502123e0)
- web/src/main/java/org/openmrs/web/Listener.java (version 01fec049c0fb6b1c326d802687f3093b502123e0)
- web/src/main/java/org/openmrs/web/OpenmrsJspServlet.java (version 01fec049c0fb6b1c326d802687f3093b502123e0)
- web/src/main/java/org/openmrs/web/filter/update/UpdateFilter.java (version 01fec049c0fb6b1c326d802687f3093b502123e0)
Rafal Korytkowski 04 Jul 2014 cf8a65b329bdb4684c8afbc15913c02f38b48bec

TRUNK-4415 Added missin build tag
- pom.xml (version cf8a65b329bdb4684c8afbc15913c02f38b48bec)
Rafal Korytkowski 04 Jul 2014 cb8b3b225348124d169e3e65ed537a207dd4858e

TRUNK-4415 Excluded tests failing with JaCoCo
- pom.xml (version cb8b3b225348124d169e3e65ed537a207dd4858e)
Rafal Korytkowski 04 Jul 2014 d51e43a4cd8b6a7ce580f4da57f2ec168157b8f2

TRUNK-4415 Add sonar properties
- pom.xml (version d51e43a4cd8b6a7ce580f4da57f2ec168157b8f2)
Daniel Kayiwa 03 Jul 2014 3fccdc5f33a2990ae6ab9bbbda6b0d08fcd22bbc

Merge pull request #973 from rpuzdrowski/TRUNK-4260
TRUNK-4260: Error while submitting empty form in the page: openmrs/admin/concepts/conceptSource.form
Radek Puzdrowski <radoslaw.puzdrowski@gmail.com> 03 Jul 2014 df1cde50e3a3981ba1b05611d659f8d0abcc1b72

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 df1cde50e3a3981ba1b05611d659f8d0abcc1b72)
Wyclif Luyima 02 Jul 2014 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 02 Jul 2014 28eacef7a2eb603cb0d0e93690ae51849a24a3e2

Merge pull request #969 from rpuzdrowski/TRUNK-4260
TRUNK-4260: Error while submitting empty form in the page: openmrs/admin/concepts/conceptSource.form
Rafal Korytkowski 01 Jul 2014 58c47c80486fc891faf206b81a7cba4986c3b139

TRUNK-2999 Removed remaining deprecated ConceptWord methods
- api/src/main/java/org/openmrs/api/ConceptService.java (version 58c47c80486fc891faf206b81a7cba4986c3b139)
- api/src/main/java/org/openmrs/api/impl/AdministrationServiceImpl.java (version 58c47c80486fc891faf206b81a7cba4986c3b139)
- api/src/main/java/org/openmrs/api/impl/ConceptServiceImpl.java (version 58c47c80486fc891faf206b81a7cba4986c3b139)
- api/src/test/java/org/openmrs/aop/RequiredDataAdviceTest.java (version 58c47c80486fc891faf206b81a7cba4986c3b139)
Vinay Venu <vinayv@thoughtworks.com> 01 Jul 2014 f607e0ebf115450fbde1c953d6734ff8e317d358

TRUNK-4414 - Ensure message correctly reflects validation error
- webapp/src/main/webapp/WEB-INF/messages.properties (version f607e0ebf115450fbde1c953d6734ff8e317d358)
Daniel Kayiwa 01 Jul 2014 31b54245a0211aea1d2c6707ebd89fd515b71297

Merge pull request #971 from vencik/master
TRUNK-3625: Fixed web image handler
Wyclif Luyima 30 Jun 2014 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)
Rafal Korytkowski 30 Jun 2014 824428c6ea49b2b0b477fbfbd18fe31344419288

TRUNK-2999 Post review fixes
- api/src/main/java/org/openmrs/ConceptName.java (version 824428c6ea49b2b0b477fbfbd18fe31344419288)
- api/src/main/java/org/openmrs/api/ConceptService.java (version 824428c6ea49b2b0b477fbfbd18fe31344419288)
- api/src/main/java/org/openmrs/api/context/Context.java (version 824428c6ea49b2b0b477fbfbd18fe31344419288)
- api/src/main/java/org/openmrs/api/db/ContextDAO.java (version 824428c6ea49b2b0b477fbfbd18fe31344419288)
- api/src/main/java/org/openmrs/api/db/hibernate/HibernateConceptDAO.java (version 824428c6ea49b2b0b477fbfbd18fe31344419288)
- api/src/main/java/org/openmrs/api/db/hibernate/HibernateContextDAO.java (version 824428c6ea49b2b0b477fbfbd18fe31344419288)
- api/src/main/java/org/openmrs/api/db/hibernate/search/CriteriaQuery.java (version 824428c6ea49b2b0b477fbfbd18fe31344419288)
- api/src/main/java/org/openmrs/api/db/hibernate/search/LuceneQuery.java (version 824428c6ea49b2b0b477fbfbd18fe31344419288)
- api/src/main/java/org/openmrs/api/db/hibernate/search/SearchQuery.java (version 824428c6ea49b2b0b477fbfbd18fe31344419288)
- api/src/main/java/org/openmrs/api/db/hibernate/search/bridge/ConceptNameClassBridge.java (version 824428c6ea49b2b0b477fbfbd18fe31344419288)
- api/src/main/java/org/openmrs/api/impl/ConceptServiceImpl.java (version 824428c6ea49b2b0b477fbfbd18fe31344419288)
- api/src/main/java/org/openmrs/collection/CollectionPart.java (version 824428c6ea49b2b0b477fbfbd18fe31344419288)
- api/src/main/java/org/openmrs/collection/ListPart.java (version 824428c6ea49b2b0b477fbfbd18fe31344419288)
- api/src/main/java/org/openmrs/util/OpenmrsConstants.java (version 824428c6ea49b2b0b477fbfbd18fe31344419288)
- api/src/test/java/org/openmrs/api/ConceptServiceTest.java (version 824428c6ea49b2b0b477fbfbd18fe31344419288)
- web/src/test/java/org/openmrs/web/controller/ConceptFormControllerTest.java (version 824428c6ea49b2b0b477fbfbd18fe31344419288)
Wyclif Luyima 27 Jun 2014 a4aacf4b4fea4e463ca5159ddd572c17587b6902

Follow to undo stray edit - TRUNK-4400
- api/src/main/java/org/openmrs/util/PrivilegeConstants.java (version a4aacf4b4fea4e463ca5159ddd572c17587b6902)
Wyclif Luyima 27 Jun 2014 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 27 Jun 2014 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 27 Jun 2014 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 27 Jun 2014 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 27 Jun 2014 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 27 Jun 2014 dcbf02a3a0e64ba6288251b8d3d08b20c99d1b3d

Fixed failing unit test - TRUNK-4402
- api/src/test/java/org/openmrs/util/databasechange/Database1_9_7UpgradeTest.java (version dcbf02a3a0e64ba6288251b8d3d08b20c99d1b3d)
Wyclif Luyima 27 Jun 2014 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> 27 Jun 2014 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 https://issues.openmrs.org/browse/TRUNK-3625
- web/src/main/java/org/openmrs/web/controller/observation/handler/WebImageHandler.java (version 3050ef692469f2e606ae5dafa2cfd1de25883b14)
Rafal Korytkowski 27 Jun 2014 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> 27 Jun 2014 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 27 Jun 2014 c4e351cd2f1b24951e93d0ee7bfe73cf5768a8db

Patient dashboard issue when using french locale - TRUNK-4251
- webapp/src/main/webapp/WEB-INF/view/portlets/patientVisits.jsp (version c4e351cd2f1b24951e93d0ee7bfe73cf5768a8db)
Wyclif Luyima 26 Jun 2014 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 26 Jun 2014 c69384cc631ccc831484463556211658067de6bf

Fixed formatting
- api/src/main/java/org/openmrs/util/OpenmrsUtil.java (version c69384cc631ccc831484463556211658067de6bf)
Daniel Kayiwa 25 Jun 2014 23a18c6e806570e0db007a7feb20669313f906b3

Merge pull request #961 from geoff-wasilwa/TRUNK-4315
TRUNK-4315: Validate on client side (javascript)
geoff-wasilwa <geoffreywanjala@gmail.com> 25 Jun 2014 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 25 Jun 2014 d601e73032064e51ad487dac257cd7da1b685e99

Merge pull request #963 from vencik/master
TRUNK-4109: Get observations by accession number
vencik <vencik@razdva.cz> 25 Jun 2014 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 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 24 Jun 2014 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 24 Jun 2014 108a08a92cb99e75b72d4953e3144d6a0d52a746

Merge pull request #960 from anotherdave/TRUNK-4380
Fix TRUNK-4380 Location parent not displayed:
David Churcher <anotherdave@users.noreply.github.com> 24 Jun 2014 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 24 Jun 2014 9ead141cc76d890629e36544d883b6f9e196f944

removing autogenerated file - trunk-4297
- web/WEB-INF/dwr-modules.xml (version 9ead141cc76d890629e36544d883b6f9e196f944)
Daniel Kayiwa 24 Jun 2014 2883290e0b38205f734c9a58748c7cbdf8be41b3

Merge pull request #955 from ujjwalarora/TRUNK-4297
Trunk-4297 : Invalid Error Message for Blank Password
Daniel Kayiwa 24 Jun 2014 f77d6da3ff3696468404e61adeefe4245899d3ba

Merge pull request #952 from geoff-wasilwa/TRUNK-4338
TRUNK-4338: Added "Manage Providers" privileges to prevent unauthorized access
Rafal Korytkowski 24 Jun 2014 1d1ccf9c2b3dd112881d42ffc70d664084e9f77a

Merge branch 'master' into hibernate-search
Conflicts:
api/src/main/java/org/openmrs/util/OpenmrsUtil.java
Daniel Kayiwa 24 Jun 2014 d0177149170ec15f331d13fcaa91960c49e836b3

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

Build: #38 failed

Job: Build and Test failed

Stages & jobs

Build and Test

Deploy

Code commits

Git

Rafal Korytkowski 22 Jul 2014 ab2c1abe57f87b9386dc6084185e20ee10f6a533

Rafal Korytkowski 22 Jul 2014 d6d061c3e4f0d2555406ce84b2de818aa068c2bc

Daniel Kayiwa 21 Jul 2014 461a7ab37dd8893921ed37b91170aafc4fe16030

anotherdave <anotherdave@users.noreply.github.com> 21 Jul 2014 5ff41cdcbbcddf83a885ed55045fd33c25671453

Daniel Kayiwa 21 Jul 2014 3a9c0ecbc2d9543976498ddd59ef2d1e662d4900

Jeffrey Kantor <jkantorjunk@yahoo.com> 20 Jul 2014 56d23e9d6ace7c989d826ae4d38c7f3f43891baa

Rafal Korytkowski 18 Jul 2014 4c8b0f2e95449c173f18bf188184fd3fb82bc01b

Rafal Korytkowski 18 Jul 2014 14c3557ac151ba04dcec1650f2361f889572ed8d

Rafal Korytkowski 18 Jul 2014 2d28a621105d69188a286d0b560e0993fdfdf887

Rafal Korytkowski 17 Jul 2014 75c9931645b4c908328b2f7758f5bbd32b825172

Daniel Kayiwa 17 Jul 2014 c3a11776a6cf07324f599ba869776c9f3ef9a601

geoff-wasilwa <geoffreywanjala@gmail.com> 17 Jul 2014 ce831848e26a42ab82b7ae90f873f08b350a9ed2

Rafal Korytkowski 16 Jul 2014 a690116fc0c51b2938d7527051b765f149b3b2a8

Rafal Korytkowski 16 Jul 2014 d33440c84616c9e3b0a7433cb45477dda6f233fb

Daniel Kayiwa 16 Jul 2014 237ee60a3359f091c7885839ff88082585bb5c49

Arkadiusz Kolodziejski <arkadiusz.kolodziejski@gmail.com> 15 Jul 2014 1b210fefbf6c076ce506cd308d98d920584a776f

Rafal Korytkowski 15 Jul 2014 4ab3ef0cbf5a6ce9b3ff4b5f5b04ac5a87310ff9

Rafal Korytkowski 15 Jul 2014 bbf8d5e5d4a570c04f288f8984b59a21091d28bf

Rafal Korytkowski 15 Jul 2014 93d60c17438361cff4445f48af7b273cff93a162

Rafal Korytkowski 15 Jul 2014 ba5d4636896e1f651821c0096f8bf48eb2ffef42

Rafal Korytkowski 15 Jul 2014 4b24bd0ff12a20b9ca459ad11937621512061cd3

Daniel Kayiwa 15 Jul 2014 67e63972324e5742c8ba17ea1edf6d12e762b502

Daniel Kayiwa 15 Jul 2014 41da0f6467a6c9a03f1cfc35b9269c0a24136171

Daniel Kayiwa 15 Jul 2014 1e2a4d1a7fd9c3857aadd36d6a50ad4c108c7f36

harsha89 <harsz89@gmail.com> 14 Jul 2014 55c0ca893617189cfccab7dce3954b73869285ce

geoff-wasilwa <geoffreywanjala@gmail.com> 14 Jul 2014 688f5d6a57faf76cb77da7144ae93f5502e93a4a

Rafal Korytkowski 14 Jul 2014 adccb94b51697edf0374ecbaaec5b9ff99c4c4b5

Rafal Korytkowski 14 Jul 2014 0272020d89fc0975c6547a7f4743c0a6ff6b0264

Rafal Korytkowski 14 Jul 2014 5a9ecce3b7078f4c00ee34c1bf5c54b210c98acb

Daniel Kayiwa 14 Jul 2014 9e9f586fd4cba6fa8bd96fb7d51c09bd6a1421cc

Radoslaw Puzdrowski <radoslaw.puzdrowski@gmail.com> 14 Jul 2014 5e345a94e0ab52b1afe9674b99145c87490e2b4a

Priya Chandran <prichand@thoughtworks.com> 14 Jul 2014 ca072594e00a59a3e92f2b6a1f2936e4913ac4b2

Priya Chandran <prichand@thoughtworks.com> 14 Jul 2014 eaac3ab6b5a97b8bfa94e3b781a4e992f8327fbe

Rafal Korytkowski 11 Jul 2014 21bcb6f4716a1681660357de916cf137c4b0562a

Wyclif Luyima 11 Jul 2014 73921ead06fa8d5d6b3fb9ac25d18b93d6f97a52

Rafal Korytkowski 11 Jul 2014 fe6f121ac860ca5eff16a36d7fa706d2f14beb77

Wyclif Luyima 11 Jul 2014 2cbd7ffd79603bd4a705b4bddc73950df4e0ddb2

Wyclif Luyima 11 Jul 2014 f581267fc31b1e2b588ee620f7d75f35fb6ba17a

Rafal Korytkowski 11 Jul 2014 ca74e955a5ba6d642bd2021eef6abc8200208a18

Wyclif Luyima 10 Jul 2014 565d71bea8a7ded6029b02b8c677c50fe6e49f72

Wyclif Luyima 10 Jul 2014 4918359a6ba4fd5980610e902077c12e260455cc

Daniel Kayiwa 10 Jul 2014 7b023764dfb38b6e84c3abc34617a5f5ebe84c8b

Wyclif Luyima 09 Jul 2014 5b649f625650aa762638b4399e431583980d54ea

Wyclif Luyima 09 Jul 2014 59c1b7b58c7032ce261a96e992a9358a848f5c0c

Wyclif Luyima 08 Jul 2014 0dc1822e9d8646516dc545887b89218ed503b69a

Arkadiusz Kolodziejski <arkadiusz.kolodziejski@gmail.com> 08 Jul 2014 8e73bdc88c7ad2610583a14f2719b6e71638c6bc

Wyclif Luyima 08 Jul 2014 6aa04b8638347f800891195485c5704d5fa02670

Wyclif Luyima 08 Jul 2014 72695858672f14c214f9ad8336788afcfe44aae4

Rafal Korytkowski 08 Jul 2014 35727217df1e878f19fcf5e625a9dac1260c4b7d

Daniel Kayiwa 08 Jul 2014 8155a771f2a5aed52078eca21ac2f8382f36ab08

Daniel Kayiwa 08 Jul 2014 e217ac34cdfb000f6cfc341f5e4c68067a264458

Rafal Korytkowski 07 Jul 2014 08e0bc1ddac0499972d491103d72c313aef77128

Arkadiusz Kolodziejski <arkadiusz.kolodziejski@gmail.com> 07 Jul 2014 dce7d1a7c4ac81a4bb7fe978b7c0f0a375a1cdca

Daniel Kayiwa 07 Jul 2014 ebd30d3b2bee221c764d5ee88f061212915c40ef

Rafal Korytkowski 07 Jul 2014 648a64ea6a36778dd19407386a53eb1e6784282e

Rafal Korytkowski 07 Jul 2014 108d2bfd4d619ed861a36709bb2775763ed6b9ab

Rafal Korytkowski 07 Jul 2014 1343c372d8bb2f0b57968e694346e71b1a223ae1

Rafal Korytkowski 07 Jul 2014 312c26b5ea90296a0cbfae20e4dd40d2c749e7f7

Arkadiusz Kolodziejski <arkadiusz.kolodziejski@gmail.com> 05 Jul 2014 f6528709e0ce21205bc9418f7f5ed401f3361055

Daniel Kayiwa 04 Jul 2014 672850c45af8822be70ebd25643c111bfd51d51c

Rafal Korytkowski 04 Jul 2014 7539e27a56a23cb772949837059dcaeeabf63379

Rafal Korytkowski 04 Jul 2014 01fec049c0fb6b1c326d802687f3093b502123e0

Rafal Korytkowski 04 Jul 2014 cf8a65b329bdb4684c8afbc15913c02f38b48bec

Rafal Korytkowski 04 Jul 2014 cb8b3b225348124d169e3e65ed537a207dd4858e

Rafal Korytkowski 04 Jul 2014 d51e43a4cd8b6a7ce580f4da57f2ec168157b8f2

Daniel Kayiwa 03 Jul 2014 3fccdc5f33a2990ae6ab9bbbda6b0d08fcd22bbc

Radek Puzdrowski <radoslaw.puzdrowski@gmail.com> 03 Jul 2014 df1cde50e3a3981ba1b05611d659f8d0abcc1b72

Wyclif Luyima 02 Jul 2014 991bed4169a047f7d2f4203f5813039ce8780742

Daniel Kayiwa 02 Jul 2014 28eacef7a2eb603cb0d0e93690ae51849a24a3e2

Rafal Korytkowski 01 Jul 2014 58c47c80486fc891faf206b81a7cba4986c3b139

Vinay Venu <vinayv@thoughtworks.com> 01 Jul 2014 f607e0ebf115450fbde1c953d6734ff8e317d358

Daniel Kayiwa 01 Jul 2014 31b54245a0211aea1d2c6707ebd89fd515b71297

Wyclif Luyima 30 Jun 2014 a64a372fc4ccf2921d47f17e566da8f0725b6464