Johannes Mockenhaupt
|
1e0b7d331a
|
Fix finding BG in graph for treatments before the first displayed BG.
(cherry picked from commit 8bdafe3)
|
2018-05-05 19:13:38 +02:00 |
|
|
AdrianLxM
|
260e259fb0
|
Update strings.xml
|
2018-05-05 15:17:03 +02:00 |
|
|
AdrianLxM
|
d574c70471
|
Merge pull request #1011 from Heiner1/dev-strings
Dev strings
|
2018-05-05 10:12:20 +02:00 |
|
|
AdrianLxM
|
4738c7ece9
|
Merge pull request #1012 from swissalpine/patch-1
Eliminate syntax error
|
2018-05-05 10:10:17 +02:00 |
|
|
swissalpine
|
fb04250c90
|
Elliminat syntax error
|
2018-05-05 10:00:30 +02:00 |
|
|
Heiner1
|
3a0c34e7b6
|
Update strings.xml
|
2018-05-05 09:45:10 +02:00 |
|
|
Heiner1
|
dc72506cdc
|
Merge pull request #2 from MilosKozak/dev
Dev
|
2018-05-05 09:33:49 +02:00 |
|
|
AdrianLxM
|
499edd7c05
|
swedish update
|
2018-05-05 09:20:29 +02:00 |
|
|
Milos Kozak
|
1b0af11ff5
|
Merge pull request #1008 from RadoslavR/patch-56
Update strings.xml
|
2018-05-05 00:19:30 +02:00 |
|
|
Radoslav Radev
|
9aeb2b6ede
|
Update strings.xml
|
2018-05-04 23:51:08 +03:00 |
|
|
Markus M. May
|
e07aecd62d
|
Further translations
|
2018-05-04 22:02:32 +02:00 |
|
|
AdrianLxM
|
49a621066d
|
Merge pull request #1005 from jotomo/combo-visual-glitch
Combo: Fix visual glitch in fragment.
|
2018-05-04 21:38:10 +02:00 |
|
|
Johannes Mockenhaupt
|
d15ada5cd9
|
Combo: Fix visual glitch in fragment.
|
2018-05-04 21:27:54 +02:00 |
|
|
AdrianLxM
|
1646420c47
|
base basal -> Basal Base (was Base Temporal)
|
2018-05-04 20:17:55 +02:00 |
|
|
AdrianLxM
|
714eca483e
|
revert gradle to dev
|
2018-05-04 20:16:12 +02:00 |
|
|
pedroll
|
5ff86e9c34
|
Spanish translation
|
2018-05-04 19:54:21 +02:00 |
|
|
AdrianLxM
|
7190bccf20
|
release candidate 3
|
2018-05-04 19:24:05 +02:00 |
|
|
AdrianLxM
|
93c3a3d624
|
Merge branch 'dev' into aaps20_rc3
|
2018-05-04 19:21:39 +02:00 |
|
|
AdrianLxM
|
f511b9ed39
|
Merge pull request #1000 from MilosKozak/bolusprogress-dismiss
IDEA: dismiss bolus progress dialog when Queue is empty
|
2018-05-04 19:03:11 +02:00 |
|
|
Milos Kozak
|
57973d4d3a
|
Merge pull request #1001 from jotomo/carbs-gen-refactor
Extract and deduplicate eCarbs generation
|
2018-05-04 16:10:23 +02:00 |
|
|
Milos Kozak
|
61e6404bbe
|
Merge pull request #995 from MilosKozak/wear-wizard
Wear eCarbs
|
2018-05-04 14:33:55 +02:00 |
|
|
Johannes Mockenhaupt
|
35a6bbb6a7
|
Set CareportalEvent.MEALBOLUS for eCarbs.
|
2018-05-04 14:22:43 +02:00 |
|
|
Johannes Mockenhaupt
|
43cc3c4908
|
Extract CarbsGenerator class.
|
2018-05-04 14:18:55 +02:00 |
|
|
Milos Kozak
|
963f1e1abf
|
Merge branch 'dev' into startupwizard
|
2018-05-04 13:26:40 +02:00 |
|
|
Milos Kozak
|
ea063cd1f1
|
Merge pull request #997 from swissalpine/transparent-deviations
Make deviation bars transparent
|
2018-05-04 13:25:58 +02:00 |
|
|
swissalpine
|
10b67a0c11
|
Update GraphData.java
|
2018-05-04 12:31:11 +02:00 |
|
|
swissalpine
|
7312bf061a
|
Update colors.xml
|
2018-05-04 12:30:28 +02:00 |
|
|
AdrianLxM
|
5c8e99b191
|
dismiss bolus progress dialog when Queue is empty
|
2018-05-04 12:24:37 +02:00 |
|
|
Milos Kozak
|
91f3db782d
|
SWButton rename option to text
|
2018-05-04 10:20:22 +02:00 |
|
|
Milos Kozak
|
55661ca7a0
|
SWButton
|
2018-05-04 10:17:50 +02:00 |
|
|
swissalpine
|
010a2f3fd8
|
Make deviation bars transparent
|
2018-05-04 10:04:45 +02:00 |
|
|
Milos Kozak
|
88d964f135
|
SW reuse save, cleanup
|
2018-05-04 09:35:57 +02:00 |
|
|
Milos Kozak
|
f7532b31be
|
Merge pull request #996 from RadoslavR/patch-55
half of the Bulgarian translation
|
2018-05-03 23:12:59 +02:00 |
|
|
AdrianLxM
|
c34cc73b1e
|
fix wear wizard
|
2018-05-03 23:08:16 +02:00 |
|
|
Radoslav Radev
|
52411f7afe
|
half of the Bulgarian translation
|
2018-05-03 23:34:50 +03:00 |
|
|
AdrianLxM
|
8d6997f519
|
ecarb ignore 0 carbs
|
2018-05-03 22:08:54 +02:00 |
|
|
AdrianLxM
|
fb75346bcd
|
ecarb make settings consistent
|
2018-05-03 22:08:50 +02:00 |
|
|
AdrianLxM
|
61f07da1a2
|
ecarb doECarb
|
2018-05-03 22:08:43 +02:00 |
|
|
AdrianLxM
|
b05b300faf
|
ecarb duration format
|
2018-05-03 22:08:35 +02:00 |
|
|
AdrianLxM
|
c69a541b75
|
ecarb ash first response
|
2018-05-03 22:08:27 +02:00 |
|
|
AdrianLxM
|
f2168ff36b
|
ecarb hang in activity again
|
2018-05-03 22:08:19 +02:00 |
|
|
AdrianLxM
|
76277d11ad
|
ecarb hang in activity
|
2018-05-03 22:08:11 +02:00 |
|
|
AdrianLxM
|
71db7b60c9
|
ecarb first activity
|
2018-05-03 22:08:02 +02:00 |
|
|
Milos Kozak
|
4539756455
|
Merge branch 'startupwizard' of https://github.com/MilosKozak/AndroidAPS into startupwizard
|
2018-05-03 22:02:12 +02:00 |
|
|
Milos Kozak
|
dea5ff0080
|
styles cleanup
|
2018-05-03 22:01:59 +02:00 |
|
|
Milos Kozak
|
d1958a3e2d
|
Merge branch 'dev' into startupwizard
|
2018-05-03 21:31:55 +02:00 |
|
|
Milos Kozak
|
02590ddd72
|
SW remove unneeded code
|
2018-05-03 21:29:34 +02:00 |
|
|
Milos Kozak
|
52bca03601
|
Merge pull request #993 from McHoffi/McHoffi-typo-fix
Typo fix
|
2018-05-03 21:23:12 +02:00 |
|
|
McHoffi
|
28d03c85a7
|
Merge pull request #1 from McHoffi/McHoffi-typo-fix
Typo fix
|
2018-05-03 21:21:05 +02:00 |
|
|
McHoffi
|
39e9448c67
|
Typo fix
|
2018-05-03 21:20:54 +02:00 |
|