Commit graph

85 commits

Author SHA1 Message Date
Milos Kozak 1ba828d20a SWFragment 2018-05-09 18:49:42 +02:00
pedroll 0d2a0798f7 Spanish translation 2 2018-05-06 20:04:12 +02:00
pedroll 7b73c59ee5 Spanish translation 2 2018-05-06 20:04:12 +02:00
AdrianLxM 1646420c47
base basal -> Basal Base (was Base Temporal) 2018-05-04 20:17:55 +02:00
pedroll 5ff86e9c34 Spanish translation 2018-05-04 19:54:21 +02:00
CaroGo a768c03462
Update strings.xml 2018-05-02 17:43:17 +02:00
Milos Kozak 42164489c8 cs translations 2018-05-02 17:05:20 +02:00
Johannes Mockenhaupt 623a5e3da1
Combo: remove unused strings, minor code cleanups. 2018-04-06 11:42:33 +02:00
Milos Kozak bcb733e42c Plugins refactor 2018-03-31 00:36:03 +02:00
Johannes Mockenhaupt 7694c80da9
Fix format specifiers in Spanish translation. 2018-03-24 10:53:46 +01:00
Milos Kozak 3f5808eca3 show max basal limit on smb fragment 2018-03-23 09:59:07 +01:00
Johannes Mockenhaupt f918a5f303
More loop results cleanup and i18n. 2018-03-19 14:14:07 +01:00
AdrianLxM 3ade9be7a2 cleanup 2018-03-19 13:32:05 +01:00
Johannes Mockenhaupt 643f3aee6c
Merge branch 'dev' into dev-merge 2018-03-18 20:20:40 +01:00
Milos Kozak 4f43feb12e allow profile to be null 2018-03-17 23:18:34 +01:00
Johannes Mockenhaupt 8457cd3843
Merge remote-tracking branch 'origin/dev' into combo-dev-merge
* origin/dev:
  check for null profile
  remove profile dependency from pump drivers, TRB optimalization
  split enacting TRB and SMB
2018-03-17 13:51:40 +01:00
Johannes Mockenhaupt db00404e43
Merge commit 'origin/dev^' into combo-dev-merge
* commit 'origin/dev^': (313 commits)
  cleanup
  draw profile in dana profile viewer
  optimize imports
  draw basal in profile viewer
  BG autobackfill configurable
  travis 2nd try
  Save new profile when updating it
  Add environment variable to handle testCoverage
  do not pass DIA to SMB determine_basal
  show Dana model properly after communication error
  fix deviation slope calculations
  Read maximum basal and bolus amount from pump
  update maxIOB hard limits
  Allow bolus record only in new treatment dialog
  use safeGetString
  JsonHelper test
  food code cleanup
  Show bolus progress
  Missing import statement
  Insight: add treatment to progress event
  ...
2018-03-16 15:44:54 +01:00
Milos Kozak db7671cd23 split enacting TRB and SMB 2018-03-15 18:30:18 +01:00
Milos Kozak 39c2d690e4 CS translations 2018-03-10 20:47:17 +01:00
Milos Kozak ed11bb1d70 Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev 2018-03-02 00:00:09 +01:00
Milos Kozak c61fcdbe3f allow 15 & 30 pump disconnection 2018-03-01 23:59:44 +01:00
Milos Kozak 75a6366115 translations cleanup 2018-03-01 15:08:55 +01:00
Johannes Mockenhaupt bf2e567f9c
Moar buttons. 2018-02-18 11:06:36 +01:00
Milos Kozak fa2e46fbe5 remove CPP profile 2018-02-11 23:02:21 +01:00
Milos Kozak 943205c782 HardLimits refactor 2018-02-11 22:41:10 +01:00
Johannes Mockenhaupt 483ecadede
Fix dutch translation for Combo's last bolus, minor cleanup.
(cherry picked from commit c0cf06a)
2018-02-07 22:53:59 +01:00
Johannes Mockenhaupt f6c5b95904
Merge remote-tracking branch 'origin/master' into combo-scripter-v2
* origin/master:
  Revert "Update strings.xml"
  bump 1.58
  Update strings.xml
  Add issue template.
  Enhance insulin plugin test
  filter null BT devices
  BaseWatchFace: Resolve issue causing Bolus and Wizard activities to fail to complete.
  BaseWatchFace: Resolve issue causing Bolus and Wizard activities to fail to complete.
  ES translations
  Dana plugin refactoring
  KO language cleanup
  Update strings.xml
  Update strings.xml
  Bg translation
  add RO language
  CS translations
  ButterKnife to Dana fragment
  bump 1.57a-dev
  Add a unit test for Insulin Plugin

# Conflicts:
#	app/build.gradle
#	app/src/main/res/values-de/strings.xml
#	app/src/main/res/values-nl/strings.xml
#	app/src/main/res/values/strings.xml
2018-02-03 16:45:29 +01:00
AdrianLxM aca422dfb6
remove duplicates 2018-02-01 23:55:08 +01:00
AdrianLxM cea99a968f
small fixes 2018-02-01 22:09:57 +01:00
AdrianLxM 2e44734b61
Merge branch 'dev' into spanishmerge 2018-02-01 22:07:06 +01:00
AdrianLxM 276784c799 Merge branch 'patch-1' of https://github.com/CaroGo/AndroidAPS into dev180127 2018-02-01 22:02:27 +01:00
CaroGo 815247dabb
Update strings.xml
I did a few changes...
2018-01-31 16:51:00 +01:00
Milos Kozak b11e301391 ES translations 2018-01-29 20:05:16 +01:00
Johannes Mockenhaupt 2468f23e97
ComboFragment: i18n last bolus. 2018-01-29 20:02:18 +01:00
Johannes Mockenhaupt bd87a893c2
Best effort to handle multiple boluses within the same minute.
(cherry picked from commit cc9094f)
2018-01-28 18:59:07 +01:00
Johannes Mockenhaupt 0067eb75d5
Fix format specifiers in Spanish translation, add MainApp.gs(id, args). 2018-01-25 20:28:21 +01:00
Johannes Mockenhaupt be8534db51
Add strings for the Combo pump, including some renames.
Some virtualpump_* strings have been renamed to pump_* since they're
now used for multiple pumps.
2018-01-11 21:47:30 +01:00
Johannes Mockenhaupt 23874ebbd6
Remove 'sync to profile' pref.
(cherry picked from commit 01c52e7)
2017-12-05 10:00:31 +01:00
Milos Kozak 9e0241aebc fix translations 2017-12-03 19:12:07 +01:00
Milos Kozak f08809ff9e rename button to activate profile 2017-10-04 23:33:02 +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
Milos Kozak 6828e11dd9 remove notes strings as well 2017-08-01 17:25:43 +02:00
AdrianLxM 1ba11ed006 spanish emptiy string 2017-07-20 01:06:21 +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