1283 commits

Author	SHA1	Message	Date
Johannes Mockenhaupt	e4ad33659b	Add missing formatters in Dutch translation. ... (cherry picked from commit 90dcc9d)	2018-01-21 12:12:58 +01:00
Johannes Mockenhaupt	20c218ae9a	Merge remote-tracking branch 'origin/dev' into combo-scripter-v2 ... * origin/dev: Overview: move checkboxes before label. fix pump unreachable for virtual pump getLastAutosensData improvement and logging remove readstatus prior every command bump 1.57-dev better log build verison to Fabric # Conflicts: # app/build.gradle	2018-01-19 21:05:37 +01:00
Johannes Mockenhaupt	8109900e9b	Overview: move checkboxes before label. ... (cherry picked from commit 4825e16)	2018-01-19 20:13:53 +01:00
Milos Kozak	91a6c7a96c	Merge branch 'dev' into smb060	2018-01-15 12:46:50 +01:00
Johannes Mockenhaupt	723bcc4ee3	Remove 'queued activities' from ComboFragment. ... (cherry picked from commit 57a4449)	2018-01-15 11:11:58 +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
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
swissalpine	8f91f37f73	Übersetzungen RUN und STOP MODE	2018-01-10 23:24:49 +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
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
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
Johannes Mockenhaupt	117b79619b	Check reservoir level before bolus and abort if not enough left.	2018-01-07 11:27:28 +01:00
Johannes Mockenhaupt	3aafcc9854	Merge remote-tracking branch 'origin/dev' into combo-scripter-v2 ... * origin/dev: Cockpit watch face: Double-tap opens MainMenuActivity prevent processing incomplete profiles set defaults for display range actual bg in objective 1 warn if wrong profile is detected	2018-01-06 00:30:04 +01:00
Milos Kozak	144292576a	Merge branch 'dev' into watchfaces-steampunk	2018-01-05 11:36:48 +01:00
AdrianLxM	95bca1a92d	actual bg in objective 1	2018-01-04 18:53:38 +01:00
Milos Kozak	d7200d1e8e	warn if wrong profile is detected	2018-01-04 11:06:57 +01:00
Milos Kozak	ff5d42522c	Merge branch 'dev' into smb060	2018-01-03 20:31:36 +01:00
Johannes Mockenhaupt	c125e9265f	Strings: TDD.	2018-01-03 16:57:56 +01:00
Johannes Mockenhaupt	2946e2a485	Merge remote-tracking branch 'swissalpine/patch-2' into combo-scripter-v2 ... * swissalpine/patch-2: Update strings.xml # Conflicts: # app/src/main/res/values-de/strings.xml	2018-01-03 16:26:35 +01:00
swissalpine	5fdd88ae75	Shortname: OBJ -> ZIEL	2018-01-03 09:42:49 +01:00
swissalpine	61cc7fc64e	Historie statt Historik ... "Historik" meint "Geschichtswissenschaft" bzw. die "Lehre von der historischen Methode der Geschichtswissenschaft". "Historie" meint das zwar auch, ist aber insgesamt ein wenig weiter gefasst und meint (bildungssprachlich) auch allgemein die Geschichte, nicht nur die Wissenschaft.	2018-01-03 09:38:17 +01:00
swissalpine	fd27e6c9f8	Delete unnecessary / not used translated strings ... In this branch this 4 lines are not used, but indeed in Milos dev branch. This lines make it impossible to compile the app.	2018-01-03 09:16:20 +01:00
Johannes Mockenhaupt	8e659f5f97	A few minor corrections on the German translation.	2018-01-01 19:11:49 +01:00
Johannes Mockenhaupt	eb51e43d70	Remove duplicate strings after merge.	2018-01-01 16:04:35 +01:00
Johannes Mockenhaupt	8eeb8b748c	Merge remote-tracking branch 'origin/dev' into combo-scripter-v2 ... * origin/dev: update German Revised German Translation	2018-01-01 16:02:05 +01:00
AdrianLxM	c8fa729d8d	update German	2018-01-01 15:45:01 +01:00
swissalpine	bccfd66874	Update strings.xml	2018-01-01 15:16:23 +01:00
swissalpine	62da90011a	Revised German Translation	2018-01-01 15:10:38 +01:00
Johannes Mockenhaupt	8fb8182f4f	Merge remote-tracking branch 'origin/dev' into combo-scripter-v2 ... * origin/dev: Objectives update	2018-01-01 13:25:36 +01:00
Milos Kozak	d27d1b1821	Objectives update	2017-12-31 12:24:51 +01:00
Johannes Mockenhaupt	0e61032dec	Merge remote-tracking branch 'origin/dev' into combo-scripter-v2 ... * origin/dev: wear update RS create bond add scrollview QuickWizard detailed settings # Conflicts: # app/src/main/res/values/strings.xml	2017-12-27 18:19:51 +01:00
Johannes Mockenhaupt	3333d7a6b7	Clean up all the basal rate sanity checks. ... * Disable loop entirely if no valid basal rate is set on the pump. Neither closed nor open loop mode makes sense without it. * Check active BR before updating the pump profile * Show 'loop disabled' state in Combo fragement. * Cancel active TBR when basal profile switch to profile != 1 is detected or when an unsupported bolus is active.	2017-12-27 12:49:04 +01:00
Johannes Mockenhaupt	728abbe224	Clean up strings.xml, finish German translation.	2017-12-27 12:28:01 +01:00
Johannes Mockenhaupt	6af28479d6	Disable loop if unsupported basal rate profile is selected. Fixes #31.	2017-12-27 12:28:01 +01:00
Johannes Mockenhaupt	715ffa28d2	Remove empty Combo prefs.	2017-12-27 01:33:42 +01:00
Milos Kozak	0ab259f61f	Merge branch 'dev' into smb060	2017-12-26 01:22:49 +01:00
Milos Kozak	72d6c4494b	add scrollview	2017-12-26 01:22:35 +01:00
Milos Kozak	162e73e64d	Merge branch 'dev' into smb060	2017-12-26 00:35:16 +01:00
Milos Kozak	8fdd16c305	QuickWizard detailed settings	2017-12-26 00:27:34 +01:00
Johannes Mockenhaupt	ea5629fc86	Merge remote-tracking branch 'origin/dev' into csv2-staging ... * origin/dev: fix non smooth ratio graph fix of fix fix wrong button type fix doubled percentage when comming from NS proper select last used profile when using profile percentage limit basal rate to minimal value supported by pump SingleClickButton RS fix crash when pairing is not confirmed on pump Double -> double use joda-time Use autosensdata for wizard instead of APSResult	2017-12-25 20:29:32 +01:00
Milos Kozak	ae30046c95	Merge branch 'dev' into smb060	2017-12-23 11:18:37 +01:00
Milos Kozak	3ce260dfe9	fix of fix	2017-12-23 11:18:17 +01:00
Milos Kozak	51de0f16c1	Merge branch 'dev' into smb060	2017-12-23 11:07:48 +01:00
Milos Kozak	6e09bfbbe4	fix wrong button type	2017-12-23 11:07:29 +01:00