Find a file
Johannes Mockenhaupt bffcd3ceee
Merge remote-tracking branch 'origin/dev' into develop
* origin/dev: (35 commits)
  fix displaying target in mmol
  Profile.getValuesList: don't add trailing newline.
  Fix some warnings.
  Use OK/Cancel buttons for profile removal dialog.
  static variables -> object variables
  Avoid npe if no string is assigned to the profile switch
  isValid implementation
  Show profile on tap in Treatments->ProfileSwitch
  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.
  ...

# Conflicts:
#	app/src/main/java/info/nightscout/androidaps/PreferencesActivity.java
2017-08-19 22:38:58 +02:00
app Merge remote-tracking branch 'origin/dev' into develop 2017-08-19 22:38:58 +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