2816 commits

Author	SHA1	Message	Date
Johannes Mockenhaupt	bf25af8c42	Merge remote-tracking branch 'origin/dev' into combo-scripter-v2 ... * origin/dev: Check activity != null before drawing graph.	2018-01-03 21:18:12 +01:00
Johannes Mockenhaupt	f09d68ad59	Check activity != null before drawing graph.	2018-01-03 20:58:49 +01:00
Johannes Mockenhaupt	abdad220f6	Merge remote-tracking branch 'origin/dev' into combo-scripter-v2 ... * origin/dev: improve GUI response narrower temp basal line for steampunk watchface darker and gracile steampunk-chart Steampunk: Enabled chart zoom with double-tap on bottom 1/3 of screen - xml files. Steampunk: Enabled chart zoom with double-tap on bottom 1/3 of screen. move steampunk md to main dir Addition of a file linking to the location of the Steampunk source photoshop file. File is not included in the repository as it exceeds Github's 25 mb limit. Steampunk watch face - improvement of the units switching functionality (less time spent on "?" on glucose dial). Steampunk watch face - unit testing complete. Steampunk watchface: Updated graphics for more accuracy / brighter background, enabled double-tap, corrected issue when changing from mg/dL to mmol/L (glucose would show as "low"). Steampunk watchface (moto360 support - ignores the chin) Steampunk watchface (mmol support) Includes delta granularity in the watch preferences. Steampunk watchface (interim commit) Steampunk watch face addition of mmol/L drawable Steampunk watch face layout changes Steampunk watch face (for testing) Steampunk watch face (not yet functional) Steampunk watch face (not yet functional)	2018-01-03 20:16:50 +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
Johannes Mockenhaupt	fd8f2c0801	Clean up unintended diversions from upstream.	2018-01-03 19:07:10 +01:00
Johannes Mockenhaupt	53a8cd4eac	Merge remote-tracking branch 'origin/dev' into combo-scripter-v2 ... * origin/dev: missing file illegalState crash fix combo-bolus-fix	2018-01-03 18:28:17 +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
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
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
AdrianLxM	1bbd9012cb	Merge pull request #37 from jotomo/the-clock-strikes-midnight ... Correctly infer pump date when crossing midnight. Fixes #35.	2018-01-02 13:28:30 +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
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	cbf005a11e	Merge remote-tracking branch 'origin/dev' into combo-scripter-v2 ... * origin/dev: another cob fix	2018-01-01 15:07:34 +01:00
Milos Kozak	d2753e0dad	another cob fix	2018-01-01 14:38:37 +01:00
Johannes Mockenhaupt	1617d6698d	Update ComboPlugin for updated ContstraintsInterface.	2018-01-01 13:26:16 +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
AdrianLxM	3bfffdb1b0	brackets on string format	2018-01-01 01:23:30 +01:00
AdrianLxM	4a01b14b35	missing file	2017-12-31 16:51:44 +01:00
AdrianLxM	e190f1b9ef	illegalState crash fix	2017-12-31 16:44:13 +01:00
Milos Kozak	d27d1b1821	Objectives update	2017-12-31 12:24:51 +01:00
Johannes Mockenhaupt	8ee95077a8	Merge remote-tracking branch 'origin/dev' into combo-scripter-v2 ... * origin/dev: fix objective 1 upload aps status and iob when loop is suspended fully offline CP Queue: synchronize creating queue thread to avoid multiple threads. Wear: No guard for RS	2017-12-31 11:41:41 +01:00
Milos Kozak	458d812e2e	fix objective 1	2017-12-31 11:07:21 +01:00
Milos Kozak	fcbe8555a6	upload aps status and iob when loop is suspended	2017-12-31 10:22:18 +01:00
AdrianLxM	d3127bc97b	Merge pull request #571 from MilosKozak/offline-treatments ... fully offline CP	2017-12-31 09:52:29 +01:00
AdrianLxM	3a7fe56f64	combo-bolus-fix	2017-12-31 09:50:51 +01:00
Milos Kozak	7b0a4d2ce7	Merge pull request #570 from jotomo/queue-starts ... Queue: synchronize creating queue thread to avoid multiple threads.	2017-12-31 09:27:27 +01:00
Johannes Mockenhaupt	a6b938d98a	Correctly infer pump date when crossing midnight. Fixes #35. ... (cherry picked from commit bda2551)	2017-12-31 00:27:41 +01:00
AdrianLxM	937872e80c	fully offline CP	2017-12-30 23:01:25 +01:00
AdrianLxM	fb2271e758	Merge pull request #568 from MilosKozak/AdrianLxM-patch-3 ... Wear: No guard for RS	2017-12-30 22:20:37 +01:00
Johannes Mockenhaupt	99f3fb6216	Merge remote-tracking branch 'origin/dev' into combo-scripter-v2 ... * origin/dev: autofix error in profile	2017-12-30 19:59:39 +01:00
Johannes Mockenhaupt	58d5c25703	Merge remote-tracking branch 'origin/dev' into combo-scripter-v2 ... * origin/dev: missing cob fix missing inheritance	2017-12-30 19:57:53 +01:00
Milos Kozak	f3db104979	autofix error in profile	2017-12-30 19:56:37 +01:00
Johannes Mockenhaupt	5ecc0ea430	Fix crash in Combo fragment when accessing resoures.	2017-12-30 19:53:22 +01:00
Milos Kozak	8c213cbc11	missing cob fix	2017-12-30 19:42:07 +01:00
Milos Kozak	b39fe2ee5e	Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev	2017-12-30 16:25:18 +01:00
Milos Kozak	cc50a6fb99	missing inheritance	2017-12-30 16:25:08 +01:00
Johannes Mockenhaupt	f658da42a7	Abort bolusing when reading initial state fails. ... Otherwise request time is zero and and any old bolus will be regarded as the last bolus delivered when recovery kicks in. Also add a safety check to not count a bolus bigger than the requested bolus as a partially delivered bolus.	2017-12-30 15:51:26 +01:00
Johannes Mockenhaupt	facdc51f6f	Queue: synchronize creating queue thread to avoid multiple threads.	2017-12-29 16:36:19 +01:00