Find a file
Johannes Mockenhaupt 7e19aff121
Merge remote-tracking branch 'origin/dev' into carbs-gen-pr
* origin/dev:
  Overview: fix rendering zero-temp covering entire displayed range.
  cleanup
  remove duplicate upload
  upload temptargets to NS properly
  fix NPE
  log profile conditional
  adding device name to AndroidAPS started note
  show tests in travis
  gradle 3.1.1
  Remove CB.getActiveLoop(), use LoopPlugin.getPlugin().
  added phone Manufacturer and model note to NS
  dummy-edit to re-trigger travis
  Fix for black number and labels on black background (aaps wear)
  Fix re-enabling the loop plugin from overview. Fixes #861.
  int to double in the isOlderThan()
  Get thresholds from NS

# Conflicts:
#	app/src/main/java/info/nightscout/androidaps/plugins/Overview/Dialogs/NewCarbsDialog.java
2018-04-12 21:18:04 +02:00
app Merge remote-tracking branch 'origin/dev' into carbs-gen-pr 2018-04-12 21:18:04 +02:00
documentation/images Combo: more setup screenshots. 2018-02-10 18:13:20 +01:00
gradle/wrapper upgrade gradledistribution path 2018-04-02 11:51:26 +02:00
wear dummy-edit to re-trigger travis 2018-04-10 22:53:27 +02:00
.gitignore inital gradle update 2018-04-01 20:49:02 +02:00
.travis.yml Merge pull request #851 from TebbeUbben/dev 2018-04-07 09:31:07 +02:00
build.gradle gradle 3.1.1 2018-04-11 16:11:12 +02:00
gradle.properties Objectives design 2016-06-04 17:28:05 +02:00
gradlew inital gradle update 2018-04-01 20:49:02 +02:00
gradlew.bat inital gradle update 2018-04-01 20:49:02 +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 wear installing on watch 2016-11-24 16:23:31 +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