Merge master into DEN-3605_Create_Treatment. Fixed remaining merge conflicts
master
+ 248 more
- 2020_EOY_DEMO
- @Environement_Swith
- Build_Issue_Merging__DEN-12716-UI_BN_S70__to__staging
- CWN-VD-Software-Update-UI
- DEN-10205_BCuff_MissingFeatures_Reconnect_Paired
- DEN-10206_BCuff_KnownBugs_OnlyPairWithOneBCuffAtATime
- DEN-10247_FW_UI_Version_Acknow_Issue_46
- DEN-10424_FW_Request_A4_A5_Msg_log
- DEN-10599_KeborMed_CloudSync_Infrastructure_Kickoff
- DEN-10599_KeborMed_CloudSync_Infrastructure_Logger
- DEN-10602_UI_DEV_Add_PatientID_PreTreatment
- DEN-11380_KeborMed_CloudSyncDevelopment
- DEN-11980-sw_dev-sprint-64
- DEN-12121-sw_dev-sprint-65
- DEN-12182-ui_dev-sprint-65
- DEN-12258-UI-BN-S66
- DEN-12640-UI-BN-S79
- DEN-12716-UI_BN_S70
- DEN-13053-S82-JI
- DEN-13198-UI_BN_75
- DEN-13226_UI_Unit_Testing
- DEN-13726-UI-BN-S79
- DEN-13962-UI-BN-S82
- DEN-13965-UI-BN-S80
- DEN-13965-UI-BN-S81
- DEN-13966-UI-BN-S81
- DEN-14147-UI-BN-S82
- DEN-14209-UI-BN-S82
- DEN-14263-UI-BN-S83
- DEN-14294-UI-BN-S84
- DEN-14478-UI-BN-S86
- DEN-14517-UI-BN-S88
- DEN-14609-UI-VD-S89
- DEN-14733-UI-BN-S90
- DEN-14733-UI-BN-S90-2
- DEN-14743-UI-VD-S90
- DEN-14796-UI-BN-S91
- DEN-14796-UI-BN-S91-2
- DEN-14838-UI-VD-S91
- DEN-14866-UI-BN-S92-1
- DEN-14866-UI-BN-S92-3
- DEN-14909-UI-VD-S92-QS-Arrows
- DEN-14909-UI-VD-S92-QS-Sliders
- DEN-14936-UI-BN-S93
- DEN-14937-UI-VD-S93
- DEN-14937-UI-VD-S93-1
- DEN-14937-UI-VD-S93-2
- DEN-14937-UI-VD-S93-ServicePass
- DEN-14947-UI-VD-S94-Misc
- DEN-14947-UI-VD-S94-brightnessLabel
- DEN-14947-UI-VD-S94-logExport-sdCard-bug
- DEN-15037-UI-BN-S94-DeviceRegistration
- DEN-15037-UI-BN-S94-MISC
- DEN-15037-UI-BN-S94-RoWater
- DEN-15037-UI-BN-S94-Sliders
- DEN-15139-UI-BN-S95-AlarmFonts
- DEN-15139-UI-BN-S95-CLIFix
- DEN-15139-UI-BN-S95-Recirculate
- DEN-15167-UI-VD-S95-DEN-13671
- DEN-15167-UI-VD-S95-LogExport
- DEN-15167-UI-VD-S95-SliderBugs
- DEN-15167-UI-VD-S95-postTest
- DEN-15219-UI-VD-S96-UpdateEth0State
- DEN-15219-UI-VD-S96-sliderLabelGap
- DEN-15219-UI-VD-S96-vitalMeasTimer
- DEN-15235-UI-BN-S96-RemoveEmptyMenus
- DEN-15279-UI-BN-S97-Cybersecurity
- DEN-15287-UI-VD-S97-BPCompareBug
- DEN-15287-UI-VD-S97-Bluetooth
- DEN-15287-UI-VD-S97-BtConf
- DEN-15287-UI-VD-S97-ExportLogBug
- DEN-15287-UI-VD-S97-RemoveWifiIni
- DEN-15287-UI-VD-S97-UsabilityChanges
- DEN-15287-UI-VD-S97-addBtAcess
- DEN-15287-UI-VD-S97-txDurationDialog
- DEN-15404-OpMode-StatesChange
- DEN-15425-UI-VD-S98
- DEN-15425-UI-VD-S98-DialysateTemp
- DEN-15425-UI-VD-S98-NoLogSymlink
- DEN-15425-UI-VD-S98-PreTxScreenMisc
- DEN-15435-UI-BN-S98-Usability
- DEN-15530-UI-VD-S99-Cybersecurity-BN-branch-off
- DEN-15530-UI-VD-S99-PrepopulateTxCreate
- DEN-15530-UI-VD-S99-vitalInputBug
- DEN-15594-UI-BN-S99-Usability
- DEN-15774-UI-MS-S100
- DEN-15785-UI-MS-S100-TYPO-1
- DEN-15799-UI-MS-S100-RM-CONF-RINSEBACK_RATE
- DEN-15833-UI-BN-VD-CyberSec-Branch-off-USB_Mounting
- DEN-15833-UI-VD-S101-FS_io_fail_alarm
- DEN-15833-UI-VD-S101-UI_HD_RTC_sync
- DEN-15833-UI-VD-S101-alarm_list_uniqueID
- DEN-15833-UI-VD-S101_LogFileModel
- DEN-15833-UI-VD-S101_POST_ConfigFilesCheck
- DEN-15833-UI-VD-S101_PressureSliderBug
- DEN-15845-UI-MS_S100
- DEN-15896-UI-MS-S102
- DEN-15905-UI-BN-S102
- DEN-15905-UI-BN-S102-Log178
- DEN-15905-UI-BN-S102-Update
- DEN-16123-UI-BN-S103-CSFR-TokenRemoval
- DEN-16123-UI-BN-S103-POSTReq
- DEN-16123-UI-BN-S103-PostHeparin
- DEN-16123-UI-BN-S103-TxLog-Pending
- DEN-16181-UI-VD-S103-FileModel
- DEN-16181-UI-VD-S103-IO_Fail_Alarm
- DEN-16181-UI-VD-S103_DateTimeSettingBug
- DEN-16181-UI-VD-S103_sdTmpFolder_correction
- DEN-16249-UI-VD-S104_P1B_StatusIndicator_Bt
- DEN-16249-UI-VD-S104_notLoggingBug
- DEN-16288-UI-BN-S104
- DEN-16335-UI-VD-S105_AVAdjustmentInTx_SliderBug
- DEN-16335-UI-VD-S105_DFF_improveExportLogs
- DEN-16335-UI-VD-S105_DisableConfirmDeviceConfig
- DEN-16335-UI-VD-S105_DisplayUFRate
- DEN-16335-UI-VD-S105_HD_DG_UsageCounterDisplay
- DEN-16335-UI-VD-S105_btMissingInitLog
- DEN-16419-UI-BN-S106
- DEN-16419-UI-BN-S106-Concentrations-Units-Typo
- DEN-16419-UI-BN-S106-FactoryReset
- DEN-16454-UI-VD-S106-FixHDUsageCounterReqBug
- DEN-16473-UI-BN-S107-CS-Txr-Logs
- DEN-16490-UI-BN-S108
- DEN-16526-UI-BN-S109
- DEN-16526-UI-BN-S109-2
- DEN-16526-UI-BN-S109-3
- DEN-16526-UI-BN-S109-4
- DEN-16526-UI-BN-S109-5
- DEN-16533-UI-VD-S110_integration_unit_test_fix
- DEN-16553-UI-BN-WPA3-Support
- DEN-16555-UI-BN-S112
- DEN-16614-ui-dn-s114-msg-update
- DEN-16657-UI-BN-S116-CSLogRetention
- DEN-16657-UI-BN-S116-EmptyPatientID
- DEN-16657-UI-BN-S116-LogUpload
- DEN-16657-UI-BN-S116-LogUpload-Compression
- DEN-16657-UI-BN-S116-production
- DEN-16657-UI-BN-S116-wpaconf-sudoers
- DEN-16658-ui-dn-s116-sonar-fix-msg-update
- DEN-16686-UI-MS-S117-Integration
- DEN-16687-ui-dn-s117-msg-update-log-files
- DEN-16777-ui-dn-s119
- DEN-16786-ui-dn-s119
- DEN-16816-UI-BN-S123-CANLOG
- DEN-16839-UI-BN-Whitney-1B1
- DEN-16860-ui-dn-s122
- DEN-16922-UI-BN-S124-uptime
- DEN-16924-Remove-QRCode-From-P1
- DEN-16951-UI-BN-QA2
- DEN-16953-ui-dn-release-15
- DEN-17055-ui-dn-release-17
- DEN-17056-ui_bn_am_test
- DEN-17098-release_18_changes
- DEN-17147-leahi-ui-updates-on-denali-repo
- DEN-17157-update_denali_application_for_dry_demo
- DEN-17206-UI-BN-Release20
- DEN-17260-ui-dn-release-21
- DEN-17295-ui-dn-release-22
- DEN-17325-release_24_dn_staging
- DEN-3605_Create_Treatment
- DEN-4598-Confirm-Priming-Begin
- DEN-4691_InLineBloodPressureAdjustments
- DEN-4860_BLE
- DEN-5171_blood_flow_dialysate_inlet_signal_percentage
- DEN-5282_UltrafiltrationStopState
- DEN-5283_SalineBolus-FWmodification
- DEN-5736_UI_Heparin_Bolus
- DEN-5751_Pre-TreatmentUltrafiltration
- DEN-5777_UI_DEV_ConvertLogging_From_hrs_to_%
- DEN-5830_AlarmDesign
- DEN-6349_bp_hr_manual_entry
- DEN-6631_UI_DEV_Post-Treatment_Rinseback
- DEN-6679_UI_DEV_ArterialandVenousRange
- DEN-7035_Date_Time_Set
- DEN-7041_UI_build_fix
- DEN-7044_Wifi
- DEN-7044_Wifi_Interface_Debug
- DEN-7135_UI_DEV_Pre-Treatment
- DEN-7174_DEN-6631_VersionsLabTestBugFix
- DEN-7524_Service-Mode
- DEN-7752_Device_Information
- DEN-7820_UI_DEV_Post-Treatment
- DEN-7903_Wifi_Static
- DEN-8058_Alarm_Volume_Brightness
- DEN-8252_POST
- DEN-8308_UI_DEV_Treatment_Log
- DEN-8352_Wifi_fixes
- DEN-8495_UI_DEV_Service_ManualDisinfection_Flush
- DEN-8514_UI_DEV_Alarms_Active_List
- DEN-8514_UI_DEV_Alarms_Active_List_Merge_Setting
- DEN-8705_Pre-Treatment_Setup_Screen
- DEN-8914_UI_DEV_BP_HR_Manual_Entry
- DEN-9411_UI_DEV_POST
- DEN-9626UI_DEV_BluetoothCuffIntegration
- DEN-sunrise-prb
- UI_BUG_S61
- UI_BUG_S62
- UI_BUG_S63
- bugfix/DEN-16597-UI-BN-S114
- bugfix/DEN-16647-UI-BN-S115
- bugfix/DEN-16647-UI-BN-S115-R11
- bugfix/DENBUG-325-Machine-Fails-to-Zip-Files-When-Asleep-Preventing-Upload-to-Cloud
- bugfix/UI-MS-S119-add_heparin_volume_check
- demo_test
- develop
- feature/DEN-15918-UI-VD-S102_SDCard_tmpFolder
- feature/LEAH-1976-implement-a-simple-video-screen
- feature/LEAH-2077-luis-application-clean-up
- feature/UI-MS-S117-Integration
- leahi/develop
- leahi/features/DEN-12031-UI-AM-Models-Nested-ifs
- leahi/features/LEAH-1864-BoardBringUp
- leahi/features/LEAH-1884-UI-BN-AdministrativeScripts
- leahi/features/LEAH-1924-UI-AM-S4-Translation
- leahi/features/LEAH-1941-UI-TM-S4-Settings
- leahi/features/LEAH-1956-ui-messaging-leahi-ui-messaging-support
- leahi/features/LEAH-1958-UI-screen-resizing
- leahi/features/LEAH-1973-leahi-logging-only-ex2
- leahi/master
- leahi/staging
- model_unit_test_fix
- release/DEN-16931-UI-BN-Release-14-IntegrationTesting
- release/Oct-09
- release/Oct-17
- release/p1
- release/p1_staging
- release/p1b/develop
- release/p1b/master
- release/p1b/staging
- release/stagingmerge-DEN-16647-UI-BN-S115-R11
- release/stagingmerge-DEN-16709-UI-Release-11
- release/stagingmerge-DEN-16709-UI-Release-11-2
- release/stagingmerge-DEN-16709-UI-Release-11-3
- release/stagingmerge-DEN-16777-UI-DN-S119-R11
- release/stagingmerge-DEN-16786-ui-dn-s119
- release/stagingmerge-DEN-16899-UI-BN-R13-build
- release/stagingmerge-DEN-16931-UI-Release-14-Build
- release/stagingmerge-DEN-17017-ui-bn-release-17
- release/stagingmerge-DEN-17098-release_18_changes
- release/stagingmerge-DEN-17206-UI-BN-Release20
- release/stagingmerge-DEN-17260-ui-dn-release-21
- release/stagingmerge-DEN-17295-ui-dn-release-22
- release/stagingmerge-DEN-17325-release_24_dn
- release/stagingmerge-DENBUG-325-Machine-Fails-to-Zip-Files-When-Asleep-Preventing-Upload-to-Cloud
- release/stagingmerge_DEN-16614-ui-dn-s114-msg-update
- release/stagingmerge_DEN-16647-UI-BN-S115
- staging
- swupdatemerge
|
 |
