LEAHI-DIALIN-LDT-3350

Bamboo Commit: Updated MAlarmMapping.cpp

    • -14
    • +20
    /sources/model/hd/alarm/MAlarmMapping.cpp
Merge branch 'bugfix/DENBUG-331-Duplicate-Device-Logs-Uploading-to-ModaFlx-Connect' into staging

Merge branch 'bugfix/DENBUG-331-Duplicate-Device-Logs-Uploading-to-ModaFlx-Connect' into develop

DENBUG-331: Duplicate-Device-Logs-Uploading-to-ModaFlx-Connect' into bugfix/DENBUG-331-Duplicate-Device-Logs-Uploading-to-ModaFlx-Connect

- Add additional tally for second backup condition

Merge branch 'bugfix/DENBUG-331-Duplicate-Device-Logs-Uploading-to-ModaFlx-Connect' into develop

Merge remote-tracking branch 'origin/bugfix/DENBUG-331-Duplicate-Device-Logs-Uploading-to-ModaFlx-Connect' into bugfix/DENBUG-331-Duplicate-Device-Logs-Uploading-to-ModaFlx-Connect

DENBUG-331: Duplicate Device Logs Uploading to Modaflx Connect

debug statement

DENBUG-331: Duplicate Device Logs Uploading to Modaflx Connect

Fix pending log tally and revert log name to just date.log

bugfix/DENBUG-331-Duplicate-Device-Logs-Uploading-to-ModaFlx-Connect'

fix issue on qstring

Merge branch 'bugfix/DENBUG-331-Duplicate-Device-Logs-Uploading-to-ModaFlx-Connect' into develop

DENBUG-331: Duplicate Device Logs Uploading to Modaflx Connect

Add debug statements to tally feature

Merge branch 'bugfix/DENBUG-331-Duplicate-Device-Logs-Uploading-to-ModaFlx-Connect' into develop

DENBUG-331: Duplicate Device Logs Uploading to Modaflx Connect

Add debug statements to tally feature

Merge branch 'bugfix/DENBUG-331-Duplicate-Device-Logs-Uploading-to-ModaFlx-Connect' into develop

DENBUG-331: Duplicate Device Logs Uploading to Modaflx Connect

- Add time to device logs when they are generated

Bamboo Commit: Updated MAlarmMapping.cpp

    • -14
    • +20
    /sources/model/hd/alarm/MAlarmMapping.cpp
Merge branch 'bugfix/DENBUG-331-Duplicate-Device-Logs-Uploading-to-ModaFlx-Connect' into develop

    • -1
    • +1
    /sources/bluetooth/BluetoothInterface.cpp
    • -1
    • +1
    /sources/bluetooth/BluetoothInterface.h
    • -1
    • +1
    /sources/gui/qml/globals/Variables.qml
    • -1
    • +1
    /sources/view/settings/VNetworkModel.cpp
    • -1
    • +1
    /sources/view/settings/VNetworkModel.h
Bamboo Commit: Updated the Copyright section and replaced tabs with 4 spaces

    • -20
    • +14
    /sources/model/hd/alarm/MAlarmMapping.cpp
DENBUG-331: Duplicate Device Logs Uploading to Modaflx Connect

Fix issues in Device Controller and Logger due to change of file extension to QStr5ing

    • -7
    • +11
    /sources/device/DeviceController.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

  1. … 605 more files in changeset.
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. … 605 more files in changeset.
Bamboo Commit: Updated MAlarmMapping.cpp

    • -14
    • +20
    /sources/model/hd/alarm/MAlarmMapping.cpp
DENBUG-331: Duplicate Device Logs Uploading to Modaflx Connect

- Change CS rejection reason order to reject reason then logname

- Add log Tally fn

- Change Log Upload, Log backup to use log tally

- Change findpending to be dynamic due to tally changes

- Change pending/uploaded extension format to account for tally with %1

    • -31
    • +23
    /sources/device/DeviceController.cpp
DENBUG-331: Duplicate Device Logs Uploading to Modaflx Connect

- add duplicate function for 2010

    • -0
    • +35
    /sources/device/DeviceController.cpp
We agreed to change back the enums into the static variation. Why would that cover a class that has been implemented to mask the enums from direct access, so if they need to be changed to dynamic o...

We agreed to change back the enums into the static variation.
Why would that cover a class that has been implemented to mask the enums from direct access, so if they need to be changed to dynamic or renamed or anything, the other repositories that are using them through this class won't be affected or need any update.

Did we not decide to revert all the changes back and the redesign the whole concept again?

Did we not decide to revert all the changes back and the redesign the whole concept again?