Andrew Warrington
96c41881fd
Merge pull request #17 from AdrianLxM/watchfaces-steampunk
...
darker and gracile steampunk-chart
2018-01-03 19:50:13 +01:00
Johannes Mockenhaupt
fd8f2c0801
Clean up unintended diversions from upstream.
2018-01-03 19:07:10 +01:00
AdrianLxM
5270f2cc69
narrower temp basal line for steampunk watchface
2018-01-03 18:58:02 +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
AdrianLxM
a75ff0d1f6
darker and gracile steampunk-chart
2018-01-03 18:13:38 +01:00
Johannes Mockenhaupt
7afb557b76
Note on DST changes.
2018-01-03 17:13:57 +01:00
Johannes Mockenhaupt
c125e9265f
Strings: TDD.
2018-01-03 16:57:56 +01:00
Andrew Warrington
267bdd6a43
Steampunk: Enabled chart zoom with double-tap on bottom 1/3 of screen - xml files.
2018-01-03 16:33:39 +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
Andrew Warrington
512341e603
Steampunk: Enabled chart zoom with double-tap on bottom 1/3 of screen.
2018-01-03 15:24:06 +01:00
Andrew Warrington
7c73a72c66
Merge pull request #16 from AdrianLxM/watchfaces-steampunk
...
fix build issues and updates from upstream
2018-01-03 14:16:08 +01:00
AdrianLxM
99f0bbb478
move steampunk md to main dir
2018-01-03 14:00:57 +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
Johannes Mockenhaupt
bcb94eb161
Merge pull request #40 from swissalpine/patch-3
...
Delete unnecessary translated strings, replace Historik with Historie
2018-01-03 13:07:01 +01:00
Andrew Warrington
7ac413553b
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.
2018-01-03 10:58:10 +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
Andrew Warrington
37f262efdc
Steampunk watch face - unit testing complete.
2018-01-03 01:18:13 +01:00
Andrew Warrington
7b0cc80369
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").
2018-01-02 15:11:59 +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
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
5609fbf738
Steampunk watchface (moto360 support - ignores the chin)
2018-01-02 00:30: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
AdrianLxM
143e0b6973
Merge pull request #576 from swissalpine/patch-1
...
Revised German Translation
2018-01-01 15:37:06 +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
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
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
