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

Merge remote-tracking branch 'origin/develop'

Browse source 
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	Dockerfile.alpine
This commit is contained in:
snipe 2023-12-07 14:12:56 +00:00
parent 09ec8d1d5c 2c5c97fd7e
commit 4e96c8d05d
5 changed files with 17 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Dockerfile.alpine
View file

@ -1,4 +1,4 @@
FROM alpine:3.17.5 FROM alpine:3.18.5
# Apache + PHP # Apache + PHP
RUN apk add --no-cache \ RUN apk add --no-cache \
apache2 \ apache2 \

26
app/Console/Commands/RestoreFromBackup.php
View file

@ -84,36 +84,36 @@ class RestoreFromBackup extends Command
$private_dirs = [ $private_dirs = [
'storage/private_uploads/accessories',
'storage/private_uploads/assetmodels',
'storage/private_uploads/assets', // these are asset _files_, not the pictures. 'storage/private_uploads/assets', // these are asset _files_, not the pictures.
'storage/private_uploads/audits', 'storage/private_uploads/audits',
'storage/private_uploads/components',
'storage/private_uploads/consumables',
'storage/private_uploads/eula-pdfs',
'storage/private_uploads/imports', 'storage/private_uploads/imports',
'storage/private_uploads/assetmodels',
'storage/private_uploads/users',
'storage/private_uploads/licenses', 'storage/private_uploads/licenses',
'storage/private_uploads/signatures', 'storage/private_uploads/signatures',
'storage/private_uploads/eula-pdfs', 'storage/private_uploads/users',
]; ];
$private_files = [ $private_files = [
'storage/oauth-private.key', 'storage/oauth-private.key',
'storage/oauth-public.key', 'storage/oauth-public.key',
]; ];
$public_dirs = [ $public_dirs = [
'public/uploads/accessories',
'public/uploads/assets', // these are asset _pictures_, not asset files
'public/uploads/avatars',
//'public/uploads/barcodes', // we don't want this, let the barcodes be regenerated
'public/uploads/categories',
'public/uploads/companies', 'public/uploads/companies',
'public/uploads/components', 'public/uploads/components',
'public/uploads/categories',
'public/uploads/manufacturers',
//'public/uploads/barcodes', // we don't want this, let the barcodes be regenerated
'public/uploads/consumables', 'public/uploads/consumables',
'public/uploads/departments', 'public/uploads/departments',
'public/uploads/avatars',
'public/uploads/suppliers',
'public/uploads/assets', // these are asset _pictures_, not asset files
'public/uploads/locations', 'public/uploads/locations',
'public/uploads/accessories',
'public/uploads/models',
'public/uploads/categories',
'public/uploads/avatars',
'public/uploads/manufacturers', 'public/uploads/manufacturers',
'public/uploads/models',
'public/uploads/suppliers',
]; ];
$public_files = [ $public_files = [

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

@ -492,5 +492,6 @@ return [
'copy_to_clipboard' => 'Copy to Clipboard', 'copy_to_clipboard' => 'Copy to Clipboard',
'copied' => 'Copied!', 'copied' => 'Copied!',
'status_compatibility' => 'If assets are already assigned, they cannot be changed to a non-deployable status type and this value change will be skipped.', 'status_compatibility' => 'If assets are already assigned, they cannot be changed to a non-deployable status type and this value change will be skipped.',
'rtd_location_help' => 'This is the location of the asset when it is not checked out',
]; ];

2
resources/views/account/view-assets.blade.php
View file

@ -491,7 +491,7 @@
<thead> <thead>
<tr> <tr>
<th class="col-md-4">{{ trans('general.name') }}</th> <th class="col-md-4">{{ trans('general.name') }}</th>
<th class="col-md-4">{{ trans('admin/hardware/form.serial') }}</th> <th class="col-md-4">{{ trans('admin/licenses/form.license_key') }}</th>
<th class="col-md-4">{{ trans('general.category') }}</th> <th class="col-md-4">{{ trans('general.category') }}</th>
</tr> </tr>
</thead> </thead>

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

@ -65,7 +65,7 @@
@endif @endif
@include ('partials.forms.edit.notes') @include ('partials.forms.edit.notes')
@include ('partials.forms.edit.location-select', ['translated_name' => trans('admin/hardware/form.default_location'), 'fieldname' => 'rtd_location_id']) @include ('partials.forms.edit.location-select', ['translated_name' => trans('admin/hardware/form.default_location'), 'fieldname' => 'rtd_location_id', 'help_text' => trans('general.rtd_location_help')])
@include ('partials.forms.edit.requestable', ['requestable_text' => trans('admin/hardware/general.requestable')]) @include ('partials.forms.edit.requestable', ['requestable_text' => trans('admin/hardware/general.requestable')])