Merge branch 'master' of git://github.com/Cyber-Duck/BookStack into Cyber-Duck-master

diff --combined resources/views/books/show.blade.php
index 0e3bd4e17bbda758c61872ba930524a5c5b3e534,d5832b7086f1cabc0328f75287788ab75e2181a4..b6a9bcfbaf8592593c98437cdbe6b4df5910a7dc
--- 1/resources/views/books/show.blade.php
--- 2/resources/views/books/show.blade.php
+++ b/resources/views/books/show.blade.php
@@@ -5,10 -5,10 +5,10 @@@
      <div class="faded-small toolbar">
          <div class="container">
              <div class="row">
 -                <div class="col-sm-6 faded">
 +                <div class="col-sm-6 col-xs-1  faded">
                      @include('books._breadcrumbs', ['book' => $book])
                  </div>
 -                <div class="col-sm-6">
 +                <div class="col-sm-6 col-xs-11">
                      <div class="action-buttons faded">
                          <span dropdown class="dropdown-container">
                              <div dropdown-toggle class="text-button text-primary"><i class="zmdi zmdi-open-in-new"></i>{{ trans('entities.export') }}</div>
@@@ -50,13 -50,13 +50,13 @@@
      </div>
  
  
 -    <div class="container" id="entity-dashboard" entity-id="{{ $book->id }}" entity-type="book">
 +    <div ng-non-bindable class="container" id="entity-dashboard" entity-id="{{ $book->id }}" entity-type="book">
          <div class="row">
              <div class="col-md-7">
  
                  <h1>{{$book->name}}</h1>
                  <div class="book-content" v-if="!searching">
-                     <p class="text-muted" v-pre>{{$book->description}}</p>
+                     <p class="text-muted" v-pre>{!! nl2br($book->description) !!}</p>
  
                      <div class="page-list" v-pre>
                          <hr>
@@@ -112,13 -112,13 +112,13 @@@
                  @endif
  
                  <div class="search-box">
 -                    <form v-on:submit="searchBook">
 +                    <form v-on:submit.prevent="searchBook">
                          <input v-model="searchTerm" v-on:change="checkSearchForm()" type="text" name="term" placeholder="{{ trans('entities.books_search_this') }}">
                          <button type="submit"><i class="zmdi zmdi-search"></i></button>
                          <button v-if="searching" v-cloak class="text-neg" v-on:click="clearSearch()" type="button"><i class="zmdi zmdi-close"></i></button>
                      </form>
                  </div>
-                 
+ 
                  <div class="activity">
                      <h3>{{ trans('entities.recent_activity') }}</h3>
                      @include('partials/activity-list', ['activity' => Activity::entityActivity($book, 20, 0)])
@@@ -127,4 -127,4 +127,4 @@@
          </div>
      </div>
  
- @stop
+ @stop

diff --combined resources/views/chapters/show.blade.php
index 9ebd8d9c459efac91ad66f901a5a698200874ff8,9b549cfbdfb194f6a43da739017270c2a149aa86..5b36037ca1f52c0a2cfdcf16c10b3c3cf40c0310
--- 1/resources/views/chapters/show.blade.php
--- 2/resources/views/chapters/show.blade.php
+++ b/resources/views/chapters/show.blade.php
@@@ -5,10 -5,10 +5,10 @@@
      <div class="faded-small toolbar">
          <div class="container">
              <div class="row">
 -                <div class="col-sm-8 faded" ng-non-bindable>
 +                <div class="col-sm-6 col-xs-3 faded" ng-non-bindable>
                      @include('chapters._breadcrumbs', ['chapter' => $chapter])
                  </div>
 -                <div class="col-sm-4 faded">
 +                <div class="col-sm-6 col-xs-9 faded">
                      <div class="action-buttons">
                          <span dropdown class="dropdown-container">
                              <div dropdown-toggle class="text-button text-primary"><i class="zmdi zmdi-open-in-new"></i>{{ trans('entities.export') }}</div>
@@@ -47,12 -47,12 +47,12 @@@
      </div>
  
  
 -    <div class="container" id="entity-dashboard" entity-id="{{ $chapter->id }}" entity-type="chapter">
 +    <div class="container" id="entity-dashboard" ng-non-bindable entity-id="{{ $chapter->id }}" entity-type="chapter">
          <div class="row">
              <div class="col-md-7">
                  <h1>{{ $chapter->name }}</h1>
                  <div class="chapter-content" v-if="!searching">
-                     <p class="text-muted">{{ $chapter->description }}</p>
+                     <p class="text-muted">{!! nl2br($chapter->description) !!}</p>
  
                      @if(count($pages) > 0)
                          <div class="page-list">
@@@ -116,7 -116,7 +116,7 @@@
                  @endif
  
                  <div class="search-box">
 -                    <form v-on:submit="searchBook">
 +                    <form v-on:submit.prevent="searchBook">
                          <input v-model="searchTerm" v-on:change="checkSearchForm()" type="text" name="term" placeholder="{{ trans('entities.chapters_search_this') }}">
                          <button type="submit"><i class="zmdi zmdi-search"></i></button>
                          <button v-if="searching" v-cloak class="text-neg" v-on:click="clearSearch()" type="button"><i class="zmdi zmdi-close"></i></button>

diff --combined tests/Auth/LdapTest.php
index 76da6286d6426f2f3fc630393a21823227c28768,f6e8336e681abb055ec72d8ef605d4889334a880..8880c7b652b9b2452188c963e698f156656a082a
--- 1/tests/Auth/LdapTest.php
--- 2/tests/Auth/LdapTest.php
+++ b/tests/Auth/LdapTest.php
@@@ -11,7 -11,6 +11,7 @@@ class LdapTest extends BrowserKitTes
      public function setUp()
      {
          parent::setUp();
 +        if (!defined('LDAP_OPT_REFERRALS')) define('LDAP_OPT_REFERRALS', 1);
          app('config')->set(['auth.method' => 'ldap', 'services.ldap.base_dn' => 'dc=ldap,dc=local', 'auth.providers.users.driver' => 'ldap']);
          $this->mockLdap = \Mockery::mock(\BookStack\Services\Ldap::class);
          $this->app['BookStack\Services\Ldap'] = $this->mockLdap;
@@@ -133,4 -132,4 +133,4 @@@
              ->dontSee('External Authentication');
      }
  
- }
+ }