application

Clone Tools
  • last updated a few minutes ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Merge branch 'DEN-16526-UI-BN-S109-3' into staging

compatibility needs the separator before the value

Addressing code review comments

    • -5
    • +5
    /sources/gui/qml/components/TouchRect.qml
Addressing Code Review comments

    • -11
    • +10
    /sources/gui/qml/components/TouchRect.qml
DENBUG-182 , DENBUG-185

DENBUG-185: UI shows version without period in between (ECO-11648, ECO-11616)

DENBUG-182: Phantom Alarm Screen Appears After Clearing Last Alarm

    • -5
    • +20
    /sources/gui/qml/components/TouchRect.qml
Merge branch 'DEN-16526-UI-BN-S109-2' into staging

Bamboo Commit: Updated MAlarmMapping.cpp

    • -1
    • +1
    /sources/model/hd/alarm/MAlarmMapping.cpp
Merge branch 'DEN-16526-UI-BN-S109-2' into develop

DEN-16531: UI: The reservoir message structure has changed on FW and UI needs to adjust.

    • -12
    • +0
    /sources/model/dg/data/MDGReservoirData.cpp
    • -9
    • +0
    /sources/model/dg/data/MDGReservoirData.h
    • -3
    • +0
    /sources/view/dg/data/VDGReservoirData.cpp
    • -3
    • +0
    /sources/view/dg/data/VDGReservoirData.h
DENBUG-204: UI: The reservoir message structure has changed on FW and UI needs to adjust.

DEN-16531: UI: The reservoir message structure has changed on FW and UI needs to adjust.

    • -12
    • +0
    /sources/model/dg/data/MDGReservoirData.cpp
    • -9
    • +0
    /sources/model/dg/data/MDGReservoirData.h
    • -3
    • +0
    /sources/view/dg/data/VDGReservoirData.cpp
    • -3
    • +0
    /sources/view/dg/data/VDGReservoirData.h
DEN-16532 UI: Remove any comma from the texts being added in the Treatment Report

Merge branch 'DEN-16526-UI-BN-S109' into staging

Bamboo Commit: Updated MAlarmMapping.cpp

    • -1
    • +1
    /sources/model/hd/alarm/MAlarmMapping.cpp
Merge branch 'DEN-16526-UI-BN-S109' into develop

DEN-16530 UI: The Generated Tx Code seems cut off.

- added second to be more unique.

Merge branch 'DEN-16526-UI-BN-S109' into develop

DEN-16530 UI: The Generated Tx Code seems cut off.

DEN-16528 UI: Format the UI version for the newly created release type branch

DENBUG-185: UI shows version without period in between (ECO-11648, ECO-11616)

DEN-16528 UI: Format the UI version for the newly created release type branch

DEN-16527 UI: Retrieval of generated TxCode stored in the pending reports is invalid.

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

    • -1
    • +1
    /sources/cloudsync/CloudSyncController.h
    • -20
    • +14
    /sources/model/hd/alarm/MAlarmMapping.cpp
  1. … 5 more files in changeset.
Merge branch 'DEN-16490-UI-BN-S108' into staging

Merge branch 'DEN-16490-UI-BN-S108' into staging

Merge remote-tracking branch 'origin/DEN-16473-UI-BN-S107-CS-Txr-Logs' into staging

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

    • -1
    • +1
    /sources/model/hd/alarm/MAlarmMapping.cpp
Merge branch 'DEN-16490-UI-BN-S108' into develop

DEN-16502: UI: CS: CloudSync out buff is created by UI which causes permission issue for CloudSync

- figured a way to delay the CS during normal bootup and reverted back the TODOs for the CS POST results.

Merge remote-tracking branch 'origin/develop' into develop

Bamboo Commit: Updated MAlarmMapping.cpp

    • -1
    • +1
    /sources/model/hd/alarm/MAlarmMapping.cpp