Commit graph

8970 commits

Author SHA1 Message Date
Milos Kozak 201e4007cc Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev 2020-01-25 23:49:06 +01:00
Milos Kozak 1777f4a5f2 Merge branch 'layout' into dev 2020-01-25 23:48:51 +01:00
Milos Kozak dab563e356
Merge pull request #2391 from Philoul/Update_String_Wear_Manifest
Some labels updated in Wear Manifest to allow translations
2020-01-25 22:43:36 +01:00
Milos Kozak 9152a063a4 Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev 2020-01-25 22:12:52 +01:00
Milos Kozak 45c6a54e48 Upload queue id fix 2020-01-25 21:52:03 +01:00
Milos Kozak 75fad1b18e convert layouts to Constraint 2020-01-25 21:31:13 +01:00
Milos Kozak 09f0f639b0
Merge pull request #2332 from swissalpine/patch-1
Fix for mixed up bage_warn, bage_urgent for Combo in Statuslights
2020-01-25 20:41:41 +01:00
Andy Rozman 36128c4007 - fix for fisplay of lot number in RL Stats 2020-01-25 18:07:22 +00:00
Philoul f396411840 Some labels updated in Wear Manifest to allow translations in actions's popups 2020-01-25 17:31:14 +01:00
Milos Kozak d732e20dee Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev 2020-01-25 01:09:45 +01:00
Milos Kozak 6c23cb1d29 catch dberror 2020-01-25 01:09:29 +01:00
Milos Kozak 11dd1b43fd
Merge pull request #2373 from jotomo/patch-1
#2369 Set event time for second event plus 1s too
2020-01-24 18:26:59 +01:00
Milos Kozak 1680f190b0 bolus progress dialog layout 2020-01-24 18:25:12 +01:00
Andy Rozman 22b8d08449 Merge branch 'omnipod_eros' of https://github.com/AAPS-Omnipod/AndroidAPS into omnipod_eros 2020-01-24 11:20:59 +00:00
Andy Rozman 14e66a230d - fix for #28 serial number not shown in RL Stats dialog 2020-01-24 11:18:40 +00:00
Milos Kozak a859776b84
Merge pull request #2384 from PoweRGbg/patch-3
Allows selecting 12:00AM (#2831)
2020-01-24 09:21:11 +01:00
Andy Rozman 17b61b7ebe - reset riley link fix 2020-01-23 23:27:41 +00:00
Andy Rozman d21339700d Merge branch 'omnipod_eros' of https://github.com/AAPS-Omnipod/AndroidAPS into omnipod_eros 2020-01-23 15:05:12 +00:00
Bart Sopers f5af607125 Add logging in OmnipodManager.resetPodState and fix NonceState.toString 2020-01-22 23:45:42 +01:00
Bart Sopers 93e7eb518f Use insulinNotDelivered field from StatusResponse to determine units delivered after cancelled bolus or pod fault 2020-01-22 21:14:41 +01:00
Roumen Georgiev cd0697fdbd
Allows selecting 12:00AM (#2831) 2020-01-22 14:11:20 +02:00
Andy Rozman 68678023d0 Merge branch 'omnipod_eros' of https://github.com/AAPS-Omnipod/AndroidAPS into omnipod_eros 2020-01-21 20:03:08 +00:00
Andy Rozman afc07c5117 - changed version information
- added logging for time switches
2020-01-21 20:02:24 +00:00
Bart Sopers 6f7a07185a Change expiration alerts to more sensible values 2020-01-21 18:54:20 +01:00
Bart Sopers 24fc4594b3 Use two CancelDelivery commands instead of CancelDelivery command and BeepConfig command as a workaround for strange cancel delivery beep behavior 2020-01-21 18:45:55 +01:00
Bart Sopers 00eb07914f Add test for safety of future fix for reporting correct insulin delivered amount after cancel bolus 2020-01-20 20:43:40 +01:00
Bart Sopers bc06b6b24a Disable instead of remove 'Enable pump unreachable' preference for pumps that have a fixed unreachable warning; make pump unreachable threshold configurable for pumps that have a fixed unreachable warning 2020-01-19 22:27:00 +01:00
Bart Sopers db2c95af46 make preference key non-translatable 2020-01-19 21:48:11 +01:00
Bart Sopers 6f2e39dca7 Remove pump unreachable preferences for pumps that have a fixed unreachable warning 2020-01-19 21:40:37 +01:00
Bart Sopers 9dcb8d5137 Log OmnipodMessages exchanged in OmnipodCommunicationService 2020-01-19 18:52:33 +01:00
Milos Kozak 8414c51493
Merge pull request #2376 from quizzmaster/dev
fix danar history layout
2020-01-17 21:10:37 +01:00
Milos Kozak 177c1e429f
Merge pull request #2377 from quizzmaster/fix_bolusdialog
BolusProgressDialog not cancelable
2020-01-17 21:09:57 +01:00
Sebastian Lenz 4521434f4e BolusProgressDialog not cancelable 2020-01-17 17:22:49 +01:00
Sebastian Lenz b264e480be fix danar history layout 2020-01-17 00:20:36 +01:00
Johannes Mockenhaupt a1c7aae794
Refactor: dedup, method abstraction level. 2020-01-16 20:39:25 +01:00
Johannes Mockenhaupt 8f02459849
#2369 Set event time for second event plus 1s too 2020-01-16 15:46:53 +01:00
Milos Kozak 6e38f52c7d
Merge pull request #2371 from quizzmaster/dev
Fix scaling of the activity graph
2020-01-16 13:40:12 +01:00
Sebastian Lenz ef4903253d Fix scaling of the activity graph 2020-01-16 12:45:55 +01:00
Milos Kozak 31edddc5cf removed icon in bolusprogress dialog 2020-01-15 22:53:40 +01:00
Milos Kozak b1a376e68a Fix displying OAPS Offline intervals 2020-01-15 22:42:42 +01:00
Milos Kozak 7607185086 show duration of careportal events 2020-01-15 21:55:53 +01:00
Milos Kozak ab51cb4d01 Merge branch 'dev' into dagger3 2020-01-15 20:47:08 +01:00
Milos Kozak 1e3c979b51 PhoneChecker 2020-01-15 19:56:57 +01:00
Milos Kozak 8c02daf39d Fix NPE 2020-01-15 11:18:25 +01:00
Milos Kozak d0fb2fd0e9 overview layout improvements 2020-01-14 16:15:43 +01:00
Milos Kozak 344c77ef53 Merge branch 'dev' into dagger3 2020-01-14 13:50:29 +01:00
Milos Kozak 230ef4e988 fix tests 2020-01-14 11:44:28 +01:00
Milos Kozak dd37ec9bb9 apply only for non faking EB 2020-01-14 09:09:22 +01:00
Milos Kozak a5d153c035
Merge pull request #2359 from MilosKozak/dagger3-stacktracelogger
add caller to log output
2020-01-14 00:04:58 +01:00
Milos Kozak d0391147e4 Fix NSClient crash 2020-01-13 23:57:37 +01:00