Commit graph

2316 commits

Author SHA1 Message Date
AdrianLxM
53723411c4
fix landscape overview 2017-12-04 10:42:34 +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
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
Milos Kozak
b314fcdd46
Merge pull request #504 from jotomo/show-hide-ext-bolus-treatments
Treatments tab: display extended bolus tab if active pump supports it…
2017-11-28 20:19:01 +01:00
Johannes Mockenhaupt
1a00f8c661
Treatments tab: display extended bolus tab if active pump supports it or if there are any extended bolus records. 2017-11-24 21:28:34 +01:00
Milos Kozak
a13661400f DanaRv2 queue & pump autodection 2017-11-22 22:09:58 +01:00
Milos Kozak
8818afe033 KoreanDanaR queue 2017-11-22 20:11:25 +01:00
Milos Kozak
dfd0218a6a Merge branch 'dev' into queue 2017-11-22 19:44:16 +01:00
Milos Kozak
a9f1acf7a7
Merge pull request #502 from jotomo/combo-extractions
Combo extractions
2017-11-22 19:36:59 +01:00
Milos Kozak
d3288da468
Merge pull request #503 from jotomo/disabling-ongoing-notification
Cancel ongoing notification when plugin is disabled.
2017-11-22 19:36:28 +01:00
Johannes Mockenhaupt
e28e5685f6
Cancel ongoing notification when plugin is disabled. 2017-11-22 19:13:56 +01:00
Johannes Mockenhaupt
1e4070e862
Fix typo in fragment name. 2017-11-22 11:34:23 +01:00
Johannes Mockenhaupt
5690772946
Nitpicky symmetry. 2017-11-22 11:33:26 +01:00
Johannes Mockenhaupt
d202976251
PersistentNotification unregister workaround. 2017-11-22 11:32:41 +01:00
Johannes Mockenhaupt
9442c56eb8
Make PumpEnactResult fluent. 2017-11-22 11:30:48 +01:00
Johannes Mockenhaupt
60324ac6c6
Minor code cleanup. 2017-11-22 11:30:38 +01:00
Milos Kozak
62527ab33b
Merge pull request #500 from jotomo/prevent-gaps-in-tbr
ConfigBuilder.applyAPSRequest: set new TBR if current TBR expires bef…
2017-11-22 10:52:15 +01:00
Milos Kozak
63dbe2bd52
Merge pull request #501 from jotomo/hide-stop-button-once-pressed
BolusProgressDialog: hide stop button once pressed.
2017-11-22 10:51:39 +01:00
Johannes Mockenhaupt
a8a7d47da2
ConfigBuilder.applyAPSRequest: set new TBR if current TBR expires before next loop iteration. 2017-11-22 00:22:02 +01:00
Johannes Mockenhaupt
b49a4c57ba
BolusProgressDialog: hide stop button once pressed. 2017-11-22 00:20:50 +01:00
Milos Kozak
252c0b3db9 DanaR queue driver 2017-11-21 23:00:53 +01:00
Milos Kozak
f134163a76 Merge branch 'dev' into queue 2017-11-21 22:31:56 +01:00