DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-09-19 23:37:38 -07:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop'

Browse source
This commit is contained in:
snipe 2023-09-25 13:46:33 +01:00
parent 13bee63fe9 81a982fd77
commit 16498fdcf8
3 changed files with 66 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
config/app.php
View file

@ -239,7 +239,7 @@ return [
|
*/
'min_php' => '7.2.5',
'min_php' => '7.4.0',
/*

6
resources/lang/en/admin/settings/general.php
View file

@ -356,4 +356,10 @@ return [
'google_login' => 'Google Workspace Login Settings',
'enable_google_login' => 'Enable users to login with Google Workspace',
'enable_google_login_help' => 'Users will not be automatically provisioned. They must have an existing account here AND in Google Workspace, and their username here must match their Google Workspace email address. ',
'mail_reply_to' => 'Mail Reply-To Address',
'mail_from' => 'Mail From Address',
'database_driver' => 'Database Driver',
'bs_table_storage' => 'Table Storage',
'timezone' => 'Timezone',
];

66
resources/views/settings/index.blade.php
View file

@ -54,7 +54,7 @@
}
</style>
<div class="row">
<!-- search filter list -->
<div class="list clearfix">
@ -346,7 +346,7 @@
</div>
</div>
</div>
</div>
@ -358,19 +358,19 @@
<h2 class="box-title">{{ trans('admin/settings/general.system') }}</h2>
</div>
<div class="box-body">
<div class="container row-striped col-md-11">
<div class="container row row-striped" style="width:97%">
<!-- row -->
<div class="row">
<div class="col-md-2">
<strong>{{ trans('admin/settings/general.snipe_version') }}</strong>
<strong>{{ trans('admin/settings/general.snipe_version') }}:</strong>
</div>
<div class="col-md-4">
{{ config('version.app_version') }} build {{ config('version.build_version') }} ({{ config('version.hash_version') }})
</div>
<div class="col-md-2">
<strong>{{ trans('admin/settings/general.license') }}</strong>
<strong>{{ trans('admin/settings/general.license') }}:</strong>
</div>
<div class="col-md-4">
<a href="https://www.gnu.org/licenses/agpl-3.0.en.html" rel="noopener">AGPL3</a>
@ -381,19 +381,68 @@
<!-- row -->
<div class="row">
<div class="col-md-2">
<strong>{{ trans('admin/settings/general.php') }}</strong>
<strong>{{ trans('admin/settings/general.php') }}:</strong>
</div>
<div class="col-md-4">
{{ phpversion() }}
</div>
<div class="col-md-2">
<strong>{{ trans('admin/settings/general.laravel') }}</strong>
<strong>{{ trans('admin/settings/general.laravel') }}:</strong>
</div>
<div class="col-md-4">
{{ $snipeSettings->lar_ver() }}
</div>
</div>
<!-- row -->
<div class="row">
<div class="col-md-2">
<strong>{{ trans('admin/settings/general.timezone') }}:</strong>
</div>
<div class="col-md-4">
{{ config('app.timezone') }}
</div>
<div class="col-md-2">
<strong>{{ trans('admin/settings/general.database_driver') }}:</strong>
</div>
<div class="col-md-4">
{{ config('database.default') }}
</div>
</div>
<!-- row -->
<div class="row">
<div class="col-md-2">
<strong>{{ trans('admin/settings/general.mail_from') }}:</strong>
</div>
<div class="col-md-4">
{{ config('mail.from.name') }}
<code>&lt;{{ config('mail.from.address') }}&gt;</code>
</div>
<div class="col-md-2">
<strong>{{ trans('admin/settings/general.mail_reply_to') }}:</strong>
</div>
<div class="col-md-4">
{{ config('mail.reply_to.name') }}
<code>&lt;{{ config('mail.reply_to.address') }}&gt;</code>
</div>
</div>
<!-- row -->
<div class="row">
<div class="col-md-2">
<strong>{{ trans('admin/settings/general.bs_table_storage') }}:</strong>
</div>
<div class="col-md-10">
{{ config('session.bs_table_storage') }}
</div>
</div>
</div>
</div>
<!--/ row -->
</div>
@ -402,6 +451,9 @@
</div><!--/col-md-8-->
</div><!--/row-->
@section('moar_scripts')
<script nonce="{{ csrf_token() }}">