Nico Schmitz
|
f28fca668f
|
Integrate info fields from swissalpine/dev-work
|
2018-06-13 00:07:13 +02:00 |
|
|
Nico Schmitz
|
5ba6f02b93
|
Remove reservoir TextView
|
2018-06-12 23:31:46 +02:00 |
|
|
Nico Schmitz
|
4ebc149783
|
Add changes of schmitzn/reservoir-view
|
2018-06-12 23:28:11 +02:00 |
|
|
Milos Kozak
|
e7eec8fe69
|
Poctech BG source
|
2018-06-11 17:26:31 +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 |
|
|
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
|
2d94133175
|
Plugin descriptions
|
2018-06-08 21:19:46 +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
|
e25ebbdafa
|
Protection against callback looping
|
2018-06-07 23:23:10 +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 |
|
|
Milos Kozak
|
1d13712aec
|
nsclient setup wizard tweaking
|
2018-06-06 22:58:50 +02:00 |
|
|
Milos Kozak
|
4adcb88d12
|
Merge pull request #1067 from jotomo/fill-one-shot-guard
One-short guards for Fill/Prime dialog.
|
2018-06-06 08:47:08 +02:00 |
|
|
Milos Kozak
|
65c8cb22ef
|
check for null context
|
2018-06-05 14:38:00 +02:00 |
|
|
Milos Kozak
|
7e7e921853
|
Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev
|
2018-06-05 14:37:47 +02:00 |
|
|
Milos Kozak
|
5df51e8a6e
|
check for NPE
|
2018-06-05 14:35:18 +02:00 |
|
|
AdrianLxM
|
4998ebae89
|
Merge pull request #1071 from TebbeUbben/new-design
TabLayout + NavigationDrawer
|
2018-06-04 23:53:42 +02:00 |
|
|
TebbeUbben
|
9cf9da0d22
|
MINIMUM_BASAL_VALUE_REPLACED -> MAXIMUM_BASAL_VALUE_REPLACED
|
2018-06-03 23:33:49 +02:00 |
|
|
TebbeUbben
|
263275659a
|
TabLayout + NavigationDrawer
|
2018-06-03 23:28:04 +02:00 |
|
|
TebbeUbben
|
a86c654f8d
|
Use real TBR cancels and dismiss their alerts
|
2018-06-03 10:56:29 +02:00 |
|
|
Johannes Mockenhaupt
|
ef6ee43c32
|
One-short guards for Fill/Prime dialog.
|
2018-06-02 18:06:04 +02:00 |
|
|
TebbeUbben
|
f151cbb0bf
|
TBR emulation
|
2018-06-02 16:37:53 +02:00 |
|
|
swissalpine
|
dd60cadd5a
|
Fix broken cage age
|
2018-05-31 22:22:22 +02:00 |
|
|
Markus M. May
|
a587f72de2
|
Fix wrong usage of event in refactored source
|
2018-05-30 18:09:41 +02:00 |
|
|
Milos Kozak
|
418f68153e
|
Merge pull request #1058 from MilosKozak/NSC-no-advancedfiltering
NSClient as source without advanced filtering
|
2018-05-30 08:08:04 +02:00 |
|
|
Markus M. May
|
0fe744c3e6
|
Remove unnecessary assignment
|
2018-05-29 21:44:33 +02:00 |
|
|
Markus M. May
|
41503800e8
|
Remove some duplicate code lines
|
2018-05-29 20:57:55 +02:00 |
|
|
AdrianLxM
|
de1196f34b
|
NSClient as source without advanced filtering
|
2018-05-29 12:57:07 +02:00 |
|
|
Milos Kozak
|
d642418e02
|
resolve NPE
|
2018-05-23 23:43:41 +02:00 |
|
|
Milos Kozak
|
fa2c0ab003
|
Merge pull request #994 from MilosKozak/startupwizard
Startupwizard
|
2018-05-22 23:07:04 +02:00 |
|
|
Milos Kozak
|
53bdb0bf09
|
asking permissions to notifications
|
2018-05-22 23:06:17 +02:00 |
|
|
Milos Kozak
|
4fa24fb009
|
SW add more texts
|
2018-05-20 23:44:09 +02:00 |
|
|
AdrianLxM
|
953128ffe5
|
UAM without advanced filtering
|
2018-05-20 19:17:46 +02:00 |
|
|
Milos Kozak
|
7714aa9138
|
Merge branch 'dev' into startupwizard
|
2018-05-20 14:18:58 +02:00 |
|
|
Milos Kozak
|
53cbe05436
|
Merge pull request #1019 from McHoffi/obj.7-add-info
Obj.7 add info about using SMB/maxIOB
|
2018-05-20 14:14:11 +02:00 |
|
|
Milos Kozak
|
66e50f5b62
|
Merge pull request #1038 from jotomo/upstreaming
[Polish] Dialog/color consistency, translations and other small stuff
|
2018-05-15 13:09:50 +02:00 |
|
|
Milos Kozak
|
e58149379a
|
Merge pull request #1043 from jotomo/issue-646
[Bugfix] On bolus cancel request, cancel all boluses. Partially addresses #646.
|
2018-05-15 10:55:04 +02:00 |
|
|
Johannes Mockenhaupt
|
25aa6f859f
|
On bolus cancel request, cancel all boluses. Partially addresses #646.
|
2018-05-13 23:57:40 +02:00 |
|
|
Johannes Mockenhaupt
|
29efe11ece
|
Combo: always send out progress updates (SMB or not).
Without this, showing SMB progress on wear is broken.
(cherry picked from commit 5ebff72)
|
2018-05-13 23:20:29 +02:00 |
|
|
Johannes Mockenhaupt
|
1883ac06dd
|
Use TT color for TT confirmations in dialogs.
|
2018-05-13 12:14:49 +02:00 |
|
|
Milos Kozak
|
337a3d9776
|
SW show ObjectivesFragment
|
2018-05-11 08:30:21 +02:00 |
|
|
Milos Kozak
|
8d7df64050
|
Merge pull request #1016 from MilosKozak/pump-notifications
Pump notifications
|
2018-05-10 23:24:45 +02:00 |
|
|
Milos Kozak
|
e105e5149e
|
Merge pull request #1032 from jotomo/wear-wizard-tt
Wear wizard: add TT config option.
|
2018-05-10 16:53:34 +02:00 |
|
|
Milos Kozak
|
1ba828d20a
|
SWFragment
|
2018-05-09 18:49:42 +02:00 |
|
|
Milos Kozak
|
61a7d69a65
|
Merge branch 'dev' into startupwizard
|
2018-05-09 11:41:05 +02:00 |
|
|
Milos Kozak
|
8c2d0d80ee
|
Merge pull request #1017 from MilosKozak/notification-height
Tests required: Notification height
|
2018-05-09 10:16:29 +02:00 |
|
|
Milos Kozak
|
e29a590cad
|
Merge pull request #1020 from MilosKozak/dia-refactor
default DIA
|
2018-05-08 23:43:54 +02:00 |
|
|
Johannes Mockenhaupt
|
ce6e53e9c6
|
Wear wizard: add TT config option.
|
2018-05-08 13:28:01 +02:00 |
|
|
Johannes Mockenhaupt
|
785c402848
|
LP: Don't notify about invalid values during editing.
|
2018-05-07 02:11:59 +02:00 |
|