Merge branch 'Cyber-Duck-master'

diff --git a/.travis.yml b/.travis.yml
index 909e3e1f4a6c3f23bb08a4ce8d71b80925487646..839d3be3f951a83f0f0b3e35855c069ca6bce232 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -25,4 +25,4 @@ after_failure:
   - cat storage/logs/laravel.log
 
 script:
-  - phpunit
\ No newline at end of file
+  - phpunit

diff --git a/resources/views/books/show.blade.php b/resources/views/books/show.blade.php
index 0e3bd4e17bbda758c61872ba930524a5c5b3e534..9882f09a2085ab1855efddc13b6dade37d3c9901 100644 (file)
--- a/resources/views/books/show.blade.php
+++ b/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(e($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
\ No newline at end of file
+@stop

diff --git a/resources/views/chapters/show.blade.php b/resources/views/chapters/show.blade.php
index 9ebd8d9c459efac91ad66f901a5a698200874ff8..9a319555595cda2ff105a6985c0f5f4cd4551b27 100644 (file)
--- a/resources/views/chapters/show.blade.php
+++ b/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(e($chapter->description)) !!}</p>
 
                     @if(count($pages) > 0)
                         <div class="page-list">

diff --git a/tests/Auth/LdapTest.php b/tests/Auth/LdapTest.php
index 76da6286d6426f2f3fc630393a21823227c28768..8880c7b652b9b2452188c963e698f156656a082a 100644 (file)
--- a/tests/Auth/LdapTest.php
+++ b/tests/Auth/LdapTest.php
@@ -133,4 +133,4 @@ class LdapTest extends BrowserKitTest
             ->dontSee('External Authentication');
     }
 
-}
\ No newline at end of file
+}