Johannes Mockenhaupt
|
01c52e753c
|
Remove 'sync to profile' pref.
|
2017-12-05 01:24:43 +01:00 |
|
|
Johannes Mockenhaupt
|
bf9f877b3d
|
Merge remote-tracking branch 'origin/dev' into combo-scripter-v2
* origin/dev: (68 commits)
max connection time to 120 sec
make chart zoomable again
fix NPE
lowest priority for background calculations
wear timestamps long
remove unneeded code
fix landscape overview
synchronized wait
fix build tools for travis
try to fix travis
upgrade build tools
R: resolve thread deadlock during bolus stop
remove unsupported code from korean pump
handle bolus stop prior to delivery correctly
fix translations
better logging
Revert unnecessary change.
Send OpenAPS timestamp to watch rather than minAgo, for more accurate updates on watch face.
gradle update
parse more iso formats
...
# Conflicts:
# app/build.gradle
# app/src/main/AndroidManifest.xml
# app/src/main/java/info/nightscout/androidaps/Config.java
# app/src/main/java/info/nightscout/androidaps/PreferencesActivity.java
# app/src/main/java/info/nightscout/androidaps/plugins/Actions/ActionsFragment.java
# app/src/main/java/info/nightscout/androidaps/plugins/Actions/dialogs/FillDialog.java
# app/src/main/java/info/nightscout/androidaps/plugins/Actions/dialogs/NewExtendedBolusDialog.java
# app/src/main/java/info/nightscout/androidaps/plugins/ConfigBuilder/ConfigBuilderPlugin.java
# app/src/main/java/info/nightscout/androidaps/plugins/Loop/LoopPlugin.java
# app/src/main/java/info/nightscout/androidaps/plugins/Overview/Dialogs/NewTreatmentDialog.java
# app/src/main/java/info/nightscout/androidaps/plugins/Overview/Dialogs/WizardDialog.java
# app/src/main/java/info/nightscout/androidaps/plugins/Overview/OverviewFragment.java
# app/src/main/java/info/nightscout/androidaps/plugins/Overview/notifications/DismissNotificationService.java
# app/src/main/java/info/nightscout/androidaps/plugins/Overview/notifications/Notification.java
# app/src/main/java/info/nightscout/androidaps/plugins/Overview/notifications/NotificationStore.java
# app/src/main/java/info/nightscout/androidaps/plugins/ProfileCircadianPercentage/CircadianPercentageProfilePlugin.java
# app/src/main/java/info/nightscout/androidaps/plugins/ProfileNS/NSProfilePlugin.java
# app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRS/services/DanaRSService.java
# app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRv2/services/DanaRv2ExecutionService.java
# app/src/main/java/info/nightscout/androidaps/plugins/Treatments/TreatmentsFragment.java
# app/src/main/java/info/nightscout/androidaps/plugins/Wear/ActionStringHandler.java
# app/src/main/java/info/nightscout/androidaps/receivers/KeepAliveReceiver.java
# app/src/main/res/values/strings.xml
# app/src/main/res/xml/pref_others.xml
# app/src/main/res/xml/pref_wear.xml
# gradle/wrapper/gradle-wrapper.properties
# wear/build.gradle
|
2017-12-05 00:32:47 +01:00 |
|
|
Milos Kozak
|
a13661400f
|
DanaRv2 queue & pump autodection
|
2017-11-22 22:09:58 +01:00 |
|
|
Johannes Mockenhaupt
|
c6ad1b59f3
|
Clean up string resources.
|
2017-11-22 11:27:49 +01:00 |
|
|
Milos Kozak
|
3ab235f829
|
refactor pump interface out of ConfigBuilder, remove handlers
|
2017-11-20 23:39:12 +01:00 |
|
|
Johannes Mockenhaupt
|
eed3773b49
|
Combo i18n.
|
2017-10-27 17:19:10 +02:00 |
|
|
Johannes Mockenhaupt
|
e1c1f4b996
|
Revert string danar_stats.
|
2017-10-19 21:31:10 +02:00 |
|
|
Johannes Mockenhaupt
|
4de010b1a2
|
Strings reuse for pumps.
|
2017-10-19 16:11:36 +02:00 |
|
|
Milos Kozak
|
f08809ff9e
|
rename button to activate profile
|
2017-10-04 23:33:02 +02:00 |
|
|
Milos Kozak
|
6ea7549e4f
|
update languages
|
2017-08-26 12:07:37 +02:00 |
|
|
Milos Kozak
|
4e4088f164
|
remove unneeded strings
|
2017-08-05 18:47:01 +02:00 |
|
|
Milos Kozak
|
f834b3b7e0
|
remove unneeded texts
|
2017-08-05 17:43:31 +02:00 |
|
|
AdrianLxM
|
e30e62e9ab
|
Some German translations, remove unused strings, App name for all
|
2017-08-01 23:46:58 +02:00 |
|
|
Milos Kozak
|
9596987b35
|
new temp basal dialog refactor
|
2017-08-01 20:02:17 +02:00 |
|
|
AdrianLxM
|
b5cb68be73
|
remove extra strings
|
2017-07-20 01:06:00 +02:00 |
|
|
Milos Kozak
|
9e8c91319e
|
move ns version to about dialog
|
2017-06-30 09:55:47 +02:00 |
|
|
Milos Kozak
|
f58f70bdca
|
wizard tweaking
|
2017-06-28 23:11:17 +02:00 |
|
|
Milos Kozak
|
d365fcd6a4
|
fix bugs & design tweaking
|
2017-06-02 23:25:11 +02:00 |
|
|
Milos Kozak
|
5208f23661
|
Temptargets under treatments
|
2017-05-23 23:56:53 +02:00 |
|
|
Milos Kozak
|
56d54a6988
|
italian language
|
2017-05-20 20:41:23 +02:00 |
|
|
Milos Kozak
|
86c975e9d6
|
Add Italian language
|
2017-05-16 13:39:24 +02:00 |
|