Commit graph

203 commits

Author SHA1 Message Date
Johannes Mockenhaupt 23874ebbd6
Remove 'sync to profile' pref.
(cherry picked from commit 01c52e7)
2017-12-05 10:00:31 +01:00
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
Andreas 29d9d20605
Update strings.xml
Add german text for local alerts
2017-12-01 08:03:33 +01:00
Andreas e07c5fb50d
Update strings.xml
Change "Temp basal" to "Temp Basal"
2017-11-30 15:04:40 +01:00
Milos Kozak a13661400f DanaRv2 queue & pump autodection 2017-11-22 22:09:58 +01:00
AdrianLxM 681add11a9 remove translations without english default 2017-11-22 21:06:31 +01:00
Johannes Mockenhaupt c6ad1b59f3
Clean up string resources. 2017-11-22 11:27:49 +01:00
Johannes Mockenhaupt 9d3625e78c
Show bolus/TBR percent and duration with activity. 2017-11-18 23:29:46 +01:00
Johannes Mockenhaupt 46fdd47ac0
Fixes and cleanups. 2017-11-18 21:32:01 +01:00
Johannes Mockenhaupt 5d077c329a
fix the fix with the fix from the fix that fixes the fix. 2017-11-10 01:16:01 +01:00
Johannes Mockenhaupt 522b5e9e1b
Clean up string resource names. 2017-10-30 21:42:14 +01:00
Johannes Mockenhaupt 6b6d252173
Day 1
* Some UI rework
* Start removing (retry) logic from ruffyscripter to ComboPlugin
* Cleanups all over
* Remove TDD stuff, this can be done independently of a pump
* New SPI/API methods confirmAlert, readReservoirLevelAndLastBolus
* Add warning and error codes from Combo manual
* Rework commands to just execute an action (verification will be in
  ComboPlugin eventually, together with retry logic)
* Rework commands to update state in field as command progresses
  rather than returnin/throwing.
* Initial version reading bolus and error history (no DB sync yet).
2017-10-29 11:36:35 +01:00
Johannes Mockenhaupt 36d5c4d806
Clean up ComboFragment, related string resources. 2017-10-28 00:47:45 +02:00
Johannes Mockenhaupt d237c46ca8
Merge remote-tracking branch 'origin/dev' into combo-v2
* origin/dev: (26 commits)
  fix RS response code
  use max absorption time for AAPS and weighted average sensitivity detection
  log.debug -> log.error on RS comm
  read status after bolus
  RS connectivity & bolus improvement
  Better bolusing with different speeds (R & Rv2)
  Detailed onscreen history logging
  Split to smaller pieces
  Update strings.xml
  Sensitivity logging optional
  RS synchronized change
  fix displaying XX:30 time intervals
  CS translations
  allow to use actual profile in wizard
  getUnits from active profile not interface
  Update strings.xml
  Update strings.xml
  Update dutch
  Update strings.xml
  Update strings.xml
  ...
2017-10-27 22:24:38 +02:00
Johannes Mockenhaupt 4bc970091e
More i18n. 2017-10-27 21:51:15 +02: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
diabetesdt1 51caffa591 Update strings.xml 2017-10-19 16:40:36 +02:00
Johannes Mockenhaupt 4de010b1a2
Strings reuse for pumps. 2017-10-19 16:11:36 +02:00
diabetesdt1 17eec803f4 Update strings.xml 2017-10-19 16:03:31 +02:00
McHoffi 434f4474b5 DE_translations 2017-10-18 11:11:41 +02:00
Milos Kozak f08809ff9e rename button to activate profile 2017-10-04 23:33:02 +02:00
diabetesdt1 efb9bed3fa Update strings.xml 2017-08-17 22:21:09 +02:00
diabetesdt1 ef42193d95 Update strings.xml
Contraints translated with "Beschränkungen" (but not in the Config-Builder -> the Option to activate/show the Contraints-Tab)

objectives_*_ updated

dia_too_short updated
2017-08-17 22:06:10 +02:00
diabetesdt1 64446f07c5 Update strings.xml
added more translations, but please review the Objectiv-Strings, it was not so easy, so i hope i have translated it right.
Then, the most german varibles are translated.
2017-08-17 12:40:14 +02:00
diabetesdt1 8cd24fd919 Update strings.xml
Replaced "Empfindlichkeit" with "Sensitivität"
2017-08-11 13:28:39 +02:00
diabetesdt1 a69a94a384 Update strings.xml 2017-08-11 12:48:15 +02:00
diabetesdt1 15fc53530d Update strings.xml
Changed Nightscout to NS back (but not on the short Text).
Add more Translations.
Overview-Notification used and not "Popup-Notification".
Removed on short Names the ".
I think "treatment" = "Behandlung" sounds wrong :-|
2017-08-11 12:43:46 +02:00
diabetesdt1 0b62669079 Update strings.xml
typo fixed
2017-08-11 07:30:53 +02:00
diabetesdt1 d78928a264 Update strings.xml
typo fixed and empty strings removed
2017-08-10 21:40:03 +02:00
diabetesdt1 c5b5d65efc Update strings.xml 2017-08-10 21:29:41 +02:00
diabetesdt1 8df0ccdbb1 Update strings.xml
rollback language-names
2017-08-10 21:28:09 +02:00
diabetesdt1 33f5e97ac6 Update strings.xml
add more german translation and typos fixed
2017-08-10 21:12:56 +02:00
Winfried Kuiper 5b43f11a3f Update strings.xml
Confirmation=Bestätigung statt Konfiguration (configuration)
2017-08-09 22:12:09 +02:00
Winfried Kuiper 99a0edfa06 Update strings.xml
Missing units in german translation
2017-08-09 22:03:59 +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 23abc0e4e5 Some more German 2017-08-02 00:08:56 +02:00
AdrianLxM 5d51b8f0f9 Some more German 2017-08-01 23:56:16 +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
Milos Kozak 6828e11dd9 remove notes strings as well 2017-08-01 17:25:43 +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 86c975e9d6 Add Italian language 2017-05-16 13:39:24 +02:00
Milos Kozak 4201709e2a finish careportal dialog redesign 2017-05-16 11:47:33 +02:00
AdrianLxM a60afbceb9 typo 2017-05-12 16:08:48 +02:00
AdrianLxM a9e093ad0d some German translations 2017-05-12 16:06:14 +02:00
Milos Kozak 554fb51a75 profile layout 2017-05-09 19:06:59 +02:00
Milos Kozak 974e5e0098 pump fragment redesign 2017-04-29 18:11:15 +02:00
Milos Kozak f641d40722 virtual pump layout 2017-04-29 17:48:45 +02:00
Milos Kozak b0c828c93e nsclient build variant 2017-02-23 20:00:33 +01:00
Milos Kozak 8a374f1b35 Shared preferences cleanup 2017-02-17 16:16:20 +01:00
Milos Kozak f9ee3c547a translations 2017-02-13 21:05:57 +01:00
Milos Kozak 4e3cc65d5d handling pump suspend, show pump actions on overview 2017-02-12 19:51:13 +01:00
viktoria b0a9d74b49 Merge remote-tracking branch 'refs/remotes/MilosKozak/dev'
Conflicts:
	app/src/main/java/info/nightscout/androidaps/plugins/OpenAPSAMA/Autosens.java
	app/src/main/res/values/strings.xml
2017-02-02 19:00:17 +01:00
Milos Kozak d6a22be184 remove absorption rate from everywhere 2017-01-29 20:19:02 +01:00
Milos Kozak 3f90ad6a5c sync profile to pump 2017-01-28 23:45:14 +01:00
LadyViktoria f510b0a8cc Add prefernces.json errer message translations
attention the characters are limited.
maybe its caused by old libs
com.android.support:appcompat-v7:23.4.0
'com.android.support:support-v4:23.4.0
2017-01-27 09:52:16 +01:00
Heiner1 5c43c66163 Update strings.xml 2017-01-25 23:35:31 +01:00
PitBeckh dc12ef3fec Update strings.xml 2017-01-23 16:26:59 +01:00
PitBeckh 2f72471915 Update strings.xml 2017-01-23 16:24:53 +01:00
PitBeckh d995910384 Update strings.xml 2017-01-22 20:34:54 +01:00
AdrianLxM ea78dd5bc1 Shorten tabs first 2017-01-21 19:44:58 +01:00
AdrianLxM 88a1dcde51 remove empty language translation 2017-01-19 21:32:09 +01:00
Milos Kozak 2754e23c08 CS translations 2017-01-19 19:52:14 +01:00
Milos Kozak c701b5d125 waiting for pump message 2017-01-19 19:21:25 +01:00
Milos Kozak 61b1ee781f temp target treatment dialog & sync fix 2017-01-16 16:59:12 +01:00
Milos Kozak 61a8cad4e8 allow refrest temp targets from NS & fix bugs 2017-01-14 16:36:42 +01:00
AdrianLxM dfc176d1bd Typo German (Ereignis with one s) 2017-01-10 02:39:16 +01:00
viktoria f3551dda7f german translation 2017-01-02 16:44:20 +01:00
Milos Kozak 1e99c00626 allow sms string to be translated separately 2016-12-29 16:22:40 +01:00
Milos Kozak 8e46a55e48 allow better translation of min ago 2016-12-29 16:06:00 +01:00
AdrianLxM e1dc624a47 fully remove mm640g 2016-12-10 22:58:31 +01:00
Milos Kozak 97a22344e3 CZ translations 2016-11-29 19:07:09 +01:00
Milos Kozak 36d5f1dc29 proper danar errors detection 2016-11-29 18:28:36 +01:00
AdrianLxM 2fef497ce9 German updates 02 2016-11-11 17:59:23 +01:00
AdrianLxM 75889c24b3 German updates 01 2016-11-11 17:59:10 +01:00
AdrianLxM 80e8ac465a Update German translation 2016-11-02 14:33:41 +01:00
AdrianLxM b265be3536 Some updates on German translation 2016-11-02 14:17:16 +01:00
Milos Kozak 4c3d67535c Korean language template 2016-10-25 23:38:44 +02:00
Milos Kozak 6f8d828ec2 QuickWizard 2016-10-20 23:50:31 +02:00
Milos Kozak 4378c9af14 more SMS commands 2016-09-16 14:08:26 +02:00
Milos Kozak b711648bee plugins refactoring 2016-08-05 23:54:03 +02:00
Milos Kozak b42644de39 objectives finalization, some todos 2016-08-04 23:38:43 +02:00
Milos Kozak c20026c15a lowsuspend cleanup 2016-08-03 14:40:47 +02:00
Milos Kozak dbb0a6a659 danar fragment update, danar pump password, toast with sound 2016-08-02 18:39:14 +02:00
Ulrich Kopp 4e2d97d42d DE translation 2016-07-24 17:36:54 +02:00
viktoria 5afe78cf2a German Translation #6 2016-07-18 23:49:25 +02:00
Milos Kozak 871eaa718d translations 2016-07-15 18:55:14 +02:00
Milos Kozak f7715a3409 xml reformating, some code cleaning 2016-07-11 17:49:09 +02:00
Milos Kozak e37917dae4 test alert fix 2016-07-08 13:39:27 +02:00
Milos Kozak c844a2ad9a DanaR preferences & preferences cleanup 2016-07-07 17:17:54 +02:00
viktoria 89c880eda2 translation fix 2016-07-06 19:23:31 +02:00
viktoria 4a603a46ad Germany Translation #5 2016-07-03 22:47:26 +02:00
viktoria 9f8015c951 German Translation #4 2016-07-03 21:34:50 +02:00
AdrianLxM 1078514ceb german typos 2016-07-03 21:13:51 +02:00
viktoria d5b9406636 German Translation #3 2016-07-03 21:04:40 +02:00
viktoria 4d9661dff2 German Translation #2 2016-07-03 20:19:11 +02:00
viktoria cac60bd296 german translation 2016-07-03 15:38:44 +02:00