Commit graph

12157 commits

Author SHA1 Message Date
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
Andrei Vereha 3432dcf85f
Merge pull request #113 from vanelsberg/FixPodExpires
Pod expiry datetime drifting until next refresh or connection (issue#92)
2021-09-12 13:36:24 +02:00
Andrei Vereha 1b1722cbb3
Merge pull request #112 from vanelsberg/tvelsberg-fixes3
Minimum fill amount = 80U
2021-09-12 13:35:55 +02:00
Andrei Vereha 7b660ba2eb
Merge pull request #111 from vanelsberg/issuetemplate-dash-testing
Add issue template for DASH testing
2021-09-12 13:35:42 +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 f505e23d50
New Crowdin updates (#627)
* New translations strings.xml (French)

* New translations strings.xml (French)

* New translations strings.xml (French)

* Update source file strings.xml

* New translations strings.xml (Hebrew)

* New translations strings.xml (Hebrew)

* New translations strings.xml (German)

* New translations strings.xml (German)

* New translations strings.xml (German)

* New translations strings.xml (German)

* New translations strings.xml (Russian)

* New translations strings.xml (Italian)

* New translations strings.xml (Hebrew)

* New translations strings.xml (Russian)

* New translations strings.xml (Russian)

* New translations strings.xml (Russian)

* New translations strings.xml (Russian)

* New translations strings.xml (Czech)

* New translations strings.xml (Czech)

* New translations strings.xml (Swedish)

* New translations strings.xml (Swedish)

* New translations strings.xml (Swedish)

* New translations strings.xml (Swedish)

* New translations strings.xml (Swedish)

* New translations strings.xml (Swedish)

* New translations strings.xml (Russian)

* New translations strings.xml (Slovak)

* Update source file exam.xml

* New translations exam.xml (Romanian)

* New translations exam.xml (Dutch)

* New translations exam.xml (Swedish)

* New translations exam.xml (Slovak)

* New translations exam.xml (Russian)

* New translations exam.xml (Portuguese)

* New translations exam.xml (Polish)

* New translations exam.xml (Norwegian)

* New translations exam.xml (Lithuanian)

* New translations exam.xml (French)

* New translations exam.xml (Korean)

* New translations exam.xml (Italian)

* New translations exam.xml (Hebrew)

* New translations exam.xml (German)

* New translations exam.xml (Czech)

* New translations exam.xml (Spanish)

* New translations exam.xml (Hebrew)

* New translations strings.xml (Hebrew)

* New translations exam.xml (Slovak)

* New translations exam.xml (Czech)

* New translations exam.xml (Italian)

* New translations exam.xml (Norwegian)

* New translations strings.xml (Norwegian)

* New translations exam.xml (Russian)

* New translations strings.xml (French)

* New translations strings.xml (Romanian)

* New translations strings.xml (Portuguese)

* New translations strings.xml (Swedish)

* New translations strings.xml (Russian)

* New translations strings.xml (Dutch)

* New translations strings.xml (Lithuanian)

* New translations strings.xml (Polish)

* New translations strings.xml (Bulgarian)

* New translations strings.xml (Czech)

* New translations strings.xml (Slovak)

* New translations strings.xml (Spanish)

* New translations strings.xml (Norwegian)

* New translations strings.xml (Hebrew)

* New translations strings.xml (Italian)

* New translations strings.xml (German)

* Update source file strings.xml

* New translations strings.xml (Lithuanian)

* New translations strings.xml (Tamil)

* New translations strings.xml (Portuguese, Brazilian)

* New translations strings.xml (Chinese Simplified)

* New translations strings.xml (Turkish)

* New translations strings.xml (Swedish)

* New translations strings.xml (Slovenian)

* New translations strings.xml (Slovak)

* New translations strings.xml (Russian)

* New translations strings.xml (Portuguese)

* New translations strings.xml (Polish)

* New translations strings.xml (Norwegian)

* New translations strings.xml (Dutch)

* New translations strings.xml (Korean)

* New translations strings.xml (Italian)

* New translations strings.xml (Hebrew)

* New translations strings.xml (Irish)

* New translations strings.xml (Greek)

* New translations strings.xml (German)

* New translations strings.xml (Danish)

* New translations strings.xml (Czech)

* New translations strings.xml (Catalan)

* New translations strings.xml (Bulgarian)

* New translations strings.xml (Afrikaans)

* New translations strings.xml (Spanish)

* New translations strings.xml (French)

* New translations strings.xml (Romanian)

* New translations strings.xml (Croatian)

* Update source file strings.xml

* New translations strings.xml (Hebrew)

* New translations strings.xml (Czech)

* New translations strings.xml (German)
2021-09-08 19:32:52 +02:00
Milos Kozak 2cbfad42fe
Merge pull request #666 from nightscout/revert-665-dev
Revert "NullPointerException while processing Bolus entries"
2021-09-08 19:19:14 +02:00
Milos Kozak 07e4440fee
Revert "NullPointerException while processing Bolus entries" 2021-09-08 19:19:02 +02:00
Milos Kozak ddbeb31d49
Merge pull request #665 from rdziadosz/dev
NullPointerException while processing Bolus entries
2021-09-08 13:53:41 +02:00
Radoslaw Dziadosz 738495ddda NullPointerException while processing Bolus entries 2021-09-08 01:04:42 +02:00
Milos Kozak 5760d3e85b Update Crowdin configuration file 2021-09-07 22:45:53 +02:00
Milos Kozak d18c05205c Resolve warnings 2021-09-07 12:08:19 +02:00
Milos Kozak 2034774b39
Merge pull request #647 from nightscout/dependabot/gradle/dev/kotlin_version-1.5.30
Bump kotlin_version from 1.5.21 to 1.5.30
2021-09-06 17:06:14 +02:00
Milos Kozak 9aaddf12d9
Merge pull request #659 from nightscout/dependabot/gradle/dev/com.android.tools.build-gradle-7.0.2
Bump gradle from 7.0.0 to 7.0.2
2021-09-06 17:04:46 +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
Milos Kozak 679a63f757 fix build 2021-09-06 13:50:58 +02:00
Milos Kozak 84343c39a4 fix tests 2021-09-06 11:27:27 +02:00
Milos Kozak 379ed6dca6
Merge pull request #663 from Philoul/Fix_Automation_regression
Fix Automation regression (Add missing return)
2021-09-06 10:27:59 +02:00
Philoul 2fafa78f56 Fix Automation regression (Add missing return) 2021-09-04 23:59:45 +02:00
Theo van Elsberg 9e4c1abd12 Pod expiry datetime drifting until next refresh or connection (issue#92) 2021-09-04 00:17:41 +02:00