Commit graph

2338 commits

Author SHA1 Message Date
Milos Kozak 23e37a8be7 remove unneeded code 2017-12-04 18:13:20 +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
Milos Kozak 45d0128097 gradle update 2017-12-03 18:29:57 +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
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
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
Roumen Georgiev d683ea2f0c
All labes scaled
COB is not here
2017-11-30 11:28:26 +02:00
Roumen Georgiev 24b9326602
Update PointsWithLabelGraphSeries.java 2017-11-30 09:57:16 +02:00
Roumen Georgiev 418a7f7094
ProfileSwitch depending on ScreenSize
Text size in ProfileSwitch events depends on screen resolution
2017-11-30 09:45:18 +02:00
Milos Kozak 04742c60cd G5 fix time value 2017-11-29 23:00:41 +01:00
Milos Kozak b73e12b731 G5: accept arrays 2017-11-29 17:22:45 +01:00
Milos Kozak 7fc9efde40 G5 offline/uploader 2017-11-29 16:07:26 +01:00
Roumen Georgiev c56330cae7
Less than, not moreThan15 2017-11-29 09:21:55 +02:00
Milos Kozak d1aec1ff18 Localalerts settings by adrian 2017-11-28 21:48:46 +01:00
Milos Kozak 7d5d327c5d fix compile 2017-11-28 21:06:50 +01:00
Milos Kozak 9b135cc4e4 Merge branch 'queue' into dev 2017-11-28 20:52:49 +01:00
Milos Kozak 694e90960e reenable RS driver 2017-11-28 20:52:24 +01:00
Milos Kozak b4187c84ed bump 1.56-dev 2017-11-28 20:51:54 +01:00
Milos Kozak 2a62b47be7
Merge pull request #507 from MilosKozak/dev
1.55 release
2017-11-28 20:38:45 +01:00
Milos Kozak bf4ffaed8f bump 1.55 2017-11-28 20:31:31 +01:00
Milos Kozak 70621837d9 disable RS driver 2017-11-28 20:29:30 +01:00
Milos Kozak b8df1fcec4 Merge branch 'dev' into queue 2017-11-28 20:27:58 +01:00