application

Clone Tools
  • last updated a few minutes ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Merge branch 'DEN-16419-UI-BN-S106-FactoryReset' into staging-ui

DEN-16435: Factory Reset deletes service password from System.conf

- Fixed the Confirmation Dialog confirm call which caused both the Decommissioning and Factory Reset to be called.

- Fixed the PlantUML section of the VDuetRoWaterDG class.

    • -42
    • +39
    /sources/view/settings/VDuetRoWaterDG.h
DEN-16435: Factory Reset deletes service password from System.conf

- Fixed the Confirmation Dialog confirm call which caused both the Decommissioning and Factory Reset to be called.

- Fixed the PlantUML section of the VDuetRoWaterDG class.

    • -42
    • +39
    /sources/view/settings/VDuetRoWaterDG.h
Merge branch 'DEN-16419-UI-BN-S106-Concentrations-Units-Typo' into staging-ui

    • -1
    • +1
    /sources/gui/qml/globals/Variables.qml
Merge branch 'DEN-16454-UI-VD-S106-FixHDUsageCounterReqBug' into staging-ui

Merge branch 'DEN-16249-UI-VD-S104_P1B_StatusIndicator_Bt' into staging-ui

    • -0
    • +11
    /sources/bluetooth/BluetoothInterface.cpp
    • -0
    • +1
    /sources/bluetooth/BluetoothInterface.h
    • -0
    • +16
    /sources/view/settings/VBluetooth.cpp
DEN-16256: Updated - UI.P1B : Display UF Rate

- minor clean up, layout fix and typo fixes

    • -0
    • +2
    /sources/gui/qml/components/TouchArea.qml
DEN-16256: Updated - UI.P1B : Display UF Rate

- minor clean up, layout fix and typo fixes

    • -0
    • +2
    /sources/gui/qml/components/TouchArea.qml
DEN-16262: Fixed - UI.P1B : HD/DG usage counter

Fixed the request not working

    • -1
    • +1
    /sources/canbus/MessageInterpreter.cpp
DEN-16262: Fixed - UI.P1B : HD/DG usage counter

Fixed the request not working

    • -1
    • +1
    /sources/canbus/MessageInterpreter.cpp
Bamboo Commit: Updated MAlarmMapping.cpp

    • -14
    • +20
    /sources/model/hd/alarm/MAlarmMapping.cpp
Bamboo Commit: Updated the Copyright section and replaced tabs with 4 spaces

    • -20
    • +14
    /sources/model/hd/alarm/MAlarmMapping.cpp
DEN-16443: UI: The concentration units shall be displayed as mEq/L

- Concentrations unit typo fix.

    • -1
    • +1
    /sources/gui/qml/globals/Variables.qml
DEN-16443: UI: The concentration units shall be displayed as mEq/L

- Concentrations unit typo fix.

    • -1
    • +1
    /sources/gui/qml/globals/Variables.qml
Bamboo Commit: Updated MAlarmMapping.cpp

    • -14
    • +20
    /sources/model/hd/alarm/MAlarmMapping.cpp
Bamboo Commit: Updated the Copyright section and replaced tabs with 4 spaces

    • -20
    • +14
    /sources/model/hd/alarm/MAlarmMapping.cpp
Bamboo Commit: Updated MAlarmMapping.cpp

    • -14
    • +20
    /sources/model/hd/alarm/MAlarmMapping.cpp
Bamboo Commit: Updated the Copyright section and replaced tabs with 4 spaces

    • -20
    • +14
    /sources/model/hd/alarm/MAlarmMapping.cpp
Bamboo Commit: Updated MAlarmMapping.cpp

    • -14
    • +20
    /sources/model/hd/alarm/MAlarmMapping.cpp
Bamboo Commit: Updated the Copyright section and replaced tabs with 4 spaces

    • -20
    • +14
    /sources/model/hd/alarm/MAlarmMapping.cpp
Bamboo Commit: Updated MAlarmMapping.cpp

    • -14
    • +20
    /sources/model/hd/alarm/MAlarmMapping.cpp
Bamboo Commit: Updated the Copyright section and replaced tabs with 4 spaces

    • -2
    • +2
    /sources/gui/qml/components/RangeBar.qml
    • -20
    • +14
    /sources/model/hd/alarm/MAlarmMapping.cpp
  1. … 3 more files in changeset.
Merge branch 'DEN-16419-UI-BN-S106' into staging

Bamboo Commit: Updated MAlarmMapping.cpp

    • -14
    • +20
    /sources/model/hd/alarm/MAlarmMapping.cpp
Bamboo Commit: Updated the Copyright section and replaced tabs with 4 spaces

    • -20
    • +14
    /sources/model/hd/alarm/MAlarmMapping.cpp
DEN-16285: UI: Cybersecurity: Restrict the SD-Card Symbolic Link usage

DEN-15626: UI: Arterial and Venous Pressure Monitor Limits

    • -3
    • +12
    /sources/gui/qml/components/RangeBar.qml
Bamboo Commit: Updated MAlarmMapping.cpp

    • -15
    • +21
    /sources/model/hd/alarm/MAlarmMapping.cpp
Bamboo Commit: Updated the Copyright section and replaced tabs with 4 spaces

    • -20
    • +14
    /sources/model/hd/alarm/MAlarmMapping.cpp
DEN-16310: Treatment Log Treatment Data May Not Be Displaying Correct Data