application

Clone Tools
  • last updated a few minutes ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Merge branch 'DEN-16553-UI-BN-WPA3-Support' into develop

DEN-16553: UI-BN-WPA3-Support

- Added WPA3 support.

    • -23
    • +18
    /sources/model/settings/MWifiNetwork.h
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

    • -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
Merge branch 'staging'

    • -4
    • +4
    /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

    • -20
    • +14
    /sources/model/hd/alarm/MAlarmMapping.cpp
Merge branch 'staging' into develop

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
Merge branch 'DEN-16839-UI-BN-Whitney-1B1' into staging

DEN-16961: UI: Release P1B branches to be created for the IDE

- Modified the UI versioning to match the new release branching:

release/p1b/<master, staging, develop>

in oppose to:

release/<p1, p1_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

    • -14
    • +14
    /sources/cloudsync/CloudSyncController.h
    • -14
    • +14
    /sources/device/DeviceController.cpp
    • -1
    • +1
    /sources/gui/qml/components/TextEntry.qml
    • -1
    • +1
    /sources/gui/qml/pages/UserConfirmation.qml
  1. … 9 more files in changeset.
Merge branch 'DEN-16839-UI-BN-Whitney-1B1' into staging

    • -2
    • +2
    /sources/view/settings/VDuetRoWaterDG.h
Merge branch 'DEN-16839-UI-BN-Whitney-1B1' into develop

DEN-16958 UI: Add arrow keys to Virtual Keyboard

- This feature did not get approved to be part of the 1B1, there for it has been reverted back and will later be added when there is less risk.

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/bluetooth/BluetoothInterface.cpp
    • -2
    • +2
    /sources/bluetooth/BluetoothInterface.h
    • -14
    • +14
    /sources/cloudsync/CloudSyncController.h
    • -14
    • +14
    /sources/device/DeviceController.cpp
    • -4
    • +4
    /sources/gui/qml/BluetoothStatusIndicator.qml
    • -5
    • +5
    /sources/gui/qml/WifiStatusIndicator.qml
    • -1
    • +1
    /sources/gui/qml/components/TextEntry.qml
  1. … 24 more files in changeset.
Merge branch 'DEN-16839-UI-BN-Whitney-1B1' into develop