Find a file
Johannes Mockenhaupt 89d59584d5
Merge remote-tracking branch 'origin/dev' into dev-merge
* origin/dev:
  prepend line feed like suggested on jamoto code review
  Rename method to reflect jomoto code review
  Unit tests are always in engmode
  Fix boolean stuff in accordance to code review with adrian
  Cleanup boolean algrabra, add method for environment retrieval from logcontexxt
  Determine directory from logback
  more checks for null profile
  Disallow profile store on pump if on dev branch but not in engineering mode
  Disable profile switch if not in Engineering mode and on dev branch
  Add info to About dialog when engineering mode is enabled.
  On start, show notification if on dev-branch, but not EM, so CL is disabled.
  Add basic Engineering mode.

# Conflicts:
#	app/src/main/java/info/nightscout/androidaps/MainActivity.java
#	app/src/main/java/info/nightscout/androidaps/plugins/Overview/notifications/Notification.java
#	app/src/main/java/info/nightscout/androidaps/queue/CommandQueue.java
#	app/src/main/res/values/strings.xml
2018-03-18 19:47:23 +01:00
app Merge remote-tracking branch 'origin/dev' into dev-merge 2018-03-18 19:47:23 +01:00
documentation/images Combo: more setup screenshots. 2018-02-10 18:13:20 +01:00
gradle/wrapper gradle update 2017-12-03 18:29:57 +01:00
wear Merge remote-tracking branch 'origin/dev' into combo-dev-merge 2018-03-17 16:45:08 +01:00
.gitignore Download jniLibs as dependency, delete on clean (in gradle) 2018-02-01 20:09:29 +01:00
.travis.yml travis 2nd try 2018-03-13 23:48:14 +01:00
build.gradle Resolved merge conflict in build.grade 2018-02-21 14:18:53 +00: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
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 Source code from ruffyscripter, ruffy-spi modules. 2018-01-28 22:03:32 +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