Find a file
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
app Merge remote-tracking branch 'origin/master' into combo-scripter-v2 2018-02-03 16:45:29 +01:00
gradle/wrapper gradle update 2017-12-03 18:29:57 +01:00
wear Merge remote-tracking branch 'origin/master' into combo-scripter-v2 2018-02-03 16:45:29 +01:00
.gitignore fix gitignore 2017-02-11 01:50:25 +01:00
.travis.yml travis accept license manually 2018-01-25 13:28:46 +01:00
build.gradle sdk27 & butterknife 2018-01-24 21:54:24 +01:00
gradle.properties Objectives design 2016-06-04 17:28:05 +02:00
gradlew permission access for travis 2016-12-28 16:10:06 +01:00
gradlew.bat Objectives design 2016-06-04 17:28:05 +02:00
ISSUE_TEMPLATE.md Add issue template. 2018-01-31 14:45:57 +01:00
LICENSE.txt Create LICENSE.txt 2016-12-15 22:14:53 +01:00
README-Combo.md Update README-Combo.md 2018-01-31 14:41:37 +01:00
README.md update badge 2018-01-11 10:01:33 +01:00
settings.gradle Source code from ruffyscripter, ruffy-spi modules. 2018-01-28 22:03:32 +01:00
Steampunk_graphics_source_link.md move steampunk md to main dir 2018-01-03 14:00:57 +01:00
Testing-Combo.md Clean up all the basal rate sanity checks. 2017-12-27 12:49:04 +01:00
TODO-Combo.md Update docs. 2017-12-06 20:27:36 +01:00

AndroidAPS

Gitter Build status codecov dev: codecov