AdrianLxM
|
3cb07c215e
|
Refactor GlucoseStatusProvider out of GlucoseStatus
|
2021-03-07 20:22:03 +01:00 |
|
Philoul
|
4ce59b929a
|
Merge remote-tracking branch 'Nightscout/dev' into User_Entry_VWU
# Conflicts:
# app/src/main/java/info/nightscout/androidaps/dialogs/CarbsDialog.kt
# app/src/main/java/info/nightscout/androidaps/dialogs/CareDialog.kt
# app/src/main/java/info/nightscout/androidaps/dialogs/InsulinDialog.kt
# app/src/main/java/info/nightscout/androidaps/dialogs/TempTargetDialog.kt
# app/src/main/java/info/nightscout/androidaps/plugins/general/actions/ActionsFragment.kt
# app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.kt
# app/src/main/java/info/nightscout/androidaps/plugins/general/smsCommunicator/SmsCommunicatorPlugin.kt
# app/src/main/java/info/nightscout/androidaps/plugins/treatments/fragments/TreatmentsTempTargetFragment.kt
# app/src/main/java/info/nightscout/androidaps/utils/wizard/BolusWizard.kt
|
2021-03-03 22:49:31 +01:00 |
|
Milos Kozak
|
3b5b945fea
|
TemporaryTarget -> room database
|
2021-03-01 12:42:42 +01:00 |
|
Philoul
|
df995724a7
|
Merge remote-tracking branch 'Nightscout/dev' into User_Entry_ValueWithUnits_Draft
# Conflicts:
# automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/AutomationFragment.kt
|
2021-03-01 08:34:40 +01:00 |
|
Milos Kozak
|
07bf16b07b
|
rename core strings
|
2021-02-22 18:04:30 +01:00 |
|
Milos Kozak
|
a0632f7753
|
automation module
|
2021-02-22 17:22:30 +01:00 |
|