API tools faq
paste
Advertisement
Guest User

Untitled

a guest
Mar 10th, 2014
73
0
Never
Add comment
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 105.63 KB | None | 0 0
raw download clone embed print report
  1. k-joseph@joseph:/media/KJoseph/Projects/openMRS/openmrs-core$ git branch
  2. 1.10.x
  3. 1.9.x
  4. TRUNK-2449
  5. TRUNK-3258
  6. TRUNK-3424
  7. TRUNK-3499
  8. TRUNK-3621
  9. TRUNK-3623
  10. TRUNK-3624
  11. TRUNK-3652
  12. TRUNK-3765
  13. TRUNK-3765_1
  14. TRUNK-3840
  15. TRUNK-3850
  16. TRUNK-3876
  17. TRUNK-3902
  18. TRUNK-3903
  19. TRUNK-3912
  20. TRUNK-3956
  21. TRUNK-3967
  22. TRUNK-3982
  23. TRUNK-3986
  24. TRUNK-4003
  25. TRUNK-4017
  26. TRUNK-4020
  27. TRUNK-4030
  28. TRUNK-4031
  29. TRUNK-4032
  30. TRUNK-4033
  31. TRUNK-4095
  32. TRUNK-4102
  33. TRUNK-4111
  34. TRUNK-4126
  35. TRUNK-4130
  36. TRUNK-4135
  37. TRUNK-4136
  38. TRUNK-4137
  39. TRUNK-4159
  40. TRUNK-4169
  41. TRUNK-4202
  42. TRUNK-4274
  43. * master
  44. k-joseph@joseph:/media/KJoseph/Projects/openMRS/openmrs-core$ git checkout 1.9.x
  45. Switched to branch '1.9.x'
  46. k-joseph@joseph:/media/KJoseph/Projects/openMRS/openmrs-core$ git status
  47. # On branch 1.9.x
  48. nothing to commit (working directory clean)
  49. k-joseph@joseph:/media/KJoseph/Projects/openMRS/openmrs-core$ git up
  50. ^C
  51. k-joseph@joseph:/media/KJoseph/Projects/openMRS/openmrs-core$ git status
  52. # On branch 1.9.x
  53. nothing to commit (working directory clean)
  54. k-joseph@joseph:/media/KJoseph/Projects/openMRS/openmrs-core$ git pull upstream 1.9.x
  55. From https://github.com/openmrs/openmrs-core
  56. * branch 1.9.x -> FETCH_HEAD
  57. warning: Cannot merge binary files: webapp/src/main/resources/liquibase-demo-data.zip (HEAD vs. 13061002987f7f314b08669217f90f5612d4bc16)
  58.  
  59. Auto-merging webapp/src/main/webapp/openmrs.js
  60. CONFLICT (content): Merge conflict in webapp/src/main/webapp/openmrs.js
  61. Auto-merging webapp/src/main/webapp/openmrs.css
  62. CONFLICT (content): Merge conflict in webapp/src/main/webapp/openmrs.css
  63. Auto-merging webapp/src/main/webapp/errorhandler.jsp
  64. CONFLICT (content): Merge conflict in webapp/src/main/webapp/errorhandler.jsp
  65. Auto-merging webapp/src/main/webapp/dictionary/conceptForm.js
  66. CONFLICT (content): Merge conflict in webapp/src/main/webapp/dictionary/conceptForm.js
  67. Auto-merging webapp/src/main/webapp/WEB-INF/web.xml
  68. CONFLICT (content): Merge conflict in webapp/src/main/webapp/WEB-INF/web.xml
  69. Auto-merging webapp/src/main/webapp/WEB-INF/view/scripts/timepicker/timepicker.js
  70. CONFLICT (content): Merge conflict in webapp/src/main/webapp/WEB-INF/view/scripts/timepicker/timepicker.js
  71. Auto-merging webapp/src/main/webapp/WEB-INF/view/scripts/openmrsmessages.js.withjstl
  72. CONFLICT (content): Merge conflict in webapp/src/main/webapp/WEB-INF/view/scripts/openmrsmessages.js.withjstl
  73. Auto-merging webapp/src/main/webapp/WEB-INF/view/scripts/jquery/autocomplete/OpenmrsAutoComplete.js
  74. CONFLICT (content): Merge conflict in webapp/src/main/webapp/WEB-INF/view/scripts/jquery/autocomplete/OpenmrsAutoComplete.js
  75. Auto-merging webapp/src/main/webapp/WEB-INF/view/scripts/jquery-ui/js/openmrsSearch.js
  76. CONFLICT (content): Merge conflict in webapp/src/main/webapp/WEB-INF/view/scripts/jquery-ui/js/openmrsSearch.js
  77. Auto-merging webapp/src/main/webapp/WEB-INF/view/scripts/jquery-ui/js/jquery-ui-datepicker-i18n.js
  78. CONFLICT (content): Merge conflict in webapp/src/main/webapp/WEB-INF/view/scripts/jquery-ui/js/jquery-ui-datepicker-i18n.js
  79. Auto-merging webapp/src/main/webapp/WEB-INF/view/scripts/drugOrder.js.withjstl
  80. CONFLICT (content): Merge conflict in webapp/src/main/webapp/WEB-INF/view/scripts/drugOrder.js.withjstl
  81. Auto-merging webapp/src/main/webapp/WEB-INF/view/scripts/calendar/calendar.js
  82. Auto-merging webapp/src/main/webapp/WEB-INF/view/portlets/patientVisits.jsp
  83. CONFLICT (content): Merge conflict in webapp/src/main/webapp/WEB-INF/view/portlets/patientVisits.jsp
  84. Auto-merging webapp/src/main/webapp/WEB-INF/view/portlets/patientRegimen.jsp
  85. CONFLICT (content): Merge conflict in webapp/src/main/webapp/WEB-INF/view/portlets/patientRegimen.jsp
  86. Auto-merging webapp/src/main/webapp/WEB-INF/view/portlets/patientPrograms.jsp
  87. CONFLICT (content): Merge conflict in webapp/src/main/webapp/WEB-INF/view/portlets/patientPrograms.jsp
  88. Auto-merging webapp/src/main/webapp/WEB-INF/view/portlets/patientOverview.jsp
  89. CONFLICT (content): Merge conflict in webapp/src/main/webapp/WEB-INF/view/portlets/patientOverview.jsp
  90. Auto-merging webapp/src/main/webapp/WEB-INF/view/portlets/patientHeader.jsp
  91. CONFLICT (content): Merge conflict in webapp/src/main/webapp/WEB-INF/view/portlets/patientHeader.jsp
  92. Auto-merging webapp/src/main/webapp/WEB-INF/view/portlets/patientGraphs.jsp
  93. Auto-merging webapp/src/main/webapp/WEB-INF/view/portlets/nameLayout.jsp
  94. CONFLICT (content): Merge conflict in webapp/src/main/webapp/WEB-INF/view/portlets/nameLayout.jsp
  95. Auto-merging webapp/src/main/webapp/WEB-INF/view/portlets/findPatient.jsp
  96. CONFLICT (content): Merge conflict in webapp/src/main/webapp/WEB-INF/view/portlets/findPatient.jsp
  97. Auto-merging webapp/src/main/webapp/WEB-INF/view/portlets/cohort.jsp
  98. CONFLICT (content): Merge conflict in webapp/src/main/webapp/WEB-INF/view/portlets/cohort.jsp
  99. Auto-merging webapp/src/main/webapp/WEB-INF/view/portlets/addressLayout.jsp
  100. CONFLICT (content): Merge conflict in webapp/src/main/webapp/WEB-INF/view/portlets/addressLayout.jsp
  101. Auto-merging webapp/src/main/webapp/WEB-INF/view/portlets/addPersonForm.jsp
  102. CONFLICT (content): Merge conflict in webapp/src/main/webapp/WEB-INF/view/portlets/addPersonForm.jsp
  103. Auto-merging webapp/src/main/webapp/WEB-INF/view/optionsForm.jsp
  104. CONFLICT (content): Merge conflict in webapp/src/main/webapp/WEB-INF/view/optionsForm.jsp
  105. Auto-merging webapp/src/main/webapp/WEB-INF/view/login.jsp
  106. Auto-merging webapp/src/main/webapp/WEB-INF/view/dictionary/conceptForm.jsp
  107. CONFLICT (content): Merge conflict in webapp/src/main/webapp/WEB-INF/view/dictionary/conceptForm.jsp
  108. Auto-merging webapp/src/main/webapp/WEB-INF/view/dictionary/concept.jsp
  109. CONFLICT (content): Merge conflict in webapp/src/main/webapp/WEB-INF/view/dictionary/concept.jsp
  110. Auto-merging webapp/src/main/webapp/WEB-INF/view/admin/visits/visitForm.jsp
  111. CONFLICT (content): Merge conflict in webapp/src/main/webapp/WEB-INF/view/admin/visits/visitForm.jsp
  112. Auto-merging webapp/src/main/webapp/WEB-INF/view/admin/users/userForm.jsp
  113. CONFLICT (content): Merge conflict in webapp/src/main/webapp/WEB-INF/view/admin/users/userForm.jsp
  114. Auto-merging webapp/src/main/webapp/WEB-INF/view/admin/scheduler/schedulerForm.jsp
  115. Auto-merging webapp/src/main/webapp/WEB-INF/view/admin/programs/workflowForm.jsp
  116. CONFLICT (content): Merge conflict in webapp/src/main/webapp/WEB-INF/view/admin/programs/workflowForm.jsp
  117. Auto-merging webapp/src/main/webapp/WEB-INF/view/admin/programs/programList.jsp
  118. CONFLICT (content): Merge conflict in webapp/src/main/webapp/WEB-INF/view/admin/programs/programList.jsp
  119. Auto-merging webapp/src/main/webapp/WEB-INF/view/admin/programs/programForm.jsp
  120. CONFLICT (content): Merge conflict in webapp/src/main/webapp/WEB-INF/view/admin/programs/programForm.jsp
  121. Auto-merging webapp/src/main/webapp/WEB-INF/view/admin/programs/conversionForm.jsp
  122. CONFLICT (content): Merge conflict in webapp/src/main/webapp/WEB-INF/view/admin/programs/conversionForm.jsp
  123. Auto-merging webapp/src/main/webapp/WEB-INF/view/admin/patients/shortPatientForm.jsp
  124. CONFLICT (content): Merge conflict in webapp/src/main/webapp/WEB-INF/view/admin/patients/shortPatientForm.jsp
  125. Auto-merging webapp/src/main/webapp/WEB-INF/view/admin/patients/patientIdentifierTypeForm.jsp
  126. CONFLICT (content): Merge conflict in webapp/src/main/webapp/WEB-INF/view/admin/patients/patientIdentifierTypeForm.jsp
  127. Auto-merging webapp/src/main/webapp/WEB-INF/view/admin/patients/index.jsp
  128. Auto-merging webapp/src/main/webapp/WEB-INF/view/admin/orders/orderList.jsp
  129. CONFLICT (content): Merge conflict in webapp/src/main/webapp/WEB-INF/view/admin/orders/orderList.jsp
  130. Auto-merging webapp/src/main/webapp/WEB-INF/view/admin/orders/orderForm.jsp
  131. CONFLICT (content): Merge conflict in webapp/src/main/webapp/WEB-INF/view/admin/orders/orderForm.jsp
  132. Auto-merging webapp/src/main/webapp/WEB-INF/view/admin/orders/orderDrugForm.jsp
  133. CONFLICT (content): Merge conflict in webapp/src/main/webapp/WEB-INF/view/admin/orders/orderDrugForm.jsp
  134. Auto-merging webapp/src/main/webapp/WEB-INF/view/admin/orders/localHeader.jsp
  135. CONFLICT (content): Merge conflict in webapp/src/main/webapp/WEB-INF/view/admin/orders/localHeader.jsp
  136. Auto-merging webapp/src/main/webapp/WEB-INF/view/admin/observations/obsForm.jsp
  137. CONFLICT (content): Merge conflict in webapp/src/main/webapp/WEB-INF/view/admin/observations/obsForm.jsp
  138. Auto-merging webapp/src/main/webapp/WEB-INF/view/admin/maintenance/globalPropsForm.jsp
  139. CONFLICT (content): Merge conflict in webapp/src/main/webapp/WEB-INF/view/admin/maintenance/globalPropsForm.jsp
  140. Auto-merging webapp/src/main/webapp/WEB-INF/view/admin/locations/locationForm.jsp
  141. Auto-merging webapp/src/main/webapp/WEB-INF/view/admin/locations/addressTemplate.jsp
  142. CONFLICT (content): Merge conflict in webapp/src/main/webapp/WEB-INF/view/admin/locations/addressTemplate.jsp
  143. Auto-merging webapp/src/main/webapp/WEB-INF/view/admin/forms/formEditForm.jsp
  144. Auto-merging webapp/src/main/webapp/WEB-INF/view/admin/forms/fieldTypeForm.jsp
  145. CONFLICT (content): Merge conflict in webapp/src/main/webapp/WEB-INF/view/admin/forms/fieldTypeForm.jsp
  146. Auto-merging webapp/src/main/webapp/WEB-INF/view/admin/encounters/encounterTypeForm.jsp
  147. CONFLICT (content): Merge conflict in webapp/src/main/webapp/WEB-INF/view/admin/encounters/encounterTypeForm.jsp
  148. Auto-merging webapp/src/main/webapp/WEB-INF/view/admin/encounters/encounterForm.jsp
  149. CONFLICT (content): Merge conflict in webapp/src/main/webapp/WEB-INF/view/admin/encounters/encounterForm.jsp
  150. Auto-merging webapp/src/main/webapp/WEB-INF/view/admin/concepts/localHeader.jsp
  151. CONFLICT (content): Merge conflict in webapp/src/main/webapp/WEB-INF/view/admin/concepts/localHeader.jsp
  152. Auto-merging webapp/src/main/webapp/WEB-INF/view/admin/concepts/conceptSourceList.jsp
  153. CONFLICT (content): Merge conflict in webapp/src/main/webapp/WEB-INF/view/admin/concepts/conceptSourceList.jsp
  154. CONFLICT (modify/delete): webapp/src/main/webapp/WEB-INF/view/admin/concepts/conceptSetDerivedForm.jsp deleted in HEAD and modified in 13061002987f7f314b08669217f90f5612d4bc16. Version 13061002987f7f314b08669217f90f5612d4bc16 of webapp/src/main/webapp/WEB-INF/view/admin/concepts/conceptSetDerivedForm.jsp left in tree.
  155. Auto-merging webapp/src/main/webapp/WEB-INF/view/admin/concepts/conceptReferenceTermForm.jsp
  156. CONFLICT (content): Merge conflict in webapp/src/main/webapp/WEB-INF/view/admin/concepts/conceptReferenceTermForm.jsp
  157. Auto-merging webapp/src/main/webapp/WEB-INF/view/admin/concepts/conceptDrugForm.jsp
  158. CONFLICT (content): Merge conflict in webapp/src/main/webapp/WEB-INF/view/admin/concepts/conceptDrugForm.jsp
  159. Auto-merging webapp/src/main/webapp/WEB-INF/view/admin/concepts/conceptDatatypeForm.jsp
  160. CONFLICT (content): Merge conflict in webapp/src/main/webapp/WEB-INF/view/admin/concepts/conceptDatatypeForm.jsp
  161. Auto-merging webapp/src/main/webapp/WEB-INF/template/gutter.jsp
  162. CONFLICT (content): Merge conflict in webapp/src/main/webapp/WEB-INF/template/gutter.jsp
  163. Auto-merging webapp/src/main/webapp/WEB-INF/template/banner.jsp
  164. CONFLICT (content): Merge conflict in webapp/src/main/webapp/WEB-INF/template/banner.jsp
  165. Auto-merging webapp/src/main/webapp/WEB-INF/tags/locationTree.tag
  166. Auto-merging webapp/src/main/webapp/WEB-INF/tags/dateField.tag
  167. Auto-merging webapp/src/main/webapp/WEB-INF/tags/conceptField.tag
  168. Auto-merging webapp/src/main/webapp/WEB-INF/taglibs/openmrs.tld
  169. CONFLICT (content): Merge conflict in webapp/src/main/webapp/WEB-INF/taglibs/openmrs.tld
  170. Auto-merging webapp/src/main/webapp/WEB-INF/messages_pt.properties
  171. CONFLICT (content): Merge conflict in webapp/src/main/webapp/WEB-INF/messages_pt.properties
  172. Auto-merging webapp/src/main/webapp/WEB-INF/messages_hi.properties
  173. CONFLICT (content): Merge conflict in webapp/src/main/webapp/WEB-INF/messages_hi.properties
  174. Auto-merging webapp/src/main/webapp/WEB-INF/messages_es.properties
  175. CONFLICT (content): Merge conflict in webapp/src/main/webapp/WEB-INF/messages_es.properties
  176. Auto-merging webapp/src/main/webapp/WEB-INF/messages.properties
  177. CONFLICT (content): Merge conflict in webapp/src/main/webapp/WEB-INF/messages.properties
  178. Auto-merging webapp/src/main/webapp/WEB-INF/dwr.xml
  179. Auto-merging webapp/src/main/resources/liquibase-demo-data.zip
  180. CONFLICT (content): Merge conflict in webapp/src/main/resources/liquibase-demo-data.zip
  181. Auto-merging webapp/pom.xml
  182. CONFLICT (content): Merge conflict in webapp/pom.xml
  183. Auto-merging web/src/test/java/org/openmrs/web/test/WebTestHelper.java
  184. CONFLICT (add/add): Merge conflict in web/src/test/java/org/openmrs/web/test/WebTestHelper.java
  185. Auto-merging web/src/test/java/org/openmrs/web/taglib/FormatTagTest.java
  186. CONFLICT (add/add): Merge conflict in web/src/test/java/org/openmrs/web/taglib/FormatTagTest.java
  187. Auto-merging web/src/test/java/org/openmrs/web/dwr/DWRPatientServiceTest.java
  188. CONFLICT (content): Merge conflict in web/src/test/java/org/openmrs/web/dwr/DWRPatientServiceTest.java
  189. Auto-merging web/src/test/java/org/openmrs/web/controller/user/RoleFormControllerTest.java
  190. CONFLICT (add/add): Merge conflict in web/src/test/java/org/openmrs/web/controller/user/RoleFormControllerTest.java
  191. Auto-merging web/src/test/java/org/openmrs/web/controller/patient/ShortPatientFormControllerTest.java
  192. CONFLICT (content): Merge conflict in web/src/test/java/org/openmrs/web/controller/patient/ShortPatientFormControllerTest.java
  193. Auto-merging web/src/test/java/org/openmrs/web/controller/concept/ConceptProposalFormControllerTest.java
  194. CONFLICT (add/add): Merge conflict in web/src/test/java/org/openmrs/web/controller/concept/ConceptProposalFormControllerTest.java
  195. Auto-merging web/src/test/java/org/openmrs/web/controller/ConceptFormControllerTest.java
  196. CONFLICT (content): Merge conflict in web/src/test/java/org/openmrs/web/controller/ConceptFormControllerTest.java
  197. Auto-merging web/src/test/java/org/openmrs/web/WebUtilTest.java
  198. CONFLICT (content): Merge conflict in web/src/test/java/org/openmrs/web/WebUtilTest.java
  199. Auto-merging web/src/main/resources/org/openmrs/web/filter/initialization/progress.vm
  200. Auto-merging web/src/main/resources/openmrs-servlet.xml
  201. CONFLICT (content): Merge conflict in web/src/main/resources/openmrs-servlet.xml
  202. Auto-merging web/src/main/java/org/openmrs/web/taglib/RequireTag.java
  203. CONFLICT (content): Merge conflict in web/src/main/java/org/openmrs/web/taglib/RequireTag.java
  204. Auto-merging web/src/main/java/org/openmrs/web/taglib/FormatTag.java
  205. CONFLICT (content): Merge conflict in web/src/main/java/org/openmrs/web/taglib/FormatTag.java
  206. Auto-merging web/src/main/java/org/openmrs/web/filter/update/UpdateFilter.java
  207. Auto-merging web/src/main/java/org/openmrs/web/filter/initialization/InitializationWizardModel.java
  208. Auto-merging web/src/main/java/org/openmrs/web/filter/initialization/InitializationFilter.java
  209. CONFLICT (content): Merge conflict in web/src/main/java/org/openmrs/web/filter/initialization/InitializationFilter.java
  210. Auto-merging web/src/main/java/org/openmrs/web/dwr/DWRProviderService.java
  211. CONFLICT (content): Merge conflict in web/src/main/java/org/openmrs/web/dwr/DWRProviderService.java
  212. Auto-merging web/src/main/java/org/openmrs/web/dwr/DWRPatientService.java
  213. CONFLICT (content): Merge conflict in web/src/main/java/org/openmrs/web/dwr/DWRPatientService.java
  214. Auto-merging web/src/main/java/org/openmrs/web/dwr/DWROrderService.java
  215. CONFLICT (content): Merge conflict in web/src/main/java/org/openmrs/web/dwr/DWROrderService.java
  216. Auto-merging web/src/main/java/org/openmrs/web/controller/visit/VisitListController.java
  217. CONFLICT (content): Merge conflict in web/src/main/java/org/openmrs/web/controller/visit/VisitListController.java
  218. Auto-merging web/src/main/java/org/openmrs/web/controller/visit/VisitFormController.java
  219. CONFLICT (content): Merge conflict in web/src/main/java/org/openmrs/web/controller/visit/VisitFormController.java
  220. Auto-merging web/src/main/java/org/openmrs/web/controller/provider/ProviderFormController.java
  221. Auto-merging web/src/main/java/org/openmrs/web/controller/person/RelationshipTypeFormController.java
  222. Auto-merging web/src/main/java/org/openmrs/web/controller/patient/PatientFormController.java
  223. Auto-merging web/src/main/java/org/openmrs/web/controller/observation/ObsFormController.java
  224. CONFLICT (content): Merge conflict in web/src/main/java/org/openmrs/web/controller/observation/ObsFormController.java
  225. Auto-merging web/src/main/java/org/openmrs/web/controller/form/FormResourceController.java
  226. CONFLICT (add/add): Merge conflict in web/src/main/java/org/openmrs/web/controller/form/FormResourceController.java
  227. Auto-merging web/src/main/java/org/openmrs/web/controller/encounter/EncounterTypeFormController.java
  228. Auto-merging web/src/main/java/org/openmrs/web/controller/concept/ConceptProposalFormController.java
  229. CONFLICT (content): Merge conflict in web/src/main/java/org/openmrs/web/controller/concept/ConceptProposalFormController.java
  230. Auto-merging web/src/main/java/org/openmrs/web/controller/ConceptFormController.java
  231. CONFLICT (content): Merge conflict in web/src/main/java/org/openmrs/web/controller/ConceptFormController.java
  232. Auto-merging web/src/main/java/org/openmrs/web/WebDaemon.java
  233. CONFLICT (add/add): Merge conflict in web/src/main/java/org/openmrs/web/WebDaemon.java
  234. Auto-merging web/src/main/java/org/openmrs/web/Listener.java
  235. CONFLICT (content): Merge conflict in web/src/main/java/org/openmrs/web/Listener.java
  236. Auto-merging web/src/main/java/org/openmrs/module/web/WebModuleUtil.java
  237. CONFLICT (content): Merge conflict in web/src/main/java/org/openmrs/module/web/WebModuleUtil.java
  238. Auto-merging web/pom.xml
  239. CONFLICT (content): Merge conflict in web/pom.xml
  240. Auto-merging tools/pom.xml
  241. CONFLICT (content): Merge conflict in tools/pom.xml
  242. Auto-merging test/pom.xml
  243. CONFLICT (content): Merge conflict in test/pom.xml
  244. Auto-merging pom.xml
  245. CONFLICT (content): Merge conflict in pom.xml
  246. Auto-merging api/src/test/resources/org/openmrs/reporting/include/PatientFilterTest.xml
  247. CONFLICT (content): Merge conflict in api/src/test/resources/org/openmrs/reporting/include/PatientFilterTest.xml
  248. Auto-merging api/src/test/resources/org/openmrs/include/standardTestDataset.xml
  249. CONFLICT (content): Merge conflict in api/src/test/resources/org/openmrs/include/standardTestDataset.xml
  250. Auto-merging api/src/test/resources/org/openmrs/include/initialInMemoryTestDataSet.xml
  251. CONFLICT (content): Merge conflict in api/src/test/resources/org/openmrs/include/initialInMemoryTestDataSet.xml
  252. Auto-merging api/src/test/resources/org/openmrs/hl7/include/ORUTest-initialData.xml
  253. Auto-merging api/src/test/resources/org/openmrs/api/include/OrderServiceTest-drugOrdersList.xml
  254. CONFLICT (add/add): Merge conflict in api/src/test/resources/org/openmrs/api/include/OrderServiceTest-drugOrdersList.xml
  255. Auto-merging api/src/test/resources/org/openmrs/api/include/EncounterServiceTest-initialData.xml
  256. CONFLICT (content): Merge conflict in api/src/test/resources/org/openmrs/api/include/EncounterServiceTest-initialData.xml
  257. Auto-merging api/src/test/resources/org/openmrs/api/include/ConceptServiceTest-words.xml
  258. CONFLICT (content): Merge conflict in api/src/test/resources/org/openmrs/api/include/ConceptServiceTest-words.xml
  259. Auto-merging api/src/test/resources/org/openmrs/api/include/ConceptServiceTest-numerics.xml
  260. CONFLICT (content): Merge conflict in api/src/test/resources/org/openmrs/api/include/ConceptServiceTest-numerics.xml
  261. Auto-merging api/src/test/java/org/openmrs/validator/UserValidatorTest.java
  262. CONFLICT (content): Merge conflict in api/src/test/java/org/openmrs/validator/UserValidatorTest.java
  263. Auto-merging api/src/test/java/org/openmrs/validator/ProviderValidatorTest.java
  264. CONFLICT (content): Merge conflict in api/src/test/java/org/openmrs/validator/ProviderValidatorTest.java
  265. Auto-merging api/src/test/java/org/openmrs/validator/ProgramValidatorTest.java
  266. CONFLICT (content): Merge conflict in api/src/test/java/org/openmrs/validator/ProgramValidatorTest.java
  267. Auto-merging api/src/test/java/org/openmrs/validator/PersonNameValidatorTest.java
  268. CONFLICT (content): Merge conflict in api/src/test/java/org/openmrs/validator/PersonNameValidatorTest.java
  269. Auto-merging api/src/test/java/org/openmrs/validator/PersonAttributeTypeValidatorTest.java
  270. CONFLICT (content): Merge conflict in api/src/test/java/org/openmrs/validator/PersonAttributeTypeValidatorTest.java
  271. Auto-merging api/src/test/java/org/openmrs/validator/PatientIdentifierValidatorTest.java
  272. CONFLICT (content): Merge conflict in api/src/test/java/org/openmrs/validator/PatientIdentifierValidatorTest.java
  273. Auto-merging api/src/test/java/org/openmrs/validator/LocationValidatorTest.java
  274. Auto-merging api/src/test/java/org/openmrs/validator/DrugOrderValidatorTest.java
  275. Auto-merging api/src/test/java/org/openmrs/validator/ConceptValidatorTest.java
  276. CONFLICT (content): Merge conflict in api/src/test/java/org/openmrs/validator/ConceptValidatorTest.java
  277. Auto-merging api/src/test/java/org/openmrs/test/StartModuleExecutionListener.java
  278. Auto-merging api/src/test/java/org/openmrs/test/StartModuleAnnotatioTest.java
  279. CONFLICT (add/add): Merge conflict in api/src/test/java/org/openmrs/test/StartModuleAnnotatioTest.java
  280. Auto-merging api/src/test/java/org/openmrs/test/BaseContextSensitiveTest.java
  281. CONFLICT (content): Merge conflict in api/src/test/java/org/openmrs/test/BaseContextSensitiveTest.java
  282. Auto-merging api/src/test/java/org/openmrs/scheduler/SchedulerServiceTest.java
  283. CONFLICT (content): Merge conflict in api/src/test/java/org/openmrs/scheduler/SchedulerServiceTest.java
  284. Auto-merging api/src/test/java/org/openmrs/module/ModuleUtilTest.java
  285. CONFLICT (content): Merge conflict in api/src/test/java/org/openmrs/module/ModuleUtilTest.java
  286. Auto-merging api/src/test/java/org/openmrs/hl7/handler/ORUR01HandlerTest.java
  287. CONFLICT (content): Merge conflict in api/src/test/java/org/openmrs/hl7/handler/ORUR01HandlerTest.java
  288. Auto-merging api/src/test/java/org/openmrs/api/handler/OpenmrsObjectSaveHandlerTest.java
  289. Auto-merging api/src/test/java/org/openmrs/api/db/hibernate/HibernatePatientDAOTest.java
  290. CONFLICT (add/add): Merge conflict in api/src/test/java/org/openmrs/api/db/hibernate/HibernatePatientDAOTest.java
  291. Auto-merging api/src/test/java/org/openmrs/api/db/UserDAOTest.java
  292. Auto-merging api/src/test/java/org/openmrs/api/db/PatientDAOTest.java
  293. CONFLICT (content): Merge conflict in api/src/test/java/org/openmrs/api/db/PatientDAOTest.java
  294. Auto-merging api/src/test/java/org/openmrs/api/db/ConceptDAOTest.java
  295. CONFLICT (content): Merge conflict in api/src/test/java/org/openmrs/api/db/ConceptDAOTest.java
  296. Auto-merging api/src/test/java/org/openmrs/api/context/DaemonTest.java
  297. CONFLICT (content): Merge conflict in api/src/test/java/org/openmrs/api/context/DaemonTest.java
  298. Auto-merging api/src/test/java/org/openmrs/api/context/ContextTest.java
  299. CONFLICT (content): Merge conflict in api/src/test/java/org/openmrs/api/context/ContextTest.java
  300. Auto-merging api/src/test/java/org/openmrs/api/VisitServiceTest.java
  301. CONFLICT (content): Merge conflict in api/src/test/java/org/openmrs/api/VisitServiceTest.java
  302. Auto-merging api/src/test/java/org/openmrs/api/UserServiceTest.java
  303. CONFLICT (content): Merge conflict in api/src/test/java/org/openmrs/api/UserServiceTest.java
  304. Auto-merging api/src/test/java/org/openmrs/api/ProviderServiceTest.java
  305. CONFLICT (content): Merge conflict in api/src/test/java/org/openmrs/api/ProviderServiceTest.java
  306. Auto-merging api/src/test/java/org/openmrs/api/ProgramWorkflowServiceTest.java
  307. CONFLICT (content): Merge conflict in api/src/test/java/org/openmrs/api/ProgramWorkflowServiceTest.java
  308. Auto-merging api/src/test/java/org/openmrs/api/PatientServiceTest.java
  309. CONFLICT (content): Merge conflict in api/src/test/java/org/openmrs/api/PatientServiceTest.java
  310. Auto-merging api/src/test/java/org/openmrs/api/OrderServiceTest.java
  311. CONFLICT (content): Merge conflict in api/src/test/java/org/openmrs/api/OrderServiceTest.java
  312. Auto-merging api/src/test/java/org/openmrs/api/LocationServiceTest.java
  313. Auto-merging api/src/test/java/org/openmrs/api/FormServiceTest.java
  314. CONFLICT (content): Merge conflict in api/src/test/java/org/openmrs/api/FormServiceTest.java
  315. Auto-merging api/src/test/java/org/openmrs/api/EncounterServiceTest.java
  316. CONFLICT (content): Merge conflict in api/src/test/java/org/openmrs/api/EncounterServiceTest.java
  317. Auto-merging api/src/test/java/org/openmrs/api/ConceptServiceTest.java
  318. CONFLICT (content): Merge conflict in api/src/test/java/org/openmrs/api/ConceptServiceTest.java
  319. Auto-merging api/src/test/java/org/openmrs/api/AdministrationServiceTest.java
  320. CONFLICT (content): Merge conflict in api/src/test/java/org/openmrs/api/AdministrationServiceTest.java
  321. Auto-merging api/src/test/java/org/openmrs/aop/RequiredDataAdviceTest.java
  322. CONFLICT (content): Merge conflict in api/src/test/java/org/openmrs/aop/RequiredDataAdviceTest.java
  323. Auto-merging api/src/test/java/org/openmrs/aop/AuthorizationAdviceTest.java
  324. CONFLICT (add/add): Merge conflict in api/src/test/java/org/openmrs/aop/AuthorizationAdviceTest.java
  325. Auto-merging api/src/test/java/org/openmrs/PatientProgramTest.java
  326. CONFLICT (content): Merge conflict in api/src/test/java/org/openmrs/PatientProgramTest.java
  327. Auto-merging api/src/test/java/org/openmrs/ObsTest.java
  328. CONFLICT (content): Merge conflict in api/src/test/java/org/openmrs/ObsTest.java
  329. Auto-merging api/src/test/java/org/openmrs/EncounterTest.java
  330. CONFLICT (content): Merge conflict in api/src/test/java/org/openmrs/EncounterTest.java
  331. Auto-merging api/src/test/java/org/openmrs/ConceptNumericTest.java
  332. CONFLICT (add/add): Merge conflict in api/src/test/java/org/openmrs/ConceptNumericTest.java
  333. Auto-merging api/src/main/resources/org/openmrs/api/db/hibernate/Order.hbm.xml
  334. CONFLICT (content): Merge conflict in api/src/main/resources/org/openmrs/api/db/hibernate/Order.hbm.xml
  335. Auto-merging api/src/main/resources/org/openmrs/api/db/hibernate/Obs.hbm.xml
  336. Auto-merging api/src/main/resources/org/openmrs/api/db/hibernate/Encounter.hbm.xml
  337. CONFLICT (modify/delete): api/src/main/resources/org/openmrs/api/db/hibernate/ConceptSetDerived.hbm.xml deleted in HEAD and modified in 13061002987f7f314b08669217f90f5612d4bc16. Version 13061002987f7f314b08669217f90f5612d4bc16 of api/src/main/resources/org/openmrs/api/db/hibernate/ConceptSetDerived.hbm.xml left in tree.
  338. Auto-merging api/src/main/resources/org/openmrs/api/db/hibernate/ConceptSet.hbm.xml
  339. Auto-merging api/src/main/resources/org/openmrs/api/db/hibernate/Concept.hbm.xml
  340. Auto-merging api/src/main/resources/liquibase-update-to-latest.xml
  341. CONFLICT (content): Merge conflict in api/src/main/resources/liquibase-update-to-latest.xml
  342. Auto-merging api/src/main/resources/liquibase-schema-only.xml
  343. Auto-merging api/src/main/resources/liquibase-core-data.xml
  344. Auto-merging api/src/main/resources/hibernate.cfg.xml
  345. CONFLICT (content): Merge conflict in api/src/main/resources/hibernate.cfg.xml
  346. Auto-merging api/src/main/resources/applicationContext-service.xml
  347. Auto-merging api/src/main/java/org/openmrs/validator/UserValidator.java
  348. CONFLICT (content): Merge conflict in api/src/main/java/org/openmrs/validator/UserValidator.java
  349. Auto-merging api/src/main/java/org/openmrs/validator/ProgramValidator.java
  350. CONFLICT (content): Merge conflict in api/src/main/java/org/openmrs/validator/ProgramValidator.java
  351. Auto-merging api/src/main/java/org/openmrs/validator/PersonAttributeTypeValidator.java
  352. CONFLICT (content): Merge conflict in api/src/main/java/org/openmrs/validator/PersonAttributeTypeValidator.java
  353. Auto-merging api/src/main/java/org/openmrs/validator/PatientProgramValidator.java
  354. CONFLICT (add/add): Merge conflict in api/src/main/java/org/openmrs/validator/PatientProgramValidator.java
  355. Auto-merging api/src/main/java/org/openmrs/validator/ObsValidator.java
  356. CONFLICT (content): Merge conflict in api/src/main/java/org/openmrs/validator/ObsValidator.java
  357. Auto-merging api/src/main/java/org/openmrs/validator/LocationValidator.java
  358. Auto-merging api/src/main/java/org/openmrs/validator/DrugOrderValidator.java
  359. CONFLICT (content): Merge conflict in api/src/main/java/org/openmrs/validator/DrugOrderValidator.java
  360. Auto-merging api/src/main/java/org/openmrs/validator/ConceptValidator.java
  361. CONFLICT (content): Merge conflict in api/src/main/java/org/openmrs/validator/ConceptValidator.java
  362. Auto-merging api/src/main/java/org/openmrs/validator/ConceptReferenceTermValidator.java
  363. CONFLICT (content): Merge conflict in api/src/main/java/org/openmrs/validator/ConceptReferenceTermValidator.java
  364. Auto-merging api/src/main/java/org/openmrs/util/databasechange/BooleanConceptChangeSet.java
  365. Auto-merging api/src/main/java/org/openmrs/util/PrivilegeConstants.java
  366. CONFLICT (content): Merge conflict in api/src/main/java/org/openmrs/util/PrivilegeConstants.java
  367. Auto-merging api/src/main/java/org/openmrs/util/OpenmrsUtil.java
  368. CONFLICT (content): Merge conflict in api/src/main/java/org/openmrs/util/OpenmrsUtil.java
  369. Auto-merging api/src/main/java/org/openmrs/util/OpenmrsConstants.java
  370. CONFLICT (content): Merge conflict in api/src/main/java/org/openmrs/util/OpenmrsConstants.java
  371. Auto-merging api/src/main/java/org/openmrs/util/OpenmrsClassLoader.java
  372. Auto-merging api/src/main/java/org/openmrs/util/LocaleUtility.java
  373. Auto-merging api/src/main/java/org/openmrs/util/DatabaseUpdater.java
  374. CONFLICT (content): Merge conflict in api/src/main/java/org/openmrs/util/DatabaseUpdater.java
  375. Auto-merging api/src/main/java/org/openmrs/module/ModuleUtil.java
  376. CONFLICT (content): Merge conflict in api/src/main/java/org/openmrs/module/ModuleUtil.java
  377. Auto-merging api/src/main/java/org/openmrs/module/ModuleFileParser.java
  378. Auto-merging api/src/main/java/org/openmrs/module/ModuleFactory.java
  379. CONFLICT (content): Merge conflict in api/src/main/java/org/openmrs/module/ModuleFactory.java
  380. Auto-merging api/src/main/java/org/openmrs/module/ModuleConstants.java
  381. CONFLICT (content): Merge conflict in api/src/main/java/org/openmrs/module/ModuleConstants.java
  382. Auto-merging api/src/main/java/org/openmrs/module/ModuleClassLoader.java
  383. Auto-merging api/src/main/java/org/openmrs/module/Module.java
  384. Auto-merging api/src/main/java/org/openmrs/messagesource/impl/MessageSourceServiceImpl.java
  385. Auto-merging api/src/main/java/org/openmrs/hl7/handler/ORUR01Handler.java
  386. CONFLICT (content): Merge conflict in api/src/main/java/org/openmrs/hl7/handler/ORUR01Handler.java
  387. Auto-merging api/src/main/java/org/openmrs/api/impl/VisitServiceImpl.java
  388. CONFLICT (content): Merge conflict in api/src/main/java/org/openmrs/api/impl/VisitServiceImpl.java
  389. Auto-merging api/src/main/java/org/openmrs/api/impl/UserServiceImpl.java
  390. CONFLICT (content): Merge conflict in api/src/main/java/org/openmrs/api/impl/UserServiceImpl.java
  391. Auto-merging api/src/main/java/org/openmrs/api/impl/ProviderServiceImpl.java
  392. CONFLICT (content): Merge conflict in api/src/main/java/org/openmrs/api/impl/ProviderServiceImpl.java
  393. Auto-merging api/src/main/java/org/openmrs/api/impl/PersonServiceImpl.java
  394. CONFLICT (content): Merge conflict in api/src/main/java/org/openmrs/api/impl/PersonServiceImpl.java
  395. Auto-merging api/src/main/java/org/openmrs/api/impl/PatientServiceImpl.java
  396. CONFLICT (content): Merge conflict in api/src/main/java/org/openmrs/api/impl/PatientServiceImpl.java
  397. Auto-merging api/src/main/java/org/openmrs/api/impl/OrderServiceImpl.java
  398. CONFLICT (content): Merge conflict in api/src/main/java/org/openmrs/api/impl/OrderServiceImpl.java
  399. Auto-merging api/src/main/java/org/openmrs/api/impl/LocationServiceImpl.java
  400. CONFLICT (content): Merge conflict in api/src/main/java/org/openmrs/api/impl/LocationServiceImpl.java
  401. Auto-merging api/src/main/java/org/openmrs/api/impl/FormServiceImpl.java
  402. CONFLICT (content): Merge conflict in api/src/main/java/org/openmrs/api/impl/FormServiceImpl.java
  403. Auto-merging api/src/main/java/org/openmrs/api/impl/EncounterServiceImpl.java
  404. CONFLICT (content): Merge conflict in api/src/main/java/org/openmrs/api/impl/EncounterServiceImpl.java
  405. Auto-merging api/src/main/java/org/openmrs/api/impl/DatatypeServiceImpl.java
  406. CONFLICT (content): Merge conflict in api/src/main/java/org/openmrs/api/impl/DatatypeServiceImpl.java
  407. Auto-merging api/src/main/java/org/openmrs/api/impl/ConceptServiceImpl.java
  408. CONFLICT (content): Merge conflict in api/src/main/java/org/openmrs/api/impl/ConceptServiceImpl.java
  409. Auto-merging api/src/main/java/org/openmrs/api/impl/AdministrationServiceImpl.java
  410. CONFLICT (content): Merge conflict in api/src/main/java/org/openmrs/api/impl/AdministrationServiceImpl.java
  411. Auto-merging api/src/main/java/org/openmrs/api/handler/OpenmrsObjectSaveHandler.java
  412. CONFLICT (content): Merge conflict in api/src/main/java/org/openmrs/api/handler/OpenmrsObjectSaveHandler.java
  413. Auto-merging api/src/main/java/org/openmrs/api/db/hibernate/PatientSearchCriteria.java
  414. Auto-merging api/src/main/java/org/openmrs/api/db/hibernate/HibernateUserDAO.java
  415. Auto-merging api/src/main/java/org/openmrs/api/db/hibernate/HibernateProviderDAO.java
  416. CONFLICT (content): Merge conflict in api/src/main/java/org/openmrs/api/db/hibernate/HibernateProviderDAO.java
  417. Auto-merging api/src/main/java/org/openmrs/api/db/hibernate/HibernatePatientDAO.java
  418. CONFLICT (content): Merge conflict in api/src/main/java/org/openmrs/api/db/hibernate/HibernatePatientDAO.java
  419. Auto-merging api/src/main/java/org/openmrs/api/db/hibernate/HibernateOrderDAO.java
  420. Auto-merging api/src/main/java/org/openmrs/api/db/hibernate/HibernateLocationDAO.java
  421. CONFLICT (content): Merge conflict in api/src/main/java/org/openmrs/api/db/hibernate/HibernateLocationDAO.java
  422. Auto-merging api/src/main/java/org/openmrs/api/db/hibernate/HibernateEncounterDAO.java
  423. CONFLICT (content): Merge conflict in api/src/main/java/org/openmrs/api/db/hibernate/HibernateEncounterDAO.java
  424. Auto-merging api/src/main/java/org/openmrs/api/db/hibernate/HibernateConceptDAO.java
  425. CONFLICT (content): Merge conflict in api/src/main/java/org/openmrs/api/db/hibernate/HibernateConceptDAO.java
  426. Auto-merging api/src/main/java/org/openmrs/api/db/ProviderDAO.java
  427. CONFLICT (content): Merge conflict in api/src/main/java/org/openmrs/api/db/ProviderDAO.java
  428. Auto-merging api/src/main/java/org/openmrs/api/db/PatientDAO.java
  429. CONFLICT (content): Merge conflict in api/src/main/java/org/openmrs/api/db/PatientDAO.java
  430. Auto-merging api/src/main/java/org/openmrs/api/db/OrderDAO.java
  431. Auto-merging api/src/main/java/org/openmrs/api/db/LocationDAO.java
  432. Auto-merging api/src/main/java/org/openmrs/api/db/EncounterDAO.java
  433. CONFLICT (content): Merge conflict in api/src/main/java/org/openmrs/api/db/EncounterDAO.java
  434. Auto-merging api/src/main/java/org/openmrs/api/context/UserContext.java
  435. Auto-merging api/src/main/java/org/openmrs/api/context/ServiceContext.java
  436. Auto-merging api/src/main/java/org/openmrs/api/context/Daemon.java
  437. CONFLICT (content): Merge conflict in api/src/main/java/org/openmrs/api/context/Daemon.java
  438. Auto-merging api/src/main/java/org/openmrs/api/context/Context.java
  439. Auto-merging api/src/main/java/org/openmrs/api/UserService.java
  440. CONFLICT (content): Merge conflict in api/src/main/java/org/openmrs/api/UserService.java
  441. Auto-merging api/src/main/java/org/openmrs/api/ProviderService.java
  442. CONFLICT (content): Merge conflict in api/src/main/java/org/openmrs/api/ProviderService.java
  443. Auto-merging api/src/main/java/org/openmrs/api/PersonService.java
  444. Auto-merging api/src/main/java/org/openmrs/api/PatientSetService.java
  445. CONFLICT (content): Merge conflict in api/src/main/java/org/openmrs/api/PatientSetService.java
  446. Auto-merging api/src/main/java/org/openmrs/api/PatientService.java
  447. CONFLICT (content): Merge conflict in api/src/main/java/org/openmrs/api/PatientService.java
  448. Auto-merging api/src/main/java/org/openmrs/api/OrderService.java
  449. CONFLICT (content): Merge conflict in api/src/main/java/org/openmrs/api/OrderService.java
  450. Auto-merging api/src/main/java/org/openmrs/api/LocationService.java
  451. CONFLICT (content): Merge conflict in api/src/main/java/org/openmrs/api/LocationService.java
  452. Auto-merging api/src/main/java/org/openmrs/api/FormService.java
  453. CONFLICT (content): Merge conflict in api/src/main/java/org/openmrs/api/FormService.java
  454. Auto-merging api/src/main/java/org/openmrs/api/EncounterService.java
  455. CONFLICT (content): Merge conflict in api/src/main/java/org/openmrs/api/EncounterService.java
  456. Auto-merging api/src/main/java/org/openmrs/api/ConceptService.java
  457. CONFLICT (content): Merge conflict in api/src/main/java/org/openmrs/api/ConceptService.java
  458. Auto-merging api/src/main/java/org/openmrs/api/AdministrationService.java
  459. CONFLICT (content): Merge conflict in api/src/main/java/org/openmrs/api/AdministrationService.java
  460. Auto-merging api/src/main/java/org/openmrs/aop/RequiredDataAdvice.java
  461. CONFLICT (content): Merge conflict in api/src/main/java/org/openmrs/aop/RequiredDataAdvice.java
  462. Auto-merging api/src/main/java/org/openmrs/aop/AuthorizationAdvice.java
  463. CONFLICT (content): Merge conflict in api/src/main/java/org/openmrs/aop/AuthorizationAdvice.java
  464. Auto-merging api/src/main/java/org/openmrs/annotation/DisableHandlers.java
  465. CONFLICT (add/add): Merge conflict in api/src/main/java/org/openmrs/annotation/DisableHandlers.java
  466. Auto-merging api/src/main/java/org/openmrs/User.java
  467. Auto-merging api/src/main/java/org/openmrs/TestOrder.java
  468. CONFLICT (add/add): Merge conflict in api/src/main/java/org/openmrs/TestOrder.java
  469. Auto-merging api/src/main/java/org/openmrs/Provider.java
  470. CONFLICT (content): Merge conflict in api/src/main/java/org/openmrs/Provider.java
  471. Auto-merging api/src/main/java/org/openmrs/PersonName.java
  472. Auto-merging api/src/main/java/org/openmrs/PersonAddress.java
  473. CONFLICT (content): Merge conflict in api/src/main/java/org/openmrs/PersonAddress.java
  474. Auto-merging api/src/main/java/org/openmrs/Order.java
  475. CONFLICT (content): Merge conflict in api/src/main/java/org/openmrs/Order.java
  476. Auto-merging api/src/main/java/org/openmrs/Obs.java
  477. Auto-merging api/src/main/java/org/openmrs/Encounter.java
  478. CONFLICT (content): Merge conflict in api/src/main/java/org/openmrs/Encounter.java
  479. Auto-merging api/src/main/java/org/openmrs/Drug.java
  480. CONFLICT (content): Merge conflict in api/src/main/java/org/openmrs/Drug.java
  481. Auto-merging api/src/main/java/org/openmrs/ConceptMap.java
  482. Auto-merging api/src/main/java/org/openmrs/Concept.java
  483. Auto-merging api/pom.xml
  484. CONFLICT (content): Merge conflict in api/pom.xml
  485. Auto-merging .gitignore
  486. CONFLICT (add/add): Merge conflict in .gitignore
  487. Automatic merge failed; fix conflicts and then commit the result.
  488. k-joseph@joseph:/media/KJoseph/Projects/openMRS/openmrs-core$ git status
  489. # On branch 1.9.x
  490. # Changes to be committed:
  491. #
  492. # modified: api/src/main/java/org/openmrs/Concept.java
  493. # modified: api/src/main/java/org/openmrs/ConceptMap.java
  494. # modified: api/src/main/java/org/openmrs/ConceptName.java
  495. # modified: api/src/main/java/org/openmrs/ConceptNumeric.java
  496. # modified: api/src/main/java/org/openmrs/Obs.java
  497. # modified: api/src/main/java/org/openmrs/PatientState.java
  498. # modified: api/src/main/java/org/openmrs/PersonName.java
  499. # modified: api/src/main/java/org/openmrs/User.java
  500. # new file: api/src/main/java/org/openmrs/annotation/OpenmrsProfile.java
  501. # new file: api/src/main/java/org/openmrs/annotation/OpenmrsProfileExclusionFilter.java
  502. # modified: api/src/main/java/org/openmrs/aop/LoggingAdvice.java
  503. # new file: api/src/main/java/org/openmrs/api/EncounterTypeLockedException.java
  504. # modified: api/src/main/java/org/openmrs/api/PersonService.java
  505. # modified: api/src/main/java/org/openmrs/api/context/Context.java
  506. # modified: api/src/main/java/org/openmrs/api/context/ServiceContext.java
  507. # modified: api/src/main/java/org/openmrs/api/context/UserContext.java
  508. # modified: api/src/main/java/org/openmrs/api/db/LocationDAO.java
  509. # modified: api/src/main/java/org/openmrs/api/db/OrderDAO.java
  510. # modified: api/src/main/java/org/openmrs/api/db/hibernate/HibernateOrderDAO.java
  511. # modified: api/src/main/java/org/openmrs/api/db/hibernate/HibernateUserDAO.java
  512. # modified: api/src/main/java/org/openmrs/api/db/hibernate/HibernateUtil.java
  513. # modified: api/src/main/java/org/openmrs/api/db/hibernate/PatientSearchCriteria.java
  514. # modified: api/src/main/java/org/openmrs/messagesource/impl/MessageSourceServiceImpl.java
  515. # modified: api/src/main/java/org/openmrs/migration/MigrationHelper.java
  516. # modified: api/src/main/java/org/openmrs/module/Module.java
  517. # modified: api/src/main/java/org/openmrs/module/ModuleClassLoader.java
  518. # new file: api/src/main/java/org/openmrs/module/ModuleConditionalResource.java
  519. # modified: api/src/main/java/org/openmrs/module/ModuleFileParser.java
  520. # modified: api/src/main/java/org/openmrs/module/UpdateFileParser.java
  521. # modified: api/src/main/java/org/openmrs/notification/Note.java
  522. # new file: api/src/main/java/org/openmrs/obs/SerializableComplexObsHandler.java
  523. # modified: api/src/main/java/org/openmrs/obs/handler/ImageHandler.java
  524. # modified: api/src/main/java/org/openmrs/reporting/export/DataExportReportObject.java
  525. # new file: api/src/main/java/org/openmrs/util/ConceptMapTypeComparator.java
  526. # modified: api/src/main/java/org/openmrs/util/LocaleUtility.java
  527. # modified: api/src/main/java/org/openmrs/util/OpenmrsClassLoader.java
  528. # modified: api/src/main/java/org/openmrs/util/PersonByNameComparator.java
  529. # new file: api/src/main/java/org/openmrs/util/ProviderByPersonNameComparator.java
  530. # modified: api/src/main/java/org/openmrs/util/databasechange/BooleanConceptChangeSet.java
  531. # modified: api/src/main/java/org/openmrs/util/databasechange/SourceMySqldiffFile.java
  532. # new file: api/src/main/java/org/openmrs/validator/AlertValidator.java
  533. # modified: api/src/main/java/org/openmrs/validator/LocationValidator.java
  534. # new file: api/src/main/java/org/openmrs/validator/RelationshipTypeValidator.java
  535. # modified: api/src/main/resources/applicationContext-service.xml
  536. # new file: api/src/main/resources/installation.h2.properties
  537. # modified: api/src/main/resources/liquibase-core-data.xml
  538. # modified: api/src/main/resources/liquibase-schema-only.xml
  539. # modified: api/src/main/resources/org/openmrs/api/db/hibernate/Concept.hbm.xml
  540. # modified: api/src/main/resources/org/openmrs/api/db/hibernate/ConceptSet.hbm.xml
  541. # modified: api/src/main/resources/org/openmrs/api/db/hibernate/Encounter.hbm.xml
  542. # modified: api/src/main/resources/org/openmrs/api/db/hibernate/Obs.hbm.xml
  543. # new file: api/src/main/resources/org/openmrs/api/openmrs.properties
  544. # new file: api/src/test/java/org/openmrs/ConceptComponentTest.java
  545. # modified: api/src/test/java/org/openmrs/ConceptTest.java
  546. # modified: api/src/test/java/org/openmrs/PatientStateTest.java
  547. # new file: api/src/test/java/org/openmrs/PersonAddressTest.java
  548. # modified: api/src/test/java/org/openmrs/PersonNameTest.java
  549. # new file: api/src/test/java/org/openmrs/annotation/OpenmrsProfile1_10.java
  550. # new file: api/src/test/java/org/openmrs/annotation/OpenmrsProfile1_6To1_8.java
  551. # new file: api/src/test/java/org/openmrs/annotation/OpenmrsProfile1_9.java
  552. # new file: api/src/test/java/org/openmrs/annotation/OpenmrsProfile1_9WithHtmlformentry.java
  553. # new file: api/src/test/java/org/openmrs/annotation/OpenmrsProfileExclusionFilterTest.java
  554. # modified: api/src/test/java/org/openmrs/api/LocationServiceTest.java
  555. # modified: api/src/test/java/org/openmrs/api/db/UserDAOTest.java
  556. # new file: api/src/test/java/org/openmrs/api/db/hibernate/HibernateProviderDAOTest.java
  557. # modified: api/src/test/java/org/openmrs/api/handler/OpenmrsObjectSaveHandlerTest.java
  558. # modified: api/src/test/java/org/openmrs/hl7/HL7ServiceTest.java
  559. # new file: api/src/test/java/org/openmrs/module/BaseModuleActivatorTest.java
  560. # new file: api/src/test/java/org/openmrs/module/ModuleActivatorTest.java
  561. # new file: api/src/test/java/org/openmrs/module/ModuleClassLoaderTest.java
  562. # new file: api/src/test/java/org/openmrs/module/ModuleFileParserTest.java
  563. # modified: api/src/test/java/org/openmrs/module/ModuleInteroperabilityTest.java
  564. # new file: api/src/test/java/org/openmrs/module/ModuleTestData.java
  565. # modified: api/src/test/java/org/openmrs/propertyeditor/LocationEditorTest.java
  566. # new file: api/src/test/java/org/openmrs/test/OpenmrsMatchers.java
  567. # modified: api/src/test/java/org/openmrs/test/SkipBaseSetup.java
  568. # modified: api/src/test/java/org/openmrs/test/StartModuleExecutionListener.java
  569. # new file: api/src/test/java/org/openmrs/util/AddressMatcher.java
  570. # new file: api/src/test/java/org/openmrs/util/NameMatcher.java
  571. # modified: api/src/test/java/org/openmrs/util/PersonByNameComparatorTest.java
  572. # new file: api/src/test/java/org/openmrs/util/ProviderByPersonNameComparatorTest.java
  573. # new file: api/src/test/java/org/openmrs/validator/AlertValidatorTest.java
  574. # modified: api/src/test/java/org/openmrs/validator/ConceptMapTypeValidatorTest.java
  575. # modified: api/src/test/java/org/openmrs/validator/DrugOrderValidatorTest.java
  576. # modified: api/src/test/java/org/openmrs/validator/LocationValidatorTest.java
  577. # modified: api/src/test/java/org/openmrs/validator/ObsValidatorTest.java
  578. # new file: api/src/test/java/org/openmrs/validator/RelationshipTypeValidatorTest.java
  579. # modified: api/src/test/resources/TestingApplicationContext.xml
  580. # new file: api/src/test/resources/org/openmrs/api/include/ConceptComplex.xml
  581. # new file: api/src/test/resources/org/openmrs/api/include/OrderServiceTest-deleteObsThatReference.xml
  582. # new file: api/src/test/resources/org/openmrs/api/include/PatientServiceTest-mergePatients.xml
  583. # modified: api/src/test/resources/org/openmrs/hl7/include/ORUTest-initialData.xml
  584. # new file: api/src/test/resources/org/openmrs/module/include/test1-1.0-SNAPSHOT.omod
  585. # new file: api/src/test/resources/org/openmrs/module/include/test1-2.0-SNAPSHOT.omod
  586. # new file: api/src/test/resources/org/openmrs/module/include/test1-update.rdf
  587. # new file: api/src/test/resources/org/openmrs/module/include/test2-1.0-SNAPSHOT.omod
  588. # new file: api/src/test/resources/org/openmrs/module/include/test2-update.rdf
  589. # new file: api/src/test/resources/org/openmrs/module/include/test3-1.0-SNAPSHOT.omod
  590. # new file: api/src/test/resources/org/openmrs/module/include/test3-2.0-SNAPSHOT.omod
  591. # new file: api/src/test/resources/org/openmrs/module/include/test3-update.rdf
  592. # modified: build.properties
  593. # modified: web/src/main/java/org/openmrs/notification/web/controller/AlertFormController.java
  594. # modified: web/src/main/java/org/openmrs/scheduler/web/controller/SchedulerFormController.java
  595. # modified: web/src/main/java/org/openmrs/web/OpenmrsCookieThemeResolver.java
  596. # modified: web/src/main/java/org/openmrs/web/controller/ForgotPasswordFormController.java
  597. # modified: web/src/main/java/org/openmrs/web/controller/encounter/EncounterTypeFormController.java
  598. # modified: web/src/main/java/org/openmrs/web/controller/form/FormFormController.java
  599. # modified: web/src/main/java/org/openmrs/web/controller/patient/PatientFormController.java
  600. # modified: web/src/main/java/org/openmrs/web/controller/person/AddPersonController.java
  601. # modified: web/src/main/java/org/openmrs/web/controller/person/RelationshipTypeFormController.java
  602. # modified: web/src/main/java/org/openmrs/web/controller/provider/ProviderFormController.java
  603. # modified: web/src/main/java/org/openmrs/web/dwr/ConceptListItem.java
  604. # modified: web/src/main/java/org/openmrs/web/dwr/DWREncounterService.java
  605. # modified: web/src/main/java/org/openmrs/web/filter/initialization/InitializationWizardModel.java
  606. # modified: web/src/main/java/org/openmrs/web/filter/update/UpdateFilter.java
  607. # modified: web/src/main/resources/org/openmrs/web/filter/initialization/progress.vm
  608. # new file: web/src/test/java/org/openmrs/module/web/WebModuleUtilTest.java
  609. # modified: web/src/test/java/org/openmrs/scheduler/web/controller/SchedulerFormControllerTest.java
  610. # new file: web/src/test/java/org/openmrs/scheduler/web/controller/SchedulerFormTest.java
  611. # new file: web/src/test/java/org/openmrs/web/controller/encounter/EncounterTypeFormControllerTest.java
  612. # new file: web/src/test/java/org/openmrs/web/controller/person/AddPersonControllerTest.java
  613. # new file: web/src/test/java/org/openmrs/web/dwr/ConceptListItemTest.java
  614. # new file: web/src/test/java/org/openmrs/web/test/TestContextLoader.java
  615. # new file: web/src/test/java/org/openmrs/web/test/WebModuleActivatorTest.java
  616. # new file: web/src/test/java/org/openmrs/web/test/WebModuleListControllerTest.java
  617. # new file: web/src/test/resources/org/openmrs/web/encounter/include/EncounterTypeFormControllerTest.xml
  618. # new file: web/src/test/resources/org/openmrs/web/include/ConceptProposalFormControllerTest.xml
  619. # modified: webapp/src/main/resources/themes/defaults.properties
  620. # modified: webapp/src/main/webapp/WEB-INF/dwr.xml
  621. # new file: webapp/src/main/webapp/WEB-INF/messages_in_ID.properties
  622. # modified: webapp/src/main/webapp/WEB-INF/tags/conceptField.tag
  623. # modified: webapp/src/main/webapp/WEB-INF/tags/dateField.tag
  624. # modified: webapp/src/main/webapp/WEB-INF/tags/locationTree.tag
  625. # modified: webapp/src/main/webapp/WEB-INF/view/admin/forms/formEditForm.jsp
  626. # modified: webapp/src/main/webapp/WEB-INF/view/admin/locations/locationForm.jsp
  627. # modified: webapp/src/main/webapp/WEB-INF/view/admin/patients/index.jsp
  628. # modified: webapp/src/main/webapp/WEB-INF/view/admin/scheduler/schedulerForm.jsp
  629. # modified: webapp/src/main/webapp/WEB-INF/view/login.jsp
  630. # modified: webapp/src/main/webapp/WEB-INF/view/portlets/patientGraphs.jsp
  631. # modified: webapp/src/main/webapp/WEB-INF/view/scripts/calendar/calendar.js
  632. #
  633. # Unmerged paths:
  634. # (use "git add/rm <file>..." as appropriate to mark resolution)
  635. #
  636. # both added: .gitignore
  637. # both modified: api/pom.xml
  638. # both modified: api/src/main/java/org/openmrs/Drug.java
  639. # both modified: api/src/main/java/org/openmrs/Encounter.java
  640. # both modified: api/src/main/java/org/openmrs/Order.java
  641. # both modified: api/src/main/java/org/openmrs/PersonAddress.java
  642. # both modified: api/src/main/java/org/openmrs/Provider.java
  643. # both added: api/src/main/java/org/openmrs/TestOrder.java
  644. # both added: api/src/main/java/org/openmrs/annotation/DisableHandlers.java
  645. # both modified: api/src/main/java/org/openmrs/aop/AuthorizationAdvice.java
  646. # both modified: api/src/main/java/org/openmrs/aop/RequiredDataAdvice.java
  647. # both modified: api/src/main/java/org/openmrs/api/AdministrationService.java
  648. # both modified: api/src/main/java/org/openmrs/api/ConceptService.java
  649. # both modified: api/src/main/java/org/openmrs/api/EncounterService.java
  650. # both modified: api/src/main/java/org/openmrs/api/FormService.java
  651. # both modified: api/src/main/java/org/openmrs/api/LocationService.java
  652. # both modified: api/src/main/java/org/openmrs/api/OrderService.java
  653. # both modified: api/src/main/java/org/openmrs/api/PatientService.java
  654. # both modified: api/src/main/java/org/openmrs/api/PatientSetService.java
  655. # both modified: api/src/main/java/org/openmrs/api/ProviderService.java
  656. # both modified: api/src/main/java/org/openmrs/api/UserService.java
  657. # both modified: api/src/main/java/org/openmrs/api/context/Daemon.java
  658. # both modified: api/src/main/java/org/openmrs/api/db/EncounterDAO.java
  659. # both modified: api/src/main/java/org/openmrs/api/db/PatientDAO.java
  660. # both modified: api/src/main/java/org/openmrs/api/db/ProviderDAO.java
  661. # both modified: api/src/main/java/org/openmrs/api/db/hibernate/HibernateConceptDAO.java
  662. # both modified: api/src/main/java/org/openmrs/api/db/hibernate/HibernateEncounterDAO.java
  663. # both modified: api/src/main/java/org/openmrs/api/db/hibernate/HibernateLocationDAO.java
  664. # both modified: api/src/main/java/org/openmrs/api/db/hibernate/HibernatePatientDAO.java
  665. # both modified: api/src/main/java/org/openmrs/api/db/hibernate/HibernateProviderDAO.java
  666. # both modified: api/src/main/java/org/openmrs/api/handler/OpenmrsObjectSaveHandler.java
  667. # both modified: api/src/main/java/org/openmrs/api/impl/AdministrationServiceImpl.java
  668. # both modified: api/src/main/java/org/openmrs/api/impl/ConceptServiceImpl.java
  669. # both modified: api/src/main/java/org/openmrs/api/impl/DatatypeServiceImpl.java
  670. # both modified: api/src/main/java/org/openmrs/api/impl/EncounterServiceImpl.java
  671. # both modified: api/src/main/java/org/openmrs/api/impl/FormServiceImpl.java
  672. # both modified: api/src/main/java/org/openmrs/api/impl/LocationServiceImpl.java
  673. # both modified: api/src/main/java/org/openmrs/api/impl/OrderServiceImpl.java
  674. # both modified: api/src/main/java/org/openmrs/api/impl/PatientServiceImpl.java
  675. # both modified: api/src/main/java/org/openmrs/api/impl/PersonServiceImpl.java
  676. # both modified: api/src/main/java/org/openmrs/api/impl/ProviderServiceImpl.java
  677. # both modified: api/src/main/java/org/openmrs/api/impl/UserServiceImpl.java
  678. # both modified: api/src/main/java/org/openmrs/api/impl/VisitServiceImpl.java
  679. # both modified: api/src/main/java/org/openmrs/hl7/handler/ORUR01Handler.java
  680. # both modified: api/src/main/java/org/openmrs/module/ModuleConstants.java
  681. # both modified: api/src/main/java/org/openmrs/module/ModuleFactory.java
  682. # both modified: api/src/main/java/org/openmrs/module/ModuleUtil.java
  683. # both modified: api/src/main/java/org/openmrs/util/DatabaseUpdater.java
  684. # both modified: api/src/main/java/org/openmrs/util/OpenmrsConstants.java
  685. # both modified: api/src/main/java/org/openmrs/util/OpenmrsUtil.java
  686. # both modified: api/src/main/java/org/openmrs/util/PrivilegeConstants.java
  687. # both modified: api/src/main/java/org/openmrs/validator/ConceptReferenceTermValidator.java
  688. # both modified: api/src/main/java/org/openmrs/validator/ConceptValidator.java
  689. # both modified: api/src/main/java/org/openmrs/validator/DrugOrderValidator.java
  690. # both modified: api/src/main/java/org/openmrs/validator/ObsValidator.java
  691. # both added: api/src/main/java/org/openmrs/validator/PatientProgramValidator.java
  692. # both modified: api/src/main/java/org/openmrs/validator/PersonAttributeTypeValidator.java
  693. # both modified: api/src/main/java/org/openmrs/validator/ProgramValidator.java
  694. # both modified: api/src/main/java/org/openmrs/validator/UserValidator.java
  695. # both modified: api/src/main/resources/hibernate.cfg.xml
  696. # both modified: api/src/main/resources/liquibase-update-to-latest.xml
  697. # deleted by us: api/src/main/resources/org/openmrs/api/db/hibernate/ConceptSetDerived.hbm.xml
  698. # both modified: api/src/main/resources/org/openmrs/api/db/hibernate/Order.hbm.xml
  699. # both added: api/src/test/java/org/openmrs/ConceptNumericTest.java
  700. # both modified: api/src/test/java/org/openmrs/EncounterTest.java
  701. # both modified: api/src/test/java/org/openmrs/ObsTest.java
  702. # both modified: api/src/test/java/org/openmrs/PatientProgramTest.java
  703. # both added: api/src/test/java/org/openmrs/aop/AuthorizationAdviceTest.java
  704. # both modified: api/src/test/java/org/openmrs/aop/RequiredDataAdviceTest.java
  705. # both modified: api/src/test/java/org/openmrs/api/AdministrationServiceTest.java
  706. # both modified: api/src/test/java/org/openmrs/api/ConceptServiceTest.java
  707. # both modified: api/src/test/java/org/openmrs/api/EncounterServiceTest.java
  708. # both modified: api/src/test/java/org/openmrs/api/FormServiceTest.java
  709. # both modified: api/src/test/java/org/openmrs/api/OrderServiceTest.java
  710. # both modified: api/src/test/java/org/openmrs/api/PatientServiceTest.java
  711. # both modified: api/src/test/java/org/openmrs/api/ProgramWorkflowServiceTest.java
  712. # both modified: api/src/test/java/org/openmrs/api/ProviderServiceTest.java
  713. # both modified: api/src/test/java/org/openmrs/api/UserServiceTest.java
  714. # both modified: api/src/test/java/org/openmrs/api/VisitServiceTest.java
  715. # both modified: api/src/test/java/org/openmrs/api/context/ContextTest.java
  716. # both modified: api/src/test/java/org/openmrs/api/context/DaemonTest.java
  717. # both modified: api/src/test/java/org/openmrs/api/db/ConceptDAOTest.java
  718. # both modified: api/src/test/java/org/openmrs/api/db/PatientDAOTest.java
  719. # both added: api/src/test/java/org/openmrs/api/db/hibernate/HibernatePatientDAOTest.java
  720. # both modified: api/src/test/java/org/openmrs/hl7/handler/ORUR01HandlerTest.java
  721. # both modified: api/src/test/java/org/openmrs/module/ModuleUtilTest.java
  722. # both modified: api/src/test/java/org/openmrs/scheduler/SchedulerServiceTest.java
  723. # both modified: api/src/test/java/org/openmrs/test/BaseContextSensitiveTest.java
  724. # both added: api/src/test/java/org/openmrs/test/StartModuleAnnotatioTest.java
  725. # both modified: api/src/test/java/org/openmrs/validator/ConceptValidatorTest.java
  726. # both modified: api/src/test/java/org/openmrs/validator/PatientIdentifierValidatorTest.java
  727. # both modified: api/src/test/java/org/openmrs/validator/PersonAttributeTypeValidatorTest.java
  728. # both modified: api/src/test/java/org/openmrs/validator/PersonNameValidatorTest.java
  729. # both modified: api/src/test/java/org/openmrs/validator/ProgramValidatorTest.java
  730. # both modified: api/src/test/java/org/openmrs/validator/ProviderValidatorTest.java
  731. # both modified: api/src/test/java/org/openmrs/validator/UserValidatorTest.java
  732. # both modified: api/src/test/resources/org/openmrs/api/include/ConceptServiceTest-numerics.xml
  733. # both modified: api/src/test/resources/org/openmrs/api/include/ConceptServiceTest-words.xml
  734. # both modified: api/src/test/resources/org/openmrs/api/include/EncounterServiceTest-initialData.xml
  735. # both added: api/src/test/resources/org/openmrs/api/include/OrderServiceTest-drugOrdersList.xml
  736. # both modified: api/src/test/resources/org/openmrs/include/initialInMemoryTestDataSet.xml
  737. # both modified: api/src/test/resources/org/openmrs/include/standardTestDataset.xml
  738. # both modified: api/src/test/resources/org/openmrs/reporting/include/PatientFilterTest.xml
  739. # both modified: pom.xml
  740. # both modified: test/pom.xml
  741. # both modified: tools/pom.xml
  742. # both modified: web/pom.xml
  743. # both modified: web/src/main/java/org/openmrs/module/web/WebModuleUtil.java
  744. # both modified: web/src/main/java/org/openmrs/web/Listener.java
  745. # both added: web/src/main/java/org/openmrs/web/WebDaemon.java
  746. # both modified: web/src/main/java/org/openmrs/web/controller/ConceptFormController.java
  747. # both modified: web/src/main/java/org/openmrs/web/controller/concept/ConceptProposalFormController.java
  748. # both added: web/src/main/java/org/openmrs/web/controller/form/FormResourceController.java
  749. # both modified: web/src/main/java/org/openmrs/web/controller/observation/ObsFormController.java
  750. # both modified: web/src/main/java/org/openmrs/web/controller/visit/VisitFormController.java
  751. # both modified: web/src/main/java/org/openmrs/web/controller/visit/VisitListController.java
  752. # both modified: web/src/main/java/org/openmrs/web/dwr/DWROrderService.java
  753. # both modified: web/src/main/java/org/openmrs/web/dwr/DWRPatientService.java
  754. # both modified: web/src/main/java/org/openmrs/web/dwr/DWRProviderService.java
  755. # both modified: web/src/main/java/org/openmrs/web/filter/initialization/InitializationFilter.java
  756. # both modified: web/src/main/java/org/openmrs/web/taglib/FormatTag.java
  757. # both modified: web/src/main/java/org/openmrs/web/taglib/RequireTag.java
  758. # both modified: web/src/main/resources/openmrs-servlet.xml
  759. # both modified: web/src/test/java/org/openmrs/web/WebUtilTest.java
  760. # both modified: web/src/test/java/org/openmrs/web/controller/ConceptFormControllerTest.java
  761. # both added: web/src/test/java/org/openmrs/web/controller/concept/ConceptProposalFormControllerTest.java
  762. # both modified: web/src/test/java/org/openmrs/web/controller/patient/ShortPatientFormControllerTest.java
  763. # both added: web/src/test/java/org/openmrs/web/controller/user/RoleFormControllerTest.java
  764. # both modified: web/src/test/java/org/openmrs/web/dwr/DWRPatientServiceTest.java
  765. # both added: web/src/test/java/org/openmrs/web/taglib/FormatTagTest.java
  766. # both added: web/src/test/java/org/openmrs/web/test/WebTestHelper.java
  767. # both modified: webapp/pom.xml
  768. # both modified: webapp/src/main/resources/liquibase-demo-data.zip
  769. # both modified: webapp/src/main/webapp/WEB-INF/messages.properties
  770. # both modified: webapp/src/main/webapp/WEB-INF/messages_es.properties
  771. # both modified: webapp/src/main/webapp/WEB-INF/messages_hi.properties
  772. # both modified: webapp/src/main/webapp/WEB-INF/messages_pt.properties
  773. # both modified: webapp/src/main/webapp/WEB-INF/taglibs/openmrs.tld
  774. # both modified: webapp/src/main/webapp/WEB-INF/template/banner.jsp
  775. # both modified: webapp/src/main/webapp/WEB-INF/template/gutter.jsp
  776. # both modified: webapp/src/main/webapp/WEB-INF/view/admin/concepts/conceptDatatypeForm.jsp
  777. # both modified: webapp/src/main/webapp/WEB-INF/view/admin/concepts/conceptDrugForm.jsp
  778. # both modified: webapp/src/main/webapp/WEB-INF/view/admin/concepts/conceptReferenceTermForm.jsp
  779. # deleted by us: webapp/src/main/webapp/WEB-INF/view/admin/concepts/conceptSetDerivedForm.jsp
  780. # both modified: webapp/src/main/webapp/WEB-INF/view/admin/concepts/conceptSourceList.jsp
  781. # both modified: webapp/src/main/webapp/WEB-INF/view/admin/concepts/localHeader.jsp
  782. # both modified: webapp/src/main/webapp/WEB-INF/view/admin/encounters/encounterForm.jsp
  783. # both modified: webapp/src/main/webapp/WEB-INF/view/admin/encounters/encounterTypeForm.jsp
  784. # both modified: webapp/src/main/webapp/WEB-INF/view/admin/forms/fieldTypeForm.jsp
  785. # both modified: webapp/src/main/webapp/WEB-INF/view/admin/locations/addressTemplate.jsp
  786. # both modified: webapp/src/main/webapp/WEB-INF/view/admin/maintenance/globalPropsForm.jsp
  787. # both modified: webapp/src/main/webapp/WEB-INF/view/admin/observations/obsForm.jsp
  788. # both modified: webapp/src/main/webapp/WEB-INF/view/admin/orders/localHeader.jsp
  789. # both modified: webapp/src/main/webapp/WEB-INF/view/admin/orders/orderDrugForm.jsp
  790. # both modified: webapp/src/main/webapp/WEB-INF/view/admin/orders/orderForm.jsp
  791. # both modified: webapp/src/main/webapp/WEB-INF/view/admin/orders/orderList.jsp
  792. # both modified: webapp/src/main/webapp/WEB-INF/view/admin/patients/patientIdentifierTypeForm.jsp
  793. # both modified: webapp/src/main/webapp/WEB-INF/view/admin/patients/shortPatientForm.jsp
  794. # both modified: webapp/src/main/webapp/WEB-INF/view/admin/programs/conversionForm.jsp
  795. # both modified: webapp/src/main/webapp/WEB-INF/view/admin/programs/programForm.jsp
  796. # both modified: webapp/src/main/webapp/WEB-INF/view/admin/programs/programList.jsp
  797. # both modified: webapp/src/main/webapp/WEB-INF/view/admin/programs/workflowForm.jsp
  798. # both modified: webapp/src/main/webapp/WEB-INF/view/admin/users/userForm.jsp
  799. # both modified: webapp/src/main/webapp/WEB-INF/view/admin/visits/visitForm.jsp
  800. # both modified: webapp/src/main/webapp/WEB-INF/view/dictionary/concept.jsp
  801. # both modified: webapp/src/main/webapp/WEB-INF/view/dictionary/conceptForm.jsp
  802. # both modified: webapp/src/main/webapp/WEB-INF/view/optionsForm.jsp
  803. # both modified: webapp/src/main/webapp/WEB-INF/view/portlets/addPersonForm.jsp
  804. # both modified: webapp/src/main/webapp/WEB-INF/view/portlets/addressLayout.jsp
  805. # both modified: webapp/src/main/webapp/WEB-INF/view/portlets/cohort.jsp
  806. # both modified: webapp/src/main/webapp/WEB-INF/view/portlets/findPatient.jsp
  807. # both modified: webapp/src/main/webapp/WEB-INF/view/portlets/nameLayout.jsp
  808. # both modified: webapp/src/main/webapp/WEB-INF/view/portlets/patientHeader.jsp
  809. # both modified: webapp/src/main/webapp/WEB-INF/view/portlets/patientOverview.jsp
  810. # both modified: webapp/src/main/webapp/WEB-INF/view/portlets/patientPrograms.jsp
  811. # both modified: webapp/src/main/webapp/WEB-INF/view/portlets/patientRegimen.jsp
  812. # both modified: webapp/src/main/webapp/WEB-INF/view/portlets/patientVisits.jsp
  813. # both modified: webapp/src/main/webapp/WEB-INF/view/scripts/drugOrder.js.withjstl
  814. # both modified: webapp/src/main/webapp/WEB-INF/view/scripts/jquery-ui/js/jquery-ui-datepicker-i18n.js
  815. # both modified: webapp/src/main/webapp/WEB-INF/view/scripts/jquery-ui/js/openmrsSearch.js
  816. # both modified: webapp/src/main/webapp/WEB-INF/view/scripts/jquery/autocomplete/OpenmrsAutoComplete.js
  817. # both modified: webapp/src/main/webapp/WEB-INF/view/scripts/openmrsmessages.js.withjstl
  818. # both modified: webapp/src/main/webapp/WEB-INF/view/scripts/timepicker/timepicker.js
  819. # both modified: webapp/src/main/webapp/WEB-INF/web.xml
  820. # both modified: webapp/src/main/webapp/dictionary/conceptForm.js
  821. # both modified: webapp/src/main/webapp/errorhandler.jsp
  822. # both modified: webapp/src/main/webapp/openmrs.css
  823. # both modified: webapp/src/main/webapp/openmrs.js
  824. #
  825. k-joseph@joseph:/media/KJoseph/Projects/openMRS/openmrs-core$ gedit .git/branches/
  826. k-joseph@joseph:/media/KJoseph/Projects/openMRS/openmrs-core$ git checkout master
  827. .gitignore: needs merge
  828. api/pom.xml: needs merge
  829. api/src/main/java/org/openmrs/Drug.java: needs merge
  830. api/src/main/java/org/openmrs/Encounter.java: needs merge
  831. api/src/main/java/org/openmrs/Order.java: needs merge
  832. api/src/main/java/org/openmrs/PersonAddress.java: needs merge
  833. api/src/main/java/org/openmrs/Provider.java: needs merge
  834. api/src/main/java/org/openmrs/TestOrder.java: needs merge
  835. api/src/main/java/org/openmrs/annotation/DisableHandlers.java: needs merge
  836. api/src/main/java/org/openmrs/aop/AuthorizationAdvice.java: needs merge
  837. api/src/main/java/org/openmrs/aop/RequiredDataAdvice.java: needs merge
  838. api/src/main/java/org/openmrs/api/AdministrationService.java: needs merge
  839. api/src/main/java/org/openmrs/api/ConceptService.java: needs merge
  840. api/src/main/java/org/openmrs/api/EncounterService.java: needs merge
  841. api/src/main/java/org/openmrs/api/FormService.java: needs merge
  842. api/src/main/java/org/openmrs/api/LocationService.java: needs merge
  843. api/src/main/java/org/openmrs/api/OrderService.java: needs merge
  844. api/src/main/java/org/openmrs/api/PatientService.java: needs merge
  845. api/src/main/java/org/openmrs/api/PatientSetService.java: needs merge
  846. api/src/main/java/org/openmrs/api/ProviderService.java: needs merge
  847. api/src/main/java/org/openmrs/api/UserService.java: needs merge
  848. api/src/main/java/org/openmrs/api/context/Daemon.java: needs merge
  849. api/src/main/java/org/openmrs/api/db/EncounterDAO.java: needs merge
  850. api/src/main/java/org/openmrs/api/db/PatientDAO.java: needs merge
  851. api/src/main/java/org/openmrs/api/db/ProviderDAO.java: needs merge
  852. api/src/main/java/org/openmrs/api/db/hibernate/HibernateConceptDAO.java: needs merge
  853. api/src/main/java/org/openmrs/api/db/hibernate/HibernateEncounterDAO.java: needs merge
  854. api/src/main/java/org/openmrs/api/db/hibernate/HibernateLocationDAO.java: needs merge
  855. api/src/main/java/org/openmrs/api/db/hibernate/HibernatePatientDAO.java: needs merge
  856. api/src/main/java/org/openmrs/api/db/hibernate/HibernateProviderDAO.java: needs merge
  857. api/src/main/java/org/openmrs/api/handler/OpenmrsObjectSaveHandler.java: needs merge
  858. api/src/main/java/org/openmrs/api/impl/AdministrationServiceImpl.java: needs merge
  859. api/src/main/java/org/openmrs/api/impl/ConceptServiceImpl.java: needs merge
  860. api/src/main/java/org/openmrs/api/impl/DatatypeServiceImpl.java: needs merge
  861. api/src/main/java/org/openmrs/api/impl/EncounterServiceImpl.java: needs merge
  862. api/src/main/java/org/openmrs/api/impl/FormServiceImpl.java: needs merge
  863. api/src/main/java/org/openmrs/api/impl/LocationServiceImpl.java: needs merge
  864. api/src/main/java/org/openmrs/api/impl/OrderServiceImpl.java: needs merge
  865. api/src/main/java/org/openmrs/api/impl/PatientServiceImpl.java: needs merge
  866. api/src/main/java/org/openmrs/api/impl/PersonServiceImpl.java: needs merge
  867. api/src/main/java/org/openmrs/api/impl/ProviderServiceImpl.java: needs merge
  868. api/src/main/java/org/openmrs/api/impl/UserServiceImpl.java: needs merge
  869. api/src/main/java/org/openmrs/api/impl/VisitServiceImpl.java: needs merge
  870. api/src/main/java/org/openmrs/hl7/handler/ORUR01Handler.java: needs merge
  871. api/src/main/java/org/openmrs/module/ModuleConstants.java: needs merge
  872. api/src/main/java/org/openmrs/module/ModuleFactory.java: needs merge
  873. api/src/main/java/org/openmrs/module/ModuleUtil.java: needs merge
  874. api/src/main/java/org/openmrs/util/DatabaseUpdater.java: needs merge
  875. api/src/main/java/org/openmrs/util/OpenmrsConstants.java: needs merge
  876. api/src/main/java/org/openmrs/util/OpenmrsUtil.java: needs merge
  877. api/src/main/java/org/openmrs/util/PrivilegeConstants.java: needs merge
  878. api/src/main/java/org/openmrs/validator/ConceptReferenceTermValidator.java: needs merge
  879. api/src/main/java/org/openmrs/validator/ConceptValidator.java: needs merge
  880. api/src/main/java/org/openmrs/validator/DrugOrderValidator.java: needs merge
  881. api/src/main/java/org/openmrs/validator/ObsValidator.java: needs merge
  882. api/src/main/java/org/openmrs/validator/PatientProgramValidator.java: needs merge
  883. api/src/main/java/org/openmrs/validator/PersonAttributeTypeValidator.java: needs merge
  884. api/src/main/java/org/openmrs/validator/ProgramValidator.java: needs merge
  885. api/src/main/java/org/openmrs/validator/UserValidator.java: needs merge
  886. api/src/main/resources/hibernate.cfg.xml: needs merge
  887. api/src/main/resources/liquibase-update-to-latest.xml: needs merge
  888. api/src/main/resources/org/openmrs/api/db/hibernate/ConceptSetDerived.hbm.xml: needs merge
  889. api/src/main/resources/org/openmrs/api/db/hibernate/Order.hbm.xml: needs merge
  890. api/src/test/java/org/openmrs/ConceptNumericTest.java: needs merge
  891. api/src/test/java/org/openmrs/EncounterTest.java: needs merge
  892. api/src/test/java/org/openmrs/ObsTest.java: needs merge
  893. api/src/test/java/org/openmrs/PatientProgramTest.java: needs merge
  894. api/src/test/java/org/openmrs/aop/AuthorizationAdviceTest.java: needs merge
  895. api/src/test/java/org/openmrs/aop/RequiredDataAdviceTest.java: needs merge
  896. api/src/test/java/org/openmrs/api/AdministrationServiceTest.java: needs merge
  897. api/src/test/java/org/openmrs/api/ConceptServiceTest.java: needs merge
  898. api/src/test/java/org/openmrs/api/EncounterServiceTest.java: needs merge
  899. api/src/test/java/org/openmrs/api/FormServiceTest.java: needs merge
  900. api/src/test/java/org/openmrs/api/OrderServiceTest.java: needs merge
  901. api/src/test/java/org/openmrs/api/PatientServiceTest.java: needs merge
  902. api/src/test/java/org/openmrs/api/ProgramWorkflowServiceTest.java: needs merge
  903. api/src/test/java/org/openmrs/api/ProviderServiceTest.java: needs merge
  904. api/src/test/java/org/openmrs/api/UserServiceTest.java: needs merge
  905. api/src/test/java/org/openmrs/api/VisitServiceTest.java: needs merge
  906. api/src/test/java/org/openmrs/api/context/ContextTest.java: needs merge
  907. api/src/test/java/org/openmrs/api/context/DaemonTest.java: needs merge
  908. api/src/test/java/org/openmrs/api/db/ConceptDAOTest.java: needs merge
  909. api/src/test/java/org/openmrs/api/db/PatientDAOTest.java: needs merge
  910. api/src/test/java/org/openmrs/api/db/hibernate/HibernatePatientDAOTest.java: needs merge
  911. api/src/test/java/org/openmrs/hl7/handler/ORUR01HandlerTest.java: needs merge
  912. api/src/test/java/org/openmrs/module/ModuleUtilTest.java: needs merge
  913. api/src/test/java/org/openmrs/scheduler/SchedulerServiceTest.java: needs merge
  914. api/src/test/java/org/openmrs/test/BaseContextSensitiveTest.java: needs merge
  915. api/src/test/java/org/openmrs/test/StartModuleAnnotatioTest.java: needs merge
  916. api/src/test/java/org/openmrs/validator/ConceptValidatorTest.java: needs merge
  917. api/src/test/java/org/openmrs/validator/PatientIdentifierValidatorTest.java: needs merge
  918. api/src/test/java/org/openmrs/validator/PersonAttributeTypeValidatorTest.java: needs merge
  919. api/src/test/java/org/openmrs/validator/PersonNameValidatorTest.java: needs merge
  920. api/src/test/java/org/openmrs/validator/ProgramValidatorTest.java: needs merge
  921. api/src/test/java/org/openmrs/validator/ProviderValidatorTest.java: needs merge
  922. api/src/test/java/org/openmrs/validator/UserValidatorTest.java: needs merge
  923. api/src/test/resources/org/openmrs/api/include/ConceptServiceTest-numerics.xml: needs merge
  924. api/src/test/resources/org/openmrs/api/include/ConceptServiceTest-words.xml: needs merge
  925. api/src/test/resources/org/openmrs/api/include/EncounterServiceTest-initialData.xml: needs merge
  926. api/src/test/resources/org/openmrs/api/include/OrderServiceTest-drugOrdersList.xml: needs merge
  927. api/src/test/resources/org/openmrs/include/initialInMemoryTestDataSet.xml: needs merge
  928. api/src/test/resources/org/openmrs/include/standardTestDataset.xml: needs merge
  929. api/src/test/resources/org/openmrs/reporting/include/PatientFilterTest.xml: needs merge
  930. pom.xml: needs merge
  931. test/pom.xml: needs merge
  932. tools/pom.xml: needs merge
  933. web/pom.xml: needs merge
  934. web/src/main/java/org/openmrs/module/web/WebModuleUtil.java: needs merge
  935. web/src/main/java/org/openmrs/web/Listener.java: needs merge
  936. web/src/main/java/org/openmrs/web/WebDaemon.java: needs merge
  937. web/src/main/java/org/openmrs/web/controller/ConceptFormController.java: needs merge
  938. web/src/main/java/org/openmrs/web/controller/concept/ConceptProposalFormController.java: needs merge
  939. web/src/main/java/org/openmrs/web/controller/form/FormResourceController.java: needs merge
  940. web/src/main/java/org/openmrs/web/controller/observation/ObsFormController.java: needs merge
  941. web/src/main/java/org/openmrs/web/controller/visit/VisitFormController.java: needs merge
  942. web/src/main/java/org/openmrs/web/controller/visit/VisitListController.java: needs merge
  943. web/src/main/java/org/openmrs/web/dwr/DWROrderService.java: needs merge
  944. web/src/main/java/org/openmrs/web/dwr/DWRPatientService.java: needs merge
  945. web/src/main/java/org/openmrs/web/dwr/DWRProviderService.java: needs merge
  946. web/src/main/java/org/openmrs/web/filter/initialization/InitializationFilter.java: needs merge
  947. web/src/main/java/org/openmrs/web/taglib/FormatTag.java: needs merge
  948. web/src/main/java/org/openmrs/web/taglib/RequireTag.java: needs merge
  949. web/src/main/resources/openmrs-servlet.xml: needs merge
  950. web/src/test/java/org/openmrs/web/WebUtilTest.java: needs merge
  951. web/src/test/java/org/openmrs/web/controller/ConceptFormControllerTest.java: needs merge
  952. web/src/test/java/org/openmrs/web/controller/concept/ConceptProposalFormControllerTest.java: needs merge
  953. web/src/test/java/org/openmrs/web/controller/patient/ShortPatientFormControllerTest.java: needs merge
  954. web/src/test/java/org/openmrs/web/controller/user/RoleFormControllerTest.java: needs merge
  955. web/src/test/java/org/openmrs/web/dwr/DWRPatientServiceTest.java: needs merge
  956. web/src/test/java/org/openmrs/web/taglib/FormatTagTest.java: needs merge
  957. web/src/test/java/org/openmrs/web/test/WebTestHelper.java: needs merge
  958. webapp/pom.xml: needs merge
  959. webapp/src/main/resources/liquibase-demo-data.zip: needs merge
  960. webapp/src/main/webapp/WEB-INF/messages.properties: needs merge
  961. webapp/src/main/webapp/WEB-INF/messages_es.properties: needs merge
  962. webapp/src/main/webapp/WEB-INF/messages_hi.properties: needs merge
  963. webapp/src/main/webapp/WEB-INF/messages_pt.properties: needs merge
  964. webapp/src/main/webapp/WEB-INF/taglibs/openmrs.tld: needs merge
  965. webapp/src/main/webapp/WEB-INF/template/banner.jsp: needs merge
  966. webapp/src/main/webapp/WEB-INF/template/gutter.jsp: needs merge
  967. webapp/src/main/webapp/WEB-INF/view/admin/concepts/conceptDatatypeForm.jsp: needs merge
  968. webapp/src/main/webapp/WEB-INF/view/admin/concepts/conceptDrugForm.jsp: needs merge
  969. webapp/src/main/webapp/WEB-INF/view/admin/concepts/conceptReferenceTermForm.jsp: needs merge
  970. webapp/src/main/webapp/WEB-INF/view/admin/concepts/conceptSetDerivedForm.jsp: needs merge
  971. webapp/src/main/webapp/WEB-INF/view/admin/concepts/conceptSourceList.jsp: needs merge
  972. webapp/src/main/webapp/WEB-INF/view/admin/concepts/localHeader.jsp: needs merge
  973. webapp/src/main/webapp/WEB-INF/view/admin/encounters/encounterForm.jsp: needs merge
  974. webapp/src/main/webapp/WEB-INF/view/admin/encounters/encounterTypeForm.jsp: needs merge
  975. webapp/src/main/webapp/WEB-INF/view/admin/forms/fieldTypeForm.jsp: needs merge
  976. webapp/src/main/webapp/WEB-INF/view/admin/locations/addressTemplate.jsp: needs merge
  977. webapp/src/main/webapp/WEB-INF/view/admin/maintenance/globalPropsForm.jsp: needs merge
  978. webapp/src/main/webapp/WEB-INF/view/admin/observations/obsForm.jsp: needs merge
  979. webapp/src/main/webapp/WEB-INF/view/admin/orders/localHeader.jsp: needs merge
  980. webapp/src/main/webapp/WEB-INF/view/admin/orders/orderDrugForm.jsp: needs merge
  981. webapp/src/main/webapp/WEB-INF/view/admin/orders/orderForm.jsp: needs merge
  982. webapp/src/main/webapp/WEB-INF/view/admin/orders/orderList.jsp: needs merge
  983. webapp/src/main/webapp/WEB-INF/view/admin/patients/patientIdentifierTypeForm.jsp: needs merge
  984. webapp/src/main/webapp/WEB-INF/view/admin/patients/shortPatientForm.jsp: needs merge
  985. webapp/src/main/webapp/WEB-INF/view/admin/programs/conversionForm.jsp: needs merge
  986. webapp/src/main/webapp/WEB-INF/view/admin/programs/programForm.jsp: needs merge
  987. webapp/src/main/webapp/WEB-INF/view/admin/programs/programList.jsp: needs merge
  988. webapp/src/main/webapp/WEB-INF/view/admin/programs/workflowForm.jsp: needs merge
  989. webapp/src/main/webapp/WEB-INF/view/admin/users/userForm.jsp: needs merge
  990. webapp/src/main/webapp/WEB-INF/view/admin/visits/visitForm.jsp: needs merge
  991. webapp/src/main/webapp/WEB-INF/view/dictionary/concept.jsp: needs merge
  992. webapp/src/main/webapp/WEB-INF/view/dictionary/conceptForm.jsp: needs merge
  993. webapp/src/main/webapp/WEB-INF/view/optionsForm.jsp: needs merge
  994. webapp/src/main/webapp/WEB-INF/view/portlets/addPersonForm.jsp: needs merge
  995. webapp/src/main/webapp/WEB-INF/view/portlets/addressLayout.jsp: needs merge
  996. webapp/src/main/webapp/WEB-INF/view/portlets/cohort.jsp: needs merge
  997. webapp/src/main/webapp/WEB-INF/view/portlets/findPatient.jsp: needs merge
  998. webapp/src/main/webapp/WEB-INF/view/portlets/nameLayout.jsp: needs merge
  999. webapp/src/main/webapp/WEB-INF/view/portlets/patientHeader.jsp: needs merge
  1000. webapp/src/main/webapp/WEB-INF/view/portlets/patientOverview.jsp: needs merge
  1001. webapp/src/main/webapp/WEB-INF/view/portlets/patientPrograms.jsp: needs merge
  1002. webapp/src/main/webapp/WEB-INF/view/portlets/patientRegimen.jsp: needs merge
  1003. webapp/src/main/webapp/WEB-INF/view/portlets/patientVisits.jsp: needs merge
  1004. webapp/src/main/webapp/WEB-INF/view/scripts/drugOrder.js.withjstl: needs merge
  1005. webapp/src/main/webapp/WEB-INF/view/scripts/jquery-ui/js/jquery-ui-datepicker-i18n.js: needs merge
  1006. webapp/src/main/webapp/WEB-INF/view/scripts/jquery-ui/js/openmrsSearch.js: needs merge
  1007. webapp/src/main/webapp/WEB-INF/view/scripts/jquery/autocomplete/OpenmrsAutoComplete.js: needs merge
  1008. webapp/src/main/webapp/WEB-INF/view/scripts/openmrsmessages.js.withjstl: needs merge
  1009. webapp/src/main/webapp/WEB-INF/view/scripts/timepicker/timepicker.js: needs merge
  1010. webapp/src/main/webapp/WEB-INF/web.xml: needs merge
  1011. webapp/src/main/webapp/dictionary/conceptForm.js: needs merge
  1012. webapp/src/main/webapp/errorhandler.jsp: needs merge
  1013. webapp/src/main/webapp/openmrs.css: needs merge
  1014. webapp/src/main/webapp/openmrs.js: needs merge
  1015. error: you need to resolve your current index first
  1016. k-joseph@joseph:/media/KJoseph/Projects/openMRS/openmrs-core$ git status
  1017. # On branch 1.9.x
  1018. # Changes to be committed:
  1019. #
  1020. # modified: api/src/main/java/org/openmrs/Concept.java
  1021. # modified: api/src/main/java/org/openmrs/ConceptMap.java
  1022. # modified: api/src/main/java/org/openmrs/ConceptName.java
  1023. # modified: api/src/main/java/org/openmrs/ConceptNumeric.java
  1024. # modified: api/src/main/java/org/openmrs/Obs.java
  1025. # modified: api/src/main/java/org/openmrs/PatientState.java
  1026. # modified: api/src/main/java/org/openmrs/PersonName.java
  1027. # modified: api/src/main/java/org/openmrs/User.java
  1028. # new file: api/src/main/java/org/openmrs/annotation/OpenmrsProfile.java
  1029. # new file: api/src/main/java/org/openmrs/annotation/OpenmrsProfileExclusionFilter.java
  1030. # modified: api/src/main/java/org/openmrs/aop/LoggingAdvice.java
  1031. # new file: api/src/main/java/org/openmrs/api/EncounterTypeLockedException.java
  1032. # modified: api/src/main/java/org/openmrs/api/PersonService.java
  1033. # modified: api/src/main/java/org/openmrs/api/context/Context.java
  1034. # modified: api/src/main/java/org/openmrs/api/context/ServiceContext.java
  1035. # modified: api/src/main/java/org/openmrs/api/context/UserContext.java
  1036. # modified: api/src/main/java/org/openmrs/api/db/LocationDAO.java
  1037. # modified: api/src/main/java/org/openmrs/api/db/OrderDAO.java
  1038. # modified: api/src/main/java/org/openmrs/api/db/hibernate/HibernateOrderDAO.java
  1039. # modified: api/src/main/java/org/openmrs/api/db/hibernate/HibernateUserDAO.java
  1040. # modified: api/src/main/java/org/openmrs/api/db/hibernate/HibernateUtil.java
  1041. # modified: api/src/main/java/org/openmrs/api/db/hibernate/PatientSearchCriteria.java
  1042. # modified: api/src/main/java/org/openmrs/messagesource/impl/MessageSourceServiceImpl.java
  1043. # modified: api/src/main/java/org/openmrs/migration/MigrationHelper.java
  1044. # modified: api/src/main/java/org/openmrs/module/Module.java
  1045. # modified: api/src/main/java/org/openmrs/module/ModuleClassLoader.java
  1046. # new file: api/src/main/java/org/openmrs/module/ModuleConditionalResource.java
  1047. # modified: api/src/main/java/org/openmrs/module/ModuleFileParser.java
  1048. # modified: api/src/main/java/org/openmrs/module/UpdateFileParser.java
  1049. # modified: api/src/main/java/org/openmrs/notification/Note.java
  1050. # new file: api/src/main/java/org/openmrs/obs/SerializableComplexObsHandler.java
  1051. # modified: api/src/main/java/org/openmrs/obs/handler/ImageHandler.java
  1052. # modified: api/src/main/java/org/openmrs/reporting/export/DataExportReportObject.java
  1053. # new file: api/src/main/java/org/openmrs/util/ConceptMapTypeComparator.java
  1054. # modified: api/src/main/java/org/openmrs/util/LocaleUtility.java
  1055. # modified: api/src/main/java/org/openmrs/util/OpenmrsClassLoader.java
  1056. # modified: api/src/main/java/org/openmrs/util/PersonByNameComparator.java
  1057. # new file: api/src/main/java/org/openmrs/util/ProviderByPersonNameComparator.java
  1058. # modified: api/src/main/java/org/openmrs/util/databasechange/BooleanConceptChangeSet.java
  1059. # modified: api/src/main/java/org/openmrs/util/databasechange/SourceMySqldiffFile.java
  1060. # new file: api/src/main/java/org/openmrs/validator/AlertValidator.java
  1061. # modified: api/src/main/java/org/openmrs/validator/LocationValidator.java
  1062. # new file: api/src/main/java/org/openmrs/validator/RelationshipTypeValidator.java
  1063. # modified: api/src/main/resources/applicationContext-service.xml
  1064. # new file: api/src/main/resources/installation.h2.properties
  1065. # modified: api/src/main/resources/liquibase-core-data.xml
  1066. # modified: api/src/main/resources/liquibase-schema-only.xml
  1067. # modified: api/src/main/resources/org/openmrs/api/db/hibernate/Concept.hbm.xml
  1068. # modified: api/src/main/resources/org/openmrs/api/db/hibernate/ConceptSet.hbm.xml
  1069. # modified: api/src/main/resources/org/openmrs/api/db/hibernate/Encounter.hbm.xml
  1070. # modified: api/src/main/resources/org/openmrs/api/db/hibernate/Obs.hbm.xml
  1071. # new file: api/src/main/resources/org/openmrs/api/openmrs.properties
  1072. # new file: api/src/test/java/org/openmrs/ConceptComponentTest.java
  1073. # modified: api/src/test/java/org/openmrs/ConceptTest.java
  1074. # modified: api/src/test/java/org/openmrs/PatientStateTest.java
  1075. # new file: api/src/test/java/org/openmrs/PersonAddressTest.java
  1076. # modified: api/src/test/java/org/openmrs/PersonNameTest.java
  1077. # new file: api/src/test/java/org/openmrs/annotation/OpenmrsProfile1_10.java
  1078. # new file: api/src/test/java/org/openmrs/annotation/OpenmrsProfile1_6To1_8.java
  1079. # new file: api/src/test/java/org/openmrs/annotation/OpenmrsProfile1_9.java
  1080. # new file: api/src/test/java/org/openmrs/annotation/OpenmrsProfile1_9WithHtmlformentry.java
  1081. # new file: api/src/test/java/org/openmrs/annotation/OpenmrsProfileExclusionFilterTest.java
  1082. # modified: api/src/test/java/org/openmrs/api/LocationServiceTest.java
  1083. # modified: api/src/test/java/org/openmrs/api/db/UserDAOTest.java
  1084. # new file: api/src/test/java/org/openmrs/api/db/hibernate/HibernateProviderDAOTest.java
  1085. # modified: api/src/test/java/org/openmrs/api/handler/OpenmrsObjectSaveHandlerTest.java
  1086. # modified: api/src/test/java/org/openmrs/hl7/HL7ServiceTest.java
  1087. # new file: api/src/test/java/org/openmrs/module/BaseModuleActivatorTest.java
  1088. # new file: api/src/test/java/org/openmrs/module/ModuleActivatorTest.java
  1089. # new file: api/src/test/java/org/openmrs/module/ModuleClassLoaderTest.java
  1090. # new file: api/src/test/java/org/openmrs/module/ModuleFileParserTest.java
  1091. # modified: api/src/test/java/org/openmrs/module/ModuleInteroperabilityTest.java
  1092. # new file: api/src/test/java/org/openmrs/module/ModuleTestData.java
  1093. # modified: api/src/test/java/org/openmrs/propertyeditor/LocationEditorTest.java
  1094. # new file: api/src/test/java/org/openmrs/test/OpenmrsMatchers.java
  1095. # modified: api/src/test/java/org/openmrs/test/SkipBaseSetup.java
  1096. # modified: api/src/test/java/org/openmrs/test/StartModuleExecutionListener.java
  1097. # new file: api/src/test/java/org/openmrs/util/AddressMatcher.java
  1098. # new file: api/src/test/java/org/openmrs/util/NameMatcher.java
  1099. # modified: api/src/test/java/org/openmrs/util/PersonByNameComparatorTest.java
  1100. # new file: api/src/test/java/org/openmrs/util/ProviderByPersonNameComparatorTest.java
  1101. # new file: api/src/test/java/org/openmrs/validator/AlertValidatorTest.java
  1102. # modified: api/src/test/java/org/openmrs/validator/ConceptMapTypeValidatorTest.java
  1103. # modified: api/src/test/java/org/openmrs/validator/DrugOrderValidatorTest.java
  1104. # modified: api/src/test/java/org/openmrs/validator/LocationValidatorTest.java
  1105. # modified: api/src/test/java/org/openmrs/validator/ObsValidatorTest.java
  1106. # new file: api/src/test/java/org/openmrs/validator/RelationshipTypeValidatorTest.java
  1107. # modified: api/src/test/resources/TestingApplicationContext.xml
  1108. # new file: api/src/test/resources/org/openmrs/api/include/ConceptComplex.xml
  1109. # new file: api/src/test/resources/org/openmrs/api/include/OrderServiceTest-deleteObsThatReference.xml
  1110. # new file: api/src/test/resources/org/openmrs/api/include/PatientServiceTest-mergePatients.xml
  1111. # modified: api/src/test/resources/org/openmrs/hl7/include/ORUTest-initialData.xml
  1112. # new file: api/src/test/resources/org/openmrs/module/include/test1-1.0-SNAPSHOT.omod
  1113. # new file: api/src/test/resources/org/openmrs/module/include/test1-2.0-SNAPSHOT.omod
  1114. # new file: api/src/test/resources/org/openmrs/module/include/test1-update.rdf
  1115. # new file: api/src/test/resources/org/openmrs/module/include/test2-1.0-SNAPSHOT.omod
  1116. # new file: api/src/test/resources/org/openmrs/module/include/test2-update.rdf
  1117. # new file: api/src/test/resources/org/openmrs/module/include/test3-1.0-SNAPSHOT.omod
  1118. # new file: api/src/test/resources/org/openmrs/module/include/test3-2.0-SNAPSHOT.omod
  1119. # new file: api/src/test/resources/org/openmrs/module/include/test3-update.rdf
  1120. # modified: build.properties
  1121. # modified: web/src/main/java/org/openmrs/notification/web/controller/AlertFormController.java
  1122. # modified: web/src/main/java/org/openmrs/scheduler/web/controller/SchedulerFormController.java
  1123. # modified: web/src/main/java/org/openmrs/web/OpenmrsCookieThemeResolver.java
  1124. # modified: web/src/main/java/org/openmrs/web/controller/ForgotPasswordFormController.java
  1125. # modified: web/src/main/java/org/openmrs/web/controller/encounter/EncounterTypeFormController.java
  1126. # modified: web/src/main/java/org/openmrs/web/controller/form/FormFormController.java
  1127. # modified: web/src/main/java/org/openmrs/web/controller/patient/PatientFormController.java
  1128. # modified: web/src/main/java/org/openmrs/web/controller/person/AddPersonController.java
  1129. # modified: web/src/main/java/org/openmrs/web/controller/person/RelationshipTypeFormController.java
  1130. # modified: web/src/main/java/org/openmrs/web/controller/provider/ProviderFormController.java
  1131. # modified: web/src/main/java/org/openmrs/web/dwr/ConceptListItem.java
  1132. # modified: web/src/main/java/org/openmrs/web/dwr/DWREncounterService.java
  1133. # modified: web/src/main/java/org/openmrs/web/filter/initialization/InitializationWizardModel.java
  1134. # modified: web/src/main/java/org/openmrs/web/filter/update/UpdateFilter.java
  1135. # modified: web/src/main/resources/org/openmrs/web/filter/initialization/progress.vm
  1136. # new file: web/src/test/java/org/openmrs/module/web/WebModuleUtilTest.java
  1137. # modified: web/src/test/java/org/openmrs/scheduler/web/controller/SchedulerFormControllerTest.java
  1138. # new file: web/src/test/java/org/openmrs/scheduler/web/controller/SchedulerFormTest.java
  1139. # new file: web/src/test/java/org/openmrs/web/controller/encounter/EncounterTypeFormControllerTest.java
  1140. # new file: web/src/test/java/org/openmrs/web/controller/person/AddPersonControllerTest.java
  1141. # new file: web/src/test/java/org/openmrs/web/dwr/ConceptListItemTest.java
  1142. # new file: web/src/test/java/org/openmrs/web/test/TestContextLoader.java
  1143. # new file: web/src/test/java/org/openmrs/web/test/WebModuleActivatorTest.java
  1144. # new file: web/src/test/java/org/openmrs/web/test/WebModuleListControllerTest.java
  1145. # new file: web/src/test/resources/org/openmrs/web/encounter/include/EncounterTypeFormControllerTest.xml
  1146. # new file: web/src/test/resources/org/openmrs/web/include/ConceptProposalFormControllerTest.xml
  1147. # modified: webapp/src/main/resources/themes/defaults.properties
  1148. # modified: webapp/src/main/webapp/WEB-INF/dwr.xml
  1149. # new file: webapp/src/main/webapp/WEB-INF/messages_in_ID.properties
  1150. # modified: webapp/src/main/webapp/WEB-INF/tags/conceptField.tag
  1151. # modified: webapp/src/main/webapp/WEB-INF/tags/dateField.tag
  1152. # modified: webapp/src/main/webapp/WEB-INF/tags/locationTree.tag
  1153. # modified: webapp/src/main/webapp/WEB-INF/view/admin/forms/formEditForm.jsp
  1154. # modified: webapp/src/main/webapp/WEB-INF/view/admin/locations/locationForm.jsp
  1155. # modified: webapp/src/main/webapp/WEB-INF/view/admin/patients/index.jsp
  1156. # modified: webapp/src/main/webapp/WEB-INF/view/admin/scheduler/schedulerForm.jsp
  1157. # modified: webapp/src/main/webapp/WEB-INF/view/login.jsp
  1158. # modified: webapp/src/main/webapp/WEB-INF/view/portlets/patientGraphs.jsp
  1159. # modified: webapp/src/main/webapp/WEB-INF/view/scripts/calendar/calendar.js
  1160. #
  1161. # Unmerged paths:
  1162. # (use "git add/rm <file>..." as appropriate to mark resolution)
  1163. #
  1164. # both added: .gitignore
  1165. # both modified: api/pom.xml
  1166. # both modified: api/src/main/java/org/openmrs/Drug.java
  1167. # both modified: api/src/main/java/org/openmrs/Encounter.java
  1168. # both modified: api/src/main/java/org/openmrs/Order.java
  1169. # both modified: api/src/main/java/org/openmrs/PersonAddress.java
  1170. # both modified: api/src/main/java/org/openmrs/Provider.java
  1171. # both added: api/src/main/java/org/openmrs/TestOrder.java
  1172. # both added: api/src/main/java/org/openmrs/annotation/DisableHandlers.java
  1173. # both modified: api/src/main/java/org/openmrs/aop/AuthorizationAdvice.java
  1174. # both modified: api/src/main/java/org/openmrs/aop/RequiredDataAdvice.java
  1175. # both modified: api/src/main/java/org/openmrs/api/AdministrationService.java
  1176. # both modified: api/src/main/java/org/openmrs/api/ConceptService.java
  1177. # both modified: api/src/main/java/org/openmrs/api/EncounterService.java
  1178. # both modified: api/src/main/java/org/openmrs/api/FormService.java
  1179. # both modified: api/src/main/java/org/openmrs/api/LocationService.java
  1180. # both modified: api/src/main/java/org/openmrs/api/OrderService.java
  1181. # both modified: api/src/main/java/org/openmrs/api/PatientService.java
  1182. # both modified: api/src/main/java/org/openmrs/api/PatientSetService.java
  1183. # both modified: api/src/main/java/org/openmrs/api/ProviderService.java
  1184. # both modified: api/src/main/java/org/openmrs/api/UserService.java
  1185. # both modified: api/src/main/java/org/openmrs/api/context/Daemon.java
  1186. # both modified: api/src/main/java/org/openmrs/api/db/EncounterDAO.java
  1187. # both modified: api/src/main/java/org/openmrs/api/db/PatientDAO.java
  1188. # both modified: api/src/main/java/org/openmrs/api/db/ProviderDAO.java
  1189. # both modified: api/src/main/java/org/openmrs/api/db/hibernate/HibernateConceptDAO.java
  1190. # both modified: api/src/main/java/org/openmrs/api/db/hibernate/HibernateEncounterDAO.java
  1191. # both modified: api/src/main/java/org/openmrs/api/db/hibernate/HibernateLocationDAO.java
  1192. # both modified: api/src/main/java/org/openmrs/api/db/hibernate/HibernatePatientDAO.java
  1193. # both modified: api/src/main/java/org/openmrs/api/db/hibernate/HibernateProviderDAO.java
  1194. # both modified: api/src/main/java/org/openmrs/api/handler/OpenmrsObjectSaveHandler.java
  1195. # both modified: api/src/main/java/org/openmrs/api/impl/AdministrationServiceImpl.java
  1196. # both modified: api/src/main/java/org/openmrs/api/impl/ConceptServiceImpl.java
  1197. # both modified: api/src/main/java/org/openmrs/api/impl/DatatypeServiceImpl.java
  1198. # both modified: api/src/main/java/org/openmrs/api/impl/EncounterServiceImpl.java
  1199. # both modified: api/src/main/java/org/openmrs/api/impl/FormServiceImpl.java
  1200. # both modified: api/src/main/java/org/openmrs/api/impl/LocationServiceImpl.java
  1201. # both modified: api/src/main/java/org/openmrs/api/impl/OrderServiceImpl.java
  1202. # both modified: api/src/main/java/org/openmrs/api/impl/PatientServiceImpl.java
  1203. # both modified: api/src/main/java/org/openmrs/api/impl/PersonServiceImpl.java
  1204. # both modified: api/src/main/java/org/openmrs/api/impl/ProviderServiceImpl.java
  1205. # both modified: api/src/main/java/org/openmrs/api/impl/UserServiceImpl.java
  1206. # both modified: api/src/main/java/org/openmrs/api/impl/VisitServiceImpl.java
  1207. # both modified: api/src/main/java/org/openmrs/hl7/handler/ORUR01Handler.java
  1208. # both modified: api/src/main/java/org/openmrs/module/ModuleConstants.java
  1209. # both modified: api/src/main/java/org/openmrs/module/ModuleFactory.java
  1210. # both modified: api/src/main/java/org/openmrs/module/ModuleUtil.java
  1211. # both modified: api/src/main/java/org/openmrs/util/DatabaseUpdater.java
  1212. # both modified: api/src/main/java/org/openmrs/util/OpenmrsConstants.java
  1213. # both modified: api/src/main/java/org/openmrs/util/OpenmrsUtil.java
  1214. # both modified: api/src/main/java/org/openmrs/util/PrivilegeConstants.java
  1215. # both modified: api/src/main/java/org/openmrs/validator/ConceptReferenceTermValidator.java
  1216. # both modified: api/src/main/java/org/openmrs/validator/ConceptValidator.java
  1217. # both modified: api/src/main/java/org/openmrs/validator/DrugOrderValidator.java
  1218. # both modified: api/src/main/java/org/openmrs/validator/ObsValidator.java
  1219. # both added: api/src/main/java/org/openmrs/validator/PatientProgramValidator.java
  1220. # both modified: api/src/main/java/org/openmrs/validator/PersonAttributeTypeValidator.java
  1221. # both modified: api/src/main/java/org/openmrs/validator/ProgramValidator.java
  1222. # both modified: api/src/main/java/org/openmrs/validator/UserValidator.java
  1223. # both modified: api/src/main/resources/hibernate.cfg.xml
  1224. # both modified: api/src/main/resources/liquibase-update-to-latest.xml
  1225. # deleted by us: api/src/main/resources/org/openmrs/api/db/hibernate/ConceptSetDerived.hbm.xml
  1226. # both modified: api/src/main/resources/org/openmrs/api/db/hibernate/Order.hbm.xml
  1227. # both added: api/src/test/java/org/openmrs/ConceptNumericTest.java
  1228. # both modified: api/src/test/java/org/openmrs/EncounterTest.java
  1229. # both modified: api/src/test/java/org/openmrs/ObsTest.java
  1230. # both modified: api/src/test/java/org/openmrs/PatientProgramTest.java
  1231. # both added: api/src/test/java/org/openmrs/aop/AuthorizationAdviceTest.java
  1232. # both modified: api/src/test/java/org/openmrs/aop/RequiredDataAdviceTest.java
  1233. # both modified: api/src/test/java/org/openmrs/api/AdministrationServiceTest.java
  1234. # both modified: api/src/test/java/org/openmrs/api/ConceptServiceTest.java
  1235. # both modified: api/src/test/java/org/openmrs/api/EncounterServiceTest.java
  1236. # both modified: api/src/test/java/org/openmrs/api/FormServiceTest.java
  1237. # both modified: api/src/test/java/org/openmrs/api/OrderServiceTest.java
  1238. # both modified: api/src/test/java/org/openmrs/api/PatientServiceTest.java
  1239. # both modified: api/src/test/java/org/openmrs/api/ProgramWorkflowServiceTest.java
  1240. # both modified: api/src/test/java/org/openmrs/api/ProviderServiceTest.java
  1241. # both modified: api/src/test/java/org/openmrs/api/UserServiceTest.java
  1242. # both modified: api/src/test/java/org/openmrs/api/VisitServiceTest.java
  1243. # both modified: api/src/test/java/org/openmrs/api/context/ContextTest.java
  1244. # both modified: api/src/test/java/org/openmrs/api/context/DaemonTest.java
  1245. # both modified: api/src/test/java/org/openmrs/api/db/ConceptDAOTest.java
  1246. # both modified: api/src/test/java/org/openmrs/api/db/PatientDAOTest.java
  1247. # both added: api/src/test/java/org/openmrs/api/db/hibernate/HibernatePatientDAOTest.java
  1248. # both modified: api/src/test/java/org/openmrs/hl7/handler/ORUR01HandlerTest.java
  1249. # both modified: api/src/test/java/org/openmrs/module/ModuleUtilTest.java
  1250. # both modified: api/src/test/java/org/openmrs/scheduler/SchedulerServiceTest.java
  1251. # both modified: api/src/test/java/org/openmrs/test/BaseContextSensitiveTest.java
  1252. # both added: api/src/test/java/org/openmrs/test/StartModuleAnnotatioTest.java
  1253. # both modified: api/src/test/java/org/openmrs/validator/ConceptValidatorTest.java
  1254. # both modified: api/src/test/java/org/openmrs/validator/PatientIdentifierValidatorTest.java
  1255. # both modified: api/src/test/java/org/openmrs/validator/PersonAttributeTypeValidatorTest.java
  1256. # both modified: api/src/test/java/org/openmrs/validator/PersonNameValidatorTest.java
  1257. # both modified: api/src/test/java/org/openmrs/validator/ProgramValidatorTest.java
  1258. # both modified: api/src/test/java/org/openmrs/validator/ProviderValidatorTest.java
  1259. # both modified: api/src/test/java/org/openmrs/validator/UserValidatorTest.java
  1260. # both modified: api/src/test/resources/org/openmrs/api/include/ConceptServiceTest-numerics.xml
  1261. # both modified: api/src/test/resources/org/openmrs/api/include/ConceptServiceTest-words.xml
  1262. # both modified: api/src/test/resources/org/openmrs/api/include/EncounterServiceTest-initialData.xml
  1263. # both added: api/src/test/resources/org/openmrs/api/include/OrderServiceTest-drugOrdersList.xml
  1264. # both modified: api/src/test/resources/org/openmrs/include/initialInMemoryTestDataSet.xml
  1265. # both modified: api/src/test/resources/org/openmrs/include/standardTestDataset.xml
  1266. # both modified: api/src/test/resources/org/openmrs/reporting/include/PatientFilterTest.xml
  1267. # both modified: pom.xml
  1268. # both modified: test/pom.xml
  1269. # both modified: tools/pom.xml
  1270. # both modified: web/pom.xml
  1271. # both modified: web/src/main/java/org/openmrs/module/web/WebModuleUtil.java
  1272. # both modified: web/src/main/java/org/openmrs/web/Listener.java
  1273. # both added: web/src/main/java/org/openmrs/web/WebDaemon.java
  1274. # both modified: web/src/main/java/org/openmrs/web/controller/ConceptFormController.java
  1275. # both modified: web/src/main/java/org/openmrs/web/controller/concept/ConceptProposalFormController.java
  1276. # both added: web/src/main/java/org/openmrs/web/controller/form/FormResourceController.java
  1277. # both modified: web/src/main/java/org/openmrs/web/controller/observation/ObsFormController.java
  1278. # both modified: web/src/main/java/org/openmrs/web/controller/visit/VisitFormController.java
  1279. # both modified: web/src/main/java/org/openmrs/web/controller/visit/VisitListController.java
  1280. # both modified: web/src/main/java/org/openmrs/web/dwr/DWROrderService.java
  1281. # both modified: web/src/main/java/org/openmrs/web/dwr/DWRPatientService.java
  1282. # both modified: web/src/main/java/org/openmrs/web/dwr/DWRProviderService.java
  1283. # both modified: web/src/main/java/org/openmrs/web/filter/initialization/InitializationFilter.java
  1284. # both modified: web/src/main/java/org/openmrs/web/taglib/FormatTag.java
  1285. # both modified: web/src/main/java/org/openmrs/web/taglib/RequireTag.java
  1286. # both modified: web/src/main/resources/openmrs-servlet.xml
  1287. # both modified: web/src/test/java/org/openmrs/web/WebUtilTest.java
  1288. # both modified: web/src/test/java/org/openmrs/web/controller/ConceptFormControllerTest.java
  1289. # both added: web/src/test/java/org/openmrs/web/controller/concept/ConceptProposalFormControllerTest.java
  1290. # both modified: web/src/test/java/org/openmrs/web/controller/patient/ShortPatientFormControllerTest.java
  1291. # both added: web/src/test/java/org/openmrs/web/controller/user/RoleFormControllerTest.java
  1292. # both modified: web/src/test/java/org/openmrs/web/dwr/DWRPatientServiceTest.java
  1293. # both added: web/src/test/java/org/openmrs/web/taglib/FormatTagTest.java
  1294. # both added: web/src/test/java/org/openmrs/web/test/WebTestHelper.java
  1295. # both modified: webapp/pom.xml
  1296. # both modified: webapp/src/main/resources/liquibase-demo-data.zip
  1297. # both modified: webapp/src/main/webapp/WEB-INF/messages.properties
  1298. # both modified: webapp/src/main/webapp/WEB-INF/messages_es.properties
  1299. # both modified: webapp/src/main/webapp/WEB-INF/messages_hi.properties
  1300. # both modified: webapp/src/main/webapp/WEB-INF/messages_pt.properties
  1301. # both modified: webapp/src/main/webapp/WEB-INF/taglibs/openmrs.tld
  1302. # both modified: webapp/src/main/webapp/WEB-INF/template/banner.jsp
  1303. # both modified: webapp/src/main/webapp/WEB-INF/template/gutter.jsp
  1304. # both modified: webapp/src/main/webapp/WEB-INF/view/admin/concepts/conceptDatatypeForm.jsp
  1305. # both modified: webapp/src/main/webapp/WEB-INF/view/admin/concepts/conceptDrugForm.jsp
  1306. # both modified: webapp/src/main/webapp/WEB-INF/view/admin/concepts/conceptReferenceTermForm.jsp
  1307. # deleted by us: webapp/src/main/webapp/WEB-INF/view/admin/concepts/conceptSetDerivedForm.jsp
  1308. # both modified: webapp/src/main/webapp/WEB-INF/view/admin/concepts/conceptSourceList.jsp
  1309. # both modified: webapp/src/main/webapp/WEB-INF/view/admin/concepts/localHeader.jsp
  1310. # both modified: webapp/src/main/webapp/WEB-INF/view/admin/encounters/encounterForm.jsp
  1311. # both modified: webapp/src/main/webapp/WEB-INF/view/admin/encounters/encounterTypeForm.jsp
  1312. # both modified: webapp/src/main/webapp/WEB-INF/view/admin/forms/fieldTypeForm.jsp
  1313. # both modified: webapp/src/main/webapp/WEB-INF/view/admin/locations/addressTemplate.jsp
  1314. # both modified: webapp/src/main/webapp/WEB-INF/view/admin/maintenance/globalPropsForm.jsp
  1315. # both modified: webapp/src/main/webapp/WEB-INF/view/admin/observations/obsForm.jsp
  1316. # both modified: webapp/src/main/webapp/WEB-INF/view/admin/orders/localHeader.jsp
  1317. # both modified: webapp/src/main/webapp/WEB-INF/view/admin/orders/orderDrugForm.jsp
  1318. # both modified: webapp/src/main/webapp/WEB-INF/view/admin/orders/orderForm.jsp
  1319. # both modified: webapp/src/main/webapp/WEB-INF/view/admin/orders/orderList.jsp
  1320. # both modified: webapp/src/main/webapp/WEB-INF/view/admin/patients/patientIdentifierTypeForm.jsp
  1321. # both modified: webapp/src/main/webapp/WEB-INF/view/admin/patients/shortPatientForm.jsp
  1322. # both modified: webapp/src/main/webapp/WEB-INF/view/admin/programs/conversionForm.jsp
  1323. # both modified: webapp/src/main/webapp/WEB-INF/view/admin/programs/programForm.jsp
  1324. # both modified: webapp/src/main/webapp/WEB-INF/view/admin/programs/programList.jsp
  1325. # both modified: webapp/src/main/webapp/WEB-INF/view/admin/programs/workflowForm.jsp
  1326. # both modified: webapp/src/main/webapp/WEB-INF/view/admin/users/userForm.jsp
  1327. # both modified: webapp/src/main/webapp/WEB-INF/view/admin/visits/visitForm.jsp
  1328. # both modified: webapp/src/main/webapp/WEB-INF/view/dictionary/concept.jsp
  1329. # both modified: webapp/src/main/webapp/WEB-INF/view/dictionary/conceptForm.jsp
  1330. # both modified: webapp/src/main/webapp/WEB-INF/view/optionsForm.jsp
  1331. # both modified: webapp/src/main/webapp/WEB-INF/view/portlets/addPersonForm.jsp
  1332. # both modified: webapp/src/main/webapp/WEB-INF/view/portlets/addressLayout.jsp
  1333. # both modified: webapp/src/main/webapp/WEB-INF/view/portlets/cohort.jsp
  1334. # both modified: webapp/src/main/webapp/WEB-INF/view/portlets/findPatient.jsp
  1335. # both modified: webapp/src/main/webapp/WEB-INF/view/portlets/nameLayout.jsp
  1336. # both modified: webapp/src/main/webapp/WEB-INF/view/portlets/patientHeader.jsp
  1337. # both modified: webapp/src/main/webapp/WEB-INF/view/portlets/patientOverview.jsp
  1338. # both modified: webapp/src/main/webapp/WEB-INF/view/portlets/patientPrograms.jsp
  1339. # both modified: webapp/src/main/webapp/WEB-INF/view/portlets/patientRegimen.jsp
  1340. # both modified: webapp/src/main/webapp/WEB-INF/view/portlets/patientVisits.jsp
  1341. # both modified: webapp/src/main/webapp/WEB-INF/view/scripts/drugOrder.js.withjstl
  1342. # both modified: webapp/src/main/webapp/WEB-INF/view/scripts/jquery-ui/js/jquery-ui-datepicker-i18n.js
  1343. # both modified: webapp/src/main/webapp/WEB-INF/view/scripts/jquery-ui/js/openmrsSearch.js
  1344. # both modified: webapp/src/main/webapp/WEB-INF/view/scripts/jquery/autocomplete/OpenmrsAutoComplete.js
  1345. # both modified: webapp/src/main/webapp/WEB-INF/view/scripts/openmrsmessages.js.withjstl
  1346. # both modified: webapp/src/main/webapp/WEB-INF/view/scripts/timepicker/timepicker.js
  1347. # both modified: webapp/src/main/webapp/WEB-INF/web.xml
  1348. # both modified: webapp/src/main/webapp/dictionary/conceptForm.js
  1349. # both modified: webapp/src/main/webapp/errorhandler.jsp
  1350. # both modified: webapp/src/main/webapp/openmrs.css
  1351. # both modified: webapp/src/main/webapp/openmrs.js
  1352. #
  1353. k-joseph@joseph:/media/KJoseph/Projects/openMRS/openmrs-core$ git reset --hard HEAD~1
  1354. giHEAD is now at 41f320b TRUNK-3014: Applying patch to propagate attrs to obs.groupMembers when invokin Encounter.addObs
  1355. k-joseph@joseph:/media/KJoseph/Projects/openMRS/openmrs-core$ git checkout master
  1356. Checking out files: 100% (1159/1159), done.
  1357. Switched to branch 'master'
  1358. Your branch and 'origin/master' have diverged,
  1359. and have 754 and 1 different commit each, respectively.
  1360. k-joseph@joseph:/media/KJoseph/Projects/openMRS/openmrs-core$ git branch -D 1.9.x
  1361. Deleted branch 1.9.x (was 41f320b).
  1362. k-joseph@joseph:/media/KJoseph/Projects/openMRS/openmrs-core$ git checkout 1.9.x
  1363. Branch 1.9.x set up to track remote branch 1.9.x from origin.
  1364. Switched to a new branch '1.9.x'
  1365. k-joseph@joseph:/media/KJoseph/Projects/openMRS/openmrs-core$ git checkout master
  1366. Checking out files: 100% (1159/1159), done.
  1367. Switched to branch 'master'
  1368. Your branch and 'origin/master' have diverged,
  1369. and have 754 and 1 different commit each, respectively.
  1370. k-joseph@joseph:/media/KJoseph/Projects/openMRS/openmrs-core$ git
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement
Public Pastes
Advertisement
We use cookies for various purposes including analytics. By continuing to use Pastebin, you agree to our use of cookies as described in the Cookies Policy.  OK, I Understand
Not a member of Pastebin yet?
Sign Up, it unlocks many cool features!