AndroidAPS/app
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
..
libs Support for TDDs 2018-04-06 21:39:42 +02:00
src Merge remote-tracking branch 'origin/dev' into carbs-gen-pr 2018-04-12 21:18:04 +02:00
build.gradle show tests in travis 2018-04-11 16:23:35 +02:00
fabric.properties add bg language 2016-07-05 20:28:23 +02:00
proguard-rules.pro plugins refactoring 2016-08-05 23:54:03 +02:00