Commit graph

6943 commits

Author SHA1 Message Date
Milos Kozak
c8f5f4a116 optimize history browser 2021-10-03 12:04:03 +02:00
Milos Kozak
29acc3d17f optimize query if TBR is not faked by EB 2021-10-03 11:37:23 +02:00
Milos Kozak
2c89dc1807 suppress warnings 2021-10-01 23:17:24 +02:00
Milos Kozak
8050fedaf6 Merge branch 'dev' of https://github.com/nightscout/AndroidAPS into dev 2021-10-01 16:55:40 +02:00
Milos Kozak
defdb28f93 code cleanup 2021-10-01 11:07:16 +02:00
Milos Kozak
9f1a87110d NSCLIENT mode: do not create local profile switch 2021-09-30 19:08:38 +02:00
Milos Kozak
45b58719a6 Merge branch 'epssync' into dev 2021-09-30 17:46:18 +02:00
Andrei Vereha
f5c6367495 disable dash for now 2021-09-25 19:05:49 +02:00
Andrei Vereha
0cd9beb2cf merge with dev 2021-09-25 13:55:57 +02:00
Milos Kozak
8d07a697c3 EffectiveProfileSwitch sync 2021-09-24 14:58:17 +02:00
Milos Kozak
b2c45d0a26 remove PowerMock from all modules except wear 2021-09-23 17:35:55 +02:00
Milos Kozak
b40428c986
Merge pull request #607 from Philoul/NewUelLog
New UserEntries
2021-09-22 18:20:06 +02:00
Milos Kozak
a1a5fbaa4f Display EventType properly 2021-09-21 22:17:06 +02:00
Milos Kozak
d33f62b23d remove PowerMockRunner where possible 2021-09-21 21:57:56 +02:00
Andrei Vereha
2a2cf9fa3c Merge branch 'dev' of https://github.com/nightscout/AndroidAPS into avereha/merge-dev-6 2021-09-21 21:17:53 +02:00
Milos Kozak
d43393e2af unify trend arrow AAPS <-> watch 2021-09-21 16:46:12 +02:00
Milos Kozak
ce59c3afd4 lints 2021-09-21 15:35:59 +02:00
Milos Kozak
9e42f91848 finish removing Objective8 2021-09-21 15:16:19 +02:00
Andrei Vereha
09675de3f1 Merge branch 'dev' of https://github.com/nightscout/AndroidAPS into dash 2021-09-20 18:32:52 +02:00
Milos Kozak
7bb2f446b7 Merge branch 'dev' of https://github.com/nightscout/AndroidAPS into dev 2021-09-20 17:20:22 +02:00
Milos Kozak
374e251801 remove @Jvm directives where possible 2021-09-20 17:20:09 +02:00
Milos Kozak
71093db68a prevent IndexOutOfBounds 2021-09-20 17:17:01 +02:00
Milos Kozak
f2cc8fb5f5
Merge pull request #678 from Philoul/Fix/ProfileTotalBasal
Fix total basal in Local Profile Fragment
2021-09-20 16:03:00 +02:00
Milos Kozak
72a309a055 reset password procedure 2021-09-20 14:13:56 +02:00
Milos Kozak
4b6d4d287c Ask for old apssword in SetupWizard 2021-09-20 13:04:13 +02:00
Milos Kozak
02b77ae554 Remove Objective8 (9) 2021-09-20 11:10:47 +02:00
Milos Kozak
b80e2a7648 Improve COB handling 2021-09-19 09:59:35 +02:00
Philoul
45f576b838 Add getEditProfile function to calculate SumLabel 2021-09-18 21:54:29 +02:00
Milos Kozak
fb9f5220d3 Ignore future events for status lights 2021-09-18 18:06:11 +02:00
Philoul
bafc8e951a Merge remote-tracking branch 'Nightscout/dev' into Fix/ProfileTotalBasal 2021-09-17 18:10:39 +02:00
Andrei Vereha
e31c77a858 Merge branch 'dev' of https://github.com/nightscout/AndroidAPS into avereha/merge-dev-5 2021-09-16 23:38:55 +02:00
Milos Kozak
a448efe09c fix profile editor (ISF limits) 2021-09-16 00:18:02 +02:00
Milos Kozak
c611674b3b show only valid data 2021-09-16 00:02:27 +02:00
Milos Kozak
56a0c97e96
Merge pull request #634 from Philoul/Fix_DisableLoop
Fix Overview LoopDialog (Disable Loop)
2021-09-15 23:54:15 +02:00
Milos Kozak
444915ebf7 fix displaying bg data on range change 2021-09-15 23:19:25 +02:00
Andrei Vereha
cb86438c27
Revert "Revert "avereha/merge dev 2"" 2021-09-15 18:38:27 +02:00
Andrei Vereha
7fff6fc564
Revert "avereha/merge dev 2" 2021-09-15 00:12:35 +02:00
Andrei Vereha
efad748939 Merge branch 'dev' of https://github.com/nightscout/AndroidAPS into avereha/merge-dev-2 2021-09-14 23:55:15 +02:00
Milos Kozak
7690419c6c always show basal in NSClient mode 2021-09-13 21:05:01 +02:00
Milos Kozak
ba71e0db9b more Profile validity checks 2021-09-13 19:06:32 +02:00
Andrei Vereha
d4b0935d6b Merge remote-tracking branch 'upstream/dev' into dash 2021-09-13 18:39:23 +02:00
Philoul
fc83e41148 Avoid disconect pump during suspend 2021-09-10 00:34:17 +02:00
Philoul
4420189310 Merge remote-tracking branch 'Nightscout/dev' into Fix_DisableLoop 2021-09-09 00:03:27 +02:00
Milos Kozak
d18c05205c Resolve warnings 2021-09-07 12:08:19 +02:00
Milos Kozak
c9897da78d
Merge pull request #641 from nightscout/openhumans_v2
Update Open Humans uploader for new database
2021-09-06 13:54:16 +02:00
Philoul
c00000e079 Simplify a bit more LoopPlugin 2021-08-29 22:24:52 +02:00
Philoul
8770cfa4ad Merge remote-tracking branch 'Nightscout/dev' into Fix_DisableLoop
# Conflicts:
#	app/src/main/java/info/nightscout/androidaps/dialogs/LoopDialog.kt
2021-08-29 17:59:21 +02:00
Milos Kozak
5411f4fb3c key_ns_receive_profile_store default true to fetch NS profiles in setup wizard 2021-08-28 20:58:27 +02:00
Philoul
69839b5395 Add Disconnect Bloc when Loop is suspended or disabled 2021-08-25 09:00:13 +02:00
TebbeUbben
dbf1772397 Merge branch 'dev' of https://github.com/nightscout/AndroidAPS into dev
 Conflicts:
	build.gradle
2021-08-20 19:42:59 +02:00