Milos Kozak
|
f134163a76
|
Merge branch 'dev' into queue
|
2017-11-21 22:31:56 +01:00 |
|
Milos Kozak
|
a6bf18244a
|
Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev
|
2017-11-21 22:31:22 +01:00 |
|
Milos Kozak
|
ca44ae9a0b
|
fix RU translation
|
2017-11-21 22:31:02 +01:00 |
|
Milos Kozak
|
3ab235f829
|
refactor pump interface out of ConfigBuilder, remove handlers
|
2017-11-20 23:39:12 +01:00 |
|
Milos Kozak
|
d8d8b150b6
|
Merge branch 'dev2' into queue
|
2017-11-20 17:34:03 +01:00 |
|
Milos Kozak
|
973b9d50c1
|
Merge branch 'dev' into dev2
|
2017-11-20 17:28:15 +01:00 |
|
Milos Kozak
|
25aa5094a4
|
alarm for failed bolus
|
2017-11-11 22:32:00 +01:00 |
|
Milos Kozak
|
a5227fc773
|
add bolus sound
|
2017-11-11 16:20:34 +01:00 |
|
Milos Kozak
|
86b11edd58
|
RS connection and status reading
|
2017-11-11 14:05:29 +01:00 |
|
Milos Kozak
|
8bae1a18e4
|
CommandQueue
|
2017-11-08 22:22:51 +01:00 |
|
Milos Kozak
|
5ad564e0e3
|
CS translation
|
2017-11-03 10:13:23 +01:00 |
|
Milos Kozak
|
f67bd291cd
|
Merge branch 'dev' into dev2
|
2017-11-01 20:44:24 +01:00 |
|
Milos Kozak
|
60699eddbb
|
preferences update
|
2017-11-01 20:43:59 +01:00 |
|
Milos Kozak
|
d180d088f0
|
fix merge conflict
|
2017-10-22 21:11:31 +02:00 |
|
Milos Kozak
|
7dd678c917
|
Better bolusing with different speeds (R & Rv2)
|
2017-10-21 18:55:56 +02:00 |
|
Radoslav Radev
|
075b74ec84
|
Update strings.xml
|
2017-10-21 17:11:25 +03:00 |
|
Milos Kozak
|
b76cb755e0
|
CS translations
|
2017-10-19 20:37:37 +02:00 |
|
Milos Kozak
|
c258b41f11
|
allow to use actual profile in wizard
|
2017-10-19 19:35:35 +02:00 |
|
Milos Kozak
|
2e32fe51e2
|
Merge pull request #475 from diabetesdt1/patch-3
Update strings.xml
|
2017-10-19 18:11:52 +02:00 |
|
diabetesdt1
|
51caffa591
|
Update strings.xml
|
2017-10-19 16:40:36 +02:00 |
|
Milos Kozak
|
e7fb045f04
|
Merge pull request #474 from boysim/dev
dutch translation update
|
2017-10-19 16:16:27 +02:00 |
|
diabetesdt1
|
17eec803f4
|
Update strings.xml
|
2017-10-19 16:03:31 +02:00 |
|
Simon Pauwels
|
28430d117d
|
Update dutch
|
2017-10-18 21:19:12 +02:00 |
|
Milos Kozak
|
55b1dcb992
|
Merge branch 'dev' into dev2
|
2017-10-18 20:14:14 +02:00 |
|
Milos Kozak
|
fe9fefa601
|
Update strings.xml
|
2017-10-18 20:06:35 +02:00 |
|
Radoslav Radev
|
f0ee2b8bed
|
Update strings.xml
|
2017-10-18 14:25:34 +03:00 |
|
McHoffi
|
434f4474b5
|
DE_translations
|
2017-10-18 11:11:41 +02:00 |
|
warstar2187
|
e3d3664ac2
|
Update strings.xml
|
2017-10-18 16:39:55 +09:00 |
|
warstar2187
|
a35262840f
|
Update strings.xml
|
2017-10-18 13:49:17 +09:00 |
|
Milos Kozak
|
13184dcb51
|
food plugin
|
2017-10-17 20:55:23 +02:00 |
|
Milos Kozak
|
3b90d02e05
|
show status on Dana fragment too
|
2017-10-13 13:31:32 +02:00 |
|
Milos Kozak
|
02c57fb9a3
|
RS connection improvement
|
2017-10-13 13:17:17 +02:00 |
|
Milos Kozak
|
e40033dcb8
|
formated=false
|
2017-10-13 09:24:02 +02:00 |
|
Milos Kozak
|
bee60eb0e3
|
CS translations
|
2017-10-13 09:16:15 +02:00 |
|
AdrianLxM
|
f751638a7f
|
enabling wearcontrols from preferences
|
2017-10-12 18:01:10 +02:00 |
|
AdrianLxM
|
39b18915d0
|
Align LP GUI
|
2017-10-11 20:19:42 +02:00 |
|
AdrianLxM
|
e6565c1911
|
reuse button on profile switch
|
2017-10-11 00:25:44 +02:00 |
|
Milos Kozak
|
24099222f3
|
Dana R & v2 speed selection
|
2017-10-10 19:14:43 +02:00 |
|
Milos Kozak
|
d142d2e4f9
|
resolve RS merge conflict
|
2017-10-10 16:47:03 +02:00 |
|
Milos Kozak
|
c6392ec625
|
Merge remote-tracking branch 'origin/dev' into profile
|
2017-10-09 23:15:02 +02:00 |
|
Milos Kozak
|
9ec3efbaab
|
fix conflict
|
2017-10-09 23:14:46 +02:00 |
|
Milos Kozak
|
230dd5f0a8
|
Merge pull request #451 from jotomo/checkboxes-and-labels-aligned
Overview: align checkboxes and labels vertically.
|
2017-10-09 23:13:16 +02:00 |
|
Johannes Mockenhaupt
|
e586e1389e
|
Overview: align checkboxes and labels vertically.
|
2017-10-09 22:37:50 +02:00 |
|
Johannes Mockenhaupt
|
62803f2a4d
|
Use existing string resource.
|
2017-10-09 21:18:55 +02:00 |
|
Johannes Mockenhaupt
|
70fefa9b70
|
NSTreatmentDialog: use same format for ES reason field as for profile.
|
2017-10-09 21:03:25 +02:00 |
|
Milos Kozak
|
60086dac8d
|
Merge remote-tracking branch 'origin/dev' into profile
|
2017-10-07 18:30:55 +02:00 |
|
Milos Kozak
|
a54b9e52d8
|
Merge pull request #446 from AdrianLxM/numberpicker-update
overview checkboxes cutoff fix
|
2017-10-07 18:29:56 +02:00 |
|
Milos Kozak
|
ef645ca600
|
fix merge conflict
|
2017-10-07 18:27:20 +02:00 |
|
AdrianLxM
|
046c28856c
|
treatments in config builder
|
2017-10-07 01:18:28 +02:00 |
|
AdrianLxM
|
10d273dac8
|
checkboxes for NS-Client layouts
|
2017-10-06 15:48:32 +02:00 |
|