Find a file
Johannes Mockenhaupt 612fc09e52
Merge remote-tracking branch 'origin/dev' into combo-dev-merge
* origin/dev:
  Don't overlap time ticks with current time
  history browser chart selection
  Insulin button: allow negative presets, fix adding TT insulin.
  Overview: symetric spacing.
  Carbs button: send carbs to pump if pump supports carbs.
  Carbs button: fix visibility pref, input type, allow negative increments.
  Smallscreen fix
  chart menu 4
  chart menu 3
  chart menu 2
  chart menu 1

# Conflicts:
#	app/src/main/res/values/strings.xml
2018-03-17 16:45:08 +01:00
app Merge remote-tracking branch 'origin/dev' into combo-dev-merge 2018-03-17 16:45:08 +01:00
documentation/images Combo: more setup screenshots. 2018-02-10 18:13:20 +01:00
gradle/wrapper gradle update 2017-12-03 18:29:57 +01:00
wear Merge remote-tracking branch 'origin/dev' into combo-dev-merge 2018-03-17 16:45:08 +01:00
.gitignore Download jniLibs as dependency, delete on clean (in gradle) 2018-02-01 20:09:29 +01:00
.travis.yml travis 2nd try 2018-03-13 23:48:14 +01:00
build.gradle Resolved merge conflict in build.grade 2018-02-21 14:18:53 +00: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.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

AndroidAPS

Gitter Build status codecov dev: codecov