leahi-application

Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
LDT-3805 SW Misc & Enhc - SW - 01 - Usability Requests - R&I - 05: DEV - Feature Implementation

fix post merge errors

Merge branch 'feature/LDT-3855-sw-enhc-general-alarm' into staging

Merge remote-tracking branch 'origin/staging' into feature/LDT-3800-enhancements-usability-requests

    • -2
    • +11
    /sources/gui/qml/components/HeaderBar.qml
    • -1
    • +8
    /sources/gui/qml/globals/Variables.qml
RESOLVED.

RESOLVED.

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

    • -1
    • +9
    /sources/gui/qml/globals/Variables.qml
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

    • -1
    • +1
    /sources/gui/qml/components/HeaderBar.qml
    • -5
    • +5
    /sources/gui/qml/components/TouchRect.qml
    • -0
    • +59
    /sources/gui/qml/pages/MainInitialization.qml
    • -57
    • +3
    /sources/gui/qml/pages/MainStack.qml
    • -70
    • +39
    /sources/gui/qml/pages/treatment/TreatmentStack.qml
LDT-3860 SW Misc & Enhc - SW - 01 - General Alarm - Temporary Break - R&I - 05: DEV - Feature Implementation

post merge confliuc iresolution

    • -4
    • +4
    /sources/gui/qml/dialogs/AlarmDialog.qml