Code commits
openmrs-core master
-
Daniel Kayiwa 428de56c562147c04cb2a84dccdb6d9aebe1f6bf
Merge pull request #1389 from SharonVarghese/TRUNK-2717
TRUNK-2717:Display a meaningful message when a scheduled task with no re... -
Rafal Korytkowski 5b434e3d18b9b676de983470111bba6dfb438cec
TRUNK-4584 Reverted openmrs version to 1.12.0-SNAPSHOT
- api/pom.xml (version 5b434e3d18b9b676de983470111bba6dfb438cec)
- pom.xml (version 5b434e3d18b9b676de983470111bba6dfb438cec)
- release-test/pom.xml (version 5b434e3d18b9b676de983470111bba6dfb438cec)
- test/pom.xml (version 5b434e3d18b9b676de983470111bba6dfb438cec)
- tools/pom.xml (version 5b434e3d18b9b676de983470111bba6dfb438cec)
- web/pom.xml (version 5b434e3d18b9b676de983470111bba6dfb438cec)
- webapp/pom.xml (version 5b434e3d18b9b676de983470111bba6dfb438cec)
-
Rafal Korytkowski 8f88f489544dcbd9a899b4a5569aba01fd96ade2
Fixing formatting
- api/src/main/java/org/openmrs/ConceptSet.java (version 8f88f489544dcbd9a899b4a5569aba01fd96ade2)
- api/src/main/java/org/openmrs/User.java (version 8f88f489544dcbd9a899b4a5569aba01fd96ade2)
- api/src/test/java/org/openmrs/UserTest.java (version 8f88f489544dcbd9a899b4a5569aba01fd96ade2)
- web/src/test/java/org/openmrs/web/controller/ConceptFormControllerTest.java (version 8f88f489544dcbd9a899b4a5569aba01fd96ade2)
-
sharonvarghese <kmit.sharonvarghese@gmail.com> 14b03a4d9a785200173c8750b882ce4d45c86b7e
TRUNK-2717:Display a meaningful message when a scheduled task with no repeat interval fails to start
- web/src/main/java/org/openmrs/scheduler/web/controller/SchedulerFormController.java (version 14b03a4d9a785200173c8750b882ce4d45c86b7e)
- web/src/test/java/org/openmrs/scheduler/web/controller/SchedulerFormControllerTest.java (version 14b03a4d9a785200173c8750b882ce4d45c86b7e)
-
Rafal Korytkowski 6f0c1a281399783e9e611e62e3870e7d6b1db021
Merge branch 'spring-4'
-
Daniel Kayiwa cda0b7455a4f7df4ef979153b254031986dc9b70
Merge pull request #1385 from gnarula/TRUNK-4582
TRUNK-4582: Set Concept for all ConceptAnswers -
Gaurav Narula <gnarula94@gmail.com> 922e6898e62b29d8f3406c81578f209b24a79af1
TRUNK-4582: Set Concept for all ConceptAnswers
- web/src/main/java/org/openmrs/web/controller/ConceptFormController.java (version 922e6898e62b29d8f3406c81578f209b24a79af1)
- web/src/test/java/org/openmrs/web/controller/ConceptFormControllerTest.java (version 922e6898e62b29d8f3406c81578f209b24a79af1)
-
Daniel Kayiwa b761ce4931bdb6d7a55005546904efdac9bf64d6
Merge pull request #1377 from akshika47/Trunk-4457-5
Trunk-4457: made the User.containsRole() method case insensitive and thr... -
Daniel Kayiwa 037c4fb6348452cbb76f294690dacaf3f5659a80
Merge pull request #1387 from itatriev/patch-1
Update message.properties -
Imran Tatriev <itatriev@gmail.com> c63f8add1df3f9786c1da49f737707ea096a111c
Update message.properties
I've found a grammar mistake while translating core.- webapp/src/main/webapp/WEB-INF/messages.properties (version c63f8add1df3f9786c1da49f737707ea096a111c)
-
Daniel Kayiwa 41d4204fdf425433e965d28211175a5349da031e m
Merge pull request #1383 from kristopherschmidt/TRUNK-4625
Re-version poms to use correct naming convention, suppress log warning, ... -
Kristopher Schmidt <kris.schmidt7@gmail.com> 9bfcce4bf2b32412f8c2269e91d123a716bff10d m
Re-version poms to use correct naming convention, suppress log warning, auto-format
- api/pom.xml (version 9bfcce4bf2b32412f8c2269e91d123a716bff10d)
- api/src/test/java/org/openmrs/api/AdministrationServiceTest.java (version 9bfcce4bf2b32412f8c2269e91d123a716bff10d)
- pom.xml (version 9bfcce4bf2b32412f8c2269e91d123a716bff10d)
- release-test/pom.xml (version 9bfcce4bf2b32412f8c2269e91d123a716bff10d)
- test/pom.xml (version 9bfcce4bf2b32412f8c2269e91d123a716bff10d)
- tools/pom.xml (version 9bfcce4bf2b32412f8c2269e91d123a716bff10d)
- web/pom.xml (version 9bfcce4bf2b32412f8c2269e91d123a716bff10d)
- web/src/test/java/org/openmrs/web/controller/form/FieldTypeListControllerTest.java (version 9bfcce4bf2b32412f8c2269e91d123a716bff10d)
- webapp/pom.xml (version 9bfcce4bf2b32412f8c2269e91d123a716bff10d)
- webapp/src/main/resources/log4j.xml (version 9bfcce4bf2b32412f8c2269e91d123a716bff10d)
-
Akshika Wijesundara <akshika@sutd.edu.sg> d2d98693c44016428496719118a147cfb4455900 m
Trunk-4457: made the User.containsRole() method case insensitive and three test methods for the alteration and the method's functionality. Updated the Javadoc comments of the method User.containsRole()
- api/src/main/java/org/openmrs/User.java (version d2d98693c44016428496719118a147cfb4455900)
- api/src/test/java/org/openmrs/UserTest.java (version d2d98693c44016428496719118a147cfb4455900)
-
Rafal Korytkowski 63c0a2dac8d918d1a26b741c3b4755c7819d4dac m
Merge branch 'master' of https://github.com/openmrs/openmrs-core into spring-4
Conflicts:
api/src/test/java/org/openmrs/api/AdministrationServiceTest.java -
k-joseph <kaweesi.joseph2012@gmail.com> b75d1542be2b6dadec45d941c61369f3ccbd6932 m
Merge pull request #1342 from kristopherschmidt/spring-4
change spring version to 4.1.4RELEASE -
Kristopher Schmidt <kris.schmidt7@gmail.com> 72ec7ce62db51ced9024810d85108bfd4673e753 m
change spring version to 4.1.4RELEASE update maven version add missing spring classes back update servlet 2.5 to 3.0.1 fix tests add a log4j file logger for easy debugging-off by default
- .gitignore (version 72ec7ce62db51ced9024810d85108bfd4673e753)
- api/pom.xml (version 72ec7ce62db51ced9024810d85108bfd4673e753)
- api/src/main/java/org/springframework/test/annotation/NotTransactional.java (version 72ec7ce62db51ced9024810d85108bfd4673e753)
- api/src/test/java/org/openmrs/api/AdministrationServiceTest.java (version 72ec7ce62db51ced9024810d85108bfd4673e753)
- pom.xml (version 72ec7ce62db51ced9024810d85108bfd4673e753)
- release-test/pom.xml (version 72ec7ce62db51ced9024810d85108bfd4673e753)
- test/pom.xml (version 72ec7ce62db51ced9024810d85108bfd4673e753)
- tools/pom.xml (version 72ec7ce62db51ced9024810d85108bfd4673e753)
- web/pom.xml (version 72ec7ce62db51ced9024810d85108bfd4673e753)
- web/src/main/java/org/springframework/http/converter/json/MappingJacksonHttpMessageConverter.java (version 72ec7ce62db51ced9024810d85108bfd4673e753)
- web/src/main/java/org/springframework/web/servlet/mvc/AbstractFormController.java (version 72ec7ce62db51ced9024810d85108bfd4673e753)
- web/src/main/java/org/springframework/web/servlet/mvc/AbstractWizardFormController.java (version 72ec7ce62db51ced9024810d85108bfd4673e753)
- web/src/main/java/org/springframework/web/servlet/mvc/BaseCommandController.java (version 72ec7ce62db51ced9024810d85108bfd4673e753)
- web/src/main/java/org/springframework/web/servlet/mvc/SimpleFormController.java (version 72ec7ce62db51ced9024810d85108bfd4673e753)
- web/src/main/java/org/springframework/web/servlet/view/json/MappingJacksonJsonView.java (version 72ec7ce62db51ced9024810d85108bfd4673e753)
- web/src/main/java/org/springframework/web/util/ExpressionEvaluationUtils.java (version 72ec7ce62db51ced9024810d85108bfd4673e753)
- web/src/test/java/org/openmrs/web/controller/form/FieldTypeListControllerTest.java (version 72ec7ce62db51ced9024810d85108bfd4673e753)
- webapp/.gitignore (version 72ec7ce62db51ced9024810d85108bfd4673e753)
- webapp/pom.xml (version 72ec7ce62db51ced9024810d85108bfd4673e753)
- webapp/src/main/resources/log4j.xml (version 72ec7ce62db51ced9024810d85108bfd4673e753)
