Find a file
Johannes Mockenhaupt fa1c282699
Merge remote-tracking branch 'origin/dev' into smb
* origin/dev: (28 commits)
  Singleton & Crashlytics logging part 2
  treatments in config builder
  Singleton & Crashlytics logging part 1
  checkboxes for NS-Client layouts
  overview checkboxes cutoff fix
  update NP value after manual entry
  restore preferences
  temp target presets
  Rv2 percent fix
  korean percent fix
  serialize reload of treatments
  getTempBasalFromHistory -> getRealTempBasalFromHistory
  Do not misinterpret a fake-extended as 0% temp.
  In one line
  Update danar_fragment.xml
  text identation
  Add files via upload
  Add files via upload
  Add files via upload
  Add files via upload
  ...

# Conflicts:
#	app/build.gradle
#	app/src/main/java/info/nightscout/androidaps/MainApp.java
2017-10-07 21:33:22 +02:00
app Merge remote-tracking branch 'origin/dev' into smb 2017-10-07 21:33:22 +02:00
gradle/wrapper Gradle update 2017-03-05 12:13:03 +01:00
wear Use SystemClock.sleep instead of Thread.sleep. 2017-09-09 16:41:11 +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 Revert "Merge branch 'dev' of C:\Users\Dylan\StudioProjects\AndroidAPS fork with conflicts." 2017-09-16 20:02:08 -04: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