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

.travis.yml

@@ -4,6 +4,15 @@ language: php
 php:
   - 7.0
 
+addons:
+  apt:
+    packages:
+      - ldap-utils
+      - slapd
+
+before_install:
+  - echo "extension=ldap.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini
+
 cache:
   directories:
     - $HOME/.composer/cache
@@ -25,4 +34,4 @@ after_failure:
   - cat storage/logs/laravel.log
 
 script:
-  - phpunit
+  - phpunit --stop-on-error --stop-on-failure

resources/views/books/show.blade.php

@@ -56,7 +56,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>
@@ -118,7 +118,7 @@
                         <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 @@
         </div>
     </div>
 
-@stop
+@stop

resources/views/chapters/show.blade.php

@@ -52,7 +52,7 @@
             <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">

tests/Auth/LdapTest.php

@@ -133,4 +133,4 @@ class LdapTest extends BrowserKitTest
             ->dontSee('External Authentication');
     }
 
-}
+}