AdrianLxM
|
7fcba81480
|
Merge pull request #1022 from RadoslavR/patch-57
bg translation
|
2018-05-06 19:50:30 +02:00 |
|
|
AdrianLxM
|
f3967e07d2
|
polish in gerenal strings.xml
|
2018-05-06 19:44:58 +02:00 |
|
|
Simon Pauwels
|
7cc31a1954
|
Merge pull request #47 from MilosKozak/dev
6/05/2018
|
2018-05-06 19:41:28 +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 |
|
|
McHoffi
|
9d367c1fa1
|
Update ObjectivesFragment.java
|
2018-05-06 18:18:34 +02:00 |
|
|
McHoffi
|
06948ca0f4
|
Update strings.xml
|
2018-05-06 18:16:42 +02:00 |
|
|
Radoslav Radev
|
b08332e340
|
bg translation
|
2018-05-06 14:49:10 +03:00 |
|
|
AdrianLxM
|
22ecdc0e9d
|
Merge pull request #1018 from jotomo/colors-unification
Colors unification
|
2018-05-06 13:11:12 +02:00 |
|
|
AdrianLxM
|
f0351834ff
|
default DIA
|
2018-05-06 12:49:03 +02:00 |
|
|
McHoffi
|
36d6edf0db
|
Update strings.xml
|
2018-05-06 12:16:51 +02:00 |
|
|
McHoffi
|
491b04d562
|
Merge pull request #2 from MilosKozak/dev
Dev
|
2018-05-06 12:13:46 +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 |
|
|
AdrianLxM
|
116222858e
|
update lastApproachingDailyLimit
|
2018-05-05 21:12:09 +02:00 |
|
|
AdrianLxM
|
d99fafe375
|
restrict aproaching daily limit to once every 30 minutes RS
|
2018-05-05 21:10:15 +02:00 |
|
|
AdrianLxM
|
5458df0907
|
restrict aproaching daily limit to once every 30 minutes Rv2
|
2018-05-05 21:08:17 +02:00 |
|
|
AdrianLxM
|
c2315b7bea
|
restrict aproaching daily limit to once every 30 minutes R-Korean
|
2018-05-05 21:03:35 +02:00 |
|
|
AdrianLxM
|
b43eff8e55
|
restrict aproaching daily limit to once every 30 minutes R
|
2018-05-05 21:02:31 +02:00 |
|
|
AdrianLxM
|
70b2b1502f
|
restrict wrong password notification to once every 30 seconds
|
2018-05-05 20:59:11 +02:00 |
|
|
AdrianLxM
|
c8c7e12056
|
Wrong password notification
|
2018-05-05 20:54:10 +02:00 |
|
|
AdrianLxM
|
246c8922df
|
Korean wrong password notification
|
2018-05-05 20:51:46 +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 |
|
|
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 |
|
|
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 |
|