mirror of
https://github.com/BookStackApp/BookStack.git
synced 2024-08-26 20:22:18 +00:00
Merge branch 'master' of git://github.com/Cyber-Duck/BookStack into Cyber-Duck-master
This commit is contained in:
commit
c1fc06ae34
11
.travis.yml
11
.travis.yml
@ -4,6 +4,15 @@ language: php
|
|||||||
php:
|
php:
|
||||||
- 7.0
|
- 7.0
|
||||||
|
|
||||||
|
addons:
|
||||||
|
apt:
|
||||||
|
packages:
|
||||||
|
- ldap-utils
|
||||||
|
- slapd
|
||||||
|
|
||||||
|
before_install:
|
||||||
|
- echo "extension=ldap.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini
|
||||||
|
|
||||||
cache:
|
cache:
|
||||||
directories:
|
directories:
|
||||||
- $HOME/.composer/cache
|
- $HOME/.composer/cache
|
||||||
@ -25,4 +34,4 @@ after_failure:
|
|||||||
- cat storage/logs/laravel.log
|
- cat storage/logs/laravel.log
|
||||||
|
|
||||||
script:
|
script:
|
||||||
- phpunit
|
- phpunit --stop-on-error --stop-on-failure
|
||||||
|
@ -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($book->description) !!}</p>
|
||||||
|
|
||||||
<div class="page-list" v-pre>
|
<div class="page-list" v-pre>
|
||||||
<hr>
|
<hr>
|
||||||
|
@ -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($chapter->description) !!}</p>
|
||||||
|
|
||||||
@if(count($pages) > 0)
|
@if(count($pages) > 0)
|
||||||
<div class="page-list">
|
<div class="page-list">
|
||||||
|
Loading…
Reference in New Issue
Block a user