Commit graph

2240 commits

Author SHA1 Message Date
Milos Kozak
1ad409754f move preparing graph series to extra class #2 2017-10-23 22:41:12 +02:00
Milos Kozak
d180d088f0 fix merge conflict 2017-10-22 21:11:31 +02:00
Milos Kozak
3cdca93b30 RS connectivity & bolus improvement 2017-10-21 20:09:21 +02:00
Milos Kozak
7dd678c917 Better bolusing with different speeds (R & Rv2) 2017-10-21 18:55:56 +02:00
Milos Kozak
8e82e341fd Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev 2017-10-21 18:07:30 +02:00
Milos Kozak
39af399ea4 Merge pull request #478 from RadoslavR/patch-48
Update strings.xml
2017-10-21 18:06:44 +02:00
Milos Kozak
06da0471d2 Merge pull request #479 from McHoffi/dev
Split to smaller pieces
2017-10-21 18:06:29 +02:00
Milos Kozak
a8751bf35a Detailed onscreen history logging 2017-10-21 18:05:19 +02:00
McHoffi
986eab041d Merge pull request #1 from MilosKozak/dev
Dev
2017-10-21 17:43:33 +02:00
McHoffi
9c7c583aed Split to smaller pieces 2017-10-21 17:41:01 +02:00
Radoslav Radev
075b74ec84 Update strings.xml 2017-10-21 17:11:25 +03:00
Milos Kozak
dbf5a5e577 Sensitivity logging optional 2017-10-21 13:14:06 +02:00
Milos Kozak
881a745e32 Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev 2017-10-20 21:36:56 +02:00
Milos Kozak
01d6f1594a RS synchronized change 2017-10-20 17:37:06 +02:00
Milos Kozak
e545f75d69 fix displaying XX:30 time intervals 2017-10-20 11:34:33 +02: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
65cb095dfd Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev 2017-10-19 19:23:52 +02:00
Milos Kozak
0b7832ec60 getUnits from active profile not interface 2017-10-19 19:23:19 +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
Milos Kozak
19f107fe53 move preparing graph series to extra class #2 2017-10-18 23:56:13 +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
8d8be3c8a4 Merge pull request #473 from MilosKozak/MilosKozak-patch-1
Update strings.xml
2017-10-18 20:12:25 +02:00
Milos Kozak
fe9fefa601 Update strings.xml 2017-10-18 20:06:35 +02:00
Milos Kozak
d65a2d8f8c move preparing graph series to extra class 2017-10-18 19:01:39 +02:00
Simon Pauwels
89faa904bd Merge pull request #6 from MilosKozak/dev
Dev
2017-10-18 19:00:01 +02:00
Milos Kozak
b53970fcd7 Merge pull request #471 from RadoslavR/patch-46
Update strings.xml
2017-10-18 13:58:37 +02:00
Radoslav Radev
f0ee2b8bed Update strings.xml 2017-10-18 14:25:34 +03:00
Milos Kozak
8591b6de4d Merge pull request #470 from McHoffi/dev
DE_translations
2017-10-18 11:20:01 +02:00
McHoffi
434f4474b5 DE_translations 2017-10-18 11:11:41 +02:00
Milos Kozak
75e6a1b2e2 Merge pull request #468 from warstar2187/dev
Update Korean
2017-10-18 09:56:34 +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
6ff3d00f3c Merge remote-tracking branch 'origin/dev' into food 2017-10-17 20:55:55 +02:00
Milos Kozak
13184dcb51 food plugin 2017-10-17 20:55:23 +02:00
Milos Kozak
9622453d3a Merge pull request #467 from jotomo/config-bulder-defaults
ConfigBuilder: hide disabled plugins by default.
2017-10-17 10:39:03 +02:00
Johannes Mockenhaupt
fee19db501
ConfigBuilder: hide disabled plugins by default. 2017-10-16 22:14:49 +02:00
Johannes Mockenhaupt
f7a46d386e
Remove j2v8. 2017-10-16 21:52:06 +02:00
Johannes Mockenhaupt
d77fa9b0cf
Revert "NDK filters to work around j2v8 vs. libBleCommandUtil issue."
This reverts commit 7c04787004.
2017-10-16 21:48:08 +02:00
Milos Kozak
8bfcd79aff Merge pull request #464 from MilosKozak/profile
Profile
2017-10-16 15:46:53 +02:00
Milos Kozak
d1a9398451 Merge pull request #463 from AdrianLxM/mr-profileRhino
sum on name for LP
2017-10-16 14:58:41 +02:00
AdrianLxM
414cb5fd8d sum on name for LP 2017-10-16 12:54:17 +02:00
Milos Kozak
5172a91ca1 Merge pull request #458 from jotomo/gh-417-new-treatment-validation
NewTreatmentDialog: sanitize inputs, fixes #417.
2017-10-16 08:38:30 +02:00
Milos Kozak
f343d88ca7 Merge pull request #462 from MilosKozak/profileRhino
Profile rhino
2017-10-16 08:29:47 +02:00
AdrianLxM
dbc5657003 log to debug not error 2017-10-15 23:21:55 +02:00
AdrianLxM
2a8ab96fe3 Merge pull request #461 from AdrianLxM/rhinoAMA
Rhino ama
2017-10-15 22:39:54 +02:00