Commit graph

2546 commits

Author SHA1 Message Date
Milos Kozak
fdbd2a2cb1
Merge pull request #596 from jotomo/tbr-active-check-race-condition
Avoid race condition checking for an active TBR.
2018-01-13 22:43:41 +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
Milos Kozak
f8ff076c59
Merge pull request #602 from triplem/pr_gradle
Cleanup gradle build files
2018-01-13 22:29:08 +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
3fc3a61c37
Merge pull request #587 from andrew-warrington/watchfaces
Steampunk watch face: Chart readability improvement
2018-01-11 20:19:37 +01:00
Andrew Warrington
3495ef129a Merge remote-tracking branch 'origin/dev' into watchfaces 2018-01-11 19:42:50 +01:00
AdrianLxM
6d60a5e195
Merge pull request #600 from MilosKozak/AdrianLxM-patch-1
Ignore Extra translations (on dev branch)
2018-01-11 14:57:56 +01:00
AdrianLxM
51ca0e0d12
Update build.gradle 2018-01-11 14:14:53 +01:00
Milos Kozak
92642c5d0c update badge 2018-01-11 10:01:33 +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
Johannes Mockenhaupt
27dcb40f48
Add null check in ConfigBuildPlugin.getTempBasalFromHistory. 2018-01-10 22:44:18 +01:00
Milos Kozak
bae9eefc4c
Merge pull request #593 from boysim/dev
typo fixes and added dutch translations
2018-01-10 11:18:55 +01:00
Johannes Mockenhaupt
06d949cd82
Avoid race condition checking for an active TBR. 2018-01-10 10:48:44 +01:00
Simon Pauwels
2df19b85a5
typo and added dutch translations 2018-01-09 21:16:37 +01:00
Simon Pauwels
0cc97388f5
Merge pull request #16 from MilosKozak/dev
Dev 9/01/18
2018-01-09 20:34:05 +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
d7dfe8942e prevent basal updated messages on virtual pump 2018-01-08 14:27:27 +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
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
Andrew Warrington
13ad74f77b Steampunk watch face: Chart readability improvement; point size increases when chert is highly zoomed in (less than 3 hours shown). 2018-01-06 14:21:31 +01:00
AdrianLxM
6c53fd11e9
Merge pull request #586 from MilosKozak/basalupdate-notif
basal updated notification
2018-01-06 09:10:00 +01:00
AdrianLxM
5089947bc1
Merge pull request #585 from MilosKozak/dialog-usability
Dialog usability tweaks
2018-01-06 09:09:29 +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
AdrianLxM
c939a35810
Merge pull request #582 from MilosKozak/watchfaces-steampunk
actual bg in objective 1
2018-01-06 00:15:55 +01:00
AdrianLxM
2c7b34e434
Merge pull request #583 from andrew-warrington/watchfaces
Cockpit watch face: Double-tap opens MainMenuActivity
2018-01-05 12:24:47 +01:00
Andrew Warrington
02e7752c3e Cockpit watch face: Double-tap opens MainMenuActivity 2018-01-05 11:58:57 +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
AdrianLxM
41fb92815b request new data on preference change 2018-01-04 12:22:08 +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
de1475dbba remove logging 2018-01-03 22:28:48 +01:00
Milos Kozak
cb1df61d88
Merge pull request #579 from jotomo/activity-npe-guard
Activity NPE guard
2018-01-03 21:17:01 +01:00
Johannes Mockenhaupt
f09d68ad59
Check activity != null before drawing graph. 2018-01-03 20:58:49 +01:00
AdrianLxM
0b76290091
Merge pull request #578 from andrew-warrington/watchfaces
Steampunk watch face
2018-01-03 19:58:40 +01:00
Milos Kozak
094737adde improve GUI response 2018-01-03 19:59:18 +01:00
Andrew Warrington
96c41881fd
Merge pull request #17 from AdrianLxM/watchfaces-steampunk
darker and gracile steampunk-chart
2018-01-03 19:50:13 +01:00