AdrianLxM
|
ec106726a7
|
wearwizard trend
|
2018-05-03 17:49:01 +02:00 |
|
AdrianLxM
|
24dd4e1710
|
wearwizard cob
|
2018-05-03 17:48:54 +02:00 |
|
Andy Rozman
|
8a451bab4d
|
Merge branch 'dev' of https://github.com/andyrozman/AndroidAPS into dev
|
2018-05-03 16:11:16 +01:00 |
|
Andy Rozman
|
acff61339c
|
Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev
|
2018-05-03 16:09:53 +01:00 |
|
Milos Kozak
|
d025b4b03d
|
Merge pull request #988 from PoweRGbg/dev
added insulin, APS, BGSOURCEscreens
|
2018-05-03 16:14:06 +02:00 |
|
Roumen Georgiev
|
5bb9861a9b
|
Merge pull request #16 from MilosKozak/startupwizard
Startupwizard
|
2018-05-03 17:05:44 +03:00 |
|
Roumen Georgiev
|
515590cdf6
|
other screens
|
2018-05-03 17:04:56 +03:00 |
|
Roumen Georgiev
|
425ba77200
|
other screens
|
2018-05-03 16:59:23 +03:00 |
|
Milos Kozak
|
d03fd2752c
|
cleanup
|
2018-05-03 15:56:01 +02:00 |
|
Milos Kozak
|
446d58f866
|
Merge pull request #987 from MilosKozak/channel-sound
channel sound
|
2018-05-03 13:17:23 +02:00 |
|
AdrianLxM
|
012593a480
|
Update NotificationStore.java
|
2018-05-03 12:18:48 +02:00 |
|
Roumen Georgiev
|
083730f476
|
WIP: BGSOURCE screen
|
2018-05-03 09:02:16 +03:00 |
|
Milos Kozak
|
e5ed63a46f
|
fix name on future profile switches
|
2018-05-03 00:13:49 +02:00 |
|
Milos Kozak
|
a35c925930
|
Merge pull request #983 from jotomo/issue-939
WIP: Fix bolus progress dialog not closing with onPause/onResume cycle
|
2018-05-02 23:20:29 +02:00 |
|
Milos Kozak
|
f8310d6974
|
Merge pull request #982 from jotomo/init-failed-msg
Combo: better error message when initialization fails
|
2018-05-02 23:19:32 +02:00 |
|
Johannes Mockenhaupt
|
396268d9c8
|
Send invalid boluses (prime boluses) to watch.
|
2018-05-02 22:49:31 +02:00 |
|
Johannes Mockenhaupt
|
599c87f794
|
Combo: better error message when initialization fails.
|
2018-05-02 22:48:57 +02:00 |
|
Milos Kozak
|
a64bfe7a39
|
Merge pull request #977 from MilosKozak/persistent-text
show bg missing not no profile
|
2018-05-02 22:38:07 +02:00 |
|
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 |
|
Johannes Mockenhaupt
|
79458a1c73
|
Ignore harmless errors (un)subscribing to the message bus.
|
2018-05-02 22:36:52 +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 |
|
Markus M. May
|
07c47a4ba7
|
Start de translation
|
2018-05-02 21:45:16 +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 |
|
Johannes Mockenhaupt
|
3b19db14fd
|
Clean up.
|
2018-05-02 21:25:04 +02:00 |
|
Johannes Mockenhaupt
|
22e90743aa
|
Fix #939.
|
2018-05-02 21:24:06 +02:00 |
|
AdrianLxM
|
eb594c1867
|
show bg missing not no profile
|
2018-05-02 21:09:04 +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
|
e856306267
|
Merge pull request #919 from PoweRGbg/dev
WIP: Basic navigation and display of wizzard pages
|
2018-05-02 15:04:24 +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 |
|