application

Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
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
RESOLVED

RESOLVED

RESOLVED

RESOLVED

RESOLVED

RESOLVED

RESOLVED

RESOLVED

RESOLVED

RESOLVED

RESOLVED

RESOLVED

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
DENBUG-331: Duplicate Device Logs Uploading to Modaflx Connect

Address CR comments

    • -1
    • +9
    /sources/cloudsync/CloudSyncController.h
Create enum for all rejection reasons. Remove default

Create enum for all rejection reasons.

Remove default