Commit graph

2530 commits

Author SHA1 Message Date
Milos Kozak
6f172bf084
Merge pull request #529 from jotomo/synchronize-for-guard
Add missing synchronized so guard works properly.
2017-12-06 14:16:03 +01:00
Johannes Mockenhaupt
ab456d5966
Remove missed reference to pref in NSProfilePlugin. 2017-12-06 12:05:39 +01:00
Johannes Mockenhaupt
d58bb75d01
Add missing synchronized so guard works properly. 2017-12-06 12:01:59 +01:00
Johannes Mockenhaupt
7d07982181
Log full class name (not just filename), so logs can be filtered by package name. 2017-12-06 11:53:51 +01:00
AdrianLxM
525adddc5e
Merge pull request #527 from osodebailar/dev
Dev
2017-12-06 10:18:43 +01:00
Milos Kozak
7be5c041cc
Merge pull request #526 from MilosKozak/untranslatable
untranslatable strings greek
2017-12-05 22:37:34 +01:00
Milos Kozak
455383cfd5 check for duration in json 2017-12-05 22:08:37 +01:00
AdrianLxM
50cbff6fa4 untranslatable strings 2017-12-05 22:08:14 +01:00
Milos Kozak
a47fe757b9 Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev 2017-12-05 17:03:58 +01:00
Milos Kozak
188762519c greek language 2017-12-05 17:03:40 +01:00
Milos Kozak
1adbee5c9e check for null 2017-12-05 10:42:10 +01:00
Johannes Mockenhaupt
23874ebbd6
Remove 'sync to profile' pref.
(cherry picked from commit 01c52e7)
2017-12-05 10:00:31 +01:00
Roumen Georgiev
5e597f03d0
Added profile's target BG in NSClient mode 2017-12-05 09:23:57 +02:00
Milos Kozak
6c714261d0 queue logging 2017-12-05 07:34:34 +01:00
AdrianLxM
17867478fb
Merge pull request #524 from MilosKozak/watchfaces
Watchfaces Andrew
2017-12-04 23:19:52 +01:00
AdrianLxM
acf9d2199b
Merge pull request #523 from MilosKozak/watchfacesandrew
wear timestamps long
2017-12-04 20:29:30 +01:00
Milos Kozak
bce6d976b0 max connection time to 120 sec 2017-12-04 20:26:57 +01:00
AdrianLxM
0701dc4a52 make chart zoomable again 2017-12-04 20:08:57 +01:00
AdrianLxM
2f235385e0 fix NPE 2017-12-04 20:04:58 +01:00
Milos Kozak
620c56e4cb lowest priority for background calculations 2017-12-04 19:57:09 +01:00
AdrianLxM
c83f966d92 wear timestamps long 2017-12-04 18:40:13 +01:00
Milos Kozak
23e37a8be7 remove unneeded code 2017-12-04 18:13:20 +01:00
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
Milos Kozak
1c1ef26c84
Merge pull request #520 from MilosKozak/waitqueue
synchronized wait
2017-12-03 22:48:03 +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