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 |
|
|
Milos Kozak
|
f5a23b2921
|
Merge branch 'dev' into virtual_pump_Bug863
|
2018-05-04 19:18:52 +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 |
|
|
Andy Rozman
|
4fb8e899c2
|
Feature Request/Bug #863
- merged with dev
- extended PumpType with new setting in PumpDescription
- added Insight pump settings for VirtualPump
|
2018-05-04 15:48:46 +01: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 |
|
|
Andy Rozman
|
f2df13dbfb
|
Merge branch 'dev' into virtual_pump_Bug863
|
2018-05-04 10:06:18 +01: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 |
|
|
Milos Kozak
|
83fcc0723e
|
Merge pull request #990 from MilosKozak/wear-wizard
Wear wizard
|
2018-05-03 20:48:24 +02:00 |
|
|
Milos Kozak
|
cc532b9107
|
SWRadioButton cleanup
|
2018-05-03 20:13:27 +02:00 |
|
|
Milos Kozak
|
94db444acb
|
SW validator, language, cleanup
|
2018-05-03 20:06:13 +02:00 |
|
|
Milos Kozak
|
36265ab1c6
|
SWPlugin
|
2018-05-03 18:41:47 +02:00 |
|
|
AdrianLxM
|
43dc7d1846
|
wear cathegorize preferences
|
2018-05-03 17:49:31 +02:00 |
|
|
AdrianLxM
|
917fcb5953
|
wearwizard reorder menu
|
2018-05-03 17:49:27 +02:00 |
|
|
AdrianLxM
|
62a38ed537
|
wearwizard fix NPE when CobInfo not available - missing part
|
2018-05-03 17:49:22 +02:00 |
|
|
AdrianLxM
|
b37b892eea
|
wearwizard fix NPE when CobInfo not available
|
2018-05-03 17:49:17 +02:00 |
|
|
AdrianLxM
|
fe0f2e3ce6
|
wearwizard settings on phone
|
2018-05-03 17:49:13 +02:00 |
|