Merge fixes from branch 'v0.12'

diff --cc app/Http/Controllers/Auth/ForgotPasswordController.php
index d93854e23a49d947ffc68188f8929956d92874b1,0000000000000000000000000000000000000000..45e40e6fe8371a5d8034ca2d5627f2ff63621acc
mode 100644,000000..100644
--- 1/app/Http/Controllers/Auth/ForgotPasswordController.php
--- /dev/null
+++ b/app/Http/Controllers/Auth/ForgotPasswordController.php
@@@ -1,33 -1,0 +1,68 @@@
 +<?php
 +
 +namespace BookStack\Http\Controllers\Auth;
 +
 +use BookStack\Http\Controllers\Controller;
 +use Illuminate\Foundation\Auth\SendsPasswordResetEmails;
++use Illuminate\Http\Request;
++use Password;
 +
 +class ForgotPasswordController extends Controller
 +{
 +    /*
 +    |--------------------------------------------------------------------------
 +    | Password Reset Controller
 +    |--------------------------------------------------------------------------
 +    |
 +    | This controller is responsible for handling password reset emails and
 +    | includes a trait which assists in sending these notifications from
 +    | your application to your users. Feel free to explore this trait.
 +    |
 +    */
 +
 +    use SendsPasswordResetEmails;
 +
 +    /**
 +     * Create a new controller instance.
 +     *
 +     * @return void
 +     */
 +    public function __construct()
 +    {
 +        $this->middleware('guest');
 +        parent::__construct();
 +    }
++
++
++    /**
++     * Send a reset link to the given user.
++     *
++     * @param  \Illuminate\Http\Request  $request
++     * @return \Illuminate\Http\RedirectResponse
++     */
++    public function sendResetLinkEmail(Request $request)
++    {
++        $this->validate($request, ['email' => 'required|email']);
++
++        // We will send the password reset link to this user. Once we have attempted
++        // to send the link, we will examine the response then see the message we
++        // need to show to the user. Finally, we'll send out a proper response.
++        $response = $this->broker()->sendResetLink(
++            $request->only('email')
++        );
++
++        if ($response === Password::RESET_LINK_SENT) {
++            $message = 'A password reset link has been sent to ' . $request->get('email') . '.';
++            session()->flash('success', $message);
++            return back()->with('status', trans($response));
++        }
++
++        // If an error was returned by the password broker, we will get this message
++        // translated so we can notify a user of the problem. We'll redirect back
++        // to where the users came from so they can attempt this process again.
++        return back()->withErrors(
++            ['email' => trans($response)]
++        );
++    }
++
 +}

diff --cc app/Http/Controllers/Auth/ResetPasswordController.php
index 656b8cc42418a63840fe2c32946100e952ee64f0,0000000000000000000000000000000000000000..bd64793f9223078d375da6577af9a01cfd1a9fae
mode 100644,000000..100644
--- 1/app/Http/Controllers/Auth/ResetPasswordController.php
--- /dev/null
+++ b/app/Http/Controllers/Auth/ResetPasswordController.php
@@@ -1,33 -1,0 +1,49 @@@
 +<?php
 +
 +namespace BookStack\Http\Controllers\Auth;
 +
 +use BookStack\Http\Controllers\Controller;
 +use Illuminate\Foundation\Auth\ResetsPasswords;
 +
 +class ResetPasswordController extends Controller
 +{
 +    /*
 +    |--------------------------------------------------------------------------
 +    | Password Reset Controller
 +    |--------------------------------------------------------------------------
 +    |
 +    | This controller is responsible for handling password reset requests
 +    | and uses a simple trait to include this behavior. You're free to
 +    | explore this trait and override any methods you wish to tweak.
 +    |
 +    */
 +
 +    use ResetsPasswords;
 +
++    protected $redirectTo = '/';
++
 +    /**
 +     * Create a new controller instance.
 +     *
 +     * @return void
 +     */
 +    public function __construct()
 +    {
 +        $this->middleware('guest');
 +        parent::__construct();
 +    }
++
++    /**
++     * Get the response for a successful password reset.
++     *
++     * @param  string  $response
++     * @return \Illuminate\Http\Response
++     */
++    protected function sendResetResponse($response)
++    {
++        $message = 'Your password has been successfully reset.';
++        session()->flash('success', $message);
++        return redirect($this->redirectPath())
++            ->with('status', trans($response));
++    }
 +}

diff --cc config/setting-defaults.php
index 5482c13315e8012f9f90f89644e765d895eb1569,deafceb29c2e774cee42900e8cc47739a4fffec8..c681bb7f55ddbe97e6ba73b29154373e18d2db55
--- 1/config/setting-defaults.php
--- 2/config/setting-defaults.php
+++ b/config/setting-defaults.php
@@@ -6,9 -6,10 +6,11 @@@
  return [
  
      'app-name'        => 'BookStack',
 +    'app-name-header' => true,
      'app-editor'      => 'wysiwyg',
      'app-color'       => '#0288D1',
-     'app-color-light' => 'rgba(21, 101, 192, 0.15)'
+     'app-color-light' => 'rgba(21, 101, 192, 0.15)',
+     'app-custom-head' => false,
+     'registration-enabled' => false,
  
  ];

diff --cc resources/assets/sass/_text.scss
Simple merge

diff --cc resources/views/auth/passwords/email.blade.php
Simple merge

diff --cc resources/views/auth/passwords/reset.blade.php
Simple merge

diff --cc resources/views/base.blade.php
Simple merge

diff --cc resources/views/public.blade.php
Simple merge

diff --cc tests/Auth/AuthTest.php
Simple merge

diff --cc tests/ImageTest.php
Simple merge