Milos Kozak
|
998eba8b9f
|
DateUtil -> kt, static funcs removed
|
2021-04-11 17:47:55 +02:00 |
|
|
Milos Kozak
|
194cf305fd
|
Rv2,RKorean
|
2021-04-10 10:41:53 +02:00 |
|
|
Milos Kozak
|
4120e9eef9
|
DanaR working
|
2021-04-09 08:02:46 +02:00 |
|
|
Philoul
|
e490c2df04
|
Update uel.log NSClientAddUpdateWorker
|
2021-04-06 00:43:51 +02:00 |
|
|
Milos Kozak
|
d27b7a6139
|
Merge branch 'meallink' of https://github.com/nightscout/AndroidAPS into meallink
|
2021-04-05 23:13:17 +02:00 |
|
|
Milos Kozak
|
2463f8fc47
|
ExtendedBolus, TemporaryBasal -> room, DanaRS working
|
2021-04-05 22:41:28 +02:00 |
|
|
Philoul
|
22c1233201
|
Merge remote-tracking branch 'Nightscout/meallink' into Test_MealLink_VWU_Merge
# Conflicts:
# app/src/main/java/info/nightscout/androidaps/dialogs/TempBasalDialog.kt
# app/src/main/java/info/nightscout/androidaps/plugins/aps/loop/LoopPlugin.kt
# app/src/main/java/info/nightscout/androidaps/utils/wizard/BolusWizard.kt
|
2021-04-04 13:51:53 +02:00 |
|
|
Philoul
|
3cc7a72b3d
|
Fix XXXValueWithUnit Refactoring
|
2021-04-04 09:20:02 +02:00 |
|
|
AdrianLxM
|
d62456f2e2
|
Merge branch 'meallink_ValueWithUnit' of https://github.com/Philoul/AndroidAPS into meallink_ValueWithUnit
|
2021-04-03 21:34:41 +02:00 |
|
|
AdrianLxM
|
c2b3e617df
|
pair programming session
|
2021-04-03 21:29:26 +02:00 |
|
|
Philoul
|
ae9503dcc0
|
Add StringResource to uel.log Food
|
2021-04-03 19:04:08 +02:00 |
|
|
Philoul
|
206bac6da8
|
Safe Delete old ValueWithUnit Class in UserEntry
|
2021-04-03 12:51:49 +02:00 |
|
|
Philoul
|
dc87bfa303
|
Replace all remaining ValueWithUnit by XXXValueWithUnit and remove Deprecated uel.log functions
|
2021-04-03 12:25:44 +02:00 |
|
|
Milos Kozak
|
e26e023ebf
|
prepare TemporaryBasal
|
2021-04-01 23:46:21 +02:00 |
|
|
Philoul
|
16959d4de9
|
Merge branch 'meallink' into meallink_ValueWithUnit
|
2021-04-01 23:02:52 +02:00 |
|
|
Milos Kozak
|
46793abbfc
|
Treatment cleanup
|
2021-04-01 18:14:31 +02:00 |
|
|
Philoul
|
e13e5e10eb
|
Merge branch 'meallink' into meallink_ValueWithUnit
|
2021-04-01 08:13:48 +02:00 |
|
|
Milos Kozak
|
699413dd6f
|
fix tests
|
2021-04-01 00:37:15 +02:00 |
|
|
Milos Kozak
|
2df8c4fc74
|
provide Worker failure results
|
2021-04-01 00:03:49 +02:00 |
|
|
Philoul
|
3d9ef71045
|
Merge branch 'meallink' into meallink_ValueWithUnit
# Conflicts:
# app/src/main/java/info/nightscout/androidaps/plugins/aps/loop/LoopPlugin.kt
|
2021-03-31 22:18:50 +02:00 |
|
|
Milos Kozak
|
a5ea0d9027
|
DeviceStatus
|
2021-03-31 21:54:49 +02:00 |
|
|
Philoul
|
ab0c739281
|
Clean Imports and add missing Sources in existing uel
|
2021-03-31 00:18:55 +02:00 |
|
|
Philoul
|
21f382f0ae
|
Remove unused code
|
2021-03-30 23:29:43 +02:00 |
|
|
Philoul
|
bf218e9ff4
|
Merge remote-tracking branch 'Nightscout/meallink' into meallink_ValueWithUnit
# Conflicts:
# app/src/main/java/info/nightscout/androidaps/dialogs/CarbsDialog.kt
# app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/NSClientAddUpdateWorker.kt
# app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/NSClientRemoveWorker.kt
# app/src/main/java/info/nightscout/androidaps/plugins/general/smsCommunicator/SmsCommunicatorPlugin.kt
# app/src/main/java/info/nightscout/androidaps/plugins/general/wear/ActionStringHandler.kt
|
2021-03-30 23:05:19 +02:00 |
|
|
Milos Kozak
|
299d0a9b01
|
finish Dana pumps
|
2021-03-30 22:45:45 +02:00 |
|
|
Milos Kozak
|
07d060c2b5
|
carbs with duration
|
2021-03-30 22:05:44 +02:00 |
|
|
Milos Kozak
|
1ae4823a9a
|
Merge remote-tracking branch 'ns/dev' into meallink
|
2021-03-30 19:39:22 +02:00 |
|
|
Milos Kozak
|
e9f4f87894
|
Remove Tratment.class where possible
|
2021-03-30 19:37:26 +02:00 |
|
|
Philoul
|
6c8b4dfab0
|
Merge branch 'meallink' into meallink_ValueWithUnit
# Conflicts:
# app/src/main/java/info/nightscout/androidaps/dialogs/TreatmentDialog.kt
|
2021-03-29 22:39:12 +02:00 |
|
|
Philoul
|
e829a6918c
|
Fix uel after merge
|
2021-03-29 22:30:44 +02:00 |
|
|
Milos Kozak
|
cb298a2646
|
eliminate treatments cache from TreatmentsPlugin
|
2021-03-29 19:15:46 +02:00 |
|
|
Philoul
|
22384ef2e8
|
Merge branch 'Adrian_ValueWithUnit_Refactor' into meallink_ValueWithUnit
# 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/FillDialog.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/dialogs/TreatmentDialog.kt
# app/src/main/java/info/nightscout/androidaps/plugins/aps/loop/LoopPlugin.kt
# app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/NSClientAddUpdateWorker.kt
# app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/NSClientPlugin.java
# app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/NSClientRemoveWorker.kt
# app/src/main/java/info/nightscout/androidaps/plugins/general/wear/ActionStringHandler.kt
# app/src/main/java/info/nightscout/androidaps/plugins/treatments/CarbsGenerator.kt
# app/src/main/java/info/nightscout/androidaps/plugins/treatments/fragments/TreatmentsBolusFragment.kt
# app/src/main/java/info/nightscout/androidaps/plugins/treatments/fragments/TreatmentsCareportalFragment.kt
# app/src/main/java/info/nightscout/androidaps/utils/wizard/BolusWizard.kt
# automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionStartTempTarget.kt
# automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionStopTempTarget.kt
# combo/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ComboPlugin.java
# core/src/main/java/info/nightscout/androidaps/data/DetailedBolusInfo.java
# core/src/main/java/info/nightscout/androidaps/logging/UserEntryLogger.kt
# database/src/main/java/info/nightscout/androidaps/database/entities/UserEntry.kt
# omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/data/ActiveBolus.java
|
2021-03-29 13:51:28 +02:00 |
|
|
Milos Kozak
|
f37e3ab4c2
|
Simplify IOB calculation call
|
2021-03-29 09:43:25 +02:00 |
|
|
Milos Kozak
|
e3ac451f8d
|
PumpSync interface, VirtualPump, remove pump driver dependency to database
|
2021-03-29 00:31:40 +02:00 |
|
|
Philoul
|
654ca35dd1
|
Merge branch 'UserEntryImprovement' into AdrianVWU_Update
# Conflicts:
# app/src/main/java/info/nightscout/androidaps/dialogs/CalibrationDialog.kt
# app/src/main/java/info/nightscout/androidaps/dialogs/CarbsDialog.kt
# app/src/main/java/info/nightscout/androidaps/dialogs/ExtendedBolusDialog.kt
# app/src/main/java/info/nightscout/androidaps/dialogs/FillDialog.kt
# app/src/main/java/info/nightscout/androidaps/dialogs/InsulinDialog.kt
# app/src/main/java/info/nightscout/androidaps/dialogs/LoopDialog.kt
# app/src/main/java/info/nightscout/androidaps/dialogs/ProfileSwitchDialog.kt
# app/src/main/java/info/nightscout/androidaps/dialogs/TempBasalDialog.kt
# app/src/main/java/info/nightscout/androidaps/dialogs/TempTargetDialog.kt
# app/src/main/java/info/nightscout/androidaps/dialogs/TreatmentDialog.kt
# app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/NSClientAddUpdateWorker.kt
# app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/NSClientRemoveWorker.kt
# app/src/main/java/info/nightscout/androidaps/plugins/general/smsCommunicator/SmsCommunicatorPlugin.kt
# app/src/main/java/info/nightscout/androidaps/plugins/general/wear/ActionStringHandler.kt
# app/src/main/java/info/nightscout/androidaps/plugins/treatments/fragments/TreatmentsBolusFragment.kt
# app/src/main/java/info/nightscout/androidaps/plugins/treatments/fragments/TreatmentsCareportalFragment.kt
# app/src/main/java/info/nightscout/androidaps/plugins/treatments/fragments/TreatmentsProfileSwitchFragment.kt
# app/src/main/java/info/nightscout/androidaps/plugins/treatments/fragments/TreatmentsTempTargetFragment.kt
# app/src/main/java/info/nightscout/androidaps/plugins/treatments/fragments/TreatmentsTemporaryBasalsFragment.kt
# app/src/main/java/info/nightscout/androidaps/plugins/treatments/fragments/TreatmentsUserEntryFragment.kt
# app/src/main/java/info/nightscout/androidaps/utils/wizard/BolusWizard.kt
# core/src/main/java/info/nightscout/androidaps/plugins/general/maintenance/formats/ClassicPrefsFormat.kt
# core/src/main/java/info/nightscout/androidaps/utils/Translator.kt
# core/src/main/java/info/nightscout/androidaps/utils/extensions/UserEntryExt.kt
# database/src/main/java/info/nightscout/androidaps/database/entities/UserEntry.kt
|
2021-03-28 17:04:52 +02:00 |
|
|
Milos Kozak
|
df1e2c53db
|
Bolus, Carbs, BolusCalcResult new way of upload to NS
|
2021-03-28 13:45:27 +02:00 |
|
|
AdrianLxM
|
4e77902bdb
|
correct call of teardown wear plugin
|
2021-03-27 23:35:57 +01:00 |
|
|
AdrianLxM
|
dc79109f5e
|
load Action String Handler
|
2021-03-27 23:35:50 +01:00 |
|
|
Milos Kozak
|
c9c02458d6
|
TT & GV new way of upload to NS
|
2021-03-27 23:14:51 +01:00 |
|
|
AdrianLxM
|
57f9fa0730
|
correct call of teardown wear plugin
|
2021-03-27 22:49:22 +01:00 |
|
|
AdrianLxM
|
b077b1d5b1
|
load Action String Handler
|
2021-03-27 22:47:45 +01:00 |
|
|
Philoul
|
2bd2510bd8
|
Add Maintenance source
|
2021-03-27 16:17:38 +01:00 |
|
|
Philoul
|
1876a6064c
|
TimeUnit for ms-> min conversion
|
2021-03-27 14:15:35 +01:00 |
|
|
Philoul
|
2e59dd3112
|
Add UserEntry for Wear
|
2021-03-27 00:58:01 +01:00 |
|
|
Milos Kozak
|
6aa9a0fe12
|
bypass Queue for TemporaryTargets
|
2021-03-26 21:16:27 +01:00 |
|
|
Milos Kozak
|
4edf51d6ea
|
remove nsUpload call for TemporaryTargets
|
2021-03-26 16:23:47 +01:00 |
|
|
Philoul
|
854715955a
|
Add Careportal and actions sources + icons
|
2021-03-25 23:08:32 +01:00 |
|
|
Milos Kozak
|
7f0fe881b6
|
DetailedBolusInfo, MealLink UI
|
2021-03-25 17:48:07 +01:00 |
|
|
Philoul
|
6e0d21a874
|
Add Source icon in UserEntryFragment, Update source in uel.log
|
2021-03-25 13:32:11 +01:00 |
|
|
AdrianLxM
|
d9aced595b
|
make new ValueWithUnit translatable
|
2021-03-25 03:23:28 +01:00 |
|