DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2025-03-05 20:52:15 -08:00
Code Issues Actions1 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop'

Browse source
This commit is contained in:
snipe 2020-11-09 21:09:05 -08:00
parent 63a8535de1 ede20523f2
commit b2101a5188
3 changed files with 7 additions and 7 deletions
config
version.php
resources/views/locations
view.blade.php
upgrade.php

10
config/version.php
View file

@ -1,10 +1,10 @@
<?php <?php
return array ( return array (
'app_version' => 'v5.0.5-pre', 'app_version' => 'v5.0.5-pre',
'full_app_version' => 'v5.0.5-pre - build 5457-', 'full_app_version' => 'v5.0.5-pre-52-g63a8535de',
'build_version' => '5457', 'build_version' => '5509',
'prerelease_version' => '', 'prerelease_version' => '',
'hash_version' => '', 'hash_version' => 'g63a8535de',
'full_hash' => 'v5.0.5-pre', 'full_hash' => 'v5.0.5-pre-52-g63a8535de',
'branch' => 'master', 'branch' => 'develop',
); );

2
resources/views/locations/view.blade.php
View file

@ -127,7 +127,7 @@
@if ($location->image!='') @if ($location->image!='')
<div class="col-md-12 text-center" style="padding-bottom: 20px;"> <div class="col-md-12 text-center" style="padding-bottom: 20px;">
<img src="{{ app('locations_upload_url') }}/{{ $location->image }}" class="img-responsive img-thumbnail" alt="{{ $location->name }}"> <img src="{{ Storage::disk('public')->url('locations/'.e($location->image)) }}" class="img-responsive img-thumbnail" alt="{{ $location->name }}">
</div> </div>
@endif @endif
<div class="col-md-12"> <div class="col-md-12">

2
upgrade.php
View file

@ -1,7 +1,7 @@
<?php <?php
(PHP_SAPI !== 'cli' || isset($_SERVER['HTTP_USER_AGENT'])) && die('Access denied.'); (PHP_SAPI !== 'cli' || isset($_SERVER['HTTP_USER_AGENT'])) && die('Access denied.');
$required_version = '7.1.3'; $required_version = '7.2.0';
if (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN') { if (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN') {
echo "Skipping user check as it is not supported on Windows\n"; echo "Skipping user check as it is not supported on Windows\n";