3310 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
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	1e602ef4ba	domain links	2018-01-02 13:40:37 +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
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
AdrianLxM	143e0b6973	Merge pull request #576 from swissalpine/patch-1 ... Revised German Translation	2018-01-01 15:37:06 +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
Johannes Mockenhaupt	2cee957fbf	Merge pull request #38 from jotomo/AdrianLxM-patch-1 ... brackets on string format	2018-01-01 02:20:33 +01:00
AdrianLxM	3bfffdb1b0	brackets on string format	2018-01-01 01:23:30 +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
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	220554dbd6	Add sluggishness/unresponsiveness to known issues. ... (cherry picked from commit ea891a4)	2017-12-30 20:06:29 +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	790d5f21e1	README: Add note on not using ruffy in parallel with AAPS.	2017-12-30 11:21:38 +01:00
Johannes Mockenhaupt	facdc51f6f	Queue: synchronize creating queue thread to avoid multiple threads.	2017-12-29 16:36:19 +01:00
Johannes Mockenhaupt	d0f876659e	Merge remote-tracking branch 'origin/dev' into combo-scripter-v2 ... * origin/dev: Ensure basal rate shown as a percentage if required according to user preferences. Show watch basal rates, whether temporary or normal.	2017-12-28 00:15:05 +01:00
AdrianLxM	bd4e51e1f9	Merge pull request #546 from andrew-warrington/dev ... Always show basal rates on watch, whether temporary or normal.	2017-12-27 23:17:52 +01:00
AdrianLxM	774203605f	Wear: No guard for RS	2017-12-27 21:19:57 +01:00
Johannes Mockenhaupt	f970e5e20e	Minor cleanups.	2017-12-27 21:16:03 +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
Milos Kozak	259c7abffd	Merge pull request #567 from MilosKozak/AdrianLxM-patch-2 ... wear update	2017-12-27 16:31:24 +01:00
Milos Kozak	b25e403215	Merge pull request #566 from MilosKozak/rs-create-bond ... RS create bond	2017-12-27 15:01:33 +01:00
AdrianLxM	9387665df9	wear update	2017-12-27 14:57:54 +01:00
Johannes Mockenhaupt	ee1236c4e4	ComboPlugin: assume valid BR unless proven otherwise. ... (cherry picked from commit bc93a4b)	2017-12-27 13:04:35 +01:00
Johannes Mockenhaupt	75cb44339c	Merge pull request #32 from jotomo/pump-basal-rate-sanity-and-german-translation ... Pump basal rate sanity and german translation	2017-12-27 12:50:40 +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	8089825c4c	SetBasalProfileCommand: abort if active BR is != 1.	2017-12-27 12:28:01 +01:00
Johannes Mockenhaupt	728abbe224	Clean up strings.xml, finish German translation.	2017-12-27 12:28:01 +01:00