sources

Clone Tools
  • last updated a few minutes ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Release 17 Code Review branch

git checkout release/stagingmerge-DEN-17017-ui-bn-release-17

git diff HEAD staging > ../stagingmerge-DEN-17017-ui-bn-release-17.patch

git apply ../stagingmerge-DEN-17017-ui-bn-release-17.patch

    • -28
    • +44
    ./gui/qml/pages/disinfect/DisinfectStack.qml
    • -6
    • +4
    ./gui/qml/pages/settings/SettingsInformation.qml
    • -10
    • +2
    ./model/hd/data/MHDUsageInfoResponse.cpp
    • -8
    • +2
    ./model/hd/data/MHDUsageInfoResponse.h
    • -4
    • +5
    ./view/settings/VAdjustmentServiceDates.h
    • -12
    • +15
    ./view/settings/VHDUsageInfo.cpp
Bamboo Commit: Updated MAlarmMapping.cpp

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

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

Bamboo Commit: Updated MAlarmMapping.cpp

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

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

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

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

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

    • -20
    • +14
    ./model/hd/alarm/MAlarmMapping.cpp
  1. … 1 more file in changeset.
Bamboo Commit: Updated MAlarmMapping.cpp

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

    • -14
    • +14
    ./cloudsync/CloudSyncController.cpp
    • -14
    • +14
    ./cloudsync/CloudSyncController.h
    • -1
    • +1
    ./gui/qml/pages/settings/SettingsExportLogs.qml
  1. … 9 more files in changeset.
Merge branch 'DEN-16839-UI-BN-Whitney-1B1' into staging

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.

DEN-16956: UI: Set the max length to 30 for the Service Password

- the SRSUI has a max defined and if not, the VV protocol will fail. So set to 30.

DEN-16959 UI: Navigate to the "Settings Screen" if HD is in service mode.

- Added the OpMode_service for the UI to go to the settings screen after the application relaunch if the HD is in service more.

- Since the UI will not go to the service mode unless user enter the password we have no security issue.

- It is expected with this fix we won't need to do hardware reset of the HD and makes the manufacturing lot easier.

DEN-16958 UI: Add arrow keys to Virtual Keyboard

- Unable to edit the incorrectly entered text with Keyboard due to not having arrow keys on keyboard, therefore added arrow left/right to the keyboard for easier enter/edit the passwords and keys

CS-10: The Log upload to the cloud - Keep stashed files and some minor changes.

- Added the Moda-flx logo to the branch

- added a build flag to bypass the POST fails

- fixed a typo in class definition.

- added the platform text to be displayed on the screen in which the application is executing for later better debugging.[ as //DEBUG: comment ]

- Added my note on BCuff connection to avoid loosing it. [ may need update ]

    • -0
    • +18
    ./bluetooth/readme.md
  1. … 6 more files in changeset.
DEN-16956: UI: Add all ASCII symbols as acceptable for the Service Password

- Added all the ASCII symbols as acceptable for the service password.

!"#$%&'()*+,-./:;<=>?@[\]^_`{|}~

Bamboo Commit: Updated MAlarmMapping.cpp

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

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

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

    • -20
    • +14
    ./model/hd/alarm/MAlarmMapping.cpp
DEN-16924: Remove QR Code for P1

- Added back the visible false for the both QR codes on the both treatment confirm/review screens.

Bamboo Commit: Updated MAlarmMapping.cpp

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

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

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

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

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

    • -20
    • +14
    ./model/hd/alarm/MAlarmMapping.cpp