Commit graph

8296 commits

Author SHA1 Message Date
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
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
Milos Kozak a859776b84
Merge pull request #2384 from PoweRGbg/patch-3
Allows selecting 12:00AM (#2831)
2020-01-24 09:21:11 +01:00
Roumen Georgiev cd0697fdbd
Allows selecting 12:00AM (#2831) 2020-01-22 14:11:20 +02: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
Milos Kozak 598ae5517c After merge fix 2020-01-13 23:34:29 +01:00
Milos Kozak 9fd71ea538 Merge branch 'dev' into dagger3 2020-01-13 23:28:53 +01:00
Milos Kozak 94dd843825 Allow EB in open loop mode 2020-01-13 22:16:13 +01:00
Milos Kozak 6e40c2ebc6 Add Careportal plugin in NSCLIENT mode only) 2020-01-13 21:06:07 +01:00
Milos Kozak ef238253f9 Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev 2020-01-13 20:25:43 +01:00
Milos Kozak dec6dcf63d Small layout improvements 2020-01-13 20:18:31 +01:00
Milos Kozak 23de3b0a3b Note & Exercise to actions 2020-01-13 19:38:10 +01:00
AdrianLxM 1851ab4084 wrap legacy static logger 2020-01-13 19:22:28 +01:00
AdrianLxM 16836ce535 omit package name while logging 2020-01-13 18:31:11 +01:00
AdrianLxM 70c83c17e0 add caller to log output 2020-01-13 17:47:45 +01:00
Milos Kozak faaa659b3d Dana drivers refactor 2020-01-12 23:43:44 +01:00
Milos Kozak 6bc2d9eef5 DanaRv2.comm 2020-01-11 16:26:34 +01:00
Milos Kozak 248ab8bc76 RS packet tests 2020-01-11 15:43:27 +01:00
Milos Kozak cb12967b17 Insulin tests 2020-01-11 15:19:46 +01:00
Milos Kozak 65ec024751 GimpPluginTest 2020-01-11 15:04:26 +01:00
Milos Kozak d213c512fd
Merge pull request #2355 from MilosKozak/dagger3-0111a
Dagger3 0111a
2020-01-11 14:58:00 +01:00
Milos Kozak 1c2036d1a3
Merge branch 'dagger3' into dagger3-0111a 2020-01-11 14:50:52 +01:00
AdrianLxM cde7b44606 test with AndroidInjector 2020-01-11 12:40:11 +01:00