Milos Kozak
98e850b1b3
Merge branch 'dev' into smb060
2018-01-26 11:54:09 +01:00
AdrianLxM
3962808626
minimum of 30 min for unreachable alert
2018-01-21 19:05:04 +01:00
Johannes Mockenhaupt
57944fb4b5
Merge remote-tracking branch 'origin/dev' into smb060
...
* origin/dev:
Actions tab: show profile switch button for single profile too.
Old NS-Version non-urgent
Add SP to imports
refactor cancelAlarm back to KeepAliveReceiver
push next alert on read status
G5 upload to xdrip
fake Esel new file
fake Esel
Apply bolus constraint before applying.
Rv2,RS: always load last 45 min
remove wear-overview notifications as replaced by system notifications
Remove missed reference to pref in NSProfilePlugin.
Remove 'sync to profile' pref.
# Conflicts:
# app/src/main/java/info/nightscout/androidaps/queue/CommandQueue.java
2017-12-20 17:28:08 +01:00
Milos Kozak
0d7e950b73
Merge pull request #505 from jotomo/sync-to-pump
...
Remove sync to pump pref, always sync
2017-12-20 10:49:47 +01:00
Milos Kozak
5f60e7cf2b
G5 upload to xdrip
2017-12-14 21:49:11 +01:00
Milos Kozak
b1c4f28eb7
OpenAPS 0.6.0 1st part
2017-12-11 18:45:04 +01:00
Johannes Mockenhaupt
23874ebbd6
Remove 'sync to profile' pref.
...
(cherry picked from commit 01c52e7
2017-12-05 10:00:31 +01:00
Milos Kozak
d4d194f7f0
Merge branch 'dev' into smb
2017-12-04 23:30:24 +01:00
AdrianLxM
07c1084287
Merge branch 'watchfaces' into dev
2017-12-02 21:45:39 +01:00
AdrianLxM
98777579c8
delta granularity and NPE fix
2017-12-01 20:32:26 +01:00
Milos Kozak
622ac15c50
Merge branch 'dev' into smb, fix compile, add queue features
2017-12-01 18:13:05 +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
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
a1c6704ae9
Merge branch 'dev2' into smb
2017-11-01 20:50:14 +01:00
Milos Kozak
60699eddbb
preferences update
2017-11-01 20:43:59 +01:00
AdrianLxM
7ed7a2e8c4
Merge remote-tracking branch 'milosremote/dev' into smb-rhino
2017-10-21 17:06:57 +02:00
AdrianLxM
f751638a7f
enabling wearcontrols from preferences
2017-10-12 18:01:10 +02:00
Milos Kozak
24099222f3
Dana R & v2 speed selection
2017-10-10 19:14:43 +02:00
Milos Kozak
d142d2e4f9
resolve RS merge conflict
2017-10-10 16:47:03 +02:00
Johannes Mockenhaupt
fa1c282699
Merge remote-tracking branch 'origin/dev' into smb
...
* origin/dev: (28 commits)
Singleton & Crashlytics logging part 2
treatments in config builder
Singleton & Crashlytics logging part 1
checkboxes for NS-Client layouts
overview checkboxes cutoff fix
update NP value after manual entry
restore preferences
temp target presets
Rv2 percent fix
korean percent fix
serialize reload of treatments
getTempBasalFromHistory -> getRealTempBasalFromHistory
Do not misinterpret a fake-extended as 0% temp.
In one line
Update danar_fragment.xml
text identation
Add files via upload
Add files via upload
Add files via upload
Add files via upload
...
# Conflicts:
# app/build.gradle
# app/src/main/java/info/nightscout/androidaps/MainApp.java
2017-10-07 21:33:22 +02:00
AdrianLxM
7f403166c7
restore preferences
2017-10-06 03:05:36 +02:00
AdrianLxM
bd93fc1adb
temp target presets
2017-10-06 02:53:23 +02:00
Milos Kozak
08fca41b5f
partial bolus code, messages blocked by sleep :(
2017-09-14 22:53:11 +02:00
Milos Kozak
ed6cabe7fa
initial RS work
2017-09-13 00:35:03 +02:00
Milos Kozak
e5cc34b975
fix merge conflict
2017-08-16 18:38:14 +02:00
Milos Kozak
898e162300
initial work on SMB
2017-08-15 23:13:37 +02:00
AdrianLxM
707d5a480c
insulincurves - rename peak to peak time
2017-08-14 16:02:07 +02:00
AdrianLxM
085caddeee
insulincurves - freepeak
2017-08-14 15:24:55 +02:00
Milos Kozak
1604b85d34
Merge branch 'dev' into move-to-range-in-profile
2017-08-05 14:48:41 +02:00
AdrianLxM
cfe8e0a23a
local broadcasts better setting title
2017-07-18 22:18:10 +02:00
AdrianLxM
c753873769
setting to disable local broadcasts in NSClient
2017-07-18 22:15:17 +02:00
Johannes Mockenhaupt
7eacd5021c
Use target ranges from profile, rather than fixed values from prefs.
2017-07-18 13:04:15 +02:00
AdrianLxM
b79beda971
wear pass through overview notifications
2017-07-15 16:03:04 +02:00
Milos Kozak
09e5fdc61b
sensitivity prefs cleanup
2017-06-30 11:56:36 +02:00
Milos Kozak
39c6ae5eae
fix merge conflict
2017-06-30 09:35:20 +02:00
Milos Kozak
fec4e60359
Merge pull request #269 from AdrianLxM/percentagevisualization
...
visualize absolute rate emulation as percentage
2017-06-30 00:00:47 +02:00
AdrianLxM
fcab1a267b
adapt diadivisor
2017-06-29 19:39:58 +02:00
AdrianLxM
16e360f200
visualize absolute rate emulation as percentage
2017-06-29 14:14:40 +02:00
Milos Kozak
3f641f9c30
carbs absorption settings
2017-06-25 11:16:19 +02:00
Milos Kozak
80962e33d7
allow to ignore profileswitch events
2017-06-20 19:52:46 +02:00
Milos Kozak
e90812634b
work from old autosens branch
2017-06-16 14:37:43 +02:00
Milos Kozak
fb7af2f317
ns alarm setting in xml
2017-06-15 21:33:45 +02:00
Milos Kozak
25110cfea4
move database actions from pump to treatments plugin
2017-05-15 18:44:40 +02:00
Milos Kozak
51d52f6b3d
Merge branch 'DanaRv2' into history
2017-05-10 21:53:31 +02:00
Milos Kozak
5b25d28f42
Merge branch 'dev' into DanaRv2
2017-05-10 14:05:43 +02:00
AdrianLxM
298d7a7d9c
Merge branch 'dev' into xdripstatusline
2017-05-09 23:26:31 +02:00
AdrianLxM
1fa3a2a697
bgi on watch status (optional)
2017-05-09 23:23:37 +02:00
Milos Kozak
09fea02ed2
Allow to disable NS upload while client is connected
2017-05-09 16:24:53 +02:00
