Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Merge remote-tracking branch 'origin/staging' into feature/LDT-3757-recirculate

  1. … 2 more files in changeset.
Merge branch 'feature/LDT-3834-sw-misc-enhc-stop-state' into staging

  1. … 1 more file in changeset.
LDT-3762 Rinseback - SW - 01 - Recirculate - R&I - 05: DEV - Feature Implementation

add TODO comment

LDT-3760 Rinseback - SW - 01 - Recirculate - R&I - 03: SDD - Design Diagram - plantuml

address CR ocmments

  1. … 1 more file in changeset.
LDT-2712: Trends and Screensaver Screens - SW - 01 - Trends Screen - R&I - 05: DEV - Feature Implementation

address crf comments

    • -27
    • +12
    ./qml/pages/treatment/TreatmentTrends.qml
  1. … 6 more files in changeset.
Merge branch 'staging' of bitbucket.org:diality-cloud/leahi-application into feature/LDT-2707-trends

    • -11
    • +19
    ./qml/pages/treatment/TreatmentStack.qml
  1. … 2 more files in changeset.
LDT-3839 SW Misc & Enhc - SW - 01 - Stop State - R&I - 05: DEV - Feature Implementation

update stop state logic on alarm dialog

    • -13
    • +12
    ./qml/dialogs/NotificationDialog.qml
LDT-3839 SW Misc & Enhc - SW - 01 - Stop State - R&I - 05: DEV - Feature Implementation

update message id for tx stop state

  1. … 9 more files in changeset.
LDT-3762 Rinseback - SW - 01 - Recirculate - R&I - 05: DEV - Feature Implementation

fix stretch

LDT-3762 Rinseback - SW - 01 - Recirculate - R&I - 05: DEV - Feature Implementation

add recirulation image rotationj

  1. … 1 more file in changeset.
LDT-3762 Rinseback - SW - 01 - Recirculate - R&I - 05: DEV - Feature Implementation

fix bugs

  1. … 1 more file in changeset.
LDT-3762 Rinseback - SW - 01 - Recirculate - R&I - 05: DEV - Feature Implementation

finished screens and progress screeen

  1. … 2 more files in changeset.
LDT-3762 Rinseback - SW - 01 - Recirculate - R&I - 05: DEV - Feature Implementation

update recirculate screens

  1. … 7 more files in changeset.
LDT-3683 SW Misc & Enhc - SW - 01 - New Design - Ultrafiltration - R&I - 05: DEV - Feature Implementation

ADDRESS CR COMMENTS

LDT-3703 SW Misc & Enhc - SW - 01 - New Design - Rinseback - R&I - 05: DEV - Feature Implementation

fix spaicng

LDT-3703 SW Misc & Enhc - SW - 01 - New Design - Rinseback - R&I - 05: DEV - Feature Implementation

address cr comments

    • -2
    • +2
    ./qml/dialogs/RinsebackCompleteDialog.qml
LDT-3683 SW Misc & Enhc - SW - 01 - New Design - Ultrafiltration - R&I - 05: DEV - Feature Implementation

update unit

LDT-3703 SW Misc & Enhc - SW - 01 - New Design - Rinseback - R&I - 05: DEV - Feature Implementation

Remo0ve obsolete rinseback pages

  1. … 1 more file in changeset.
LDT-3703 SW Misc & Enhc - SW - 01 - New Design - Rinseback - R&I - 05: DEV - Feature Implementation

fiknish rinseback updates

  1. … 1 more file in changeset.
LDT-3703 SW Misc & Enhc - SW - 01 - New Design - Rinseback - R&I - 05: DEV - Feature Implementation

risneback ciompelte dialog ocmpelted

    • -0
    • +31
    ./qml/dialogs/RinsebackCompleteDialog.qml
  1. … 1 more file in changeset.
LDT-3683 SW Misc & Enhc - SW - 01 - New Design - Ultrafiltration - R&I - 05: DEV - Feature Implementation

Merge remote-tracking branch 'origin/staging' into feature/LDT-3574-misc-sw-enhancements

    • -0
    • +11
    ./qml/pages/treatment/TreatmentHome.qml
  1. … 2 more files in changeset.
Merge branch 'feature/LDT-3516-sw-integration-101' into staging

LDT-3579 Misc SW Enhancements - SW - 01 - General Aesthetics - 02-S24 - R&I - 05: DEV - Feature Implementation

address cr comments

LDT-3521 Misc SW Enhancements - SW - 01 - SW Integration 101 - R&I - 05: DEV - Feature Implementation

update button layout for treatment section header

LDT-3521 Misc SW Enhancements - SW - 01 - SW Integration 101 - R&I - 05: DEV - Feature Implementation

move expand button to top header bar of componenet

    • -4
    • +6
    ./qml/pages/treatment/TreatmentSection.qml
LDT-3579 Misc SW Enhancements - SW - 01 - General Aesthetics - 02-S24 - R&I - 05: DEV - Feature Implementation

address cr commejnts

Merge remote-tracking branch 'origin/staging' into feature/LDT-3574-misc-sw-enhancements

    • -1
    • +1
    ./qml/pages/treatment/TreatmentHeparin.qml
    • -2
    • +2
    ./qml/pages/treatment/TreatmentHome.qml
  1. … 2 more files in changeset.
Merge remote-tracking branch 'origin/staging' into feature/LDT-3433-water-dialysate-and-blood-sample

  1. … 2 more files in changeset.
Merge remote-tracking branch 'origin/staging' into feature/LDT-3516-sw-integration-101

    • -2
    • +2
    ./qml/pages/treatment/TreatmentHome.qml
  1. … 2 more files in changeset.