Milos Kozak
|
f9bbb72831
|
Merge pull request #979 from MilosKozak/lp-ps-always
LP: Allow ProfileSwitch before pump is connected.
|
2018-05-02 22:37:23 +02:00 |
|
|
Milos Kozak
|
28430cc757
|
fix cob calculation
|
2018-05-02 22:35:51 +02:00 |
|
|
Milos Kozak
|
e2f28e0ae4
|
fix rounding on bolus delivery
|
2018-05-02 22:20:27 +02:00 |
|
|
AdrianLxM
|
a3421316ac
|
Allow ProfileSwitch before pump is connected.
https://github.com/MilosKozak/AndroidAPS/issues/969
|
2018-05-02 21:38:45 +02:00 |
|
|
Milos Kozak
|
d0e6a2258f
|
Merge pull request #976 from MilosKozak/swedish-update-1
Update Swedish strings.xml
|
2018-05-02 21:07:26 +02:00 |
|
|
AdrianLxM
|
f1736f048e
|
Update strings.xml
|
2018-05-02 20:20:13 +02:00 |
|
|
Milos Kozak
|
8419f8d0e9
|
update socket.io to 1.0.0
|
2018-05-02 18:49:40 +02:00 |
|
|
Milos Kozak
|
a36b1b2a10
|
Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev
|
2018-05-02 18:39:47 +02:00 |
|
|
Milos Kozak
|
4cc952900d
|
show progress reason from iobcobthread
|
2018-05-02 18:39:37 +02:00 |
|
|
Milos Kozak
|
5671b99f30
|
Merge pull request #974 from MilosKozak/swedish-update
Swedis Update strings.xml
|
2018-05-02 18:02:51 +02:00 |
|
|
AdrianLxM
|
6c78bdcdca
|
Merge pull request #975 from CaroGo/patch-2
Update strings.xml
|
2018-05-02 17:51:30 +02:00 |
|
|
CaroGo
|
a768c03462
|
Update strings.xml
|
2018-05-02 17:43:17 +02:00 |
|
|
Milos Kozak
|
a4ff9d29e2
|
Merge branch 'dev' into swedish-update
|
2018-05-02 17:10:01 +02:00 |
|
|
Milos Kozak
|
e42d5f1204
|
Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev
|
2018-05-02 17:05:32 +02:00 |
|
|
Milos Kozak
|
42164489c8
|
cs translations
|
2018-05-02 17:05:20 +02:00 |
|
|
AdrianLxM
|
f52451085c
|
remove translation of language names
|
2018-05-02 16:41:56 +02:00 |
|
|
AdrianLxM
|
fb61f3cde2
|
Update strings.xml
|
2018-05-02 16:39:28 +02:00 |
|
|
Milos Kozak
|
6697c66435
|
Merge pull request #971 from jotomo/watch-pred-colors
Watch: colored preds.
|
2018-05-02 16:38:01 +02:00 |
|
|
Johannes Mockenhaupt
|
c51635dba4
|
Watch: colored preds.
|
2018-05-02 16:01:40 +02:00 |
|
|
Milos Kozak
|
efff5d4e10
|
Merge pull request #966 from jotomo/greener-grass
Brighter green for "treatment active" for better readability.
|
2018-05-02 15:05:27 +02:00 |
|
|
Milos Kozak
|
e562d0f437
|
Merge pull request #957 from triplem/charging_merged
Charging merged
|
2018-05-02 15:04:00 +02:00 |
|
|
Milos Kozak
|
b715c3f0c7
|
Merge pull request #963 from MilosKozak/use-gs
Use MainApp.gs() everywhere
|
2018-05-02 15:02:04 +02:00 |
|
|
Johannes Mockenhaupt
|
32323d673b
|
Brighter green for "treatment active" for better readability.
|
2018-05-02 15:01:49 +02:00 |
|
|
AdrianLxM
|
926ee535d5
|
use MainApp.gs instead of context 2
|
2018-05-02 14:28:16 +02:00 |
|
|
AdrianLxM
|
d289c5c7d7
|
use MainApp.gs instead of context
|
2018-05-02 14:27:23 +02:00 |
|
|
AdrianLxM
|
3f3959f785
|
use MainApp.gs instead of getString from Activity/Dialog 2
|
2018-05-02 14:21:53 +02:00 |
|
|
AdrianLxM
|
611d761a41
|
use MainApp.gs instead of getString from Activity/Dialog
|
2018-05-02 14:16:40 +02:00 |
|
|
AdrianLxM
|
4a22fd355d
|
Merge remote-tracking branch 'milosremote/dev' into use-gs
|
2018-05-02 14:11:45 +02:00 |
|
|
AdrianLxM
|
a42bded248
|
Merge pull request #962 from MilosKozak/cob-status
refactor cob string
|
2018-05-02 14:04:16 +02:00 |
|
|
AdrianLxM
|
5aa3a88c7f
|
remove direct access to sResources 9
|
2018-05-02 13:59:27 +02:00 |
|
|
AdrianLxM
|
166f2843df
|
remove direct access to sResources 8
|
2018-05-02 13:58:52 +02:00 |
|
|
AdrianLxM
|
de4643d16f
|
remove direct access to sResources 8
|
2018-05-02 13:57:28 +02:00 |
|
|
AdrianLxM
|
74d0c71712
|
remove direct access to sResources 7
|
2018-05-02 13:51:24 +02:00 |
|
|
AdrianLxM
|
545d1d1586
|
remove direct access to sResources 6
|
2018-05-02 13:50:31 +02:00 |
|
|
AdrianLxM
|
0e4e36f2b1
|
remove direct access to sResources 5
|
2018-05-02 13:49:24 +02:00 |
|
|
AdrianLxM
|
3979913a6d
|
remove direct access to sResources 4
|
2018-05-02 13:46:38 +02:00 |
|
|
AdrianLxM
|
2af62d8e4e
|
remove direct access to sResources 3
|
2018-05-02 13:42:50 +02:00 |
|
|
AdrianLxM
|
a8382daefd
|
remove direct access to sResources 2
|
2018-05-02 13:36:56 +02:00 |
|
|
AdrianLxM
|
81ad2779bc
|
remove direct access to sResources 1
|
2018-05-02 13:32:41 +02:00 |
|
|
AdrianLxM
|
cfaa26d337
|
remove one more gs helper
|
2018-05-02 13:28:58 +02:00 |
|
|
AdrianLxM
|
20263c9fe4
|
remove other gs helper methods
|
2018-05-02 13:17:57 +02:00 |
|
|
AdrianLxM
|
73b41a7162
|
some more gs
|
2018-05-02 13:12:08 +02:00 |
|
|
AdrianLxM
|
7b6402de09
|
use gs function in MainApp to get strings
|
2018-05-02 13:05:22 +02:00 |
|
|
AdrianLxM
|
2749c1c853
|
refactor cob string
|
2018-05-02 11:19:03 +02:00 |
|
|
Milos Kozak
|
6fa3c04db8
|
Merge pull request #959 from MilosKozak/cob-status
New COB status for external status and ongoing notifiaction
|
2018-05-02 11:08:49 +02:00 |
|
|
AdrianLxM
|
24bd509ec6
|
COB in ongoing notification
|
2018-05-02 08:30:37 +02:00 |
|
|
AdrianLxM
|
c445c078e1
|
add g to default COB as well
|
2018-05-02 08:30:34 +02:00 |
|
|
AdrianLxM
|
915dac8ef3
|
COB in external status
|
2018-05-02 08:30:28 +02:00 |
|
|
AdrianLxM
|
f75329f5dc
|
move COB string representation to CobInfo
|
2018-05-02 08:30:23 +02:00 |
|
|
Milos Kozak
|
55db89b547
|
Merge pull request #958 from triplem/refix_objectives
Fixes wrong algo
|
2018-05-02 07:38:03 +02:00 |
|