Milos Kozak
|
7714aa9138
|
Merge branch 'dev' into startupwizard
|
2018-05-20 14:18:58 +02:00 |
|
|
boysim
|
5c346f5b79
|
addedd formattng="false"
|
2018-05-20 14:18:37 +02:00 |
|
|
Milos Kozak
|
53cbe05436
|
Merge pull request #1019 from McHoffi/obj.7-add-info
Obj.7 add info about using SMB/maxIOB
|
2018-05-20 14:14:11 +02:00 |
|
|
Milos Kozak
|
8f0bd8e67f
|
Merge pull request #1047 from PoweRGbg/patch-1
remove wizard from backstack and fix the Exit -> returning to SW
|
2018-05-20 13:54:54 +02:00 |
|
|
boysim
|
e2bfb224f2
|
dutch typo fixes
|
2018-05-20 13:36:28 +02:00 |
|
|
boysim
|
da8acd4a1e
|
dutch typo fixes
|
2018-05-20 12:55:52 +02:00 |
|
|
Simon Pauwels
|
25b20f13f1
|
Merge pull request #50 from MilosKozak/dev
20 mei
|
2018-05-20 12:20:49 +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 |
|
|
Andy Rozman
|
4aefea0b28
|
Add constants file and modified status.
|
2018-05-17 14:21:35 +01:00 |
|
|
Roumen Georgiev
|
764e035666
|
remove wizard from backstack and fix the Exit -> returning to SW
|
2018-05-16 15:35:17 +03:00 |
|
|
Milos Kozak
|
e91d7e0d11
|
Merge pull request #1045 from MilosKozak/AdrianLxM-patch-2
Swedish update
|
2018-05-15 14:27:39 +02:00 |
|
|
Milos Kozak
|
84cd34f1d3
|
Merge pull request #1046 from MilosKozak/AdrianLxM-patch-3
polish update
|
2018-05-15 14:27:23 +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 |
|
|
Milos Kozak
|
e918301f9a
|
Merge pull request #1042 from jotomo/bleep-bleep-bleep
[Bugfix] Combo: always send out progress updates (SMB or not).
|
2018-05-15 10:35:45 +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 |
|
|
Andy Rozman
|
2600a7009b
|
Added UTests for PumpUtil and VirualPlugin (new methods)
|
2018-05-13 18:40:53 +01:00 |
|
|
Milos Kozak
|
30a0b49666
|
Merge pull request #1039 from TebbeUbben/startupwizard
Some styling for SW
|
2018-05-13 18:33:07 +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 |
|
|
Andy Rozman
|
7a388a5715
|
Little bit of refactoring.
|
2018-05-12 14:29:02 +01:00 |
|
|
Andy Rozman
|
f0e51c72a6
|
Merge branch 'riley_link_medtronic' of https://github.com/andyrozman/AndroidAPS into riley_link_medtronic
|
2018-05-12 00:43:46 +01:00 |
|
|
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 |
|
|
boysim
|
aab85fe298
|
added dutch translations
|
2018-05-11 23:23:55 +02:00 |
|
|
Andy Rozman
|
9e16045553
|
Update README.md
|
2018-05-11 21:02:43 +01:00 |
|
|
boysim
|
bf5e8e7142
|
added dutch translations
|
2018-05-11 21:26:42 +02:00 |
|
|
Simon Pauwels
|
f788f5981d
|
Merge pull request #49 from MilosKozak/dev
11/05
|
2018-05-11 21:05:31 +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 |
|
|
Roumen Georgiev
|
49c0917c03
|
Merge pull request #21 from MilosKozak/startupwizard
Startupwizard
|
2018-05-11 11:47:55 +03: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 |
|
|
Milos Kozak
|
0beccdea54
|
Merge pull request #1036 from PoweRGbg/dev
Added description for insulin plugins
|
2018-05-10 14:28:34 +02: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 |
|