Commit graph

4518 commits

Author SHA1 Message Date
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
swissalpine 2972138d2a Fix for black number and labels on black background (aaps wear) 2018-04-10 22:14:52 +02:00
Johannes Mockenhaupt 80be7fb586
Fix re-enabling the loop plugin from overview. Fixes #861.
Note that enabling a loop plugin is hardcoded against the only
impl currently available LoopPlugin. Support for multiple loop
plugins is incomplete (and not needed at this point), since
there's no LoopInterface, but immediately LoopPlugin (as compared
to APSInterface with OpenAPS* impls).
When adding support, the last activated loop plugin must be remembered
so the correct one is re-enabled.
2018-04-10 12:10:19 +02:00
Markus M. May 99c8bbc6c2 Adding notes to carbs and to wizard on overview 2018-04-09 22:10:08 +02:00
Milos Kozak e9ac979a1b fix NPE in TempBasal treatments tab 2018-04-09 19:52:01 +02:00
Milos Kozak 132400bb9e
Merge pull request #859 from MilosKozak/watchsmb
Watchsmb
2018-04-09 15:19:24 +02:00
AdrianLxM d1d46849ee
Merge pull request #832 from MilosKozak/lp-edit
LocalProfile reset/save button
2018-04-09 14:08:22 +02:00
Milos Kozak b2129fa48e
Merge pull request #857 from TebbeUbben/disable-tdd-load-button
Hide TDD buttons
2018-04-09 00:36:48 +02:00
Milos Kozak 0f0d68e46a
Merge pull request #855 from TebbeUbben/automatic-careportal-events
Automatic careportal events
2018-04-09 00:35:23 +02:00
Milos Kozak 82bb65560b QuickWizardTest part1 2018-04-09 00:37:23 +02:00
Milos Kozak 9b91b4ab93
Merge branch 'dev' into automatic-careportal-events 2018-04-08 23:53:04 +02:00