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

Merge branch 'master' into develop

Browse source
This commit is contained in:
snipe 2016-07-21 19:42:11 -07:00
commit 8ba9399de7
2 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
resources/lang/en/general.php
View file

@ -140,6 +140,7 @@
'select_asset' => 'Select Asset', 'select_asset' => 'Select Asset',
'settings' => 'Settings', 'settings' => 'Settings',
'sign_in' => 'Sign in', 'sign_in' => 'Sign in',
'some_features_disabled' => 'Some features are disabled for this installation.',
'site_name' => 'Site Name', 'site_name' => 'Site Name',
'state' => 'State', 'state' => 'State',
'status_labels' => 'Status Labels', 'status_labels' => 'Status Labels',

2
resources/views/layouts/default.blade.php
View file

@ -496,7 +496,7 @@
<h1 class="pull-left"> <h1 class="pull-left">
@yield('title') @yield('title')
@if (config('app.lock_passwords')) @if (config('app.lock_passwords'))
<p class="help-block">{{ trans('general.feature_disabled') }}</p> <p class="help-block">{{ trans('general.some_features_disabled') }}</p>
@endif @endif
</h1> </h1>