Milos Kozak
|
5a4733dbdc
|
Merge branch 'meallink' of https://github.com/nightscout/AndroidAPS into meallink
|
2021-04-11 20:38:17 +02:00 |
|
|
Philoul
|
0ad53011c1
|
Merge branch 'meallink' into meallink_VWU_v2
|
2021-04-11 18:09:20 +02:00 |
|
|
Milos Kozak
|
dcc0b040df
|
Merge branch 'meallink' of https://github.com/nightscout/AndroidAPS into meallink
|
2021-04-11 17:59:02 +02:00 |
|
|
Milos Kozak
|
8ce5a881d3
|
_now() -> now()
|
2021-04-11 17:58:50 +02:00 |
|
|
Milos Kozak
|
998eba8b9f
|
DateUtil -> kt, static funcs removed
|
2021-04-11 17:47:55 +02:00 |
|
|
Philoul
|
09aa909cd6
|
Move uel.log outside Callback
|
2021-04-11 16:11:37 +02:00 |
|
|
Philoul
|
f5330287e9
|
Replace ValueWithUnit.StringResource by ValueWithUnit.SimpleString
|
2021-04-11 16:02:53 +02:00 |
|
|
Philoul
|
04ef92eb78
|
Add gsNotLocalised in ResourceHelper
|
2021-04-11 12:50:11 +02:00 |
|
|
Milos Kozak
|
b0a12dab1a
|
Merge pull request #468 from Philoul/meallink_VWU_v2
Fix double Entries in Treatment Dialog (+ add new uel.log for plugin enabled/disabled
|
2021-04-11 08:39:43 +02:00 |
|
|
Philoul
|
62443f6738
|
Merge branch 'meallink' into meallink_VWU_v2
|
2021-04-10 20:44:08 +02:00 |
|
|
Philoul
|
4d1f330064
|
Fix double userEntry with VirtualPump if we enter Carbs + Insulin
|
2021-04-10 19:56:28 +02:00 |
|
|
Philoul
|
baa37c4e3a
|
uel.log for plugin enabled / disabled
|
2021-04-10 19:55:24 +02:00 |
|
|
Milos Kozak
|
8b321b9b5b
|
Merge pull request #457 from robertrub/dev
Update strings.xml
|
2021-04-10 18:24:32 +02:00 |
|
|
Milos Kozak
|
ebf0781f47
|
Merge pull request #466 from Philoul/meallink_VWU_v2
New uel.log
|
2021-04-10 18:23:40 +02:00 |
|
|
Milos Kozak
|
2b58bc8306
|
DanaRKoreanPlugin -> kt
|
2021-04-10 15:32:47 +02:00 |
|
|
Milos Kozak
|
d898a374e6
|
fix tests, removed Trigger reflection
|
2021-04-10 14:36:55 +02:00 |
|
|
Milos Kozak
|
e4d70a7303
|
fix tests
|
2021-04-10 12:56:54 +02:00 |
|
|
Milos Kozak
|
4eef2507fb
|
fix tests
|
2021-04-10 12:19:31 +02:00 |
|
|
Philoul
|
c728f8689b
|
uel.log for Start and Exit AAPS
|
2021-04-10 11:35:38 +02:00 |
|
|
Milos Kozak
|
194cf305fd
|
Rv2,RKorean
|
2021-04-10 10:41:53 +02:00 |
|
|
Philoul
|
5a143b5444
|
Merge branch 'meallink' into meallink_VWU_v2
|
2021-04-09 12:38:42 +02:00 |
|
|
Philoul
|
5023225650
|
Add uel.log for Alert Carbs required
|
2021-04-09 12:00:33 +02:00 |
|
|
Milos Kozak
|
4a51b276f9
|
add DiaLink text
|
2021-04-09 10:16:47 +02:00 |
|
|
Milos Kozak
|
4120e9eef9
|
DanaR working
|
2021-04-09 08:02:46 +02:00 |
|
|
Philoul
|
ff0e6e9c87
|
Use icon of activeBgSource for uel Log
|
2021-04-08 18:47:00 +02:00 |
|
|
BernhardRo
|
2789a5d661
|
Merge pull request #22 from nightscout/master
discord badge
|
2021-04-08 12:47:11 +02:00 |
|
|
Philoul
|
8bba73a6ca
|
Fix Plugin Type for BGSource in PluginStore.kt
I don't know if it could have side effect...
|
2021-04-08 11:24:10 +02:00 |
|
|
Philoul
|
6114effb22
|
Add BG sources for uel (Calibration and Sensor Change)
|
2021-04-08 10:06:00 +02:00 |
|
|
Andrei Vereha
|
feed6a2f63
|
Merge pull request #27 from 0pen-dash/andrei/retries
retries, error handling, session resynchronization
|
2021-04-07 20:55:08 +02:00 |
|
|
Milos Kozak
|
ec9efefb93
|
Merge pull request #462 from Philoul/meallink_VWU_v2
Remove dana dependency
|
2021-04-07 12:07:12 +02:00 |
|
|
Philoul
|
22dfea652d
|
RRemove unused injection and try to fix tests...
It works for LoopPluginTest, but not for ClassicPrefsFormatTest as many other... (don't know if it's my config or not)
|
2021-04-06 23:58:54 +02:00 |
|
|
Philoul
|
ffa9c04496
|
Remove dependency and create 2 classes for drivers
|
2021-04-06 23:30:16 +02:00 |
|
|
Milos Kozak
|
d9f62b24c4
|
Merge pull request #461 from Philoul/meallink_VWU_v2
Update for uel.log
|
2021-04-06 13:39:34 +02:00 |
|
|
Philoul
|
e490c2df04
|
Update uel.log NSClientAddUpdateWorker
|
2021-04-06 00:43:51 +02:00 |
|
|
Milos Kozak
|
7b4ebbd440
|
2.8.2.1-dev-e2
|
2021-04-05 23:26:13 +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
|
b04da525c1
|
Merge pull request #451 from Philoul/meallink_ValueWithUnit
Meallink ValueWithUnit Refactor
|
2021-04-05 22:42:50 +02:00 |
|
|
Milos Kozak
|
2463f8fc47
|
ExtendedBolus, TemporaryBasal -> room, DanaRS working
|
2021-04-05 22:41:28 +02:00 |
|
|
Philoul
|
f74cd6796f
|
Same Color for DEV and BGI in menu + SEN value * 100
|
2021-04-05 10:44:52 +02:00 |
|
|
Andrei Vereha
|
821135edec
|
dash ble: Supress deteket
|
2021-04-04 21:04:21 +02:00 |
|
|
Philoul
|
1e4983e659
|
Merge branch 'meallink' into meallink_ValueWithUnit
|
2021-04-04 19:55:36 +02:00 |
|
|
Andrei Vereha
|
40ac1d189a
|
dash ble: detekt reduce number of arguments
|
2021-04-04 17:57:17 +02:00 |
|
|
Andrei Vereha
|
513007f6ae
|
dash: undo the temporary discardButtonEnabled test
|
2021-04-04 17:15:44 +02:00 |
|
|
Andrei Vereha
|
0c35eb7da9
|
dash: bugfix DefaultStatusResponse and add more tests
|
2021-04-04 17:10:17 +02:00 |
|
|
Milos Kozak
|
0782878725
|
Merge pull request #458 from nightscout/meallink-carb-callback
callback if carbs are added to db but not pump
|
2021-04-04 16:18:27 +02:00 |
|
|
Andrei Vereha
|
6d2d5a7e76
|
dash ble: detekt
|
2021-04-04 16:06:39 +02:00 |
|
|
Philoul
|
cc3919e9fc
|
Add SITE/RESERVOIR CHANGE Action and improve Colors
|
2021-04-04 15:05:43 +02:00 |
|
|
Philoul
|
c615afce95
|
Prepare Migration function
|
2021-04-04 14:00:39 +02:00 |
|
|
Philoul
|
b8bccdbeeb
|
database v12
|
2021-04-04 13:58:18 +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 |
|