AdrianLxM
|
6df614e7c6
|
Merge remote-tracking branch 'milosremote/dev' into cob-rework
|
2018-04-19 19:29:27 +02:00 |
|
Milos Kozak
|
0b8ff8fa76
|
Merge pull request #899 from MilosKozak/xDrip-source
xDrip plugin depend filtering on source
|
2018-04-19 18:22:20 +02:00 |
|
AdrianLxM
|
eac6f15881
|
XDrip source description extra
|
2018-04-19 17:49:18 +02:00 |
|
AdrianLxM
|
572b308f6c
|
cleanup
|
2018-04-19 17:47:34 +02:00 |
|
AdrianLxM
|
a227a8b601
|
Push source to xDrip plugin
|
2018-04-19 17:45:52 +02:00 |
|
AdrianLxM
|
938040ae6b
|
xDrip plugin depend filtering on source
|
2018-04-19 17:44:52 +02:00 |
|
AdrianLxM
|
d810be9b6a
|
consider absorption time for carbs - not DIA
|
2018-04-19 14:03:30 +02:00 |
|
AdrianLxM
|
8d94acb051
|
more cleanups
|
2018-04-19 13:44:06 +02:00 |
|
AdrianLxM
|
d7bf3c563a
|
cleanup
|
2018-04-19 13:35:52 +02:00 |
|
AdrianLxM
|
09cc8c01b6
|
use min5min impact actually used for SMB
|
2018-04-19 13:31:34 +02:00 |
|
AdrianLxM
|
f4dea97f36
|
cutoff at max absorption time
|
2018-04-19 13:04:21 +02:00 |
|
AdrianLxM
|
00c05c0e23
|
totalMinCarbsImpact depending on sensitivty plugin
|
2018-04-19 12:57:13 +02:00 |
|
AdrianLxM
|
e8406320e0
|
COB settings
|
2018-04-19 11:48:00 +02:00 |
|
Milos Kozak
|
6942a3d4b8
|
Merge pull request #897 from MilosKozak/overview-ps
Update Overview on Profile Switch
|
2018-04-19 08:17:32 +02:00 |
|
AdrianLxM
|
542cc9ac7f
|
Update Overview on Profile Switch
|
2018-04-19 01:38:27 +02:00 |
|
AdrianLxM
|
50eef089ea
|
Merge pull request #894 from MilosKozak/AdrianLxM-wear-patch
revert wear targetSdkVersion
|
2018-04-18 21:00:06 +02:00 |
|
AdrianLxM
|
9839ad0497
|
revert wear targetSdkVersion
... as we use old communication protocol.
|
2018-04-18 20:59:40 +02:00 |
|
Milos Kozak
|
75076b43e8
|
Merge pull request #890 from jotomo/nstreatment-dialog-hypo-tt-preset
NewNSTreatmentDialog: add Hypo TT preset.
|
2018-04-18 16:34:45 +02:00 |
|
Johannes Mockenhaupt
|
49a836eda9
|
NewNSTreatmentDialog: add Hypo TT preset.
|
2018-04-18 16:03:23 +02:00 |
|
Milos Kozak
|
3d5203b56f
|
Merge pull request #887 from MilosKozak/lp-buttons
Local Profile Buttons
|
2018-04-17 22:39:42 +02:00 |
|
AdrianLxM
|
00a0bf2f1a
|
local profile icons
|
2018-04-17 20:41:43 +02:00 |
|
AdrianLxM
|
eb2f628f1f
|
unify names of same icon with different resolution
|
2018-04-17 20:41:33 +02:00 |
|
Alessya
|
05a1b35ccb
|
Rename Icon files
|
2018-04-17 20:41:21 +02:00 |
|
Alessya
|
8dd589c5fe
|
New icons added for local profile screen
|
2018-04-17 20:41:07 +02:00 |
|
Milos Kozak
|
7063f4de8b
|
Merge pull request #879 from MilosKozak/temptargetfix
NewNSTreatment dialog cleanup
|
2018-04-17 07:45:08 +02:00 |
|
Milos Kozak
|
abadcd4eaa
|
fix test
|
2018-04-16 23:29:53 +02:00 |
|
Milos Kozak
|
d9ac199559
|
Merge pull request #878 from triplem/fix_objectives
Fix Objectives Issue #842
|
2018-04-12 22:26:51 +02:00 |
|
Milos Kozak
|
54048b29c4
|
NewNSTreatment dialog cleanup
|
2018-04-12 21:45:59 +02:00 |
|
Milos Kozak
|
7fafd59a5e
|
Merge pull request #872 from triplem/notes_wizard
Notes wizard
|
2018-04-12 21:17:33 +02:00 |
|
Milos Kozak
|
c573bcc277
|
Merge pull request #876 from MilosKozak/temptargetfix
upload temptargets to NS properly
|
2018-04-12 21:17:11 +02:00 |
|
Milos Kozak
|
5d81e40f74
|
Merge pull request #877 from jotomo/zeor-temp-basal
Overview: fix rendering zero-temp covering entire displayed range.
|
2018-04-12 21:16:42 +02:00 |
|
Markus M. May
|
42e36ab818
|
Fix #842
|
2018-04-12 21:08:06 +02:00 |
|
Johannes Mockenhaupt
|
b04eee0b52
|
Overview: fix rendering zero-temp covering entire displayed range.
(cherry picked from commit 525eaef)
|
2018-04-12 21:00:08 +02:00 |
|
Milos Kozak
|
0a377eb98e
|
cleanup
|
2018-04-12 10:32:52 +02:00 |
|
Milos Kozak
|
5eee8054c4
|
remove duplicate upload
|
2018-04-12 10:21:38 +02:00 |
|
Milos Kozak
|
dfc869ba2b
|
upload temptargets to NS properly
|
2018-04-12 10:17:59 +02:00 |
|
Milos Kozak
|
80e81b1c25
|
fix NPE
|
2018-04-12 09:53:14 +02:00 |
|
Milos Kozak
|
613b8a2f30
|
log profile conditional
|
2018-04-12 09:40:12 +02:00 |
|
Markus M. May
|
ca53b94498
|
Merge branch 'dev' into notes_wizard
|
2018-04-11 20:05:47 +02:00 |
|
Milos Kozak
|
263263daf1
|
Merge pull request #869 from PoweRGbg/phoneModel
Phone model note added to Ns #841
|
2018-04-11 17:57:30 +02:00 |
|
Roumen Georgiev
|
1acefaea3c
|
adding device name to AndroidAPS started note
|
2018-04-11 18:09:08 +03:00 |
|
Milos Kozak
|
83421c7266
|
show tests in travis
|
2018-04-11 16:23:35 +02:00 |
|
Milos Kozak
|
e6ec114eb7
|
gradle 3.1.1
|
2018-04-11 16:11:12 +02:00 |
|
Milos Kozak
|
d79882d927
|
Merge pull request #862 from jotomo/861-overview-enable-loop
WIP Fix re-enabling the loop plugin from overview. Fixes #861.
|
2018-04-11 15:56:15 +02:00 |
|
Johannes Mockenhaupt
|
d0edd89b5b
|
Remove CB.getActiveLoop(), use LoopPlugin.getPlugin().
|
2018-04-11 15:42:51 +02:00 |
|
Roumen Georgiev
|
564e87d782
|
added phone Manufacturer and model note to NS
|
2018-04-11 15:44:53 +03:00 |
|
Roumen Georgiev
|
35882ed146
|
Merge branch 'phoneModel' into dev
|
2018-04-11 13:27:23 +03:00 |
|
Roumen Georgiev
|
4a293373ce
|
Merge pull request #12 from MilosKozak/dev
latest dev
|
2018-04-11 13:23:15 +03:00 |
|
AdrianLxM
|
ebfb950ce0
|
Merge pull request #865 from swissalpine/white-number-patch
Fix for black number and labels on black background (aaps wear)
|
2018-04-10 23:10:11 +02:00 |
|
AdrianLxM
|
2414be85f2
|
dummy-edit to re-trigger travis
|
2018-04-10 22:53:27 +02:00 |
|