AdrianLxM
|
aefb0d62df
|
Merge pull request #522 from MilosKozak/dev
Dev
|
2017-12-04 17:53:36 +01:00 |
|
|
AdrianLxM
|
f71f972f97
|
Merge pull request #519 from andrew-warrington/watchfaces
Update of watchfaces
|
2017-12-04 17:51:16 +01:00 |
|
|
Milos Kozak
|
34fe8d8b60
|
Merge branch 'staledata' into dev
|
2017-12-04 13:02:23 +01:00 |
|
|
Milos Kozak
|
812583059a
|
Merge pull request #512 from PoweRGbg/patch-3
ProfileSwitch on graph depending on ScreenSize
|
2017-12-04 12:49:01 +01:00 |
|
|
Roumen Georgiev
|
bf5d884964
|
Merge pull request #4 from AdrianLxM/roumen-overview
fix landscape overview
|
2017-12-04 11:48:04 +02:00 |
|
|
AdrianLxM
|
53723411c4
|
fix landscape overview
|
2017-12-04 10:42:34 +01:00 |
|
|
Roumen Georgiev
|
9773485631
|
Merge pull request #3 from AdrianLxM/roumen-overview
Roumen overview
|
2017-12-04 10:16:53 +02:00 |
|
|
Johannes Mockenhaupt
|
fe40ebd4a5
|
More steps towards reducing comms amount.
(cherry picked from commit 3ba6079)
|
2017-12-03 23:06:57 +01:00 |
|
|
Johannes Mockenhaupt
|
471c813bb4
|
Don't check pump history, clean up usage of pumpHistoryLastChecked, mark stuff to disable.
(cherry picked from commit bcd1ac3)
|
2017-12-03 22:48:06 +01:00 |
|
|
Johannes Mockenhaupt
|
0c7b2e1953
|
Remove last bolus, units display of reservoir level from Combo fragment.
(cherry picked from commit 42847cb)
|
2017-12-03 22:48:06 +01:00 |
|
|
Milos Kozak
|
1c1ef26c84
|
Merge pull request #520 from MilosKozak/waitqueue
synchronized wait
|
2017-12-03 22:48:03 +01:00 |
|
|
Johannes Mockenhaupt
|
afdcf0b1c5
|
Remove combo pairing stubs.
|
2017-12-03 22:47:55 +01:00 |
|
|
Johannes Mockenhaupt
|
1b91684c65
|
Enforce low-suspend loop mode rather than disabling loop on usage violation. Because.
|
2017-12-03 22:26:02 +01:00 |
|
|
Johannes Mockenhaupt
|
1e19f19cd2
|
Hide buttons on Combo tab until plugin is initialized.
|
2017-12-03 22:25:43 +01:00 |
|
|
AdrianLxM
|
42c61f4e6f
|
synchronized wait
|
2017-12-03 21:58:35 +01:00 |
|
|
Milos Kozak
|
27436487bc
|
fix build tools for travis
|
2017-12-03 21:36:24 +01:00 |
|
|
Milos Kozak
|
2c4db98f58
|
try to fix travis
|
2017-12-03 21:31:06 +01:00 |
|
|
Milos Kozak
|
5a12d15c8c
|
upgrade build tools
|
2017-12-03 21:15:12 +01:00 |
|
|
Milos Kozak
|
4c3e26d19c
|
R: resolve thread deadlock during bolus stop
|
2017-12-03 20:10:54 +01:00 |
|
|
Milos Kozak
|
2b2d729f42
|
remove unsupported code from korean pump
|
2017-12-03 19:55:23 +01:00 |
|
|
Milos Kozak
|
4185bb347d
|
handle bolus stop prior to delivery correctly
|
2017-12-03 19:34:01 +01:00 |
|
|
Milos Kozak
|
9e0241aebc
|
fix translations
|
2017-12-03 19:12:07 +01:00 |
|
|
Milos Kozak
|
5d217cf1b3
|
better logging
|
2017-12-03 19:02:11 +01:00 |
|
|
Andrew Warrington
|
eea5082278
|
Revert unnecessary change.
|
2017-12-03 19:01:56 +01:00 |
|
|
Andrew Warrington
|
9dca53f968
|
Send OpenAPS timestamp to watch rather than minAgo, for more accurate updates on watch face.
|
2017-12-03 18:53:52 +01:00 |
|
|
Milos Kozak
|
45d0128097
|
gradle update
|
2017-12-03 18:29:57 +01:00 |
|
|
Andrew Warrington
|
cefe93d0a0
|
Merge remote-tracking branch 'origin/dev' into watchfaces
|
2017-12-03 17:48:36 +01:00 |
|
|
Milos Kozak
|
f25334273a
|
Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev
|
2017-12-03 17:34:58 +01:00 |
|
|
Milos Kozak
|
0101bc0a81
|
parse more iso formats
|
2017-12-03 17:34:29 +01:00 |
|
|
AdrianLxM
|
7777143b07
|
scrollable overview on Jelly
|
2017-12-03 17:30:20 +01:00 |
|
|
AdrianLxM
|
7958dc9dce
|
jelly overview
|
2017-12-03 13:55:54 +01:00 |
|
|
AdrianLxM
|
0a8d89db8a
|
Merge remote-tracking branch 'roumenremote/patch-3' into roumen-overview
|
2017-12-03 11:48:14 +01:00 |
|
|
AdrianLxM
|
eb1683d291
|
Merge pull request #518 from andrew-warrington/dev
watchfaces andrew
|
2017-12-02 21:46:17 +01:00 |
|
|
AdrianLxM
|
07c1084287
|
Merge branch 'watchfaces' into dev
|
2017-12-02 21:45:39 +01:00 |
|
|
Milos Kozak
|
38ecd88f6c
|
Merge pull request #513 from AdrianLxM/btwatchdog-pr
|
2017-12-02 16:19:46 +01:00 |
|
|
Milos Kozak
|
02f3bc52f9
|
Merge pull request #515 from MilosKozak/pumpalarm-NoAPS-NPEfix
|
2017-12-02 16:13:40 +01:00 |
|
|
AdrianLxM
|
14bb0e6ac4
|
Only do pump alarms in APS mode
|
2017-12-02 10:21:42 +01:00 |
|
|
Milos Kozak
|
8a7f0f22d9
|
min NS version 0.10.2
|
2017-12-01 22:51:25 +01:00 |
|
|
Andrew Warrington
|
a0a5768dea
|
Merge pull request #1 from AdrianLxM/watchworks
delta granularity and NPE fix
|
2017-12-01 20:51:12 +01:00 |
|
|
AdrianLxM
|
98777579c8
|
delta granularity and NPE fix
|
2017-12-01 20:32:26 +01:00 |
|
|
Milos Kozak
|
faea3a5147
|
RS proper evaluate extended bolus result
|
2017-12-01 17:37:49 +01:00 |
|
|
AdrianLxM
|
1a5852271d
|
Merge branch 'dev' into btwatchdog-pr
|
2017-12-01 14:04:49 +01:00 |
|
|
AdrianLxM
|
090127012c
|
Merge branch 'dev' into btwatchdog-pr
|
2017-12-01 14:03:44 +01:00 |
|
|
AdrianLxM
|
09dac632f9
|
bluetooth watchdog
|
2017-12-01 13:57:53 +01:00 |
|
|
AdrianLxM
|
4b063a7766
|
fix SP for long with string-ressource-id
|
2017-12-01 13:49:50 +01:00 |
|
|
Milos Kozak
|
aa210970ec
|
Merge branch 'g5' into dev
|
2017-12-01 10:18:53 +01:00 |
|
|
Milos Kozak
|
77e855ec61
|
fix NPE
|
2017-12-01 10:18:27 +01:00 |
|
|
Roumen Georgiev
|
ecbac7ea96
|
Make ProfileSwitch text 20% larger
|
2017-12-01 10:30:18 +02:00 |
|
|
Andreas
|
29d9d20605
|
Update strings.xml
Add german text for local alerts
|
2017-12-01 08:03:33 +01:00 |
|
|
Andreas
|
e07c5fb50d
|
Update strings.xml
Change "Temp basal" to "Temp Basal"
|
2017-11-30 15:04:40 +01:00 |
|