Milos Kozak
|
97834e3fef
|
Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev
|
2018-02-12 13:44:57 +01:00 |
|
Milos Kozak
|
5d408daefd
|
remove displaying deviation slope
|
2018-02-12 13:42:50 +01:00 |
|
Milos Kozak
|
1bf73b8269
|
Merge pull request #685 from jotomo/notification-store-race
NotificationStore: add synchronisation when accessing internal store.
|
2018-02-12 13:24:59 +01:00 |
|
Johannes Mockenhaupt
|
b6c5326524
|
NotificationStore: clean up access to store, avoid potential deadlock.
|
2018-02-12 12:43:23 +01:00 |
|
Johannes Mockenhaupt
|
ee1efa4f7f
|
NotificationStore: add synchronisation when accessing internal store.
|
2018-02-12 11:15:59 +01:00 |
|
Milos Kozak
|
d92a7e8ef1
|
Merge branch 'history' into dev
|
2018-02-11 23:46:20 +01:00 |
|
Milos Kozak
|
fa2e46fbe5
|
remove CPP profile
|
2018-02-11 23:02:21 +01:00 |
|
Milos Kozak
|
943205c782
|
HardLimits refactor
|
2018-02-11 22:41:10 +01:00 |
|
Milos Kozak
|
5dd0f70686
|
Merge pull request #682 from jotomo/insight-hide-your-constraint
Only show Insight as pump plugin in config tab.
|
2018-02-11 21:09:54 +01:00 |
|
Milos Kozak
|
0a69a1ab2f
|
FR language
|
2018-02-11 21:00:09 +01:00 |
|
Johannes Mockenhaupt
|
e80559c948
|
Only show insight as pump plugin in config tab.
|
2018-02-11 19:51:03 +01:00 |
|
Milos Kozak
|
e4891683b5
|
fix NPE in profile
|
2018-02-11 14:40:07 +01:00 |
|
Milos Kozak
|
23396ed80b
|
Merge pull request #675 from triplem/configbuilder
Refactoring ConfigBuilder - cleanup fragment visibility
|
2018-02-10 23:48:07 +01:00 |
|
Milos Kozak
|
359b8401b2
|
Merge pull request #678 from jamorham/dev
Updates to Insight plugin
|
2018-02-10 15:13:35 +01:00 |
|
Jamorham
|
046de51496
|
Insight few small changes
|
2018-02-10 09:29:23 +00:00 |
|
Markus M. May
|
a1bb67d425
|
Refactoring ConfigBuilder - cleanup fragment visibility
|
2018-02-08 22:23:48 +01:00 |
|
Milos Kozak
|
538f70a725
|
Merge pull request #669 from MilosKozak/AdrianLxM-bolusDelivered
Don't treat an extended bolus as bolus if it emulates basal
|
2018-02-08 21:08:10 +01:00 |
|
Milos Kozak
|
5c7c430ee4
|
Merge pull request #673 from jotomo/bolus-error-dialog-sound
Bolus error dialog / sound
|
2018-02-08 21:07:21 +01:00 |
|
Milos Kozak
|
6f487aded5
|
Merge pull request #674 from jotomo/ext-bolus-query-race-condition
Avoid race condition using active extended bolus.
|
2018-02-08 21:06:26 +01:00 |
|
Johannes Mockenhaupt
|
f888e0d7ab
|
Avoid race condition using active extended bolus.
(cherry picked from commit 5b7c0cc)
|
2018-02-08 20:44:42 +01:00 |
|
Johannes Mockenhaupt
|
6767d8b767
|
Use pager sound instead of smoke detector alarm for bolus error.
|
2018-02-07 20:32:09 +01:00 |
|
Johannes Mockenhaupt
|
43755f071d
|
Add mute button to error dialog.
So that users needn't hastily close the dialog to stop the sound
and then not being able to read the actual message.
|
2018-02-07 20:32:09 +01:00 |
|
Tebbe Ubben
|
1d8ffeb36d
|
Merge remote-tracking branch 'remotes/origin/dev' into dev
|
2018-02-07 19:28:33 +01:00 |
|
Jamorham
|
bda1866c6d
|
Do our own history merging for TBRs
|
2018-02-07 13:36:06 +00:00 |
|
AdrianLxM
|
599b04c4ff
|
Don't treat an extended bolus as bolus if it emulates basal
|
2018-02-06 19:31:04 +01:00 |
|
Tebbe Ubben
|
515b0d251a
|
Merge remote-tracking branch 'remotes/origin/dev' into dev
|
2018-02-06 00:13:28 +01:00 |
|
AdrianLxM
|
0c0f68d510
|
Merge pull request #666 from MilosKozak/AdrianLxM-VPdefault
Don't enable Insight by default
|
2018-02-05 23:16:48 +01:00 |
|
Jamorham
|
693c3ef8ad
|
Store in history exactly what we enact
|
2018-02-05 22:11:26 +00:00 |
|
AdrianLxM
|
8e69573710
|
Merge pull request #668 from savek-cc/careportal-bg-update
fix display unit when updating careportal entry for historic bg value
|
2018-02-05 22:47:46 +01:00 |
|
Timm Korte
|
9713836e69
|
fix display unit when updating careportal entry for historic bg value
|
2018-02-05 22:35:08 +01:00 |
|
Tebbe Ubben
|
ac3b15135e
|
Merge remote-tracking branch 'remotes/origin/dev' into dev
|
2018-02-05 18:58:17 +01:00 |
|
Jamorham
|
6a9b293e49
|
Improved TBR cancelling
|
2018-02-05 14:39:55 +00:00 |
|
AdrianLxM
|
36608559af
|
Don't enable Insight by default
|
2018-02-05 14:11:54 +01:00 |
|
Jamorham
|
44ba10e00c
|
Insight treat 100% TBR from absolute as cancel
|
2018-02-05 11:33:00 +00:00 |
|
Milos Kozak
|
9fd8ad8705
|
Merge pull request #665 from jotomo/graph-target-line-fix
Graph: fix rendering target line for ranges from profiles.
|
2018-02-04 22:32:33 +01:00 |
|
Johannes Mockenhaupt
|
b5c35dea71
|
Graph: fix rendering target line for ranges from profiles.
|
2018-02-04 22:01:30 +01:00 |
|
Milos Kozak
|
4b061d1a51
|
Merge pull request #652 from savek-cc/careportal-bg-update
update bg for treatment in the past via careportal
|
2018-02-04 21:54:33 +01:00 |
|
Milos Kozak
|
94a6794504
|
Merge pull request #661 from MilosKozak/move-rhino-lib
move rhino to external lib
|
2018-02-04 21:51:04 +01:00 |
|
Tebbe Ubben
|
3a5bd0139b
|
Merge branch 'dev' of https://github.com/jamorham/AndroidAPS into dev
|
2018-02-04 20:16:45 +01:00 |
|
Jamorham
|
1d169bc27f
|
Better calculation for Absolute basal from Tebbe
|
2018-02-04 19:14:02 +00:00 |
|
Milos Kozak
|
1471d2bcd5
|
Merge pull request #639 from triplem/cleanup_libs
Remove jniLibs, download on build
|
2018-02-04 18:18:39 +01:00 |
|
Milos Kozak
|
f094b5cb64
|
Merge pull request #658 from bogdangorescu/patch-2
RO translation
|
2018-02-04 18:00:37 +01:00 |
|
Milos Kozak
|
6f7e6b04b5
|
Merge pull request #659 from jotomo/graph-target-line
Graph target line
|
2018-02-04 17:58:47 +01:00 |
|
Bog Dan
|
8c858d2b2d
|
RO translation - without translatable="false"
Removed translatable="false"
|
2018-02-04 17:55:59 +02:00 |
|
Tebbe Ubben
|
38fff9219a
|
Merge remote-tracking branch 'remotes/origin/dev' into dev
|
2018-02-04 14:06:14 +01:00 |
|
Jamorham
|
501ca5c597
|
Fix for some TBR cancels getting through
|
2018-02-04 12:57:10 +00:00 |
|
AdrianLxM
|
316c3da46c
|
use default repo for rhino
|
2018-02-04 08:24:12 +01:00 |
|
AdrianLxM
|
1bac0e573d
|
move rhino to external lib
|
2018-02-04 07:27:02 +01:00 |
|
Johannes Mockenhaupt
|
6b4b044cd6
|
Remove nested layout for better performance.
|
2018-02-04 00:36:08 +01:00 |
|
Johannes Mockenhaupt
|
f573265bc2
|
Add target line to graph.
Uses the middle if a range is specified to show what the loop
aims for.
|
2018-02-04 00:34:14 +01:00 |
|