Milos Kozak
|
12fe8bcfdd
|
Merge branch 'dev' into smb060
|
2018-01-13 22:50:41 +01:00 |
|
Milos Kozak
|
24909bf59c
|
Merge branch 'smb060' of https://gitlab.com/MilosKozak/AndroidAPS into smb060
|
2018-01-13 22:50:10 +01:00 |
|
Milos Kozak
|
390cef5174
|
remainingCATime fix
|
2018-01-13 22:49:58 +01:00 |
|
Milos Kozak
|
4f9df99ffb
|
Merge pull request #601 from jotomo/combo-strings
Add strings for the Combo pump, including some renames.
|
2018-01-13 22:29:46 +01:00 |
|
Markus M. May
|
f5cc2debd7
|
Cleanup gradle build files
|
2018-01-13 21:34:38 +01:00 |
|
Johannes Mockenhaupt
|
be8534db51
|
Add strings for the Combo pump, including some renames.
Some virtualpump_* strings have been renamed to pump_* since they're
now used for multiple pumps.
|
2018-01-11 21:47:30 +01:00 |
|
AdrianLxM
|
51ca0e0d12
|
Update build.gradle
|
2018-01-11 14:14:53 +01:00 |
|
Milos Kozak
|
1d5d44e008
|
Merge pull request #598 from MilosKozak/coverage
Coverage
|
2018-01-11 00:09:07 +01:00 |
|
Milos Kozak
|
99eef3b19a
|
more round tests
|
2018-01-10 23:57:02 +01:00 |
|
Milos Kozak
|
a430a7d70d
|
coverage
|
2018-01-10 23:31:31 +01:00 |
|
Simon Pauwels
|
2df19b85a5
|
typo and added dutch translations
|
2018-01-09 21:16:37 +01:00 |
|
Milos Kozak
|
70e22487b2
|
fix canceling temp in open loop mode. credits to @warstar2187
|
2018-01-09 19:47:32 +01:00 |
|
Milos Kozak
|
1ce6f32c39
|
Merge branch 'dev' into smb060
|
2018-01-09 19:45:45 +01:00 |
|
Milos Kozak
|
bdd1a85d26
|
fix canceling temp in open loop mode. credits to @warstar2187
|
2018-01-09 19:44:42 +01:00 |
|
Milos Kozak
|
7e625918ac
|
Merge branch 'dev' into smb060
|
2018-01-08 14:27:39 +01:00 |
|
Milos Kozak
|
d7dfe8942e
|
prevent basal updated messages on virtual pump
|
2018-01-08 14:27:27 +01:00 |
|
Milos Kozak
|
144315ba61
|
pass enableSMB_always to determinebasal
|
2018-01-08 14:19:21 +01:00 |
|
Milos Kozak
|
db3369865a
|
Merge branch 'dev' into smb060
|
2018-01-08 14:09:23 +01:00 |
|
Milos Kozak
|
6ebd6bcdc0
|
Merge branch 'nsc' into dev
|
2018-01-08 14:09:02 +01:00 |
|
Milos Kozak
|
b31504ac83
|
Merge pull request #590 from kuchjir/BolusWizard_fix_for_bg_bellow_targetBGLow
added BolusWizardTest
|
2018-01-07 22:58:22 +01:00 |
|
kuchjir
|
e5b21ccc3e
|
added BolusWizardTest
|
2018-01-07 22:16:08 +01:00 |
|
Milos Kozak
|
fbb120673f
|
Merge branch 'dev' into smb060
|
2018-01-07 15:32:14 +01:00 |
|
Milos Kozak
|
1ff99c4814
|
prefill profile switch JSON from local store if not exists
|
2018-01-07 15:29:50 +01:00 |
|
Milos Kozak
|
ab89e16acd
|
PARTIAL_WAKE_LOCK for NSClientService
|
2018-01-07 12:09:23 +01:00 |
|
Milos Kozak
|
8cf69006b2
|
check 30min interval only for basal rates
|
2018-01-07 11:13:02 +01:00 |
|
AdrianLxM
|
6c53fd11e9
|
Merge pull request #586 from MilosKozak/basalupdate-notif
basal updated notification
|
2018-01-06 09:10:00 +01:00 |
|
AdrianLxM
|
4dd238097f
|
basal updated notification
|
2018-01-06 07:37:39 +01:00 |
|
AdrianLxM
|
b9ad3a71fd
|
Dialogs usability tweaks
|
2018-01-06 06:52:30 +01:00 |
|
Milos Kozak
|
144292576a
|
Merge branch 'dev' into watchfaces-steampunk
|
2018-01-05 11:36:48 +01:00 |
|
Milos Kozak
|
aff0e6f5a8
|
Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev
|
2018-01-04 23:12:40 +01:00 |
|
Milos Kozak
|
b7df21c7d0
|
prevent processing incomplete profiles
|
2018-01-04 23:12:35 +01:00 |
|
Milos Kozak
|
955ecc6d64
|
set defaults for display range
|
2018-01-04 21:33:18 +01:00 |
|
AdrianLxM
|
95bca1a92d
|
actual bg in objective 1
|
2018-01-04 18:53:38 +01:00 |
|
AdrianLxM
|
468426bd31
|
Merge pull request #581 from MilosKozak/watchfaces-steampunk
request new data on preference change
|
2018-01-04 17:41:30 +01:00 |
|
AdrianLxM
|
c3d14b506d
|
allow old data on the wf
|
2018-01-04 16:20:49 +01:00 |
|
Milos Kozak
|
d7200d1e8e
|
warn if wrong profile is detected
|
2018-01-04 11:06:57 +01:00 |
|
Milos Kozak
|
4643cdc3b9
|
accept local NS data broadcast even when ns_upload_only is selected
|
2018-01-04 09:45:17 +01:00 |
|
Milos Kozak
|
a08a6cbb70
|
patch SMB determine_basal to not produce error
|
2018-01-03 22:59:26 +01:00 |
|
Milos Kozak
|
ed3f076bd7
|
Merge branch 'dev' into smb060
|
2018-01-03 22:40:34 +01:00 |
|
Milos Kozak
|
de1475dbba
|
remove logging
|
2018-01-03 22:28:48 +01:00 |
|
Milos Kozak
|
230ec7177b
|
Merge branch 'dev' into smb060
|
2018-01-03 21:22:38 +01:00 |
|
Johannes Mockenhaupt
|
f09d68ad59
|
Check activity != null before drawing graph.
|
2018-01-03 20:58:49 +01:00 |
|
Milos Kozak
|
ff5d42522c
|
Merge branch 'dev' into smb060
|
2018-01-03 20:31:36 +01:00 |
|
Milos Kozak
|
094737adde
|
improve GUI response
|
2018-01-03 19:59:18 +01:00 |
|
AdrianLxM
|
0b76290091
|
Merge pull request #578 from andrew-warrington/watchfaces
Steampunk watch face
|
2018-01-03 19:58:40 +01:00 |
|
AdrianLxM
|
e0abd1b816
|
Merge remote-tracking branch 'andrewremote/watchfaces' into watchfaces-steampunk
|
2018-01-03 13:53:38 +01:00 |
|
AdrianLxM
|
28a52b3ab7
|
Merge pull request #574 from MilosKozak/illegalstate-fix
illegalState crash fix
|
2018-01-03 13:45:31 +01:00 |
|
Andrew Warrington
|
8b37826335
|
Steampunk watch face - improvement of the units switching functionality (less time spent on "?" on glucose dial).
|
2018-01-03 10:41:18 +01:00 |
|
Milos Kozak
|
cc1cd675c7
|
Merge pull request #573 from MilosKozak/combo-bolus-fix
combo-bolus-fix
|
2018-01-02 10:05:20 +01:00 |
|
Andrew Warrington
|
7475b1ba3a
|
Merge remote-tracking branch 'origin/dev' into watchfaces
|
2018-01-01 22:36:07 +01:00 |
|