Johannes Mockenhaupt
|
8036f8bcde
|
Disable slope deviation unless on dev branch, fixes #1096.
|
2018-06-21 00:31:35 +02:00 |
|
|
Milos Kozak
|
5292e09535
|
Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev
|
2018-06-20 23:56:50 +02:00 |
|
|
Milos Kozak
|
a02961da61
|
check for NPE
|
2018-06-20 23:56:38 +02:00 |
|
|
Nico Schmitz
|
c3050740a8
|
Synchronize Butterknife / Eventbus
|
2018-06-20 22:57:31 +02:00 |
|
|
Milos Kozak
|
3ed11f9002
|
oref1 autosens: count with extra deviations
|
2018-06-20 20:49:16 +02:00 |
|
|
Milos Kozak
|
6eef71c4c0
|
Merge pull request #1116 from TebbeUbben/cb-fix
Fix for #1115
|
2018-06-20 20:43:29 +02:00 |
|
|
TebbeUbben
|
ed10c8cadc
|
Fix for #1115
|
2018-06-20 20:12:22 +02:00 |
|
|
Milos Kozak
|
370008f41e
|
oref 0.6.0 sens
|
2018-06-20 18:39:47 +02:00 |
|
|
Milos Kozak
|
e913cfe454
|
prepare oref1 plugin
|
2018-06-19 20:41:40 +02:00 |
|
|
Milos Kozak
|
df021a2dd2
|
Merge pull request #1111 from jotomo/combo-setup-notification
Combo setup notification
|
2018-06-19 18:41:43 +02:00 |
|
|
Johannes Mockenhaupt
|
3ed4aa468d
|
Combo: fix ReadQuickInfoCommand to handle empty bolus history.
|
2018-06-18 20:19:47 +02:00 |
|
|
Johannes Mockenhaupt
|
ef650b80a1
|
Combo: show notification on broken setup.
|
2018-06-18 20:19:30 +02:00 |
|
|
TebbeUbben
|
ef237ed378
|
DummyService javadoc
|
2018-06-18 19:43:40 +02:00 |
|
|
Milos Kozak
|
af8e1fb32f
|
Merge pull request #1078 from MilosKozak/AdrianLxM-patch-1
restrict local profile DIA to min of 5 on the GUI
|
2018-06-18 18:58:29 +02:00 |
|
|
TebbeUbben
|
a590a8be42
|
Foreground service
|
2018-06-17 23:33:32 +02:00 |
|
|
Milos Kozak
|
f14ba554f0
|
RS ble cleanup
|
2018-06-16 13:18:00 +02:00 |
|
|
Tebbe Ubben
|
1e4c7178f4
|
Merge branch 'dev' into dev
|
2018-06-15 21:10:33 +02:00 |
|
|
Milos Kozak
|
21b598edfa
|
Merge pull request #1100 from MilosKozak/rsoption
Rsoption
|
2018-06-15 00:19:08 +02:00 |
|
|
Milos Kozak
|
bcabeac228
|
Merge pull request #1104 from schmitzn/fix-careportalevent
Fix bug in CareportalEvent.getHoursFromStart()
|
2018-06-15 00:04:47 +02:00 |
|
|
Milos Kozak
|
5acb689eeb
|
Merge pull request #1102 from TebbeUbben/new-icon
New launcher icon
|
2018-06-14 23:10:43 +02:00 |
|
|
TebbeUbben
|
da9d586326
|
Also set round icon if available
|
2018-06-14 19:43:16 +02:00 |
|
|
TebbeUbben
|
f77e903721
|
Revert "Use icon for all build configurations"
This reverts commit e194e0d
|
2018-06-14 19:39:00 +02:00 |
|
|
Nico Schmitz
|
43d787ff88
|
Simplify isOlderThan()
|
2018-06-14 12:38:15 +02:00 |
|
|
Nico Schmitz
|
f82240a724
|
Fix bug in getHoursFromStart()
|
2018-06-14 12:34:42 +02:00 |
|
|
TebbeUbben
|
e194e0dc48
|
Use icon for all build configurations
|
2018-06-13 20:26:46 +02:00 |
|
|
TebbeUbben
|
9e0dc9bfe5
|
New launcher icon
|
2018-06-13 20:23:40 +02:00 |
|
|
Roumen Georgiev
|
904957d0d2
|
removing unneeded methods
|
2018-06-13 18:24:50 +03:00 |
|
|
PoweRGbg
|
a64364de4e
|
removed excessive debugging and unneeded source
|
2018-06-13 16:17:10 +03:00 |
|
|
PoweRGbg
|
5a197676fb
|
IT WORKS!!!
|
2018-06-13 15:57:42 +03:00 |
|
|
PoweRGbg
|
faab8fbc67
|
setting full userOptions
|
2018-06-13 11:43:44 +03:00 |
|
|
Milos Kozak
|
4d2e166620
|
try to fix crash
|
2018-06-13 10:41:15 +02:00 |
|
|
PoweRGbg
|
eaffa66946
|
latest
|
2018-06-13 11:11:03 +03:00 |
|
|
PoweRGbg
|
56651691a5
|
more more
|
2018-06-13 11:08:47 +03:00 |
|
|
PoweRGbg
|
64b5783e4a
|
more
|
2018-06-13 11:07:03 +03:00 |
|
|
PoweRGbg
|
71c474ef5f
|
danaR changes
|
2018-06-13 11:04:32 +03:00 |
|
|
PoweRGbg
|
5634aabd9f
|
more
|
2018-06-13 11:02:52 +03:00 |
|
|
PoweRGbg
|
2cb3c15d61
|
more update
|
2018-06-13 11:01:43 +03:00 |
|
|
PoweRGbg
|
cd337ecdc8
|
update to latest changes from Milos
|
2018-06-13 10:51:06 +03:00 |
|
|
PoweRGbg
|
434db333b1
|
reverting changes
|
2018-06-13 09:56:30 +03:00 |
|
|
PoweRGbg
|
87bc6ed798
|
Revert "more debugging output"
This reverts commit 1adf8718ae.
|
2018-06-13 09:49:58 +03:00 |
|
|
PoweRGbg
|
0f067ef3a7
|
Revert "more debugging output"
This reverts commit f1f8bae2d1.
|
2018-06-13 09:49:45 +03:00 |
|
|
PoweRGbg
|
90a3a66c30
|
Revert "Merge remote-tracking branch 'upstream/rsoption' into dev"
This reverts commit 233fb33659, reversing
changes made to f1f8bae2d1.
|
2018-06-13 09:49:37 +03:00 |
|
|
PoweRGbg
|
0e40d1e7ef
|
Revert "Revert "more debugging output""
This reverts commit 209fb79396.
|
2018-06-13 09:49:35 +03:00 |
|
|
PoweRGbg
|
209fb79396
|
Revert "more debugging output"
This reverts commit f1f8bae2d1.
|
2018-06-13 09:34:57 +03:00 |
|
|
PoweRGbg
|
233fb33659
|
Merge remote-tracking branch 'upstream/rsoption' into dev
|
2018-06-13 09:14:46 +03:00 |
|
|
Roumen Georgiev
|
f1f8bae2d1
|
more debugging output
|
2018-06-13 09:00:04 +03:00 |
|
|
Milos Kozak
|
082918c776
|
remove unneded code
|
2018-06-13 07:44:26 +02:00 |
|
|
Milos Kozak
|
6fa759a395
|
remove unneded code
|
2018-06-13 07:42:57 +02:00 |
|
|
Milos Kozak
|
ecdbe2ac37
|
setUserOptions cleanup
|
2018-06-12 23:43:04 +02:00 |
|
|
Milos Kozak
|
d051e081e2
|
Merge branch 'dev' into rsoption
|
2018-06-12 21:59:20 +02:00 |
|
|
Milos Kozak
|
d4ed6539d8
|
poctech units mmol/L
|
2018-06-12 21:57:33 +02:00 |
|
|
Roumen Georgiev
|
1adf8718ae
|
more debugging output
|
2018-06-12 13:30:07 +03:00 |
|
|
Roumen Georgiev
|
06507bab2c
|
update method names
|
2018-06-12 12:41:40 +03:00 |
|
|
Roumen Georgiev
|
978d94499f
|
update method names
|
2018-06-12 11:03:23 +03:00 |
|
|
Roumen Georgiev
|
f044ab15c0
|
setting swithces in activity
|
2018-06-12 10:39:47 +03:00 |
|
|
Roumen Georgiev
|
01012d817c
|
getting userOptions from v2
|
2018-06-12 10:29:47 +03:00 |
|
|
Milos Kozak
|
e7eec8fe69
|
Poctech BG source
|
2018-06-11 17:26:31 +02:00 |
|
|
TebbeUbben
|
41a7f57b75
|
Update Objective views every minute
|
2018-06-11 16:35:47 +02:00 |
|
|
TebbeUbben
|
3ac10f4f7a
|
Improved MinimumDurationTask visualization
|
2018-06-11 16:24:46 +02:00 |
|
|
TebbeUbben
|
31cb68240b
|
Automatically scroll to currently active objective
|
2018-06-11 15:45:28 +02:00 |
|
|
Roumen Georgiev
|
2441214bb8
|
added SetUserOptions for DanaR
|
2018-06-11 11:36:32 +03:00 |
|
|
TebbeUbben
|
97984f8ef3
|
Improved leftover time display
|
2018-06-09 23:15:46 +02:00 |
|
|
TebbeUbben
|
6bc13d9cc0
|
Don't return false in isStarted if objective has been accomplished
|
2018-06-09 23:10:54 +02:00 |
|
|
TebbeUbben
|
0d21a0ab62
|
Fixed tests
|
2018-06-09 23:03:31 +02:00 |
|
|
TebbeUbben
|
005039effc
|
Objectives styling
|
2018-06-09 22:07:41 +02:00 |
|
|
AdrianLxM
|
8106907a55
|
unify padding pills and pumpstatus
|
2018-06-09 13:53:11 +02:00 |
|
|
AdrianLxM
|
3a9017ae10
|
Merge pull request #1092 from TebbeUbben/sw-same-color-scheme
Same color scheme for SW
|
2018-06-09 13:37:31 +02:00 |
|
|
TebbeUbben
|
934a7e6797
|
Same color scheme for SW
|
2018-06-09 13:27:27 +02:00 |
|
|
TebbeUbben
|
531a926d00
|
Close navigation drawer on click
|
2018-06-09 13:17:26 +02:00 |
|
|
Milos Kozak
|
30dbbb12a8
|
Merge pull request #1081 from MilosKozak/AdrianLxM-patch-3
Wizard: fully undo "ok" on constraints violation
|
2018-06-09 11:46:41 +02:00 |
|
|
Milos Kozak
|
6344e88550
|
Merge pull request #1084 from TebbeUbben/dev
Config builder styling
|
2018-06-09 11:39:16 +02:00 |
|
|
TebbeUbben
|
09b93078a8
|
Fixed typos
|
2018-06-08 23:45:32 +02:00 |
|
|
TebbeUbben
|
67b6d94fe5
|
Android Wear was renamed to WearOS
|
2018-06-08 23:35:18 +02:00 |
|
|
TebbeUbben
|
5d60f34e26
|
Better description for MDI plugin
|
2018-06-08 23:31:57 +02:00 |
|
|
TebbeUbben
|
f7597c93d7
|
Merge remote-tracking branch 'milos/AdrianLxM-patch-4' into dev
# Conflicts:
# app/src/main/java/info/nightscout/androidaps/plugins/Careportal/CareportalPlugin.java
# app/src/main/java/info/nightscout/androidaps/plugins/PumpVirtual/VirtualPumpPlugin.java
|
2018-06-08 23:30:39 +02:00 |
|
|
TebbeUbben
|
37d543c865
|
Improvements to descriptions from Adrian
|
2018-06-08 23:27:52 +02:00 |
|
|
TebbeUbben
|
506482082d
|
Fixed descriptions
|
2018-06-08 21:26:12 +02:00 |
|
|
TebbeUbben
|
029057f1fc
|
Fix typo
|
2018-06-08 21:25:19 +02:00 |
|
|
TebbeUbben
|
2d94133175
|
Plugin descriptions
|
2018-06-08 21:19:46 +02:00 |
|
|
TebbeUbben
|
f9582d042f
|
Don't restore CheckBoxes and RadioButtons automatically
|
2018-06-08 20:05:33 +02:00 |
|
|
swissalpine
|
5bf6057838
|
Update danar_fragment.xml
|
2018-06-08 19:22:36 +02:00 |
|
|
swissalpine
|
87ea018181
|
Update wear_fragment.xml
|
2018-06-08 19:22:03 +02:00 |
|
|
swissalpine
|
3c58b94a28
|
Update objectives_fragment.xml
|
2018-06-08 19:19:21 +02:00 |
|
|
swissalpine
|
5df03e4ea7
|
Update openapsama_fragment.xml
|
2018-06-08 19:07:04 +02:00 |
|
|
swissalpine
|
ab599a452b
|
Update loop_fragment.xml
|
2018-06-08 19:06:16 +02:00 |
|
|
swissalpine
|
a926c4db86
|
Update combopump_fragment.xml
|
2018-06-08 19:05:34 +02:00 |
|
|
swissalpine
|
76505e0229
|
Update careportal_fragment.xml
|
2018-06-08 19:04:31 +02:00 |
|
|
swissalpine
|
7bd2f629bf
|
Update bgsource_fragment.xml
|
2018-06-08 19:02:20 +02:00 |
|
|
AdrianLxM
|
bbf09a62f1
|
synchronize onDestroyView
|
2018-06-08 06:20:35 +02:00 |
|
|
AdrianLxM
|
97bbc00dcf
|
Don't set text onunbound gui elements
|
2018-06-08 06:19:02 +02:00 |
|
|
TebbeUbben
|
38526d64c6
|
These should not be changed
|
2018-06-07 23:24:10 +02:00 |
|
|
TebbeUbben
|
e25ebbdafa
|
Protection against callback looping
|
2018-06-07 23:23:10 +02:00 |
|
|
TebbeUbben
|
aa86a49339
|
Use real plugin descriptions
|
2018-06-07 22:55:13 +02:00 |
|
|
TebbeUbben
|
13cb4c28ed
|
ConfigBuilder styling
|
2018-06-07 22:54:27 +02:00 |
|
|
AdrianLxM
|
d6184cc151
|
Wizard: fully undo "ok" on constraints violation
Fixes https://github.com/MilosKozak/AndroidAPS/issues/1056
|
2018-06-07 22:44:09 +02:00 |
|
|
Roumen Georgiev
|
17a0aba2e5
|
remove button if pump is DanaR Korean
|
2018-06-07 09:34:12 +03:00 |
|
|
Roumen Georgiev
|
6559f57cd9
|
remove button if pump is DanaR Korean
|
2018-06-07 09:33:29 +03:00 |
|
|
Roumen Georgiev
|
4b7f8615bf
|
Merge pull request #26 from MilosKozak/rsoption
update
|
2018-06-07 09:30:22 +03:00 |
|
|
Roumen Georgiev
|
9e2074433e
|
remove button if pump is DanaR Korean
|
2018-06-07 09:26:33 +03:00 |
|
|
Milos Kozak
|
9e099ec741
|
Merge pull request #1079 from MilosKozak/AdrianLxM-patch-2
Ro update by @bogdangorescu
|
2018-06-06 23:33:26 +02:00 |
|