Commit graph

10205 commits

Author SHA1 Message Date
Milos Kozak
d5d91ba374 add comment 2021-01-08 17:08:39 +01:00
Milos Kozak
dac720e919 Merge branch 'dev' of https://github.com/nightscout/AndroidAPS into dev 2021-01-08 14:20:31 +01:00
Milos Kozak
c847a5a340 add warning to ns_upload_only 2021-01-08 14:20:18 +01:00
Milos Kozak
2ab27f5eb9
Merge pull request #197 from AAPS-Omnipod/rl_battery_level_medtronic
Show RL battery level for Medtronic & add setting to enable battery change logging for Omnipod
2021-01-08 13:39:19 +01:00
Milos Kozak
5a44544630
Merge pull request #198 from nightscout/fix/wear-gradle-semilocalised
downgrade gradle and fix mixed localisation comparison
2021-01-08 11:25:19 +01:00
Bart Sopers
8f52bde000 Fix display of device model in RileyLink status fragment 2021-01-08 11:03:29 +01:00
AdrianLxM
819a3b7d43 downgrade gradle and fix mixed localisation comparison 2021-01-08 01:18:44 +01:00
Bart Sopers
5c0545cd99 Add setting for showing RL battery level for Medtronic and add setting for enabling battery change logging for Omnipod 2021-01-07 23:38:00 +01:00
Milos Kozak
83324c97a7 prevent ArrayIndexOutOfBoundsException 2021-01-07 11:16:41 +01:00
Milos Kozak
5d53029b54
Merge pull request #181 from xJoe/dev
Status lights battery
2021-01-07 10:29:09 +01:00
Milos Kozak
2524fc705d
Update app/src/main/res/values/strings.xml
Co-authored-by: Stephen Brown II <Stephen.Brown2@gmail.com>
2021-01-07 10:28:27 +01:00
Milos Kozak
273b04f0e7
Merge pull request #183 from rICTx-T1D/rICTxT1D/Issue156
Fix for issue #156 (correct vertical alignment of label)
2021-01-07 10:27:17 +01:00
Milos Kozak
8109472a04
Merge pull request #188 from nightscout/crashalytics_280_jan21
Crashalytics 280 jan21
2021-01-07 10:26:01 +01:00
Milos Kozak
706783edab
Merge pull request #192 from AAPS-Omnipod/omnipod_eros_dev_upstream_merge
Omnipod fixes
2021-01-07 10:25:44 +01:00
Bart Sopers
4cfbcd6040 Merge branch 'omnipod_eros_dev_upstream_merge' into rl_battery_level_medtronic 2021-01-07 03:57:40 +01:00
Bart Sopers
1a688260e6 Merge branch 'omnipod_eros_dev' into omnipod_eros_dev_upstream_merge 2021-01-07 03:57:19 +01:00
Bart Sopers
8034c7411d Only automatically update Omnipod time for DST and TZ changes 2021-01-07 03:56:54 +01:00
Bart Sopers
9415fadee0 Merge branch 'omnipod_eros_dev_upstream_merge' into rl_battery_level_medtronic 2021-01-07 02:36:04 +01:00
Bart Sopers
ec8b02464e Merge branch 'omnipod_eros_dev' into omnipod_eros_dev_upstream_merge 2021-01-07 02:35:36 +01:00
Bart Sopers
99a9320099 Make sure Omnipod warnings are shown when queue is not empty 2021-01-07 02:35:15 +01:00
Bart Sopers
f1bb85eafa Distinguish between configured and connected device for Medtronic in RileyLink fragment 2021-01-07 02:21:41 +01:00
Bart Sopers
647c0ea74a Remove unused imports in RileyLink module 2021-01-07 00:07:07 +01:00
Bart Sopers
169443e5f7 Also retrieve battery level for Medtronic and show it in RileyLink status fragment 2021-01-07 00:05:07 +01:00
Bart Sopers
71eca73b3a Revert "Update version for Omnipod"
This reverts commit 4720dfc1c7.
2021-01-06 22:21:49 +01:00
Bart Sopers
4720dfc1c7 Update version for Omnipod 2021-01-06 22:17:12 +01:00
Bart Sopers
7aa71c2364 Merge branch 'omnipod_eros_dev_upstream_merge' into omnipod_eros_dev 2021-01-06 22:16:05 +01:00
Bart Sopers
564e87aa5a Fix reporting cancelled TBR upon suspending delivery for Omnipod 2021-01-06 22:14:26 +01:00
rICTx-T1D
16fc035873 #156 - vertical-centered label by using TableRow-method to prevent truncation of translation 2021-01-05 22:08:43 +01:00
Andy Rozman
d1fca8f37d Merge branch 'dev' into crashalytics_280_jan21 2021-01-05 20:54:47 +00:00
Andy Rozman
66db7bc89b - problems found on crashalytics 2021-01-05 20:52:45 +00:00
Milos Kozak
016d159559
Merge pull request #184 from Philoul/Layout_Improvement
Layout improvement
2021-01-05 17:26:26 +01:00
Milos Kozak
dfba82b7a8
Merge pull request #185 from StephenBrown2/remove-extra-minus-sign
Remove extra minus sign from Bolus Wizard timeshift result
2021-01-05 17:25:11 +01:00
Stephen Brown II
151fb270df Remove extra minus sign from Bolus Wizard timeshift result 2021-01-04 16:22:21 -07:00
Philoul
ab2a1ed1fa Layout improvement
datetime vertical centered for languages with "long translations"
Add marging for right icon of automation (too close to border)
2021-01-04 22:19:02 +01:00
rICTx-T1D
dfa1fb3426 #156 - remove comment of create-date and created by 2021-01-04 20:59:01 +01:00
rICTx-T1D
99803870c5 #156 - vertical-centered label 2021-01-04 20:57:23 +01:00
rICTx-T1D
022df5e70d
Merge pull request #8 from nightscout/dev
nightscrout:dev to dev
2021-01-04 20:45:34 +01:00
Milos Kozak
3e45ab5187 hide non NSClient controls by default 2021-01-03 19:12:59 +01:00
xJoe
27cd727643
Status lights battery
added "pump" as there is also sensor battery as of AAPS 2.8
2021-01-03 18:07:41 +01:00
Milos Kozak
fd934fde2b RS: force BT disconnect on failed bolus 2021-01-03 17:59:56 +01:00
Milos Kozak
eb84f5e6a7 LoopDialog protection 2021-01-03 17:26:37 +01:00
Milos Kozak
34435d4684 fix CGM data is unchanged 2021-01-03 16:26:57 +01:00
Milos Kozak
d6f00e5b0d fix editing automation event name 2021-01-03 16:02:29 +01:00
Milos Kozak
f28b04226e limit key_smbmaxminutes 2021-01-03 15:16:21 +01:00
Milos Kozak
cac28dd01f trying to fix crowdin 2021-01-03 11:37:31 +01:00
Milos Kozak
bd218a58a2 Merge branch 'dev' of https://github.com/nightscout/AndroidAPS into dev 2021-01-03 11:32:47 +01:00
Milos Kozak
e5902b73c7 trying to fix crowdin 2021-01-03 11:32:37 +01:00
Milos Kozak
378e2f9442
Merge pull request #179 from xJoe/dev
Update strings.xml
2021-01-03 11:08:19 +01:00
xJoe
9e286b789a
Update strings.xml 2021-01-03 10:50:08 +01:00
Milos Kozak
61813c65d2
Merge pull request #178 from AAPS-Omnipod/omnipod_eros_dev_upstream_merge
Prevent crash in Omnipod overview fragment
2021-01-03 10:20:00 +01:00