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 |
|
|
Milos Kozak
|
b5eff7baab
|
Merge pull request #1099 from PoweRGbg/dev
getting userOptions from v2 works
|
2018-06-12 18:29:14 +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
|
23d69c1da8
|
Merge pull request #1080 from PoweRGbg/dev
more work on saving the options to R and v2
|
2018-06-11 17:30:57 +02: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
|
ec5b0cc3f7
|
Merge pull request #1093 from MilosKozak/padding
unify padding pills and pumpstatus
|
2018-06-09 14:33:23 +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 |
|
|
AdrianLxM
|
e1cc07ca11
|
Merge pull request #1091 from TebbeUbben/dev
Close navigation drawer on click
|
2018-06-09 13:32:05 +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 |
|
|
AdrianLxM
|
e83a57f3e9
|
Merge pull request #1087 from swissalpine/patch-2
Some more paddings
|
2018-06-08 20:16:33 +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 |
|