AndroidAPS/app/src/main/java/info/nightscout/androidaps/plugins/Overview
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
..
activities QuickWizard detailed settings 2017-12-26 00:27:34 +01:00
Dialogs more checks for null profile 2018-03-17 18:07:22 +01:00
events Show bolus progress 2018-03-11 22:53:18 +01:00
graphData check for null profile 2018-03-17 08:12:07 +01:00
graphExtensions Merge branch 'dev' into smb060 2018-01-26 11:54:09 +01:00
notifications Merge remote-tracking branch 'origin/dev' into dev-merge 2018-03-18 19:47:23 +01:00
OverviewFragment.java Merge remote-tracking branch 'origin/dev' into combo-dev-merge 2018-03-17 16:45:08 +01:00
OverviewPlugin.java access overview preferences from configbuilder 2018-02-25 11:15:26 +01:00