Find a file
Johannes Mockenhaupt 9459dfe321
Merge remote-tracking branch 'origin/dev' into combo-scripter-v2
* origin/dev:
  Remove dead code.
  Ctors Android-style.
  Fix NPE initialising MyPreferencesFragment.
  RS fix last bolus time
  RS remove duplicated message
  RS fix extended bolus result
  show timeshift if not zero
  CS translation
  removed unneeded code
  long click on name to open settings
  add link to advanced settings

# Conflicts:
#	app/src/main/java/info/nightscout/androidaps/PreferencesActivity.java
2017-11-18 17:46:20 +01:00
app Merge remote-tracking branch 'origin/dev' into combo-scripter-v2 2017-11-18 17:46:20 +01:00
gradle/wrapper Upgrade to Android Studio 3.0. 2017-10-25 22:49:50 +02:00
ruffy-spi Major cleanup and some new features. 2017-11-18 13:19:04 +01:00
ruffyscripter Minor improvements. 2017-11-18 16:41:25 +01:00
wear Dead code be gone. 2017-10-29 21:39:25 +01:00
.gitignore fix gitignore 2017-02-11 01:50:25 +01:00
.travis.yml revert sdk to 23 2017-04-22 10:18:31 +02:00
build.gradle Upgrade to Android Studio 3.0. 2017-10-25 22:49:50 +02:00
gradle.properties Revert "NDK filters to work around j2v8 vs. libBleCommandUtil issue." 2017-10-16 21:48:08 +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
LICENSE.txt Create LICENSE.txt 2016-12-15 22:14:53 +01:00
README-Combo.md Stuff: 2017-11-12 00:01:01 +01:00
README.md Travis badge 2016-12-29 14:13:04 +01:00
settings.gradle Extract modules ruffy-spi, ruffyscripter. 2017-10-18 14:00:47 +02:00
Testing-Combo.md Cleanups. 2017-11-13 23:05:49 +01:00
TODO-Combo.md Minor improvements. 2017-11-18 16:41:25 +01:00

AndroidAPS

Gitter Build status