Milos Kozak
|
c5841063a2
|
Merge branch 'dev' into rs-sync-warn
|
2018-06-24 14:03:12 +02:00 |
|
|
Milos Kozak
|
8c695255d6
|
Merge pull request #1143 from jotomo/strings
Rename "Lock screen" -> "Keep screen on".
|
2018-06-24 13:58:35 +02:00 |
|
|
AdrianLxM
|
3e53c66365
|
don't set time on large diff, just warn
|
2018-06-24 13:27:55 +02:00 |
|
|
Johannes Mockenhaupt
|
a8d783874c
|
Rename "Lock screen" -> "Keep screen on".
|
2018-06-24 12:50:11 +02:00 |
|
|
Milos Kozak
|
f7609317ba
|
Merge branch 'dev' into rs-sync-warn
|
2018-06-24 11:45:33 +02:00 |
|
|
Johannes Mockenhaupt
|
784c071f53
|
Small oref1 sens corrections.
|
2018-06-24 01:03:38 +02:00 |
|
|
Milos Kozak
|
a3fafa521b
|
nsclient for phones layout
|
2018-06-23 22:17:54 +02:00 |
|
|
Milos Kozak
|
a4b3b7b2e9
|
Clean AndroidAPS started button
|
2018-06-23 20:28:20 +02:00 |
|
|
AdrianLxM
|
9c0665124d
|
Update strings.xml
|
2018-06-23 20:04:09 +02:00 |
|
|
Milos Kozak
|
d59c3c567b
|
Merge pull request #1132 from jotomo/1129
Combo: update error message. Fixes #1129.
|
2018-06-23 18:32:59 +02:00 |
|
|
Milos Kozak
|
586665e19f
|
nsclient table mode improvements
|
2018-06-23 18:24:04 +02:00 |
|
|
Johannes Mockenhaupt
|
5c95b785bb
|
Combo: update error message. Fixes #1129.
|
2018-06-23 13:33:17 +02:00 |
|
|
Milos Kozak
|
9360151100
|
Merge branch 'dev' into oref1
|
2018-06-22 17:55:38 +02:00 |
|
|
Milos Kozak
|
7bed827f4b
|
Merge pull request #1119 from jotomo/delete-future-treatments
Treatments tab: add button (if applicable) to delete future treatments.
|
2018-06-22 17:47:37 +02:00 |
|
|
Johannes Mockenhaupt
|
58d79892ed
|
Overview: TT context menu.
|
2018-06-21 22:06:39 +02:00 |
|
|
Johannes Mockenhaupt
|
41ce9677df
|
Remove duplicate string.
|
2018-06-21 09:57:35 +02:00 |
|
|
Johannes Mockenhaupt
|
6002c747e6
|
Treatments tab: add button (if applicable) to delete future treatments.
|
2018-06-21 00:38:22 +02:00 |
|
|
Milos Kozak
|
370008f41e
|
oref 0.6.0 sens
|
2018-06-20 18:39:47 +02:00 |
|
|
Milos Kozak
|
e913cfe454
|
prepare oref1 plugin
|
2018-06-19 20:41:40 +02:00 |
|
|
Johannes Mockenhaupt
|
ef650b80a1
|
Combo: show notification on broken setup.
|
2018-06-18 20:19:30 +02:00 |
|
|
Tebbe Ubben
|
1e4c7178f4
|
Merge branch 'dev' into dev
|
2018-06-15 21:10:33 +02:00 |
|
|
Milos Kozak
|
21b598edfa
|
Merge pull request #1100 from MilosKozak/rsoption
Rsoption
|
2018-06-15 00:19:08 +02:00 |
|
|
Milos Kozak
|
5acb689eeb
|
Merge pull request #1102 from TebbeUbben/new-icon
New launcher icon
|
2018-06-14 23:10:43 +02:00 |
|
|
TebbeUbben
|
9e0dc9bfe5
|
New launcher icon
|
2018-06-13 20:23:40 +02:00 |
|
|
Milos Kozak
|
d051e081e2
|
Merge branch 'dev' into rsoption
|
2018-06-12 21:59:20 +02:00 |
|
|
Milos Kozak
|
e7eec8fe69
|
Poctech BG source
|
2018-06-11 17:26:31 +02:00 |
|
|
TebbeUbben
|
3ac10f4f7a
|
Improved MinimumDurationTask visualization
|
2018-06-11 16:24:46 +02:00 |
|
|
TebbeUbben
|
005039effc
|
Objectives styling
|
2018-06-09 22:07:41 +02:00 |
|
|
AdrianLxM
|
8106907a55
|
unify padding pills and pumpstatus
|
2018-06-09 13:53:11 +02:00 |
|
|
TebbeUbben
|
934a7e6797
|
Same color scheme for SW
|
2018-06-09 13:27:27 +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 |
|
|
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 |
|
|
TebbeUbben
|
38526d64c6
|
These should not be changed
|
2018-06-07 23:24:10 +02:00 |
|
|
TebbeUbben
|
e25ebbdafa
|
Protection against callback looping
|
2018-06-07 23:23:10 +02:00 |
|