Commit graph

140 commits

Author SHA1 Message Date
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
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 eed3773b49
Combo i18n. 2017-10-27 17:19:10 +02:00
Radoslav Radev 075b74ec84 Update strings.xml 2017-10-21 17:11:25 +03: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 fe9fefa601 Update strings.xml 2017-10-18 20:06:35 +02:00
Radoslav Radev f0ee2b8bed Update strings.xml 2017-10-18 14:25:34 +03:00
Milos Kozak f08809ff9e rename button to activate profile 2017-10-04 23:33:02 +02:00
Radoslav Radev e1c4074663 Update strings.xml 2017-08-31 09:09:26 +03:00
Radoslav Radev 6bf120e9da Update strings.xml 2017-08-26 22:59:14 +03: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 1ac1b77fd4 remove translated string not in default strings and add flag to cancel method 2017-08-03 02:01:52 +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
Radoslav Radev 39891bbad9 Update strings.xml 2017-08-01 23:29:23 +03:00
Milos Kozak e933650330 CS translations 2017-08-01 22:17:39 +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
Radoslav Radev 3098f0bdfa update bg translation 2017-07-20 09:24:35 +03:00
AdrianLxM 732e225c7d bulgarian removed non-translatable 2017-07-19 19:50:40 +02:00
PoweRGbg c3f85faede removed some "unneeded" translations 2017-07-18 18:10:24 +03:00
PoweRGbg 7216418f44 Translated latest additions strings.xml 2017-07-17 11:37:00 +03: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
Radoslav Radev d58ddf48c6 Update strings.xml 2017-05-11 17:01:49 +03: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
Radoslav Radev 3b129dc7f6 Update strings.xml 2017-03-05 15:58:37 +02:00
Radoslav Radev a0f2e4f663 Update strings.xml 2017-03-05 15:42:01 +02:00
Radoslav Radev 54f376330a Update strings.xml 2017-03-05 15:28:20 +02:00
Milos Kozak b0c828c93e nsclient build variant 2017-02-23 20:00:33 +01:00
Milos Kozak 5d795fbe33 Merge branch 'dev' into nsclient 2017-02-17 22:26:02 +01:00
Milos Kozak 8a374f1b35 Shared preferences cleanup 2017-02-17 16:16:20 +01:00
Radoslav Radev 09880f029a Update strings.xml 2017-02-16 16:46:47 +02: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
Milos Kozak 715d15b51f CS translations 2017-02-09 22:44:42 +01:00
Milos Kozak 762b561abb CS translations 2017-01-29 21:15:05 +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
Radoslav Radev fbceeec5b0 Update strings.xml 2017-01-23 11:01:42 +02:00
Radoslav Radev 106bfe4f1c Update strings.xml 2017-01-23 07:14:12 +02:00
Radoslav Radev 2d02449a87 Update strings.xml 2017-01-22 21:44:49 +02:00
AdrianLxM ea78dd5bc1 Shorten tabs first 2017-01-21 19:44:58 +01:00
Milos Kozak c701b5d125 waiting for pump message 2017-01-19 19:21:25 +01:00
Milos Kozak 08c078466a Merge pull request #127 from MilosKozak/temptarget
Temptarget
2017-01-17 17:47:14 +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
Radoslav Radev cbd7aa74eb Update strings.xml 2017-01-14 15:21:47 +02:00
Radoslav Radev ddcc4c147d Update strings.xml 2016-12-29 20:49:18 +02: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
Radoslav Radev 71461e38ca Update strings.xml 2016-12-28 12:17:17 +02: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
Radoslav Radev 8b5ee91c95 Update strings.xml 2016-11-17 22:40:51 +02:00
Radoslav Radev 56c83aac2f bg translation
1
2016-11-17 22:12:19 +02:00
Radoslav Radev b9d4a5fc0a Update strings.xml 2016-11-03 07:47:24 +02: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
Radoslav Radev 9c82350c1e Update strings.xml 2016-09-10 10:37:33 +03:00
Milos Kozak 40aada0eb4 ajdust some danar pump comm params 2016-08-12 20:22:44 +02:00
Radoslav Radev 9bbc1e97a5 BG translation 2016-08-11 07:45:35 +03:00
Milos Kozak d2b01dcc32 fix BG lang 2016-08-10 18:25:49 +02:00
Radoslav Radev 098aa22da6 BG translation
fix
2016-08-10 16:44:13 +03:00
Milos Kozak b42644de39 objectives finalization, some todos 2016-08-04 23:38:43 +02:00
Milos Kozak fd91348eba fix bg translation 2016-07-20 23:14:19 +02:00
Radoslav Radev 9007d25e7e translation bg 2016-07-20 22:37:22 +03:00
Milos Kozak 871eaa718d translations 2016-07-15 18:55:14 +02:00
Milos Kozak efa2944c4c translations & fixes 2016-07-11 22:52:23 +02:00
Milos Kozak f7715a3409 xml reformating, some code cleaning 2016-07-11 17:49:09 +02:00
Milos Kozak 076135195b Merge pull request #18 from slavidex/patch-3
Update strings.xml
2016-07-10 15:05:48 +02:00
Radoslav Radev 1a57ed07bd Update strings.xml 2016-07-09 00:08:43 +03:00
Milos Kozak e37917dae4 test alert fix 2016-07-08 13:39:27 +02:00
Radoslav Radev 6159a78d81 Update strings.xml 2016-07-07 21:37:54 +03: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
Radoslav Radev c4a1442c22 BG translation 2016-07-05 21:29:48 +03:00
Milos Kozak ce7439bc00 add bg language 2016-07-05 20:28:23 +02:00