Skip to content
This repository has been archived by the owner on Jan 9, 2023. It is now read-only.

feat(medications): implement basic medication module #2249

Merged
merged 43 commits into from
Aug 14, 2020
Merged

feat(medications): implement basic medication module #2249

merged 43 commits into from
Aug 14, 2020

Commits on Jul 8, 2020

  1. fix: add Relates Person search crash if matched person has no DoB 

    fix #2195
    @blestab
    blestab committed Jul 8, 2020
    Configuration menu
    Copy the full SHA
    e97c3ca View commit details
    Browse the repository at this point in the history

Commits on Jul 10, 2020

  1. feat(incidents): add ability to resolve an incident 

    re #2078
    @blestab
    blestab committed Jul 10, 2020
    Configuration menu
    Copy the full SHA
    5a34b8f View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into master

    @matteovivona
    matteovivona committed Jul 10, 2020
    Configuration menu
    Copy the full SHA
    daada44 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' into master

    @fox1t
    fox1t committed Jul 10, 2020
    Configuration menu
    Copy the full SHA
    77c2be5 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'master' into master

    @fox1t @blestab
    fox1t authored and blestab committed Jul 10, 2020
    Configuration menu
    Copy the full SHA
    0b4d018 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'master' of https://github.com/blestab/hospitalrun-frontend

    @blestab
    blestab committed Jul 10, 2020
    Configuration menu
    Copy the full SHA
    d2b935e View commit details
    Browse the repository at this point in the history

  6. Merge branch 'master' of https://github.com/blestab/hospitalrun-frontend

    @blestab
    blestab committed Jul 10, 2020
    Configuration menu
    Copy the full SHA
    d43fa37 View commit details
    Browse the repository at this point in the history

  7. Merge branch 'master' of https://github.com/blestab/hospitalrun-frontend

    @blestab
    blestab committed Jul 10, 2020
    Configuration menu
    Copy the full SHA
    bfecf24 View commit details
    Browse the repository at this point in the history

  8. Merge branch 'master' into master

    @fox1t
    fox1t committed Jul 10, 2020
    Configuration menu
    Copy the full SHA
    6f6bfe0 View commit details
    Browse the repository at this point in the history

Commits on Jul 11, 2020

  1. Merge branch 'master' into master

    @matteovivona
    matteovivona committed Jul 11, 2020
    Configuration menu
    Copy the full SHA
    52dc151 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into master

    @matteovivona @blestab
    matteovivona authored and blestab committed Jul 11, 2020
    Configuration menu
    Copy the full SHA
    6bea698 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' of https://github.com/blestab/hospitalrun-frontend

    @blestab
    blestab committed Jul 11, 2020
    Configuration menu
    Copy the full SHA
    14ad01a View commit details
    Browse the repository at this point in the history

  4. Merge branch 'master' into master

    @matteovivona
    matteovivona committed Jul 11, 2020
    Configuration menu
    Copy the full SHA
    bfe9ccc View commit details
    Browse the repository at this point in the history

  5. Merge branch 'master' of https://github.com/blestab/hospitalrun-frontend

    @blestab
    blestab committed Jul 11, 2020
    Configuration menu
    Copy the full SHA
    2b01be8 View commit details
    Browse the repository at this point in the history

  6. Merge branch 'master' of https://github.com/blestab/hospitalrun-frontend

    @blestab
    blestab committed Jul 11, 2020
    Configuration menu
    Copy the full SHA
    20c0a71 View commit details
    Browse the repository at this point in the history

  7. Merge branch 'master' of https://github.com/blestab/hospitalrun-frontend

    @blestab
    blestab committed Jul 11, 2020
    Configuration menu
    Copy the full SHA
    eb9f2b3 View commit details
    Browse the repository at this point in the history

  8. Merge branch 'master' of https://github.com/blestab/hospitalrun-frontend

    @blestab
    blestab committed Jul 11, 2020
    Configuration menu
    Copy the full SHA
    309a716 View commit details
    Browse the repository at this point in the history

Commits on Jul 23, 2020

  1. feat(medications): implement basic medication module 

    re #2229
    @blestab
    blestab committed Jul 23, 2020
    Configuration menu
    Copy the full SHA
    a7e415c View commit details
    Browse the repository at this point in the history

Commits on Jul 24, 2020

  1. Merge branch 'master' into master

    @matteovivona
    matteovivona committed Jul 24, 2020
    Configuration menu
    Copy the full SHA
    92e9233 View commit details
    Browse the repository at this point in the history

Commits on Jul 25, 2020

  1. feat(medications): implement basic medication module 

    re #2229
    @blestab
    blestab committed Jul 25, 2020
    Configuration menu
    Copy the full SHA
    6944fb3 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' of https://github.com/blestab/hospitalrun-frontend

    @blestab
    blestab committed Jul 25, 2020
    Configuration menu
    Copy the full SHA
    ac914fe View commit details
    Browse the repository at this point in the history

Commits on Jul 26, 2020

  1. Merge branch 'master' of https://github.com/blestab/hospitalrun-frontend

    @blestab
    blestab committed Jul 26, 2020
    Configuration menu
    Copy the full SHA
    7074b90 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' of https://github.com/blestab/hospitalrun-frontend

    @blestab
    blestab committed Jul 26, 2020
    Configuration menu
    Copy the full SHA
    65ef8cb View commit details
    Browse the repository at this point in the history

  3. feat(medications): implement basic medication module

    @blestab
    blestab committed Jul 26, 2020
    Configuration menu
    Copy the full SHA
    d950e50 View commit details
    Browse the repository at this point in the history

Commits on Jul 27, 2020

  1. Merge branch 'master' into master

    @matteovivona
    matteovivona committed Jul 27, 2020
    Configuration menu
    Copy the full SHA
    40b08d8 View commit details
    Browse the repository at this point in the history

Commits on Jul 28, 2020

  1. feat(navbar): add "Request Medication" to quick create button in navbar 

    re #2257
    @blestab
    blestab committed Jul 28, 2020
    Configuration menu
    Copy the full SHA
    cae8481 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' of https://github.com/blestab/hospitalrun-frontend

    @blestab
    blestab committed Jul 28, 2020
    Configuration menu
    Copy the full SHA
    0de73fc View commit details
    Browse the repository at this point in the history

Commits on Jul 30, 2020

  1. Merge branch 'master' into master

    @matteovivona
    matteovivona committed Jul 30, 2020
    Configuration menu
    Copy the full SHA
    abebbc7 View commit details
    Browse the repository at this point in the history

Commits on Jul 31, 2020

  1. Merge branch 'master' into master

    @matteovivona
    matteovivona committed Jul 31, 2020
    Configuration menu
    Copy the full SHA
    ea93a61 View commit details
    Browse the repository at this point in the history

Commits on Aug 2, 2020

  1. Merge branch 'master' into master

    @matteovivona
    matteovivona committed Aug 2, 2020
    Configuration menu
    Copy the full SHA
    cef43eb View commit details
    Browse the repository at this point in the history

  2. feat(medications): PR Feedback (tests, remove 'complete' feature)

    @blestab
    blestab committed Aug 2, 2020
    Configuration menu
    Copy the full SHA
    ee02c91 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' of https://github.com/blestab/hospitalrun-frontend

    @blestab
    blestab committed Aug 2, 2020
    Configuration menu
    Copy the full SHA
    4a06814 View commit details
    Browse the repository at this point in the history

Commits on Aug 3, 2020

  1. feat(medications): PR feedback - refactor tests, setup function

    @blestab
    blestab committed Aug 3, 2020
    Configuration menu
    Copy the full SHA
    6e909c4 View commit details
    Browse the repository at this point in the history

  2. feat(medications): pr feedback refactor tests add setup function

    @blestab
    blestab committed Aug 3, 2020
    Configuration menu
    Copy the full SHA
    b67f68f View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' of https://github.com/blestab/hospitalrun-frontend

    @blestab
    blestab committed Aug 3, 2020
    Configuration menu
    Copy the full SHA
    45678a0 View commit details
    Browse the repository at this point in the history

Commits on Aug 13, 2020

  1. Merge branch 'master' into fix_merge_conflicts_imagings_meds

    @blestab
    blestab committed Aug 13, 2020
    Configuration menu
    Copy the full SHA
    5cf1307 View commit details
    Browse the repository at this point in the history

  2. fix: merge conflict imaging and medications

    @blestab
    blestab committed Aug 13, 2020
    Configuration menu
    Copy the full SHA
    e52802d View commit details
    Browse the repository at this point in the history

  3. fix(medications): pr merge conflicts 

    missing new line in sidebar test file
    @blestab
    blestab committed Aug 13, 2020
    Configuration menu
    Copy the full SHA
    871f1e7 View commit details
    Browse the repository at this point in the history

  4. fix merge issues

    @blestab
    blestab committed Aug 13, 2020
    Configuration menu
    Copy the full SHA
    c19fbac View commit details
    Browse the repository at this point in the history

  5. fix merge issues

    @blestab
    blestab committed Aug 13, 2020
    Configuration menu
    Copy the full SHA
    07a9ff3 View commit details
    Browse the repository at this point in the history

  6. fix merge issues 

    sidebar test
    @blestab
    blestab committed Aug 13, 2020
    Configuration menu
    Copy the full SHA
    a755035 View commit details
    Browse the repository at this point in the history

  7. fix merge issues sidebar

    @blestab
    blestab committed Aug 13, 2020
    Configuration menu
    Copy the full SHA
    5e72dce View commit details
    Browse the repository at this point in the history

  8. bug: fix sidebar test

    @morrme
    morrme committed Aug 13, 2020
    Configuration menu
    Copy the full SHA
    e2a83a2 View commit details
    Browse the repository at this point in the history