Commit graph

11922 commits

Author SHA1 Message Date
Milos Kozak 89578b4423 unify trend arrow AAPS <-> watch 2021-09-21 21:37:12 +02:00
Milos Kozak 9d5b4c9997 lints 2021-09-21 21:37:12 +02:00
Milos Kozak 7f24933f4d finish removing Objective8 2021-09-21 21:37:11 +02:00
Andrei Vereha 8184500467 fix warnings 2021-09-21 21:37:11 +02:00
Andrei Vereha 2dee60b4e0 update bluetooth status. fix warnings. 2021-09-21 21:37:11 +02:00
Andrei Vereha 8767065fda format 2021-09-21 21:37:11 +02:00
Andrei Vereha 6b441b515e more translation 2021-09-21 21:37:11 +02:00
Andrei Vereha 613e7963f2 translate exceptions. Display expiration 8h before the real expiration 2021-09-21 21:37:11 +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 545ff0af6e update dictionary 2021-09-20 16:13:37 +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 cb2402ae45 Fix tests 2021-09-20 10:55:49 +02:00
Milos Kozak 77e3c73608 Fix Omnipod bolus progress text 2021-09-20 10:31:46 +02:00
Milos Kozak 2c177b38bf 2.8.2.3-dev 2021-09-19 10:07:38 +02:00
Milos Kozak b80e2a7648 Improve COB handling 2021-09-19 09:59:35 +02:00
Andrei Vereha eca0368af6
Merge pull request #121 from 0pen-dash/avereha/merge-dev-5
merge with dev
2021-09-19 08:35:14 +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 5e9b03cffd fix tests 2021-09-15 23:49:34 +02:00
Milos Kozak 444915ebf7 fix displaying bg data on range change 2021-09-15 23:19:25 +02:00
Andrei Vereha 3255ecda6d
Merge pull request #120 from 0pen-dash/avereha/merge-dev-3
avereha/merge dev 3
2021-09-15 18:40:52 +02:00
Andrei Vereha b0f80d5c62 Merge branch 'dev' of https://github.com/nightscout/AndroidAPS into avereha/merge-dev-3 2021-09-15 18:39:28 +02:00
Andrei Vereha 7af3685933
Merge pull request #119 from 0pen-dash/revert-118-revert-117-avereha/merge-dev-2
Revert "Revert "avereha/merge dev 2""
2021-09-15 18:38:54 +02:00
Andrei Vereha cb86438c27
Revert "Revert "avereha/merge dev 2"" 2021-09-15 18:38:27 +02:00
Milos Kozak 3d32d5ec43
Merge pull request #672 from Philoul/fix/targetoutofhardlimit
Fix ProfileSealed Target out of Hardlimit
2021-09-15 12:11:01 +02:00
Andrei Vereha b8eefa842d
Merge pull request #118 from 0pen-dash/revert-117-avereha/merge-dev-2
Revert "avereha/merge dev 2"
2021-09-15 00:13:06 +02:00
Andrei Vereha 7fff6fc564
Revert "avereha/merge dev 2" 2021-09-15 00:12:35 +02:00
Andrei Vereha aea88ffddf
Merge pull request #117 from 0pen-dash/avereha/merge-dev-2
avereha/merge dev 2
2021-09-14 23:59:33 +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
Philoul d9c066a859 Fix ProfileSealed Target out of Hardlimit 2021-09-14 21:47:13 +02:00
Andrei Vereha 829f5fec6a
Merge pull request #116 from 0pen-dash/avereha/unconfirmed
bugfix: ALARM_ILLEGAL_PUMP_STATE
2021-09-14 20:19:15 +02:00
Andrei Vereha 40a56d11ee bufix for ALARM_ILLEGAL_PUMP_STATE 2021-09-14 20:01:21 +02:00
Milos Kozak 7690419c6c always show basal in NSClient mode 2021-09-13 21:05:01 +02:00
Milos Kozak 0b764a2881 fix SP crash on start 2021-09-13 19:28:45 +02:00
Milos Kozak efd6b28a64 Merge branch 'dev' of https://github.com/nightscout/AndroidAPS into dev 2021-09-13 19:06:36 +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
Milos Kozak 1bb0e07db7
Merge pull request #670 from Philoul/fix/automation
Fix Automation rule regression (new)
2021-09-13 11:49:01 +02:00
Philoul c49dbe655a Fix Automation rule
Action not displayed with JSONArray, it works with a JSONObject...
2021-09-12 15:56:34 +02:00