Commit graph

1717 commits

Author SHA1 Message Date
Radoslav Radev
09880f029a Update strings.xml 2017-02-16 16:46:47 +02:00
AdrianLxM
cf57fea473 Merge pull request #65 from MilosKozak/dev
Dev
2017-02-16 09:02:05 +01:00
Milos Kozak
11e57e4043 Merge pull request #182 from AdrianLxM/wear-bolus5
Background for wear settings
2017-02-15 19:38:13 +01:00
Milos Kozak
404d585838 Merge pull request #181 from LadyViktoria/dev
fix key for openapsama_current_basal_safety_multiplier
2017-02-15 19:35:40 +01:00
AdrianLxM
d74ea13937 Merge remote-tracking branch 'milosremote/dev' into wear-bolus5 2017-02-15 16:28:15 +01:00
AdrianLxM
74562ae548 wear settings same background as menu 2017-02-15 16:27:46 +01:00
LadyViktoria
92cd31a0b6 fix key for openapsama_current_basal_safety_multiplier 2017-02-15 14:42:59 +01:00
LadyViktoria
16555347e8 fix key for openapsama_current_basal_safety_multiplier 2017-02-15 13:21:38 +01:00
Milos Kozak
1a3d3eb97c 1.1g 2017-02-14 21:41:39 +01:00
Milos Kozak
dda95dc275 allow to remove treatments from GUI 2017-02-14 21:13:13 +01:00
Milos Kozak
a75c62be35 show notification when aproaching daily limit 2017-02-14 19:47:45 +01:00
Milos Kozak
2e4aec9916 settings password protected 2017-02-14 19:16:34 +01:00
Milos Kozak
5992413cf9 disable quickwizard with if bg is old 2017-02-14 15:50:24 +01:00
Milos Kozak
8001796f4b virtual pump status upload optional 2017-02-14 15:41:30 +01:00
Milos Kozak
e00045155e prefill bg value in careportal dialog 2017-02-14 15:09:22 +01:00
Milos Kozak
ac82e2b044 1.1f 2017-02-13 21:06:20 +01:00
Milos Kozak
f9ee3c547a translations 2017-02-13 21:05:57 +01:00
Milos Kozak
e3edf5cce5 calculate cob 1.5 * DIA to the past 2017-02-13 19:35:01 +01:00
Milos Kozak
c6b3fe9883 Merge pull request #178 from AdrianLxM/wear-bolus5
Wear Bolus
2017-02-13 18:13:36 +01:00
AdrianLxM
f0fc3f6688 wear added viktoria's design 2017-02-13 17:48:11 +01:00
Milos Kozak
c31795d2e6 adjust devicestatus upload timings 2017-02-13 17:47:58 +01:00
AdrianLxM
56e5fae27d wear allow multiple input layouts 2017-02-13 16:54:06 +01:00
AdrianLxM
05d40e4af0 wear better toasts 2017-02-13 14:18:23 +01:00
Milos Kozak
a1529b3438 Merge pull request #176 from AdrianLxM/pumpstatus2
Pumpstatus 2
2017-02-13 08:27:16 +01:00
AdrianLxM
665f662f3a Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into pumpstatus2 2017-02-13 02:18:32 +01:00
AdrianLxM
5ce9d257e8 pump shortStatus String in interface 2017-02-13 02:18:25 +01:00
AdrianLxM
e85e651c56 wear full status support and product flavour with/without controls on wear 2017-02-13 01:55:35 +01:00
AdrianLxM
6fcee9ea3f pump shortStatus String in interface 2017-02-13 00:15:02 +01:00
Milos Kozak
e003ef8368 Merge pull request #175 from LadyViktoria/dev
use validation lib in cpp - layout fixes & longer snackbar duration
2017-02-12 22:29:20 +01:00
Milos Kozak
f6ae267bb5 CS translations 2017-02-12 22:28:42 +01:00
Milos Kozak
1f3aee091e manual invoke of loop in separate thread 2017-02-12 22:02:42 +01:00
viktoria
ba254f8829 Merged branch dev into dev 2017-02-12 20:01:25 +01:00
viktoria
0d02f42714 use validation lib in cpp - layout fixes & longer snackbar duration 2017-02-12 19:51:56 +01:00
Milos Kozak
4e3cc65d5d handling pump suspend, show pump actions on overview 2017-02-12 19:51:13 +01:00
AdrianLxM
65d1624a5f wear carb restriction 2017-02-12 19:50:25 +01:00
AdrianLxM
c0b287ba00 wear target statusO 2017-02-12 17:32:53 +01:00
AdrianLxM
0559c75f4e Merge pull request #64 from MilosKozak/dev
Dev
2017-02-12 14:50:42 +01:00
Milos Kozak
351a624b83 small string change 2017-02-12 13:48:03 +01:00
Milos Kozak
dc85bc26fc typo 2017-02-12 13:45:08 +01:00
Milos Kozak
d32a823071 Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev 2017-02-12 13:43:29 +01:00
Milos Kozak
e5e5eca37f Merge pull request #172 from AdrianLxM/patch-16
Validation for CPP
2017-02-12 11:23:34 +01:00
AdrianLxM
5e96124a2d mmol/l fix 2017-02-11 22:27:04 +01:00
AdrianLxM
2e6d754c86 mmol/l fix 2017-02-11 22:26:16 +01:00
AdrianLxM
1f5dd4750a CPP dismiss info when focus is lost 2017-02-11 22:20:29 +01:00
AdrianLxM
6c5028b4be CPP dismiss info when focus is lost 2017-02-11 22:18:28 +01:00
AdrianLxM
104c146b2f Merge pull request #63 from AdrianLxM/patch-16
LadyViktoria validation lib plus safety
2017-02-11 21:12:22 +01:00
AdrianLxM
e4c529fa1f reenable safety function 2017-02-11 19:59:20 +01:00
AdrianLxM
d9103b6823 wear wizard confirm reformat, connection stability, prime not in menu per default 2017-02-11 19:51:33 +01:00
AdrianLxM
6cb192b876 Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into wear-bolus5 2017-02-11 18:09:22 +01:00
AdrianLxM
b57253af5e wear add carbs to bolus-wizard confirmation 2017-02-11 17:54:47 +01:00