Behrouz NematiPour

Merge branch 'feature/LDT-2937-rinseback' into staging

Merge branch 'feature/LDT-2937-rinseback' into staging

Merge branch 'feature/LDT-2937-rinseback' into staging

Merge branch 'feature/LDT-3139-blood-set-auto-load' into staging

Merge branch 'feature/LDT-3139-blood-set-auto-load' into staging

Merge branch 'feature/LDT-3139-blood-set-auto-load' into staging

Merge branch 'feature/LDT-3139-blood-set-auto-load' into staging

Merge branch 'feature/LDT-3139-blood-set-auto-load' into staging

Merge branch 'feature/LDT-2805-edit-treatment-parameters' into staging

    • -9
    • +9
    /configurations/Parameters/DataList.conf
Merge branch 'feature/LDT-2805-edit-treatment-parameters' into staging

    • -4
    • +87
    /sources/canbus/MessageDispatcher.cpp
    • -2
    • +15
    /sources/canbus/MessageInterpreter.cpp
    • -88
    • +22
    /sources/gui/qml/compounds/ValueAdjuster.qml
    • -0
    • +2
    /sources/gui/qml/globals/Variables.qml
    • -32
    • +47
    /sources/gui/qml/pages/treatment/TreatmentStack.qml
  1. … 8 more files in changeset.
Merge branch 'feature/LDT-2805-edit-treatment-parameters' into staging

Merge branch 'feature/LDT-2805-edit-treatment-parameters' into staging

Merge branch 'feature/LDT-2805-edit-treatment-parameters' into staging

    • -60
    • +86
    /leahi_dialin/ui/td_messaging.py
Merge remote-tracking branch 'origin/staging' into staging

Merge branch 'feature/LDT-3072-beta-transition' into staging

    • -1
    • +0
    /sources/canbus/MessageInterpreter.cpp
Merge branch 'feature/LDT-3072-beta-transition' into staging

    • -57
    • +91
    /leahi_dialin/ui/dd_messaging.py
Merge branch 'feature/LDT-3072-beta-transition' into staging

Merge branch 'feature/LDT-2825-institutional' into staging

Merge branch 'feature/LDT-2825-institutional' into staging

    • -0
    • +459
    /leahi_dialin/ui/td_messaging.py
Merge branch 'feature/LDT-2825-institutional' into staging

    • -3
    • +121
    /sources/canbus/MessageDispatcher.cpp
    • -2
    • +10
    /sources/canbus/MessageInterpreter.cpp
Merge branch 'feature/LDT-2825-institutional' into staging

Merge branch 'feature/LDT-3000-end-of-treatment' into staging

Merge branch 'feature/LDT-3000-end-of-treatment' into staging

Merge branch 'feature/LDT-3000-end-of-treatment' into staging

    • -1
    • +1
    /sources/canbus/MessageInterpreter.cpp
    • -0
    • +7
    /sources/gui/qml/components/HeaderBar.qml
    • -1
    • +7
    /sources/gui/qml/dialogs/ConfirmDialog.qml
Merge branch 'feature/LDT-3000-end-of-treatment' into staging

Merge branch 'feature/LDT-3046-feature-options' into staging

Merge branch 'feature/LDT-2957-heparin' into staging

    • -2
    • +3
    /sources/gui/qml/components/HeaderBar.qml
    • -0
    • +5
    /sources/gui/qml/globals/Variables.qml
Merge branch 'feature/LDT-2957-heparin' into staging

Merge branch 'feature/LDT-2957-heparin' into staging

    • -16
    • +59
    /leahi_dialin/ui/td_messaging.py
Merge branch 'feature/LDT-2727-service' into staging

    • -1
    • +3
    /sources/gui/qml/globals/Variables.qml