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
|
32f4a08fa6
|
slightly more padding on top buttons/fields
|
2018-06-05 13:26:43 +02:00 |
|
|
Roumen Georgiev
|
4a481bf294
|
Merge branch 'dev' into dev
|
2018-06-05 12:45:00 +03:00 |
|
|
Roumen Georgiev
|
54cc768a47
|
files renamed and added icon
|
2018-06-05 12:39:55 +03:00 |
|
|
Roumen Georgiev
|
c1b69404d0
|
files renamed and added icon
|
2018-06-05 12:19:47 +03:00 |
|
|
Roumen Georgiev
|
37e6e0268c
|
Merge pull request #25 from alesinka/master
adding icons from Alessya
|
2018-06-05 10:55:41 +03:00 |
|
|
AdrianLxM
|
536fe3e5d2
|
higher contrast ok and cancel buttons
|
2018-06-05 00:15:41 +02:00 |
|
|
AdrianLxM
|
171209503e
|
remove unneeded log statement
|
2018-06-05 00:04:03 +02:00 |
|
|
AdrianLxM
|
9d07e3e83f
|
Merge pull request #1072 from jotomo/silly-idea
Revert "Update prediction colors to match NS."
|
2018-06-04 23:54:22 +02:00 |
|
|
AdrianLxM
|
4998ebae89
|
Merge pull request #1071 from TebbeUbben/new-design
TabLayout + NavigationDrawer
|
2018-06-04 23:53:42 +02:00 |
|
|
TebbeUbben
|
5fa79b1db9
|
Changed accent color to #009688
|
2018-06-04 23:34:56 +02:00 |
|
|
TebbeUbben
|
f7b19e37a1
|
Button for plugin preferences
|
2018-06-04 21:56:31 +02:00 |
|
|
TebbeUbben
|
80e9d769e4
|
Compact version of toolbar
|
2018-06-04 21:34:21 +02:00 |
|
|
Alessya
|
fbe44b7190
|
new icon added to danaR tab - user options
|
2018-06-04 17:48:02 +03:00 |
|
|
Johannes Mockenhaupt
|
d31b90cd3e
|
Fix format specifier in French translation.
|
2018-06-04 15:38:06 +02:00 |
|
|
Roumen Georgiev
|
19e7d507b2
|
shutdown value can be 0
|
2018-06-04 10:24:20 +03:00 |
|
|
Roumen Georgiev
|
1147c28f04
|
use numberPicker instead of editText
|
2018-06-04 10:23:01 +03:00 |
|
|
Johannes Mockenhaupt
|
358108be49
|
Revert "Update prediction colors to match NS."
This reverts commit dd41afa
|
2018-06-04 03:00:50 +02:00 |
|
|
TebbeUbben
|
6c1ccebb4a
|
Moved padding to Toolbar
|
2018-06-03 23:42:10 +02:00 |
|
|
AdrianLxM
|
151bd0e058
|
Merge pull request #1066 from TebbeUbben/dev
TBR emulation
|
2018-06-03 23:38:17 +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
|
f8c621dc6a
|
Fixed tests
|
2018-06-03 11:04:33 +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 |
|
|
Roumen Georgiev
|
054003460c
|
push new settings to pump
|
2018-06-01 16:42:56 +03:00 |
|
|
Milos Kozak
|
96fb4323f8
|
Merge pull request #1064 from jotomo/purple-pony
Update prediction colors to match NS.
|
2018-06-01 13:57:20 +02:00 |
|
|
Milos Kozak
|
32a923d6b8
|
Merge pull request #1063 from swissalpine/patch-1
Fix for broken cage age display
|
2018-06-01 13:56:57 +02:00 |
|
|
Johannes Mockenhaupt
|
ef8f4f1448
|
Fix unit test.
|
2018-06-01 12:24:09 +02:00 |
|
|
Roumen Georgiev
|
75dbf71a70
|
Merge remote-tracking branch 'origin/dev' into dev
|
2018-06-01 12:11:29 +03:00 |
|
|
Roumen Georgiev
|
861f9bdd8d
|
Timeformat reverse
|
2018-06-01 12:10:08 +03:00 |
|
|
Roumen Georgiev
|
9569fbf183
|
Merge branch 'dev' into dev
|
2018-06-01 12:02:41 +03:00 |
|
|
Roumen Georgiev
|
908fd9f77e
|
strings update
|
2018-06-01 11:55:59 +03:00 |
|
|
Roumen Georgiev
|
85bef0036b
|
back to original
|
2018-06-01 11:45:31 +03:00 |
|
|
Roumen Georgiev
|
4581733cd7
|
some debugging output and forced getting user options
|
2018-06-01 11:41:37 +03:00 |
|
|
Roumen Georgiev
|
319e786988
|
display 666 in backlightontime if no settings read
|
2018-06-01 10:08:13 +03:00 |
|
|
Roumen Georgiev
|
f3d19aa6f4
|
convert int values to strings
|
2018-06-01 09:38:18 +03:00 |
|
|
Johannes Mockenhaupt
|
dd41afa55a
|
Update prediction colors to match NS.
|
2018-06-01 02:53:23 +02:00 |
|
|
swissalpine
|
dd60cadd5a
|
Fix broken cage age
|
2018-05-31 22:22:22 +02:00 |
|
|
Roumen Georgiev
|
bbb9c681e6
|
filling in some data
|
2018-05-31 17:16:30 +03:00 |
|
|
Roumen Georgiev
|
41af503104
|
filling in some data
|
2018-05-31 17:10:09 +03:00 |
|
|
Roumen Georgiev
|
da89ea1643
|
some formatting
|
2018-05-31 16:47:58 +03:00 |
|
|
Roumen Georgiev
|
39e704645b
|
create userOptionsActivity class
|
2018-05-31 14:45:26 +03:00 |
|
|
Roumen Georgiev
|
e4e4829c73
|
update of strings
|
2018-05-31 14:18:43 +03:00 |
|
|
Roumen Georgiev
|
f71372444b
|
strings for danaR options fragment
|
2018-05-31 13:54:37 +03:00 |
|
|
Milos Kozak
|
8f5120df4c
|
Merge pull request #1061 from triplem/dup_fix
Fix wrong usage of event in refactored source
|
2018-05-30 18:16:44 +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 |
|