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 build errror

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

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
Merge branch 'feature/LDT-3656-New-Design-CreateRx' into staging

    • -1
    • +9
    /sources/gui/qml/globals/Variables.qml
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
Merge branch 'feature/LDT-3757-recirculate' into staging

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

    • -1
    • +1
    /sources/gui/qml/dialogs/AlarmDialog.qml
Merge remote-tracking branch 'origin/staging' into feature/LDT-3757-recirculate

Merge branch 'feature/LDT-3834-sw-misc-enhc-stop-state' into staging

LDT-3661 SW Misc & Enhc - SW - 01 - New Design - CreateRx - R&I - 05: DEV - Feature Implementation

fix build error

LDT-3661 SW Misc & Enhc - SW - 01 - New Design - CreateRx - R&I - 05: DEV - Feature Implementation

address cr comments

    • -4
    • +4
    /sources/gui/qml/components/HeaderBar.qml
Merge branch 'feature/LDT-2707-trends' into staging

LDT-3937 Post-Treatment - SW - 01 - Foundation - R&I - 05: DEV - Feature Implementation

add message ids

LDT-3661 SW Misc & Enhc - SW - 01 - New Design - CreateRx - R&I - 05: DEV - Feature Implementation

cr comments

LDT-3661 SW Misc & Enhc - SW - 01 - New Design - CreateRx - R&I - 05: DEV - Feature Implementation

address cr comments

LDT-3661 SW Misc & Enhc - SW - 01 - New Design - CreateRx - R&I - 05: DEV - Feature Implementation

fix bug

LDT-3760 Rinseback - SW - 01 - Recirculate - R&I - 03: SDD - Design Diagram - plantuml

sdd png

LDT-3661 SW Misc & Enhc - SW - 01 - New Design - CreateRx - R&I - 05: DEV - Feature Implementation

cr comments

    • -1
    • +1
    /sources/view/td/data/VTreatmentRanges.cpp
LDT-3762 Rinseback - SW - 01 - Recirculate - R&I - 05: DEV - Feature Implementation

add TODO comment

LDT-3760 Rinseback - SW - 01 - Recirculate - R&I - 03: SDD - Design Diagram - plantuml

address CR ocmments

    • -2
    • +0
    /sources/gui/qml/pages/TreatmentFlowBase.qml
LDT-2712: Trends and Screensaver Screens - SW - 01 - Trends Screen - R&I - 05: DEV - Feature Implementation

rem0oved obsolete dox comment

LDT-2712: Trends and Screensaver Screens - SW - 01 - Trends Screen - R&I - 05: DEV - Feature Implementation

address crf comments

LDT-3860 SW Misc & Enhc - SW - 01 - General Alarm - Temporary Break - R&I - 05: DEV - Feature Implementation

addres cr comments

LDT-3661 SW Misc & Enhc - SW - 01 - New Design - CreateRx - R&I - 05: DEV - Feature Implementation

added uf logic

LDT-3459 - Cloud Communication - SW - 01 - CloudSync - R&I - 05: DEV - Feature Implementation

- Updated StorageGlobals.cpp to add comment with old CloudSync config path.

LDT-3661 SW Misc & Enhc - SW - 01 - New Design - CreateRx - R&I - 05: DEV - Feature Implementation

Merge branch 'staging' of bitbucket.org:diality-cloud/leahi-application into feature/LDT-2707-trends

    • -0
    • +4
    /sources/gui/qml/globals/Variables.qml
    • -11
    • +19
    /sources/gui/qml/pages/treatment/TreatmentStack.qml