lunax/snipe_it
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity Actions

Merge branch 'develop'

Browse source 
# Conflicts:
#	config/version.php
This commit is contained in:
snipe 2018-06-21 07:46:27 -07:00
commit cbb4b4d846
2 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
docker/entrypoint.sh
View file

@ -23,6 +23,12 @@ done
chown -R docker:root /var/lib/snipeit/data/* chown -R docker:root /var/lib/snipeit/data/*
chown -R docker:root /var/lib/snipeit/dumps chown -R docker:root /var/lib/snipeit/dumps
chown -R docker:root /var/lib/snipeit/keys
# If the Oauth DB files are not present copy the vendor files over to the db migrations
if [ ! -f "/var/www/html/database/migrations/*create_oauth*" ]; then
cp -ax /var/www/html/vendor/laravel/passport/database/migrations/* /var/www/html/database/migrations/
fi
. /etc/apache2/envvars . /etc/apache2/envvars
exec apache2 -DNO_DETACH < /dev/null exec apache2 -DNO_DETACH < /dev/null

10
resources/views/settings/branding.blade.php
View file

@ -88,7 +88,7 @@
{{ Form::label('brand', trans('admin/settings/general.brand')) }} {{ Form::label('brand', trans('admin/settings/general.brand')) }}
</div> </div>
<div class="col-md-9"> <div class="col-md-9">
{!! Form::select('brand', array('1'=>'Text','2'=>'Logo','3'=>'Logo + Text'), Input::old('brand', $setting->brand), array('class' => 'form-control', 'style'=>'width: 150px ;')) !!} {!! Form::select('brand', array('1'=>'Text','2'=>'Logo','3'=>'Logo + Text'), Input::old('brand', $setting->brand), array('class' => 'form-control select2', 'style'=>'width: 150px ;')) !!}
{!! $errors->first('brand', '<span class="alert-msg">:message</span>') !!} {!! $errors->first('brand', '<span class="alert-msg">:message</span>') !!}
</div> </div>
</div> </div>
@ -158,9 +158,9 @@
</div> </div>
<div class="col-md-9"> <div class="col-md-9">
@if (config('app.lock_passwords')===true) @if (config('app.lock_passwords')===true)
{!! Form::select('support_footer', array('on'=>'Enabled','off'=>'Disabled','admin'=>'Superadmin Only'), Input::old('support_footer', $setting->support_footer), ['class' => 'form-control disabled', 'style'=>'width: 150px ;', 'disabled' => 'disabled']) !!} {!! Form::select('support_footer', array('on'=>'Enabled','off'=>'Disabled','admin'=>'Superadmin Only'), Input::old('support_footer', $setting->support_footer), ['class' => 'form-control select2 disabled', 'style'=>'width: 150px ;', 'disabled' => 'disabled']) !!}
@else @else
{!! Form::select('support_footer', array('on'=>'Enabled','off'=>'Disabled','admin'=>'Superadmin Only'), Input::old('support_footer', $setting->support_footer), array('class' => 'form-control', 'style'=>'width: 150px ;')) !!} {!! Form::select('support_footer', array('on'=>'Enabled','off'=>'Disabled','admin'=>'Superadmin Only'), Input::old('support_footer', $setting->support_footer), array('class' => 'form-control select2', 'style'=>'width: 150px ;')) !!}
@endif @endif
<p class="help-block">{{ trans('admin/settings/general.support_footer_help') }}</p> <p class="help-block">{{ trans('admin/settings/general.support_footer_help') }}</p>
@ -176,9 +176,9 @@
</div> </div>
<div class="col-md-9"> <div class="col-md-9">
@if (config('app.lock_passwords')===true) @if (config('app.lock_passwords')===true)
{!! Form::select('version_footer', array('on'=>'Enabled','off'=>'Disabled','admin'=>'Superadmin Only'), Input::old('version_footer', $setting->version_footer), ['class' => 'form-control disabled', 'style'=>'width: 150px ;', 'disabled' => 'disabled']) !!} {!! Form::select('version_footer', array('on'=>'Enabled','off'=>'Disabled','admin'=>'Superadmin Only'), Input::old('version_footer', $setting->version_footer), ['class' => 'form-control select2 disabled', 'style'=>'width: 150px ;', 'disabled' => 'disabled']) !!}
@else @else
{!! Form::select('version_footer', array('on'=>'Enabled','off'=>'Disabled','admin'=>'Superadmin Only'), Input::old('version_footer', $setting->version_footer), array('class' => 'form-control', 'style'=>'width: 150px ;')) !!} {!! Form::select('version_footer', array('on'=>'Enabled','off'=>'Disabled','admin'=>'Superadmin Only'), Input::old('version_footer', $setting->version_footer), array('class' => 'form-control select2', 'style'=>'width: 150px ;')) !!}
@endif @endif
<p class="help-block">{{ trans('admin/settings/general.version_footer_help') }}</p> <p class="help-block">{{ trans('admin/settings/general.version_footer_help') }}</p>