diff --git a/config/app.php b/config/app.php index 2559b8012..cca6b85e5 100755 --- a/config/app.php +++ b/config/app.php @@ -239,7 +239,7 @@ return [ | */ - 'min_php' => '7.2.5', + 'min_php' => '7.4.0', /* diff --git a/resources/lang/en/admin/settings/general.php b/resources/lang/en/admin/settings/general.php index 0516bb6a8..64d0aef53 100644 --- a/resources/lang/en/admin/settings/general.php +++ b/resources/lang/en/admin/settings/general.php @@ -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', + ]; diff --git a/resources/views/settings/index.blade.php b/resources/views/settings/index.blade.php index fd1e9b630..9ff9c94f7 100755 --- a/resources/views/settings/index.blade.php +++ b/resources/views/settings/index.blade.php @@ -54,7 +54,7 @@ } - +
@@ -346,7 +346,7 @@
- + @@ -358,19 +358,19 @@

{{ trans('admin/settings/general.system') }}

-
+
- {{ trans('admin/settings/general.snipe_version') }} + {{ trans('admin/settings/general.snipe_version') }}:
{{ config('version.app_version') }} build {{ config('version.build_version') }} ({{ config('version.hash_version') }})
- {{ trans('admin/settings/general.license') }} + {{ trans('admin/settings/general.license') }}:
AGPL3 @@ -381,19 +381,68 @@
- {{ trans('admin/settings/general.php') }} + {{ trans('admin/settings/general.php') }}:
{{ phpversion() }}
- {{ trans('admin/settings/general.laravel') }} + {{ trans('admin/settings/general.laravel') }}:
{{ $snipeSettings->lar_ver() }}
+
+ +
+
+ {{ trans('admin/settings/general.timezone') }}: +
+
+ {{ config('app.timezone') }} +
+ +
+ {{ trans('admin/settings/general.database_driver') }}: +
+
+ {{ config('database.default') }} +
+
+ + +
+
+ {{ trans('admin/settings/general.mail_from') }}: +
+
+ {{ config('mail.from.name') }} + <{{ config('mail.from.address') }}> +
+ +
+ {{ trans('admin/settings/general.mail_reply_to') }}: +
+
+ {{ config('mail.reply_to.name') }} + <{{ config('mail.reply_to.address') }}> +
+
+ + +
+
+ {{ trans('admin/settings/general.bs_table_storage') }}: +
+
+ {{ config('session.bs_table_storage') }} +
+ +
+ +
@@ -402,6 +451,9 @@
+ + + @section('moar_scripts')