lucas.mathieu/cachet-docker
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch '1.2'

Browse Source 
Conflicts:
	composer.lock
	resources/views/partials/incidents.blade.php
This commit is contained in:
Graham Campbell
2015-09-04 11:53:25 +01:00
parent 99cd275a9d 1ac4b7a64a
commit d20ee2987b
6 changed files with 40 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
resources/views/partials/incident.blade.php
+2 -2
View File
@@ -13,9 +13,9 @@
<br>
<small class="date">
@if($with_link)
<a href="{{ route('incident', ['id' => $incident->id]) }}"><abbr class="timeago" data-toggle="tooltip" data-placement="right" title="{{ $incident->created_at_formatted }}" data-timeago="{{ $incident->created_at_iso }}"></abbr></a>
<a href="{{ route('incident', ['id' => $incident->id]) }}"><abbr class="timeago" data-toggle="tooltip" data-placement="right" title="{{ $incident->timestamp_formatted }}" data-timeago="{{ $incident->timestamp_iso }}"></abbr></a>
@else
<abbr class="timeago" data-toggle="tooltip" data-placement="right" title="{{ $incident->created_at_formatted }}" data-timeago="{{ $incident->created_at_iso }}"></abbr>
<abbr class="timeago" data-toggle="tooltip" data-placement="right" title="{{ $incident->timestamp_formatted }}" data-timeago="{{ $incident->timestamp_iso }}"></abbr>
@endif
</small>
</div>