webapp/bookstack
1
0
Fork 0
mirror of https://github.com/BookStackApp/BookStack.git synced 2025-07-31 15:24:31 +03:00
Code Activity

Merge branch 'master' into 2019-design

Browse Source
This commit is contained in:
Dan Brown
2019-02-09 14:58:38 +00:00
parent 67d4fa0c65 df6f6e2d77
commit 3286f29a61
20 changed files with 156 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
resources/views/pages/revisions.blade.php
View File

@ -35,7 +35,7 @@
@endif
</td>
<td> @if($revision->createdBy) {{ $revision->createdBy->name }} @else {{ trans('common.deleted_user') }} @endif</td>
<td><small>{{ $revision->created_at->format('jS F, Y H:i:s') }} <br> ({{ $revision->created_at->diffForHumans() }})</small></td>
<td><small>{{ $revision->created_at->formatLocalized('%e %B %Y %H:%M:%S') }} <br> ({{ $revision->created_at->diffForHumans() }})</small></td>
<td>{{ $revision->summary }}</td>
<td class="actions">
<a href="{{ $revision->getUrl('changes') }}" target="_blank">{{ trans('entities.pages_revisions_changes') }}</a>