DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2025-01-12 06:17:28 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #8061 from Godmartinz/develop

Browse source 
fixed a table header error
This commit is contained in:
snipe 2020-05-26 19:52:14 -07:00 committed by GitHub
parent dee1f5ec35 edd4797178
commit 5b4e4c8dcd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
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

@ -95,6 +95,7 @@
'first_name_format' => 'First Name (jane@example.com)',
'files' => 'Files',
'file_name' => 'File',
'file_type' => 'File Type',
'file_uploads' => 'File Uploads',
'generate' => 'Generate',
'github_markdown' => 'This field accepts <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>.',

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

@ -1039,7 +1039,7 @@
data-cookie-id-table="assetFileHistory">
<thead>
<tr>
<th data-visible="true" data-field="icon"><span class="sr-only">Icon</span></th>
<th data-visible="true" data-field="icon">{{trans('general.file_type')}}</th>
<th class="col-md-2" data-searchable="true" data-visible="true" data-field="notes">{{ trans('general.notes') }}</th>
<th class="col-md-2" data-searchable="true" data-visible="true" data-field="image">{{ trans('general.image') }}</th>
<th class="col-md-2" data-searchable="true" data-visible="true" data-field="filename">{{ trans('general.file_name') }}</th>