Milos Kozak
09270f36bf
Merge branch 'dev' into automation
2019-07-25 16:17:16 +02:00
Milos Kozak
51bc5d3618
Merge branch 'dev' into medtronic_andy_merge
2019-07-25 13:40:37 +02:00
Andy Rozman
b1320c4bcb
- added keys for preferences and fixes on all other places
2019-07-23 16:09:56 +01:00
Milos Kozak
e02681ac31
Merge branch 'dev' into automation
2019-07-23 13:13:26 +02:00
Milos Kozak
c4ba821dc1
Merge branch 'dev' into automation
2019-07-14 20:00:42 +02:00
Milos Kozak
8c2c2b21ea
Merge branch 'dev' into medtronic_andy_merge
2019-07-14 19:50:07 +02:00
Milos Kozak
72ff3e1e7f
Merge branch 'dev' into IA-in-BG-graph
2019-07-14 19:44:01 +02:00
Johannes Mockenhaupt
0e37228a07
Tidepool: remove category summary (is never displayed).
2019-07-14 11:54:03 +02:00
Johannes Mockenhaupt
35cc095f8b
Tidepool: fix prefs category/header.
2019-07-14 11:52:51 +02:00
Paulus
fc1dd360b3
split menu for 1st & secondary graphs
2019-07-11 21:17:41 +02:00
Milos Kozak
c0345ce56c
Merge branch 'dev' into automation
2019-07-04 23:37:36 +01:00
Milos Kozak
c49da9a818
conditional upload
2019-06-08 23:39:14 +02:00
Milos Kozak
01006b32ce
remove explicit enable checkbox, test login
2019-06-07 09:13:29 +02:00
Milos Kozak
a0c00273bc
remove window latency
2019-06-05 10:47:32 +02:00
Milos Kozak
e32801ca6b
preferences, button
2019-06-04 07:38:17 +02:00
Milos Kozak
9b1acf6958
add missing classes. convert to use AAPS data
2019-06-01 18:40:33 +02:00
Andy Rozman
86ffc3370a
Merge branch 'dev' into medtronic_andy
2019-06-01 17:34:30 +01:00
Andy Rozman
67862d3385
- fix for task #126 - battery display, it will work for Alakaline and Lithium battery, but probably not for recharchargables
2019-05-26 14:44:33 +01:00
Tebbe Ubben
552298496f
Pump control: Fix crash when opening Insight paring activity
2019-05-12 02:20:00 +02:00
Milos Kozak
4ae7efc75f
Merge branch 'dev' into automation
2019-04-16 21:08:08 +02:00
Andy Rozman
ad17c66b1b
Merge branch 'dev' into medtronic_andy
2019-04-10 17:05:56 +01:00
Milos Kozak
3b1d96ecc9
LINT: xml
2019-04-08 17:03:18 +02:00
Milos Kozak
a339e0cf28
LINT: xml
2019-04-08 16:39:41 +02:00
Andy Rozman
03b3bf7388
Merge branch 'dev' into medtronic_andy
2019-04-07 23:48:20 +01:00
AdrianLxM
6378d0a6bf
Merge branch 'dev' into 221-fix
2019-04-07 18:16:42 +02:00
AdrianLxM
5fbc274c5b
Merge branch 'master' of https://github.com/MilosKozak/AndroidAPS into 221-fix
2019-04-07 17:00:36 +02:00
AdrianLxM
5e720f8081
deactivate TT raises/lowers target
2019-04-07 16:57:51 +02:00
Tebbe Ubben
e3f45aa6be
Fix automatic careportal entries
2019-04-03 00:07:20 +02:00
Andy Rozman
bd3529e650
Merge branch 'dev' into medtronic_andy
2019-03-31 20:03:49 +01:00
Nico Schmitz
fc7e65c4d1
Update to recent upstream/dev
2019-03-22 23:08:13 +01:00
Nico Schmitz
91e4b01f10
Display actions and merge recent upstream/dev
...
- Add ActionListAdapter
- Add ChooseActionDialog
- Merge upstream/dev branch
2019-03-19 19:08:46 +01:00
Tebbe Ubben
9524818c4d
Headline for Insight related settings
2019-03-07 15:25:29 +01:00
Andy Rozman
5a8b5f3e7b
Merge branch 'dev' into medtronic_andy
2019-03-03 23:35:12 +00:00
Tebbe Ubben
91c3123865
Fix crash in Insight plugin
2019-03-02 22:20:37 +01:00
Andy Rozman
011aaf5336
Moved medtronic to correct package
2019-03-02 20:39:14 +00:00
Milos Kozak
f24b32bc8c
fix overview intent name
2019-03-02 19:25:22 +01:00
Andy Rozman
289902633e
Merge branch 'dev' into medtronic_andy
2019-03-02 18:20:37 +00:00
Milos Kozak
395faa7dc9
pumps package refactor
2019-02-26 20:38:27 +01:00
Milos Kozak
be2866d894
fix key_smbmaxminutes
2019-02-25 20:15:28 +01:00
Andy Rozman
5aa5d9f749
Merge branch 'dev' into medtronic_andy
2019-02-16 20:50:36 +00:00
TebbeUbben
d2b0665af1
Merge branch 'master' into insight-dev2
2019-02-12 15:01:29 +01:00
TebbeUbben
a4312acb3e
Incremental recovery duration
2019-02-12 14:54:27 +01:00
Milos Kozak
f540c70f22
Merge branch 'dev' into G6
2019-02-08 19:11:38 +01:00
TebbeUbben
cc189d360f
Merge remote-tracking branch 'nico/dev-wip' into dev-nico
2019-02-02 16:58:21 +01:00
TebbeUbben
d1f7086651
Merge branch 'master' into insight-dev
...
# Conflicts:
# app/src/main/java/info/nightscout/androidaps/plugins/Overview/notifications/Notification.java
2019-01-31 13:08:33 +01:00
TebbeUbben
2770a49869
Local Insight driver
2019-01-18 22:40:22 +01:00
Andy Rozman
8fc694e812
Merge branch 'dev' into medtronic_andy
2019-01-04 22:24:44 +01:00
Andy Rozman
56eaacb3a2
[0.6]
...
Configuration:
- added delay for Bolus delivery
- added choice for decoding (done on RL or in software)
Code:
- encoding DailyTotals for 522 and 523
- some minor fixes reported by Crashalytics
- refactoring history
- added history display
- changes to delivering Bolus (canceling)
- started adding 6b4b hardware decoding
2019-01-04 14:02:10 +01:00
Milos Kozak
2b9b3b4f16
Eversense support
2018-12-11 21:56:57 +01:00
Nico Schmitz
9e03f0f8ca
Update to current dev branch
2018-12-11 14:51:26 +01:00
