DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-11-10 07:34:06 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop'

Browse source
This commit is contained in:
snipe 2022-06-03 12:54:13 -07:00
parent 50c92d4730 f519fb747f
commit 54f828743e
2 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
resources/lang/en/validation.php
View file

@ -91,6 +91,11 @@ return [
'url' => 'The :attribute format is invalid.', 'url' => 'The :attribute format is invalid.',
'unique_undeleted' => 'The :attribute must be unique.', 'unique_undeleted' => 'The :attribute must be unique.',
'non_circular' => 'The :attribute must not create a circular reference.', 'non_circular' => 'The :attribute must not create a circular reference.',
'disallow_same_pwd_as_user_fields' => 'Password cannot be the same as the username.',
'letters' => 'Password must contain at least one letter.',
'numbers' => 'Password must contain at least one number.',
'case_diff' => 'Password must use mixed case.',
'symbols' => 'Password must contain symbols.',
'gte' => [ 'gte' => [
'numeric' => 'Value cannot be negative' 'numeric' => 'Value cannot be negative'
], ],

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

@ -8,7 +8,7 @@
@stop @stop
@section('header_right') @section('header_right')
@can('superuser') @can('update', \App\Models\AssetModel::class)
<div class="btn-group pull-right"> <div class="btn-group pull-right">
<button class="btn btn-default dropdown-toggle" data-toggle="dropdown">{{ trans('button.actions') }} <button class="btn btn-default dropdown-toggle" data-toggle="dropdown">{{ trans('button.actions') }}
<span class="caret"></span> <span class="caret"></span>