Andy Rozman
|
2cc4fe4450
|
Added options Max Bolus and Max Basal
Little bit of refactoring in Medtronic code
|
2018-05-12 00:41:44 +01:00 |
|
|
Andy Rozman
|
c03b4f6780
|
Minor change in plugin util.
|
2018-05-07 13:52:21 +01:00 |
|
|
Andy Rozman
|
41205d4ba7
|
Merge branch 'dev' into riley_link_medtronic
|
2018-05-07 12:11:38 +01:00 |
|
|
Andy Rozman
|
fb45bad8d9
|
Removed .orig
|
2018-05-07 12:06:47 +01:00 |
|
|
Andy Rozman
|
af56304669
|
Initial commit after dev was merged into here
|
2018-05-07 12:05:53 +01:00 |
|
|
Johannes Mockenhaupt
|
785c402848
|
LP: Don't notify about invalid values during editing.
|
2018-05-07 02:11:59 +02:00 |
|
|
AdrianLxM
|
3385a23bdb
|
Merge pull request #1004 from pedroll/aaps20_rc3
Spanish translation
|
2018-05-06 20:25:17 +02:00 |
|
|
pedroll
|
0d2a0798f7
|
Spanish translation 2
|
2018-05-06 20:04:12 +02:00 |
|
|
pedroll
|
7b73c59ee5
|
Spanish translation 2
|
2018-05-06 20:04:12 +02:00 |
|
|
AdrianLxM
|
cdc8e45f32
|
Merge pull request #1015 from jotomo/lemming-treatment
Fix finding BG in graph for treatments before the first displayed BG.
|
2018-05-06 19:51:01 +02:00 |
|
|
Radoslav Radev
|
b08332e340
|
bg translation
|
2018-05-06 14:49:10 +03:00 |
|
|
Johannes Mockenhaupt
|
56cbac3b4d
|
Leftover MainApp.gs rewrite.
|
2018-05-06 11:49:16 +02:00 |
|
|
Johannes Mockenhaupt
|
ef70c1f244
|
MainApp.sResources.getColor -> MainApp.gc.
|
2018-05-06 11:47:15 +02:00 |
|
|
Johannes Mockenhaupt
|
b9c649bd68
|
Uso blue/orange for carbs/insulin in confirmation dialogs.
Aligns with the graph's use of using blueish colors insulin and
orange for carbs stuff.
|
2018-05-06 11:46:09 +02:00 |
|
|
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 |
|
|
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 |
|
|
Radoslav Radev
|
9aeb2b6ede
|
Update strings.xml
|
2018-05-04 23:51:08 +03: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 |
|
|
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 |
|
|
swissalpine
|
010a2f3fd8
|
Make deviation bars transparent
|
2018-05-04 10:04:45 +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
|
c69a541b75
|
ecarb ash first response
|
2018-05-03 22:08:27 +02:00 |
|
|
McHoffi
|
39e9448c67
|
Typo fix
|
2018-05-03 21:20:54 +02:00 |
|
|
Andy Rozman
|
421946269a
|
Merge branch 'dev' into riley_link_medtronic
|
2018-05-03 17:23:23 +01:00 |
|
|
Andy Rozman
|
f6110bd096
|
Merge branch 'virtual_pump_Bug863' into riley_link_medtronic
|
2018-05-03 16:54:03 +01:00 |
|
|
AdrianLxM
|
43dc7d1846
|
wear cathegorize preferences
|
2018-05-03 17:49:31 +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 |
|
|
AdrianLxM
|
c394c045c9
|
wearwizard reduced watch settings
|
2018-05-03 17:49:09 +02:00 |
|
|
AdrianLxM
|
bdfce784c0
|
wearwizard ensure watch apk is up to date
|
2018-05-03 17:49:05 +02:00 |
|