Andy Rozman
|
2600a7009b
|
Added UTests for PumpUtil and VirualPlugin (new methods)
|
2018-05-13 18:40:53 +01:00 |
|
Andy Rozman
|
347d210d06
|
Merge branch 'virtual_pump_Bug863' of https://github.com/andyrozman/AndroidAPS into virtual_pump_Bug863
|
2018-05-10 12:42:06 +01:00 |
|
Andy Rozman
|
6f19ad1407
|
Wrong handling of specialBasalDurations (Duration15 and Duartion30 flags), and added some logging.
|
2018-05-10 12:40:31 +01:00 |
|
Milos Kozak
|
d5137a061b
|
Merge branch 'dev' into virtual_pump_Bug863
|
2018-05-10 13:19:44 +02:00 |
|
Milos Kozak
|
dbc5e3689a
|
Merge pull request #1028 from andyrozman/translation_irish
Translation - Irish (Gaeilge)
|
2018-05-09 11:20:52 +02:00 |
|
Andy Rozman
|
bacc79970a
|
Added formated=false to some translations.
|
2018-05-09 10:19:27 +01:00 |
|
Milos Kozak
|
8c2d0d80ee
|
Merge pull request #1017 from MilosKozak/notification-height
Tests required: Notification height
|
2018-05-09 10:16:29 +02:00 |
|
Milos Kozak
|
0c848b25f6
|
Merge branch 'dev' into translation_irish
|
2018-05-09 09:25:11 +02:00 |
|
Milos Kozak
|
e29a590cad
|
Merge pull request #1020 from MilosKozak/dia-refactor
default DIA
|
2018-05-08 23:43:54 +02:00 |
|
Milos Kozak
|
62a83bc197
|
Merge pull request #1010 from MilosKozak/sv-update
swedish update
|
2018-05-08 23:32:10 +02:00 |
|
Milos Kozak
|
3f568c2724
|
Merge pull request #1030 from triplem/wifi_connection
Add isConnected, enable NSClient only, if really connected to internet
|
2018-05-08 23:30:51 +02:00 |
|
Milos Kozak
|
faba0d9ff6
|
Merge pull request #1023 from MilosKozak/polish-translation
Polish translation
|
2018-05-08 23:27:14 +02:00 |
|
Milos Kozak
|
8c042b4bc8
|
Merge pull request #1029 from RadoslavR/patch-58
bg translation again
|
2018-05-08 23:18:52 +02:00 |
|
Johannes Mockenhaupt
|
39905f8e60
|
Darker UAM, ZT prediction colors.
They now have the same level of 'brightness'.
|
2018-05-08 21:26:52 +02:00 |
|
Markus M. May
|
b0d8d547d8
|
Add isConnected, enable NSClient only, if really connected to internet
|
2018-05-07 20:43:13 +02:00 |
|
Radoslav Radev
|
0164da23a4
|
Update strings.xml
|
2018-05-07 21:34:55 +03:00 |
|
Andy Rozman
|
3baf907267
|
Initial irish translation
|
2018-05-07 16:45:38 +01:00 |
|
AdrianLxM
|
c6dac2789c
|
one more polish update
|
2018-05-07 10:30:07 +02:00 |
|
AdrianLxM
|
af2c27236b
|
polish update
|
2018-05-07 10:24:06 +02: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 |
|
AdrianLxM
|
f3967e07d2
|
polish in gerenal strings.xml
|
2018-05-06 19:44:58 +02:00 |
|
AdrianLxM
|
858c75095b
|
polish arrays.xml
|
2018-05-06 19:32:43 +02:00 |
|
AdrianLxM
|
b89ac3049c
|
polish fix strings
|
2018-05-06 19:30:35 +02:00 |
|
AdrianLxM
|
7b0acd1c4a
|
polish remove translatable=false
|
2018-05-06 19:29:00 +02:00 |
|
AdrianLxM
|
270f60ac1c
|
polish first - thanks Tomasz K.
|
2018-05-06 19:25:10 +02:00 |
|
Radoslav Radev
|
b08332e340
|
bg translation
|
2018-05-06 14:49:10 +03:00 |
|
AdrianLxM
|
f0351834ff
|
default DIA
|
2018-05-06 12:49:03 +02: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 |
|
AdrianLxM
|
1ac41323e6
|
fix notification last line cutoff
|
2018-05-05 21:55:49 +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 |
|
AdrianLxM
|
499edd7c05
|
swedish update
|
2018-05-05 09:20:29 +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 |
|
pedroll
|
5ff86e9c34
|
Spanish translation
|
2018-05-04 19:54:21 +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 |
|