Code commits
openmrs-core master
-
ssmusoke <ssmusoke@gmail.com> ee2b39ed4d278e53407c38b82e5d2a1b3989a7fd
TRUNK-4824 Concept name tag validator not to throw duplicate validation error for the tag being validated
(cherry picked from commit d992a42c3fc628ed0a85fc92f3796ca7bd996041)
Conflicts:
api/src/test/java/org/openmrs/validator/ConceptNameTagValidatorTest.java- api/src/main/java/org/openmrs/validator/ConceptNameTagValidator.java (version ee2b39ed4d278e53407c38b82e5d2a1b3989a7fd)
- api/src/test/java/org/openmrs/validator/ConceptNameTagValidatorTest.java (version ee2b39ed4d278e53407c38b82e5d2a1b3989a7fd)
-
Rafal Korytkowski 67ed491de453b10d67c6a554e9dd2c484d48e5fb
TRUNK-4811 Adjusted @since
- api/src/main/java/org/openmrs/api/context/Daemon.java (version 67ed491de453b10d67c6a554e9dd2c484d48e5fb)
-
Rafal Korytkowski 49dccb453eb32b4b49d36d76530f9b69ca1e9243
TRUNK-4811 Daemon user must be cached
(cherry picked from commit aade027ab497c28371d2403352793078154048a5)
Conflicts:
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/Context.java (version 49dccb453eb32b4b49d36d76530f9b69ca1e9243)
- api/src/main/java/org/openmrs/api/context/Daemon.java (version 49dccb453eb32b4b49d36d76530f9b69ca1e9243)
-
mogoodrich <mgoodrich@pih.org> 606eac6943d84304f20a504eff477b63d6569f07
reapply: TRUNK-3915: Adding not-null constraint to uuid columns not run when creating a new 1.9.3 database from scratch
(cherry picked from commit e4b0eff7af5fd0e6d801ba1cab4e5c3c6f7bd1b2)
Conflicts:
api/src/main/resources/liquibase-update-to-latest.xml- api/src/main/resources/liquibase-update-to-latest.xml (version 606eac6943d84304f20a504eff477b63d6569f07)
- api/src/test/resources/org/openmrs/util/databasechange/UpgradeTest-orderWithBlankUnitsOrFrequency.xml (version 606eac6943d84304f20a504eff477b63d6569f07)
- api/src/test/resources/org/openmrs/util/databasechange/standardTest-1.9.7-dataSet.xml (version 606eac6943d84304f20a504eff477b63d6569f07)