Git

• 

  mgoodrich <mark.goodrich@live.com> 03 Jun 2020 aa4dd5c0390e45d1259d64a63cec3292258226b3

  RA-1770: Allow dispositions to be filtered based on EncounterType

  • api/src/main/java/org/openmrs/module/emrapi/disposition/Disposition.java (version aa4dd5c0390e45d1259d64a63cec3292258226b3)
  • api/src/main/java/org/openmrs/module/emrapi/disposition/DispositionServiceImpl.java (version aa4dd5c0390e45d1259d64a63cec3292258226b3)
  • api/src/test/java/org/openmrs/module/emrapi/disposition/DispositionServiceTest.java (version aa4dd5c0390e45d1259d64a63cec3292258226b3)
  • api/src/test/resources/specifiedDispositionConfig.json (version aa4dd5c0390e45d1259d64a63cec3292258226b3)
• 

  mgoodrich <mark.goodrich@live.com> 02 Jun 2020 1892c5c48ea1e4fa5bca58421d5e5d9a80d20dd0

  RA-1770: Allow dispositions to be filtered based on EncounterType

  • api/src/main/java/org/openmrs/module/emrapi/disposition/DispositionService.java (version 1892c5c48ea1e4fa5bca58421d5e5d9a80d20dd0)
  • api/src/main/java/org/openmrs/module/emrapi/disposition/DispositionServiceImpl.java (version 1892c5c48ea1e4fa5bca58421d5e5d9a80d20dd0)
  • api/src/test/java/org/openmrs/module/emrapi/disposition/DispositionServiceTest.java (version 1892c5c48ea1e4fa5bca58421d5e5d9a80d20dd0)
• 

  mgoodrich <mark.goodrich@live.com> 02 Jun 2020 2784ceb7c1d675689c93ba9ddb41f2c42a1c5350

  Merge branch 'master' of https://github.com/openmrs/openmrs-module-emrapi
• 

  mgoodrich <mark.goodrich@live.com> 02 Jun 2020 fb6ea9d96dc62e35046b43a8edb2cdd9fa587e86 m

  Merge branch 'master' of https://github.com/openmrs/openmrs-module-emrapi
• 

  mgoodrich <mark.goodrich@live.com> 01 Jun 2020 f652cbb2ae61c255e126ce5e64c112e3e31d9f0a m

  Merge branch 'master' of https://github.com/openmrs/openmrs-module-emrapi
• 

  mgoodrich <mark.goodrich@live.com> 24 Mar 2020 9eebd12bfe334316262d8c49b1eccd2ac03f71c4 m

  Merge branch 'master' of https://github.com/openmrs/openmrs-module-emrapi
• 

  mgoodrich <mark.goodrich@live.com> 23 Mar 2020 a24388967602c52bf84c687a91f46bf4487c1f86 m

  Merge branch 'master' of https://github.com/openmrs/openmrs-module-emrapi
  
  Conflicts:
  
          api/src/main/java/org/openmrs/module/emrapi/EmrApiActivator.java
• 

  mks-d <dimitri@mekomsolutions.com> 05 Mar 2020 e522f006d8ed577aac8998b95680cc21a93085c3 m

  MAP-19: Patient identifier types metadata set to have a fixed UUID.

  • api/src/main/java/org/openmrs/module/emrapi/EmrApiActivator.java (version e522f006d8ed577aac8998b95680cc21a93085c3)