Milos Kozak
|
7714aa9138
|
Merge branch 'dev' into startupwizard
|
2018-05-20 14:18:58 +02:00 |
|
|
Milos Kozak
|
948e925d12
|
Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev
|
2018-05-20 10:56:37 +02:00 |
|
|
Milos Kozak
|
06e52bb6ae
|
remove duplicated key
|
2018-05-20 10:56:32 +02:00 |
|
|
Milos Kozak
|
e91d7e0d11
|
Merge pull request #1045 from MilosKozak/AdrianLxM-patch-2
Swedish update
|
2018-05-15 14:27:39 +02:00 |
|
|
AdrianLxM
|
bf23a8f935
|
polish update
|
2018-05-15 14:20:35 +02:00 |
|
|
AdrianLxM
|
bae05b26bb
|
Update strings.xml
Thanks Marcus
|
2018-05-15 14:03:14 +02:00 |
|
|
Milos Kozak
|
66e50f5b62
|
Merge pull request #1038 from jotomo/upstreaming
[Polish] Dialog/color consistency, translations and other small stuff
|
2018-05-15 13:09:50 +02:00 |
|
|
Milos Kozak
|
e58149379a
|
Merge pull request #1043 from jotomo/issue-646
[Bugfix] On bolus cancel request, cancel all boluses. Partially addresses #646.
|
2018-05-15 10:55:04 +02:00 |
|
|
Johannes Mockenhaupt
|
561c7fb470
|
Add test.
|
2018-05-14 00:38:47 +02:00 |
|
|
Johannes Mockenhaupt
|
25aa6f859f
|
On bolus cancel request, cancel all boluses. Partially addresses #646.
|
2018-05-13 23:57:40 +02:00 |
|
|
Johannes Mockenhaupt
|
29efe11ece
|
Combo: always send out progress updates (SMB or not).
Without this, showing SMB progress on wear is broken.
(cherry picked from commit 5ebff72)
|
2018-05-13 23:20:29 +02:00 |
|
|
TebbeUbben
|
3103a0f276
|
Some styling for SW
|
2018-05-13 13:40:34 +02:00 |
|
|
Johannes Mockenhaupt
|
52da1feaf0
|
i18n: add German translation, layout issues with longer translations.
Dialog headers (insulin, carbs, prime/fill) now lock proper at least
in English and German.
|
2018-05-13 13:35:24 +02:00 |
|
|
Johannes Mockenhaupt
|
24e672a7f8
|
Add icon header to calibration dialog.
|
2018-05-13 12:48:30 +02:00 |
|
|
Johannes Mockenhaupt
|
d80fecc390
|
Add T.now, plus, minus methods.
|
2018-05-13 12:44:47 +02:00 |
|
|
Johannes Mockenhaupt
|
d0492462a4
|
Add time to build version.
|
2018-05-13 12:32:45 +02:00 |
|
|
Johannes Mockenhaupt
|
1883ac06dd
|
Use TT color for TT confirmations in dialogs.
|
2018-05-13 12:14:49 +02:00 |
|
|
Milos Kozak
|
4fae6c703c
|
SW autostart SetupWizard
|
2018-05-11 13:14:59 +02:00 |
|
|
Milos Kozak
|
ff2cc04408
|
SW warn if exported configuration is missing
|
2018-05-11 13:04:17 +02:00 |
|
|
Milos Kozak
|
7be418fdf2
|
Merge pull request #980 from triplem/de
DE translation
|
2018-05-11 09:24:24 +02:00 |
|
|
Markus M. May
|
cdd264686b
|
fix duplicate %
|
2018-05-11 08:43:24 +02:00 |
|
|
Milos Kozak
|
337a3d9776
|
SW show ObjectivesFragment
|
2018-05-11 08:30:21 +02:00 |
|
|
Milos Kozak
|
0a51c86afb
|
SW Configure APS button
|
2018-05-11 00:09:35 +02:00 |
|
|
Milos Kozak
|
376fffa6ec
|
SW Import settings, Skip wizard
|
2018-05-10 23:59:20 +02:00 |
|
|
Milos Kozak
|
8d7df64050
|
Merge pull request #1016 from MilosKozak/pump-notifications
Pump notifications
|
2018-05-10 23:24:45 +02:00 |
|
|
Milos Kozak
|
e105e5149e
|
Merge pull request #1032 from jotomo/wear-wizard-tt
Wear wizard: add TT config option.
|
2018-05-10 16:53:34 +02:00 |
|
|
Markus M. May
|
6d04d4b6e5
|
use positional indices in formatted strings to allow the usage of the translation editor
|
2018-05-10 16:53:01 +02:00 |
|
|
Roumen Georgiev
|
91c0b1a2ec
|
make Objectives visible
|
2018-05-10 14:36:05 +03:00 |
|
|
Roumen Georgiev
|
61afdd6e4c
|
cleanup
|
2018-05-10 14:05:33 +03:00 |
|
|
Roumen Georgiev
|
9ac081dd1d
|
arrays.xml clean
|
2018-05-10 14:01:17 +03:00 |
|
|
Roumen Georgiev
|
016aa1c069
|
Added insulin descriptions to SW screen
|
2018-05-10 13:56:50 +03:00 |
|
|
Roumen Georgiev
|
2fa77d2a8c
|
Added insulin descriptions to SW screen
|
2018-05-10 13:49:13 +03:00 |
|
|
Roumen Georgiev
|
33a6135e75
|
Added insulin descriptions to SW screen
|
2018-05-10 13:48:18 +03:00 |
|
|
Roumen Georgiev
|
06180e3bbd
|
Merge branch 'startupwizard' of https://github.com/MilosKozak/AndroidAPS into dev
|
2018-05-10 12:51:12 +03:00 |
|
|
Milos Kozak
|
71b44edea6
|
SW enable loop
|
2018-05-09 19:34:15 +02:00 |
|
|
Milos Kozak
|
fb7067b207
|
SW profile switch
|
2018-05-09 19:24:20 +02:00 |
|
|
Milos Kozak
|
1ba828d20a
|
SWFragment
|
2018-05-09 18:49:42 +02:00 |
|
|
Johannes Mockenhaupt
|
a2a165d510
|
Wear wizard: make TT option depend on BG being enabled.
|
2018-05-09 16:46:22 +02:00 |
|
|
Roumen Georgiev
|
e3153230e0
|
added NSClient followup
|
2018-05-09 17:11:07 +03:00 |
|
|
Milos Kozak
|
0060a2ba7f
|
SW show pump status
|
2018-05-09 15:10:47 +02:00 |
|
|
Roumen Georgiev
|
50f8bf2d18
|
fix for screens adding up
|
2018-05-09 15:55:02 +03:00 |
|
|
Roumen Georgiev
|
bfd61a65a0
|
fix for screens adding up
|
2018-05-09 15:44:40 +03:00 |
|
|
Roumen Georgiev
|
41d736e176
|
updated to latest from Milos
|
2018-05-09 15:06:34 +03:00 |
|
|
Roumen Georgiev
|
a7bbf93599
|
Merge pull request #19 from MilosKozak/startupwizard
Startupwizard
|
2018-05-09 14:49:17 +03:00 |
|
|
Roumen Georgiev
|
0e8f0669c5
|
Update SWDefinition.java
|
2018-05-09 14:48:35 +03:00 |
|
|
Milos Kozak
|
bacb3fb337
|
SW pump screen
|
2018-05-09 13:38:17 +02:00 |
|
|
Roumen Georgiev
|
1f2f2f54fc
|
added SWCheckbox item
|
2018-05-09 14:15:53 +03:00 |
|
|
Milos Kozak
|
ed43eddc83
|
SWInfotext
|
2018-05-09 11:55:21 +02:00 |
|
|
Milos Kozak
|
61a7d69a65
|
Merge branch 'dev' into startupwizard
|
2018-05-09 11:41:05 +02:00 |
|
|
Milos Kozak
|
dbc5e3689a
|
Merge pull request #1028 from andyrozman/translation_irish
Translation - Irish (Gaeilge)
|
2018-05-09 11:20:52 +02:00 |
|