Find a file
Johannes Mockenhaupt a19e49e5f8
Merge remote-tracking branch 'origin/dev' into develop
* origin/dev: (27 commits)
  Check for tempbasal not RealTempbasla
  Overlapping interval - regard first element on cut
  AcceptTempButton visible
  show notification on toast alarm
  parse 12h format properly
  fix index
  Show profile switch button in profiles
  set pump time only if needed
  restrict DIA for expectedDelta
  Overlappinginterfals - find first element
  Extract method Profile.toTargetRangeString.
  Simplify.
  Overview: format target using unit specific format.
  Dutch language
  insulincurves - notification on short DIA
  insulincurves - forgotten string updated
  insulincurves - rename peak to peak time
  insulincurves - remove unused base fragment
  insulincurves - i18n
  insulincurves - ActivityGraph fix double plotting
  ...

# Conflicts:
#	app/src/main/java/info/nightscout/androidaps/PreferencesActivity.java
2017-08-17 10:08:15 +02:00
app Merge remote-tracking branch 'origin/dev' into develop 2017-08-17 10:08:15 +02:00
gradle/wrapper Gradle update 2017-03-05 12:13:03 +01:00
wear Version-Number in settings 2017-08-08 02:06:46 +02: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 gradle 2.3.3 2017-06-10 12:57:03 +02: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
LICENSE.txt Create LICENSE.txt 2016-12-15 22:14:53 +01:00
README.md Travis badge 2016-12-29 14:13:04 +01:00
settings.gradle wear installing on watch 2016-11-24 16:23:31 +01:00

AndroidAPS

Gitter Build status