github-mirror/BookStack
github-mirror/BookStack
2
0
Fork 0
mirror of https://github.com/BookStackApp/BookStack.git synced 2025-05-02 00:54:06 +08:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Merge branch 'Cyber-Duck-master'

Browse Source
This commit is contained in:
Dan Brown 2017-07-27 16:29:09 +01:00
commit 9d61eecd81
No known key found for this signature in database
GPG Key ID: 46D9F943C24A2EF9
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.travis.yml
View File

@ -25,4 +25,4 @@ after_failure:
- cat storage/logs/laravel.log - cat storage/logs/laravel.log
script: script:
- phpunit - phpunit

6
resources/views/books/show.blade.php
View File

@ -56,7 +56,7 @@
<h1>{{$book->name}}</h1> <h1>{{$book->name}}</h1>
<div class="book-content" v-if="!searching"> <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> <div class="page-list" v-pre>
<hr> <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> <button v-if="searching" v-cloak class="text-neg" v-on:click="clearSearch()" type="button"><i class="zmdi zmdi-close"></i></button>
</form> </form>
</div> </div>
<div class="activity"> <div class="activity">
<h3>{{ trans('entities.recent_activity') }}</h3> <h3>{{ trans('entities.recent_activity') }}</h3>
@include('partials/activity-list', ['activity' => Activity::entityActivity($book, 20, 0)]) @include('partials/activity-list', ['activity' => Activity::entityActivity($book, 20, 0)])
@ -127,4 +127,4 @@
</div> </div>
</div> </div>
@stop @stop

2
resources/views/chapters/show.blade.php
View File

@ -52,7 +52,7 @@
<div class="col-md-7"> <div class="col-md-7">
<h1>{{ $chapter->name }}</h1> <h1>{{ $chapter->name }}</h1>
<div class="chapter-content" v-if="!searching"> <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) @if(count($pages) > 0)
<div class="page-list"> <div class="page-list">

2
tests/Auth/LdapTest.php
View File

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