3425 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Johannes Mockenhaupt	2e0d052209	Merge remote-tracking branch 'MasterPlexus/combo-scripter-v2' into combo-scripter-v2 ... * MasterPlexus/combo-scripter-v2: Update Readme-Combo.md	2018-01-13 23:23:08 +01:00
Johannes Mockenhaupt	d54b99c559	Merge remote-tracking branch 'origin/dev' into combo-scripter-v2 ... * origin/dev: Cleanup gradle build files Add null check in ConfigBuildPlugin.getTempBasalFromHistory. Avoid race condition checking for an active TBR. Steampunk watch face: Chart readability improvement; point size increases when chert is highly zoomed in (less than 3 hours shown). # Conflicts: # app/build.gradle	2018-01-13 23:18:44 +01:00
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
MasterPlexus	8cd3e3ec9f	Update Readme-Combo.md ... Add recommendation for ruffy to put screen rotation off,and an additional way for possible pairing.	2018-01-12 21:36:14 +01:00
Johannes Mockenhaupt	7d4d6374be	Merge branch 'combo-strings' into combo-scripter-v2 ... * combo-strings: Add strings for the Combo pump, including some renames. # Conflicts: # app/src/main/res/values/strings.xml	2018-01-11 21:48:01 +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
Johannes Mockenhaupt	61174d1b0a	Merge remote-tracking branch 'origin/dev' into combo-scripter-v2 ... * origin/dev: Update build.gradle update badge more round tests coverage	2018-01-11 17:50:07 +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
Johannes Mockenhaupt	864a5e6d81	Missing string resources (en/de).	2018-01-10 23:41:56 +01:00
Simon Pauwels	0ffc61a1ba	Added dutch combo translations (#42) ... * Added and improved Dutch translations * typo fix * double string removal * Typo fix * added translations * Update strings.xml * Added Dutch combo translations	2018-01-10 23:36:20 +01:00
Johannes Mockenhaupt	cc86330f1b	Merge pull request #43 from swissalpine/patch-4 ... Übersetzungen RUN und STOP MODE	2018-01-10 23:35:15 +01:00
Milos Kozak	a430a7d70d	coverage	2018-01-10 23:31:31 +01:00
swissalpine	8f91f37f73	Übersetzungen RUN und STOP MODE	2018-01-10 23:24:49 +01:00
Johannes Mockenhaupt	27dcb40f48	Add null check in ConfigBuildPlugin.getTempBasalFromHistory.	2018-01-10 22:44:18 +01:00
Johannes Mockenhaupt	b4998feee1	Disable reading reservoir level units.	2018-01-10 15:05:17 +01:00
Johannes Mockenhaupt	9ece407f32	Integrate dutch translation with Combo changes. ... The lesson to learn here: don't rename string resources in a long- running branch, but do it after the merge. Note that Multiwave is a Combo-specific term, the more general term to describe the combination of a bolus and an extended bolus is combo bolus, ironically and confusingly ;-)	2018-01-10 11:37:42 +01:00
Johannes Mockenhaupt	0c0a58f16b	Merge remote-tracking branch 'origin/dev' into combo-scripter-v2 ... * origin/dev: typo and added dutch translations	2018-01-10 11:20:15 +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
Johannes Mockenhaupt	9a74b0fb95	Merge remote-tracking branch 'origin/dev' into combo-scripter-v2 ... * origin/dev: fix canceling temp in open loop mode. credits to @warstar2187 prevent basal updated messages on virtual pump added BolusWizardTest prefill profile switch JSON from local store if not exists PARTIAL_WAKE_LOCK for NSClientService	2018-01-09 20:59: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
Johannes Mockenhaupt	ad3ef00645	Merge pull request #41 from savek-cc/patch-1 ... Update README-Combo.md	2018-01-08 23:45:17 +01:00
Savek-CC	ba8dd8c3c6	Update README-Combo.md ... Android 8.1 is also supported	2018-01-08 21:20:04 +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
Johannes Mockenhaupt	22c774830c	README-Combo: add note on Quick info.	2018-01-07 21:26:40 +01:00
Milos Kozak	1ff99c4814	prefill profile switch JSON from local store if not exists	2018-01-07 15:29:50 +01:00
Johannes Mockenhaupt	968431d931	i18n reservoir unit.	2018-01-07 13:02:50 +01:00
Milos Kozak	ab89e16acd	PARTIAL_WAKE_LOCK for NSClientService	2018-01-07 12:09:23 +01:00
Johannes Mockenhaupt	d72c243140	Merge remote-tracking branch 'origin/dev' into combo-scripter-v2 ... * origin/dev: check 30min interval only for basal rates	2018-01-07 11:38:51 +01:00
Johannes Mockenhaupt	117b79619b	Check reservoir level before bolus and abort if not enough left.	2018-01-07 11:27:28 +01:00
Johannes Mockenhaupt	836abd74ab	Read reservoir level.	2018-01-07 11:21:56 +01:00
Milos Kozak	8cf69006b2	check 30min interval only for basal rates	2018-01-07 11:13:02 +01:00
Johannes Mockenhaupt	3369d84de8	Merge remote-tracking branch 'origin/dev' into combo-scripter-v2 ... * origin/dev: basal updated notification Dialogs usability tweaks	2018-01-06 16:27: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