lunax/snipe_it
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity Actions

Merge remote-tracking branch 'origin/develop'

Browse source
This commit is contained in:
snipe 2025-04-16 15:52:18 +01:00
commit e2616e8039
3 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.env.example
View file

@ -179,6 +179,7 @@ PASSWORD_RESET_MAX_ATTEMPTS_PER_MIN=50
# OPTIONAL: MISC # OPTIONAL: MISC
# -------------------------------------------- # --------------------------------------------
LOG_CHANNEL=single LOG_CHANNEL=single
LOG_DEPRECATIONS=false
LOG_MAX_DAYS=10 LOG_MAX_DAYS=10
APP_LOCKED=false APP_LOCKED=false
APP_CIPHER=AES-256-CBC APP_CIPHER=AES-256-CBC

6
config/logging.php
View file

@ -140,5 +140,11 @@ if ((env('APP_ENV')=='production') && (env('ROLLBAR_TOKEN'))) {
} }
if (env('LOG_DEPRECATIONS')=='true') {
$config['channels']['deprecations'] = [
'driver' => 'single',
'path' => storage_path('logs/deprecations.log')
];
}
return $config; return $config;

4
resources/lang/en-US/admin/settings/general.php
View file

@ -8,13 +8,13 @@ return [
'ad_append_domain' => 'Append domain name to username field', 'ad_append_domain' => 'Append domain name to username field',
'ad_append_domain_help' => 'User isn\'t required to write "username@domain.local", they can just type "username".', 'ad_append_domain_help' => 'User isn\'t required to write "username@domain.local", they can just type "username".',
'admin_cc_email' => 'CC Email', 'admin_cc_email' => 'CC Email',
'admin_cc_email_help' => 'If you would like to send a copy of checkin/checkout emails that are sent to users to an additional email account, enter it here. Otherwise leave this field blank.', 'admin_cc_email_help' => 'Send a copy of checkin/checkout emails to this address.',
'admin_settings' => 'Admin Settings', 'admin_settings' => 'Admin Settings',
'is_ad' => 'This is an Active Directory server', 'is_ad' => 'This is an Active Directory server',
'alerts' => 'Alerts', 'alerts' => 'Alerts',
'alert_title' => 'Update Notification Settings', 'alert_title' => 'Update Notification Settings',
'alert_email' => 'Send alerts to', 'alert_email' => 'Send alerts to',
'alert_email_help' => 'Email addresses or distribution lists you want alerts to be sent to, comma separated', 'alert_email_help' => 'Email addresses or distribution lists you want alerts to be sent to, comma separated.',
'alerts_enabled' => 'Email Alerts Enabled', 'alerts_enabled' => 'Email Alerts Enabled',
'alert_interval' => 'Expiring Alerts Threshold (in days)', 'alert_interval' => 'Expiring Alerts Threshold (in days)',
'alert_inv_threshold' => 'Inventory Alert Threshold', 'alert_inv_threshold' => 'Inventory Alert Threshold',