AdrianLxM
|
a23c76f473
|
Merge branch 'dev' into smb-wear2
|
2018-02-14 15:03:45 +01:00 |
|
|
AdrianLxM
|
c821ef97d8
|
option to enable wear/SMB notifications
|
2018-02-14 15:02:04 +01:00 |
|
|
AdrianLxM
|
7270b0b2f5
|
no wear vibrations on SMB
|
2018-02-14 14:59:26 +01:00 |
|
|
Milos Kozak
|
bf6e3a9061
|
run calculation after interval change
|
2018-02-14 07:47:22 +01:00 |
|
|
Milos Kozak
|
4cdadaf0c4
|
IobCobPlugin specify loading time
|
2018-02-13 19:12:02 +01:00 |
|
|
Milos Kozak
|
31d493d8ae
|
Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev
|
2018-02-13 18:38:55 +01:00 |
|
|
Milos Kozak
|
3e06b6a4ed
|
Merge pull request #687 from jotomo/error-announcements
Create NS-anouncements for error dialogs and local alerts.
|
2018-02-13 18:08:14 +01:00 |
|
|
Milos Kozak
|
f063fb94d1
|
Update strings.xml
|
2018-02-13 18:06:26 +01:00 |
|
|
Johannes Mockenhaupt
|
f8075927f2
|
Make new behaviour configurable, default on.
|
2018-02-13 00:34:24 +01:00 |
|
|
Jamorham
|
d3bf4fd026
|
History intent updates for Asclepius compatibility
|
2018-02-12 21:27:35 +00:00 |
|
|
Milos Kozak
|
6470f7a63e
|
Update strings.xml
|
2018-02-12 20:18:44 +01:00 |
|
|
Milos Kozak
|
5225276259
|
Update strings.xml
|
2018-02-12 20:15:47 +01:00 |
|
|
Milos Kozak
|
a6a937ba20
|
IobCobCalculatorPlugin as a param for GraphData
|
2018-02-12 20:07:39 +01:00 |
|
|
Milos Kozak
|
0ab2d5ba38
|
unstatic IobCobCalculatorPlugin
|
2018-02-12 19:49:08 +01:00 |
|
|
Milos Kozak
|
da777d9660
|
HistoryBrowser fill space by bggraph
|
2018-02-12 19:39:45 +01:00 |
|
|
Johannes Mockenhaupt
|
0df796d3f4
|
Create NS-anouncements for error dialogs and local alerts.
|
2018-02-12 15:42:58 +01:00 |
|
|
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 |
|
|
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 |
|
|
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 |
|
|
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 |
|