leahi-application

Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Merge branch 'staging' of bitbucket.org:diality-cloud/leahi-application into feature/LDT-2707-trends

LDT-2407: Software Upgrade - SW - 01 - Animated Instructions Investigation - R&I - 05: DEV - Feature Implementation

- Updated main.cpp and NotificationDialog.qml to add test animations.

Merge branch 'feature/LDT-3307-misc-sw-enhancements' into staging

LDT-3312 Misc SW Enhancements - SW - 01 - General Aesthetics - R&I - 05: DEV - Feature Implementation

PUSH qml error fixes

    • -1
    • +0
    /sources/gui/qml/components/ProgressBarEx.qml
    • -1
    • +1
    /sources/gui/qml/components/RangedValue.qml
Merge branch 'feature/LDT-3307-misc-sw-enhancements' into staging

file is removed but code review still displays it

file is removed but code review still displays it

Merge branch 'staging' into feature/LDT-3307-misc-sw-enhancements

    • -6
    • +10
    /sources/gui/qml/components/HeaderBar.qml
text removed

text removed

Merge branch 'feature/LDT-3323-enhancements-rinseback-bloodflow' into staging

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

    • -5
    • +11
    /sources/gui/qml/globals/Variables.qml
Merge branch 'staging' into feature/LDT-3307-misc-sw-enhancements

    • -4
    • +4
    /sources/gui/qml/components/HeaderBar.qml
    • -1
    • +1
    /sources/gui/qml/components/RangeMarker.qml
    • -0
    • +5
    /sources/view/td/data/VTreatmentRanges.cpp
    • -0
    • +3
    /sources/view/td/data/VTreatmentRanges.h
Merge branch 'staging' of bitbucket.org:diality-cloud/leahi-application into feature/LDT-3323-enhancements-rinseback-bloodflow

    • -5
    • +5
    /sources/gui/qml/components/HeaderBar.qml
Merge branch 'staging' of bitbucket.org:diality-cloud/leahi-application into feature/LDT-3323-enhancements-rinseback-bloodflow

    • -0
    • +39
    /sources/canbus/MessageDispatcher.cpp
    • -50
    • +9
    /sources/canbus/MessageInterpreter.cpp