Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Merge remote-tracking branch 'origin/staging' into feature/LDT-3800-enhancements-usability-requests

    • -346
    • +48
    ./dialogs/NotificationDialog.qml
  1. … 1 more file in changeset.
LDT-3805 SW Misc & Enhc - SW - 01 - Usability Requests - R&I - 05: DEV - Feature Implementation

fix post merge errors

    • -23
    • +8
    ./pages/treatment/TreatmentStack.qml
Merge remote-tracking branch 'origin/staging' into feature/LDT-3800-enhancements-usability-requests

    • -13
    • +12
    ./dialogs/NotificationDialog.qml
    • -0
    • +6
    ./pages/endtreatment/EndTreatmentBase.qml
    • -29
    • +23
    ./pages/pretreatment/PreTreatmentStack.qml
    • -8
    • +39
    ./pages/treatment/TreatmentStack.qml
  1. … 1 more file in changeset.
RESOLVED.

RESOLVED.

Merge branch 'feature/LDT-3656-New-Design-CreateRx' into staging

    • -2
    • +14
    ./pages/treatment/TreatmentStack.qml
  1. … 4 more files in changeset.
RESOLVED.

RESOLVED.

RESOLVED.

RESOLVED.

RESOLVED.

RESOLVED.

RESOLVED.

RESOLVED.

RESOLVED.

RESOLVED.

RESOLVED.

RESOLVED.

RESOLVED.

RESOLVED.

updated

updated

updated

updated

added

added

updated

updated

updated

updated

updated

updated

updated

updated

updated

updated

updated

updated

updated and tested

updated and tested

not needed since i set it on the outside

not needed since i set it on the outside

added

added

LDT-3805 SW Misc & Enhc - SW - 01 - Usability Requests - R&I - 05: DEV - Feature Implementation

address cr c omments

    • -0
    • +59
    ./pages/MainInitialization.qml
    • -2
    • +2
    ./pages/pretreatment/PreTreatmentStack.qml
    • -0
    • +6
    ./pages/treatment/TreatmentBloodPrime.qml
    • -70
    • +39
    ./pages/treatment/TreatmentStack.qml
  1. … 2 more files in changeset.
LDT-3860 SW Misc & Enhc - SW - 01 - General Alarm - Temporary Break - R&I - 05: DEV - Feature Implementation

post merge confliuc iresolution

  1. … 1 more file in changeset.