Merge branch 'develop' into chore/migrate-select-helper

# Conflicts:
#	resources/views/partials/forms/edit/company.blade.php

.env.dev.docker

@@ -11,7 +11,7 @@ MYSQL_ROOT_PASSWORD=changeme1234
 # REQUIRED: BASIC APP SETTINGS
 # --------------------------------------------
 APP_ENV=develop
-APP_DEBUG=false
+APP_DEBUG=true
 # please regenerate the APP_KEY value by calling `docker-compose run --rm snipeit bash` and then `php artisan key:generate --show` and then copy paste the value here
 APP_KEY=base64:3ilviXqB9u6DX1NRcyWGJ+sjySF+H18CPDGb3+IVwMQ=
 APP_URL=http://localhost:8000
@@ -158,7 +158,7 @@ RESET_PASSWORD_LINK_EXPIRES=900
 # --------------------------------------------
 # OPTIONAL: MISC
 # --------------------------------------------
-LOG_CHANNEL=stderr
+LOG_CHANNEL=single
 LOG_MAX_DAYS=10
 APP_LOCKED=false
 APP_CIPHER=AES-256-CBC

Dockerfile.alpine

@@ -73,7 +73,7 @@ RUN mkdir -p /var/www/.composer && chown apache /var/www/.composer
 
 # Install dependencies
 USER apache
-RUN COMPOSER_CACHE_DIR=/dev/null composer install --no-dev --working-dir=/var/www/html
+RUN COMPOSER_CACHE_DIR=/dev/null composer install --working-dir=/var/www/html
 
 USER root
 

app/Console/Commands/ResetDemoSettings.php

@@ -65,7 +65,7 @@ class ResetDemoSettings extends Command
         $settings->thumbnail_max_h = '30';
         $settings->locale = 'en-US';
         $settings->version_footer = 'on';
-        $settings->support_footer = null;
+        $settings->support_footer = 'on';
         $settings->saml_enabled = '0';
         $settings->saml_sp_x509cert = null;
         $settings->saml_idp_metadata = null;

app/Events/NoteAdded.php

@@ -0,0 +1,28 @@
+<?php
+
+namespace App\Events;
+
+use App\Models\User;
+use Illuminate\Foundation\Events\Dispatchable;
+use Illuminate\Queue\SerializesModels;
+
+class NoteAdded
+{
+    use Dispatchable, SerializesModels;
+    public $itemNoteAddedOn;
+    public $note;
+    public $noteAddedBy;
+
+
+    /**
+     * Create a new event instance.
+     *
+     * @return void
+     */
+    public function __construct($itemNoteAddedOn, User $noteAddedBy, $note)
+    {
+        $this->itemNoteAddedOn = $itemNoteAddedOn;
+        $this->note = $note;
+        $this->noteAddedBy = $noteAddedBy;
+    }
+}

app/Helpers/IconHelper.php

@@ -184,7 +184,9 @@ class IconHelper
                 return 'fa-regular fa-id-card';
             case 'department' :
                 return 'fa-solid fa-building-user';
-
+            case 'note':
+            case 'notes':
+                return 'fas fa-sticky-note';
         }
     }
 }

app/Http/Controllers/Accessories/AccessoriesFilesController.php

@@ -51,15 +51,15 @@ class AccessoriesFilesController extends Controller
                 }
 
 
-                return redirect()->route('accessories.show', $accessory->id)->with('success', trans('general.file_upload_success'));
+                return redirect()->route('accessories.show', $accessory->id)->withFragment('files')->with('success', trans('general.file_upload_success'));
 
             }
 
-            return redirect()->route('accessories.show', $accessory->id)->with('error', trans('general.no_files_uploaded'));
+            return redirect()->route('accessories.show', $accessory->id)->withFragment('files')->with('error', trans('general.no_files_uploaded'));
         }
         // Prepare the error message
-        return redirect()->route('accessories.index')
+        return redirect()->route('accessories.index')->with('error', trans('admin/accessories/message.does_not_exist'));
-            ->with('error', trans('general.file_does_not_exist'));
+
     }
 
     /**
@@ -72,30 +72,27 @@ class AccessoriesFilesController extends Controller
      */
     public function destroy($accessoryId = null, $fileId = null) : RedirectResponse
     {
-        $accessory = Accessory::find($accessoryId);
+        if ($accessory = Accessory::find($accessoryId)) {
-
-        // the asset is valid
-        if (isset($accessory->id)) {
             $this->authorize('update', $accessory);
-            $log = Actionlog::find($fileId);
 
-            // Remove the file if one exists
+            if ($log = Actionlog::find($fileId)) {
-            if (Storage::exists('accessories/'.$log->filename)) {
+
-                try {
+                if (Storage::exists('private_uploads/accessories/'.$log->filename)) {
-                    Storage::delete('accessories/'.$log->filename);
+                    try {
-                } catch (\Exception $e) {
+                        Storage::delete('private_uploads/accessories/' . $log->filename);
-                    Log::debug($e);
+                        $log->delete();
+                        return redirect()->back()->withFragment('files')->with('success', trans('admin/hardware/message.deletefile.success'));
+                    } catch (\Exception $e) {
+                        Log::debug($e);
+                        return redirect()->route('accessories.index')->with('error', trans('general.file_does_not_exist'));
+                    }
                 }
+
             }
-
+            return redirect()->route('accessories.show', ['accessory' => $accessory])->withFragment('files')->with('error',  trans('general.log_record_not_found'));
-            $log->delete();
-
-            return redirect()->back()
-                ->with('success', trans('admin/hardware/message.deletefile.success'));
         }
 
-        // Redirect to the licence management page
+        return redirect()->route('accessories.index')->with('error', trans('admin/accessories/message.does_not_exist'));
-        return redirect()->route('accessories.index')->with('error', trans('general.file_does_not_exist'));
     }
 
     /**
@@ -125,10 +122,11 @@ class AccessoriesFilesController extends Controller
                 }
             }
 
-            return redirect()->route('accessories.show', ['accessory' => $accessory])->with('error',  trans('general.log_record_not_found'));
+            return redirect()->route('accessories.show', ['accessory' => $accessory])->withFragment('files')->with('error',  trans('general.log_record_not_found'));
 
         }
 
-        return redirect()->route('accessories.index')->with('error', trans('general.file_not_found'));
+        return redirect()->route('accessories.index')->with('error', trans('admin/accessories/message.does_not_exist'));
+
     }
 }

app/Http/Controllers/ActionlogController.php

@@ -40,10 +40,13 @@ class ActionlogController extends Controller
     public function getStoredEula($filename) : Response | BinaryFileResponse | RedirectResponse
     {
         $this->authorize('view', \App\Models\Asset::class);
-        $file = config('app.private_uploads').'/eula-pdfs/'.$filename;
+
+        if (config('filesystems.default') == 's3_private') {
+            return redirect()->away(Storage::disk('s3_private')->temporaryUrl('private_uploads/eula-pdfs/'.$filename, now()->addMinutes(5)));
+        }
 
         if (Storage::exists('private_uploads/eula-pdfs/'.$filename)) {
-            return response()->download($file);
+            return response()->download(config('app.private_uploads').'/eula-pdfs/'.$filename);
         }
 
         return redirect()->back()->with('error',  trans('general.file_does_not_exist'));

app/Http/Controllers/Api/AssetModelFilesController.php

@@ -9,6 +9,7 @@ use App\Http\Controllers\Controller;
 use App\Models\AssetModel;
 use App\Models\Actionlog;
 use App\Http\Requests\UploadFileRequest;
+use App\Http\Transformers\AssetModelsTransformer;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Support\Facades\Log;
 use Symfony\Component\HttpFoundation\StreamedResponse;
@@ -68,37 +69,15 @@ class AssetModelFilesController extends Controller
     /**
      * List the files for an asset.
      *
-     * @param  int $assetModelId
+     * @param  int $assetmodel
      * @since [v7.0.12]
      * @author [r-xyz]
      */
-    public function list($assetModelId = null) : JsonResponse
+    public function list($assetmodel_id) : JsonResponse | array
     {
-        // Start by checking if the asset being acted upon exists
+            $assetmodel = AssetModel::with('uploads')->find($assetmodel_id);
-        if (! $assetModel = AssetModel::find($assetModelId)) {
+            $this->authorize('view', $assetmodel);
-            return response()->json(Helper::formatStandardApiResponse('error', null, trans('admin/models/message.does_not_exist')), 404);
+            return (new AssetModelsTransformer)->transformAssetModelFiles($assetmodel, $assetmodel->uploads()->count());
-        }
-        
-        // the asset is valid
-        if (isset($assetModel->id)) {
-            $this->authorize('view', $assetModel);
-
-            // Check that there are some uploads on this asset that can be listed
-            if ($assetModel->uploads->count() > 0) {
-                $files = array();
-                foreach ($assetModel->uploads as $upload) {
-                    array_push($files, $upload);
-                }
-                // Give the list of files back to the user
-                return response()->json(Helper::formatStandardApiResponse('success', $files, trans('admin/models/message.upload.success')));
-            }
-
-            // There are no files.
-            return response()->json(Helper::formatStandardApiResponse('success', array(), trans('admin/models/message.upload.success')));
-        }
-
-        // Send back an error message
-        return response()->json(Helper::formatStandardApiResponse('error', null, trans('admin/models/message.download.error')), 500);
     }
 
     /**

app/Http/Controllers/Api/ImportController.php

@@ -9,12 +9,14 @@ use App\Http\Transformers\ImportsTransformer;
 use App\Models\Asset;
 use App\Models\Company;
 use App\Models\Import;
+use Illuminate\Http\UploadedFile;
 use Illuminate\Support\Facades\Artisan;
 use Illuminate\Database\Eloquent\JsonEncodingException;
 use Illuminate\Support\Facades\Request;
 use Illuminate\Support\Facades\Session;
 use Illuminate\Support\Facades\Storage;
 use League\Csv\Reader;
+use Onnov\DetectEncoding\EncodingDetector;
 use Symfony\Component\HttpFoundation\File\Exception\FileException;
 use Illuminate\Support\Facades\Log;
 use Illuminate\Http\JsonResponse;
@@ -45,6 +47,8 @@ class ImportController extends Controller
             $path = config('app.private_uploads').'/imports';
             $results = [];
             $import = new Import;
+            $detector = new EncodingDetector();
+
             foreach ($files as $file) {
                 if (! in_array($file->getMimeType(), [
                     'application/vnd.ms-excel',
@@ -55,7 +59,6 @@ class ImportController extends Controller
                     'text/comma-separated-values',
                     'text/tsv', ])) {
                     $results['error'] = 'File type must be CSV. Uploaded file is '.$file->getMimeType();
-
                     return response()->json(Helper::formatStandardApiResponse('error', null, $results['error']), 422);
                 }
 
@@ -63,7 +66,25 @@ class ImportController extends Controller
                 if (! ini_get('auto_detect_line_endings')) {
                     ini_set('auto_detect_line_endings', '1');
                 }
+                $file_contents = $file->getContent(); //TODO - this *does* load the whole file in RAM, but we need that to be able to 'iconv' it?
+                $encoding = $detector->getEncoding($file_contents);
+                $reader = null;
+                if (strcasecmp($encoding, 'UTF-8') != 0) {
+                    $transliterated = iconv($encoding, 'UTF-8', $file_contents);
+                    if ($transliterated !== false) {
+                        $tmpname = tempnam(sys_get_temp_dir(), '');
+                        $tmpresults = file_put_contents($tmpname, $transliterated);
+                        if ($tmpresults !== false) {
+                            $transliterated = null; //save on memory?
+                            $newfile = new UploadedFile($tmpname, $file->getClientOriginalName(), null, null, true); //WARNING: this is enabling 'test mode' - which is gross, but otherwise the file won't be treated as 'uploaded'
+                            if ($newfile->isValid()) {
+                                $file = $newfile;
+                            }
+                        }
+                    }
+                }
                 $reader = Reader::createFromFileObject($file->openFile('r')); //file pointer leak?
+                $file_contents = null; //try to save on memory, I guess?
 
                 try {
                     $import->header_row = $reader->fetchOne(0);

app/Http/Controllers/Api/NotesController.php

@@ -0,0 +1,43 @@
+<?php
+
+namespace App\Http\Controllers\Api;
+
+use App\Events\NoteAdded;
+use App\Helpers\Helper;
+use App\Http\Controllers\Controller;
+use App\Models\Asset;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Auth;
+use Illuminate\Validation\Rule;
+
+class NotesController extends Controller
+{
+    public function store(Request $request)
+    {
+        $validated = $request->validate([
+            'note' => 'required|string|max:500',
+            'type' => [
+                'required',
+                Rule::in(['asset']),
+            ],
+        ]);
+
+        // This can be made dynamic by using $request->input('type') to determine which model type to add the note to.
+        // For now, we are only placing this on Assets
+        $item = Asset::findOrFail($request->input("id"));
+        $this->authorize('update', $item);
+
+        event(new NoteAdded($item, Auth::user(), $validated['note']));
+
+        return response()->json(Helper::formatStandardApiResponse('success'));
+    }
+
+    public function update(Request $request)
+    {
+
+    }
+    public function destroy(Request $request)
+    {
+
+    }
+}

app/Http/Controllers/AssetModelsFilesController.php

@@ -44,10 +44,10 @@ class AssetModelsFilesController extends Controller
                 $model->logUpload($file_name, $request->get('notes'));
             }
 
-            return redirect()->back()->with('success', trans('general.file_upload_success'));
+            return redirect()->back()->withFragment('files')->with('success', trans('general.file_upload_success'));
         }
 
-        return redirect()->back()->with('error', trans('admin/hardware/message.upload.nofiles'));
+        return redirect()->back()->withFragment('files')->with('error', trans('admin/hardware/message.upload.nofiles'));
     }
 
     /**
@@ -119,11 +119,10 @@ class AssetModelsFilesController extends Controller
                 }
                 $log->delete();
 
-                return redirect()->back()->with('success', trans('admin/hardware/message.deletefile.success'));
+                return redirect()->back()->withFragment('files')->with('success', trans('admin/hardware/message.deletefile.success'));
             }
 
-            return redirect()->back()
+            return redirect()->back()->withFragment('files')->with('success', trans('admin/hardware/message.deletefile.success'));
-                ->with('success', trans('admin/hardware/message.deletefile.success'));
         }
 
         // Redirect to the hardware management page

app/Http/Controllers/Assets/AssetFilesController.php

@@ -45,7 +45,7 @@ class AssetFilesController extends Controller
                 $asset->logUpload($file_name, $request->get('notes'));
             }
 
-            return redirect()->back()->with('success', trans('admin/hardware/message.upload.success'));
+            return redirect()->back()->withFragment('files')->with('success', trans('admin/hardware/message.upload.success'));
         }
 
         return redirect()->back()->with('error', trans('admin/hardware/message.upload.nofiles'));
@@ -97,25 +97,19 @@ class AssetFilesController extends Controller
      */
     public function destroy($assetId = null, $fileId = null) : RedirectResponse
     {
-        $asset = Asset::find($assetId);
+        if ($asset = Asset::find($assetId))  {
-        $this->authorize('update', $asset);
-        $rel_path = 'private_uploads/assets';
-
-        // the asset is valid
-        if (isset($asset->id)) {
             $this->authorize('update', $asset);
-            $log = Actionlog::find($fileId);
+            $rel_path = 'private_uploads/assets';
-            if ($log) {
+
+            if ($log = Actionlog::find($fileId)) {
                 if (Storage::exists($rel_path.'/'.$log->filename)) {
                     Storage::delete($rel_path.'/'.$log->filename);
                 }
                 $log->delete();
-
+                return redirect()->back()->withFragment('files')->with('success', trans('admin/hardware/message.deletefile.success'));
-                return redirect()->back()->with('success', trans('admin/hardware/message.deletefile.success'));
             }
 
-            return redirect()->back()
+            return redirect()->route('hardware.show', ['hardware' => $asset])->with('error',  trans('general.log_record_not_found'));
-                ->with('success', trans('admin/hardware/message.deletefile.success'));
         }
 
         return redirect()->route('hardware.index')->with('error', trans('admin/hardware/message.does_not_exist'));

app/Http/Controllers/Assets/AssetsController.php

@@ -535,7 +535,7 @@ class AssetsController extends Controller
     {
         $settings = Setting::getSettings();
 
-        if ($settings->qr_code == '1') {
+        if (($settings->qr_code === '1') && ($settings->label2_2d_type !== 'none')) {
             $asset = Asset::withTrashed()->find($assetId);
             if ($asset) {
                 $size = Helper::barcodeDimensions($settings->label2_2d_type);
@@ -865,8 +865,8 @@ class AssetsController extends Controller
     public function quickScan()
     {
         $this->authorize('audit', Asset::class);
-        $dt = Carbon::now()->addMonths(12)->toDateString();
+        $settings = Setting::getSettings();
-
+        $dt = Carbon::now()->addMonths($settings->audit_interval)->toDateString();
         return view('hardware/quickscan')->with('next_audit_date', $dt);
     }
 
@@ -883,7 +883,6 @@ class AssetsController extends Controller
         $this->authorize('audit', Asset::class);
         $dt = Carbon::now()->addMonths($settings->audit_interval)->toDateString();
         $asset = Asset::findOrFail($id);
-
         return view('hardware/audit')->with('asset', $asset)->with('next_audit_date', $dt)->with('locations_list');
     }
 

app/Http/Controllers/Auth/ResetPasswordController.php

@@ -103,22 +103,24 @@ class ResetPasswordController extends Controller
                     ], $messages);
             }
 
+            if ($user->ldap_import != '1') {
 
-            // set the response
+                    // set the response
-            $response = $broker->reset(
+                    $response = $broker->reset(
-                $this->credentials($request), function ($user, $password) {
+                        $this->credentials($request), function ($user, $password) {
-                $this->resetPassword($user, $password);
+                        $this->resetPassword($user, $password);
-            });
+                    });
 
-            // Check if the password reset above actually worked
+                    // Check if the password reset above actually worked
-            if ($response == \Password::PASSWORD_RESET) {
+                    if ($response == \Password::PASSWORD_RESET) {
-                Log::debug('Password reset for '.$user->username.' worked');
+                        Log::debug('Password reset for ' . $user->username . ' worked');
-                return redirect()->guest('login')->with('success', trans('passwords.reset'));
+                        return redirect()->guest('login')->with('success', trans('passwords.reset'));
+                    }
+
+                    Log::debug('Password reset for ' . $user->username . ' FAILED - this user exists but the token is not valid');
+                    return redirect()->back()->withInput($request->only('email'))->with('success', trans('passwords.reset'));
             }
 
-            Log::debug('Password reset for '.$user->username.' FAILED - this user exists but the token is not valid');
-            return redirect()->back()->withInput($request->only('email'))->with('success', trans('passwords.reset'));
-
         }
 
 

app/Http/Controllers/Components/ComponentsFilesController.php

@@ -50,7 +50,7 @@ class ComponentsFilesController extends Controller
                 }
 
 
-                return redirect()->route('components.show', $component->id)->with('success', trans('general.file_upload_success'));
+                return redirect()->route('components.show', $component->id)->withFragment('files')->with('success', trans('general.file_upload_success'));
 
             }
 
@@ -91,7 +91,7 @@ class ComponentsFilesController extends Controller
 
             $log->delete();
 
-            return redirect()->back()
+            return redirect()->back()->withFragment('files')
                 ->with('success', trans('admin/hardware/message.deletefile.success'));
         }
 

app/Http/Controllers/Consumables/ConsumablesFilesController.php

@@ -48,7 +48,7 @@ class ConsumablesFilesController extends Controller
                 }
 
 
-                return redirect()->route('consumables.show', $consumable->id)->with('success', trans('general.file_upload_success'));
+                return redirect()->route('consumables.show', $consumable->id)->withFragment('files')->with('success', trans('general.file_upload_success'));
 
             }
 
@@ -89,7 +89,7 @@ class ConsumablesFilesController extends Controller
 
             $log->delete();
 
-            return redirect()->back()
+            return redirect()->back()->withFragment('files')
                 ->with('success', trans('admin/hardware/message.deletefile.success'));
         }
 

app/Http/Controllers/ModalController.php

@@ -32,7 +32,8 @@ class ModalController extends Controller
             'statuslabel',
             'supplier',
             'upload-file',
-            'user',         
+            'user',
+            'add-note',
         ];
 
 

app/Http/Controllers/ProfileController.php

@@ -99,9 +99,13 @@ class ProfileController extends Controller
      * User change email page.
      *
      */
-    public function password() : View
+    public function password() : View | RedirectResponse
     {
+
         $user = auth()->user();
+        if ($user->ldap_import=='1') {
+            return redirect()->route('account')->with('error', trans('admin/users/message.error.password_ldap'));
+        }
         return view('account/change-password', compact('user'));
     }
 
@@ -116,7 +120,7 @@ class ProfileController extends Controller
 
         $user = auth()->user();
         if ($user->ldap_import == '1') {
-            return redirect()->route('account.password.index')->with('error', trans('admin/users/message.error.password_ldap'));
+            return redirect()->route('account')->with('error', trans('admin/users/message.error.password_ldap'));
         }
 
         $rules = [

app/Http/Controllers/ReportsController.php

@@ -11,6 +11,7 @@ use App\Models\AssetModel;
 use App\Models\Category;
 use App\Models\AssetMaintenance;
 use App\Models\CheckoutAcceptance;
+use App\Models\Company;
 use App\Models\CustomField;
 use App\Models\Depreciation;
 use App\Models\License;
@@ -18,6 +19,7 @@ use App\Models\ReportTemplate;
 use App\Models\Setting;
 use App\Notifications\CheckoutAssetNotification;
 use Carbon\Carbon;
+use Illuminate\Database\Eloquent\Relations\MorphTo;
 use Illuminate\Http\Request;
 use Illuminate\Http\Response;
 use Illuminate\Support\Facades\Mail;
@@ -1109,28 +1111,31 @@ class ReportsController extends Controller
         $this->authorize('reports.view');
         $showDeleted = $deleted == 'deleted';
 
-        /**
+        $query = CheckoutAcceptance::pending()
-         * Get all assets with pending checkout acceptances
+            ->where('checkoutable_type', 'App\Models\Asset')
-         */
+            ->with([
-        if($showDeleted) {
+                'checkoutable' => function (MorphTo $query) {
-            $acceptances = CheckoutAcceptance::pending()->where('checkoutable_type', 'App\Models\Asset')->withTrashed()->with(['assignedTo' , 'checkoutable.assignedTo', 'checkoutable.model'])->get();
+                    $query->morphWith([
-        } else {
+                        AssetModel::class => ['model'],
-            $acceptances = CheckoutAcceptance::pending()->where('checkoutable_type', 'App\Models\Asset')->with(['assignedTo' => function ($query) {
+                        Company::class => ['company'],
-                $query->withTrashed();
+                        Asset::class => ['assignedTo'],
-            }, 'checkoutable.assignedTo', 'checkoutable.model'])->get();
+                    ])->with('model.category');
+                },
+                'assignedTo' => function($query){
+                         $query->withTrashed();
+                    }
+            ]);
+
+        if ($showDeleted) {
+            $query->withTrashed();
         }
 
-        $assetsForReport = $acceptances
+        $assetsForReport = $query->get()
-            ->filter(function ($acceptance) {
+                ->map(function ($acceptance) {
-                $acceptance_checkoutable_flag = false;
+                    return [
-                if ($acceptance->checkoutable){
+                        'assetItem' => $acceptance->checkoutable,
-                    $acceptance_checkoutable_flag = $acceptance->checkoutable->checkedOutToUser();
+                        'acceptance' => $acceptance,
-                }
+                    ];
-                
-                return $acceptance->checkoutable_type == 'App\Models\Asset' && $acceptance_checkoutable_flag;
-            })
-            ->map(function($acceptance) {
-                return ['assetItem' => $acceptance->checkoutable, 'acceptance' => $acceptance];
             });
 
         return view('reports/unaccepted_assets', compact('assetsForReport','showDeleted' ));

app/Http/Controllers/SettingsController.php

@@ -192,6 +192,7 @@ class SettingsController extends Controller
         $settings->next_auto_tag_base = 1;
         $settings->auto_increment_assets = $request->input('auto_increment_assets', 0);
         $settings->auto_increment_prefix = $request->input('auto_increment_prefix');
+        $settings->zerofill_count = $request->input('zerofill_count') ?: 0;
 
         if ((! $user->isValid()) || (! $settings->isValid())) {
             return redirect()->back()->withInput()->withErrors($user->getErrors())->withErrors($settings->getErrors());

app/Http/Controllers/Users/BulkUsersController.php

@@ -70,7 +70,7 @@ class BulkUsersController extends Controller
             // bulk password reset, just do the thing
             } elseif ($request->input('bulk_actions') == 'bulkpasswordreset') {
                 foreach ($users as $user) {
-                    if (($user->activated == '1') && ($user->email != '')) {
+                    if (($user->activated == '1') && ($user->email != '') && ($user->ldap_import != '1')) {
                         $credentials = ['email' => $user->email];
                         Password::sendResetLink($credentials/* , function (Message $message) {
                         $message->subject($this->getEmailSubject()); // TODO - I'm not sure if we still need this, but this second parameter is no longer accepted in later Laravel versions.

app/Http/Controllers/Users/UserFilesController.php

@@ -56,7 +56,7 @@ class UserFilesController extends Controller
                 $logActions[] = $logAction;
             }
             // dd($logActions);
-            return redirect()->back()->with('success', trans('admin/users/message.upload.success'));
+            return redirect()->back()->withFragment('files')->with('success', trans('admin/users/message.upload.success'));
         }
         return redirect()->back()->with('error', trans('admin/users/message.upload.nofiles'));
 
@@ -87,7 +87,7 @@ class UserFilesController extends Controller
                 
                 if (Storage::exists($rel_path.'/'.$filename)) {
                     Storage::delete($rel_path.'/'.$filename);
-                    return redirect()->back()->with('success', trans('admin/users/message.deletefile.success'));
+                    return redirect()->back()->withFragment('files')->with('success', trans('admin/users/message.deletefile.success'));
                 }
 
             }

app/Http/Requests/SettingsSamlRequest.php

@@ -62,7 +62,7 @@ class SettingsSamlRequest extends FormRequest
             $custom_privateKey = '';
             $custom_x509certNew = '';
             if (! empty($this->input('saml_custom_settings'))) {
-                $req_custom_settings = preg_split('/\r\n|\r|\n/', $this->input('saml_custom_settings'));
+                $req_custom_settings = preg_split('/\r\n|\r|\n/', $this->input('saml_custom_settings', ''));
                 $custom_settings = [];
 
                 foreach ($req_custom_settings as $custom_setting) {

app/Http/Requests/UploadFileRequest.php

@@ -46,8 +46,6 @@ class UploadFileRequest extends Request
         $extension = $file->getClientOriginalExtension();
         $file_name = $name_prefix.'-'.str_random(8).'-'.str_slug(basename($file->getClientOriginalName(), '.'.$extension)).'.'.$file->guessExtension();
 
-
-        Log::debug("Your filetype IS: ".$file->getMimeType());
         // Check for SVG and sanitize it
         if ($file->getMimeType() === 'image/svg+xml') {
             Log::debug('This is an SVG');
@@ -66,7 +64,6 @@ class UploadFileRequest extends Request
 
         } else {
             $put_results = Storage::put($dirname.$file_name, file_get_contents($file));
-            Log::debug("Here are the '$put_results' (should be 0 or 1 or true or false or something?)");
         }
         return $file_name;
     }

app/Http/Transformers/AssetModelsTransformer.php

@@ -87,6 +87,41 @@ class AssetModelsTransformer
         return $array;
     }
 
+    public function transformAssetModelFiles($assetmodel, $total)
+    {
+
+        $array = [];
+        foreach ($assetmodel->uploads as $file) {
+            $array[] = self::transformAssetModelFile($file, $assetmodel);
+        }
+
+        return (new DatatablesTransformer)->transformDatatables($array, $total);
+    }
+
+    public function transformAssetModelFile($file, $assetmodel)
+    {
+
+        $array = [
+            'id' => (int) $file->id,
+            'filename' => e($file->filename),
+            'url' => route('show/modelfile', [$assetmodel->id, $file->id]),
+            'created_by' => ($file->adminuser) ? [
+                'id' => (int) $file->adminuser->id,
+                'name'=> e($file->adminuser->present()->fullName),
+            ] : null,
+            'created_at' => Helper::getFormattedDateObject($file->created_at, 'datetime'),
+            'updated_at' => Helper::getFormattedDateObject($file->updated_at, 'datetime'),
+            'deleted_at' => Helper::getFormattedDateObject($file->deleted_at, 'datetime'),
+        ];
+
+        $permissions_array['available_actions'] = [
+            'delete' => (Gate::allows('update', AssetModel::class) && ($assetmodel->deleted_at == '')),
+        ];
+
+        $array += $permissions_array;
+        return $array;
+    }
+
     public function transformAssetModelsDatatable($assetmodels)
     {
         return (new DatatablesTransformer)->transformDatatables($assetmodels);

app/Http/Transformers/DepreciationReportTransformer.php

@@ -61,7 +61,7 @@ class DepreciationReportTransformer
         /**
          * Override the previously set null values if there is a valid model and associated depreciation
          */
-        if (($asset->model) && ($asset->model->depreciation)) {
+        if (($asset->model) && ($asset->model->depreciation) && ($asset->model->depreciation->months !== 0)) {
             $depreciated_value = Helper::formatCurrencyOutput($asset->getDepreciatedValue());
             $monthly_depreciation =Helper::formatCurrencyOutput($asset->purchase_cost / $asset->model->depreciation->months);
             $diff = Helper::formatCurrencyOutput(($asset->purchase_cost - $asset->getDepreciatedValue()));

app/Importer/Importer.php

@@ -39,6 +39,7 @@ abstract class Importer
      * @var array
      */
     private $defaultFieldMap = [
+        'id' => 'id',
         'asset_tag' => 'asset tag',
         'activated' => 'activated',
         'category' => 'category',

app/Importer/ItemImporter.php

@@ -456,14 +456,13 @@ class ItemImporter extends Importer
     {
         if (empty($asset_location)) {
             $this->log('No location given, so none created.');
-
             return null;
         }
+
         $location = Location::where(['name' => $asset_location])->first();
 
         if ($location) {
             $this->log('Location '.$asset_location.' already exists');
-
             return $location->id;
         }
         // No matching locations in the collection, create a new one.

app/Importer/LocationImporter.php

@@ -38,8 +38,16 @@ class LocationImporter extends ItemImporter
     {
 
         $editingLocation = false;
+
         $location = Location::where('name', '=', $this->findCsvMatch($row, 'name'))->first();
 
+        if ($this->findCsvMatch($row, 'id')!='') {
+            // Override location if an ID was given
+            \Log::debug('Finding location by ID: '.$this->findCsvMatch($row, 'id'));
+            $location = Location::find($this->findCsvMatch($row, 'id'));
+        }
+
+
         if ($location) {
             if (! $this->updating) {
                 $this->log('A matching Location '.$this->item['name'].' already exists');
@@ -95,6 +103,7 @@ class LocationImporter extends ItemImporter
 
         } else {
             Log::debug($location->getErrors());
+            $this->logError($location, 'Location "'.$this->item['name'].'"');
             return $location->errors;
         }
 

app/Listeners/CheckoutableListener.php

@@ -106,7 +106,13 @@ class CheckoutableListener
                 }
             }
         } catch (ClientException $e) {
-            Log::error("ClientException caught during checkin notification: " . $e->getMessage());
+            if (strpos($e->getMessage(), 'channel_not_found') !== false) {
+                Log::warning(Setting::getSettings()->webhook_selected." notification failed: " . $e->getMessage());
+                return redirect()->back()->with('warning', ucfirst(Setting::getSettings()->webhook_selected) .trans('admin/settings/message.webhook.webhook_channel_not_found') );
+            }
+            else {
+                Log::error("ClientException caught during checkin notification: " . $e->getMessage());
+            }
             return redirect()->back()->with('warning', ucfirst(Setting::getSettings()->webhook_selected) .trans('admin/settings/message.webhook.webhook_fail') );
         } catch (Exception $e) {
             Log::error(ucfirst(Setting::getSettings()->webhook_selected) . ' webhook notification failed:', [
@@ -156,7 +162,7 @@ class CheckoutableListener
         $ccEmails = array_filter($adminCcEmailsArray);
         $mailable =  $this->getCheckinMailType($event);
         $notifiable = $this->getNotifiables($event);
-        if  ($event->checkedOutTo->locale){
+        if ($event->checkedOutTo?->locale) {
             $mailable->locale($event->checkedOutTo->locale);
         }
         // Send email notifications
@@ -196,8 +202,14 @@ class CheckoutableListener
                 }
             }
         } catch (ClientException $e) {
-            Log::error("ClientException caught during checkin notification: " . $e->getMessage());
+            if (strpos($e->getMessage(), 'channel_not_found') !== false) {
-            return redirect()->back()->with('warning', ucfirst(Setting::getSettings()->webhook_selected) .trans('admin/settings/message.webhook.webhook_fail'));
+                Log::warning(Setting::getSettings()->webhook_selected." notification failed: " . $e->getMessage());
+                return redirect()->back()->with('warning', ucfirst(Setting::getSettings()->webhook_selected) .trans('admin/settings/message.webhook.webhook_channel_not_found') );
+            }
+            else {
+                Log::error("ClientException caught during checkin notification: " . $e->getMessage());
+                return redirect()->back()->with('warning', ucfirst(Setting::getSettings()->webhook_selected) . trans('admin/settings/message.webhook.webhook_fail'));
+            }
         } catch (Exception $e) {
             Log::error(ucfirst(Setting::getSettings()->webhook_selected) . ' webhook notification failed:', [
                 'error' => $e->getMessage(),

app/Listeners/LogListener.php

@@ -17,6 +17,7 @@ use App\Events\ItemAccepted;
 use App\Events\ItemDeclined;
 use App\Events\LicenseCheckedIn;
 use App\Events\LicenseCheckedOut;
+use App\Events\NoteAdded;
 use App\Models\Actionlog;
 use App\Models\User;
 use App\Models\LicenseSeat;
@@ -128,6 +129,23 @@ class LogListener
 
     }
 
+
+    /**
+     * Note is added to action log
+     *
+     */
+    public function onNoteAdded(NoteAdded $event)
+    {
+        $logaction = new Actionlog();
+        $logaction->item_id = $event->itemNoteAddedOn->id;
+        $logaction->item_type = get_class($event->itemNoteAddedOn);
+        $logaction->note = $event->note; //this is the received alphanumeric text from the box
+        $logaction->created_by = $event->noteAddedBy->id;
+        $logaction->action_type = 'note_added';
+        $logaction->save();
+    }
+
+
     /**
      * Register the listeners for the subscriber.
      *
@@ -141,6 +159,7 @@ class LogListener
             'CheckoutAccepted',
             'CheckoutDeclined',
             'UserMerged',
+            'NoteAdded',
         ];
 
         foreach ($list as $event) {

app/Livewire/Importer.php

@@ -329,6 +329,7 @@ class Importer extends Component
         ];
 
         $this->locations_fields = [
+            'id' => trans('general.id'),
             'name' => trans('general.item_name_var', ['item' => trans('general.location')]),
             'address' => trans('general.address'),
             'address2' => trans('general.importer.address2'),
@@ -400,7 +401,6 @@ class Importer extends Component
                     'requestable',
                     'Requestable',
                 ],
-
             'gravatar' =>
                 [
                     'gravatar',

app/Livewire/SlackSettingsForm.php

@@ -159,7 +159,7 @@ class SlackSettingsForm extends Component
             ]);
 
         try {
-            $test = $webhook->post($this->webhook_endpoint, ['body' => $payload]);
+            $test = $webhook->post($this->webhook_endpoint, ['body' => $payload, ['headers' => ['Content-Type' => 'application/json']]]);
 
             if(($test->getStatusCode() == 302)||($test->getStatusCode() == 301)){
                 return session()->flash('error' , trans('admin/settings/message.webhook.error_redirect', ['endpoint' => $this->webhook_endpoint]));

app/Models/Actionlog.php

@@ -69,7 +69,7 @@ class Actionlog extends SnipeModel
         'company'     => ['name'],
         'adminuser'   => ['first_name','last_name','username', 'email'],
         'user'        => ['first_name','last_name','username', 'email'],
-        'assets'      => ['asset_tag','name'],
+        'assets'      => ['asset_tag','name', 'serial'],
     ];
 
     /**

app/Models/CheckoutAcceptance.php

@@ -35,7 +35,7 @@ class CheckoutAcceptance extends Model
     /**
      * The resource that was is out
      *
-     * @return Illuminate\Database\Eloquent\Relations\MorphTo
+     * @return \Illuminate\Database\Eloquent\Relations\MorphTo
      */
     public function checkoutable()
     {

app/Models/CustomField.php

@@ -307,7 +307,7 @@ class CustomField extends Model
     public function formatFieldValuesAsArray()
     {
         $result = [];
-        $arr = preg_split('/\\r\\n|\\r|\\n/', $this->field_values);
+        $arr = preg_split('/\\r\\n|\\r|\\n/', $this->field_values ?? '');
 
         if (($this->element != 'checkbox') && ($this->element != 'radio')) {
             $result[''] = 'Select '.strtolower($this->format);

app/Notifications/CheckinAssetNotification.php

@@ -79,7 +79,7 @@ class CheckinAssetNotification extends Notification
 
         $fields = [
             trans('general.administrator') => '<'.$admin->present()->viewUrl().'|'.$admin->present()->fullName().'>',
-            trans('general.status') => $item->assetstatus->name,
+            trans('general.status') => $item->assetstatus?->name,
             trans('general.location') => ($item->location) ? $item->location->name : '',
         ];
 
@@ -106,9 +106,9 @@ class CheckinAssetNotification extends Notification
                 ->title(trans('mail.Asset_Checkin_Notification'))
                 ->addStartGroupToSection('activityText')
                 ->fact(htmlspecialchars_decode($item->present()->name), '', 'activityText')
-                ->fact(trans('mail.checked_into'), $item->location->name ? $item->location->name : '')
+                ->fact(trans('mail.checked_into'), ($item->location) ? $item->location->name : '')
                 ->fact(trans('mail.Asset_Checkin_Notification') . " by ", $admin->present()->fullName())
-                ->fact(trans('admin/hardware/form.status'), $item->assetstatus->name)
+                ->fact(trans('admin/hardware/form.status'), $item->assetstatus?->name)
                 ->fact(trans('mail.notes'), $note ?: '');
         }
 
@@ -116,9 +116,9 @@ class CheckinAssetNotification extends Notification
         $message = trans('mail.Asset_Checkin_Notification');
         $details = [
             trans('mail.asset') => htmlspecialchars_decode($item->present()->name),
-            trans('mail.checked_into') => $item->location->name ? $item->location->name : '',
+            trans('mail.checked_into') => ($item->location) ? $item->location->name : '',
             trans('mail.Asset_Checkin_Notification')." by " => $admin->present()->fullName(),
-            trans('admin/hardware/form.status') => $item->assetstatus->name,
+            trans('admin/hardware/form.status') => $item->assetstatus?->name,
             trans('mail.notes') => $note ?: '',
         ];
 
@@ -142,8 +142,8 @@ class CheckinAssetNotification extends Notification
                         Section::create(
                             KeyValue::create(
                                 trans('mail.checked_into') ?: '',
-                                $item->location->name ? $item->location->name : '',
+                                ($item->location) ? $item->location->name : '',
-                                trans('admin/hardware/form.status').": ".$item->assetstatus->name,
+                                trans('admin/hardware/form.status').": ".$item->assetstatus?->name,
                             )
                                 ->onClick(route('hardware.show', $item->id))
                         )

app/Observers/AssetObserver.php

@@ -48,7 +48,7 @@ class AssetObserver
             $changed = [];
 
             foreach ($asset->getRawOriginal() as $key => $value) {
-                if ($asset->getRawOriginal()[$key] != $asset->getAttributes()[$key]) {
+                if ((array_key_exists($key, $asset->getAttributes())) && ($asset->getRawOriginal()[$key] != $asset->getAttributes()[$key])) {
                     $changed[$key]['old'] = $asset->getRawOriginal()[$key];
                     $changed[$key]['new'] = $asset->getAttributes()[$key];
                 }
@@ -80,7 +80,7 @@ class AssetObserver
     {
         if ($settings = Setting::getSettings()) {
             $tag = $asset->asset_tag;
-            $prefix = $settings->auto_increment_prefix;
+            $prefix = (string)($settings->auto_increment_prefix ?? '');
             $number = substr($tag, strlen($prefix));
             // IF - auto_increment_assets is on, AND (there is no prefix OR the prefix matches the start of the tag)
             //      AND the rest of the string after the prefix is all digits, THEN...

app/Presenters/ActionlogPresenter.php

@@ -46,7 +46,7 @@ class ActionlogPresenter extends Presenter
                 return 'fa-solid fa-mobile-screen';
             }
 
-            if ($this->action_type == 'create new') {
+            if ($this->action_type == 'create') {
                 return 'fa-solid fa-user-plus';
             }
 
@@ -70,7 +70,7 @@ class ActionlogPresenter extends Presenter
         }
 
         // Everything else
-        if ($this->action_type == 'create new') {
+        if ($this->action_type == 'create') {
             return 'fa-solid fa-plus';
         }
 
@@ -98,6 +98,10 @@ class ActionlogPresenter extends Presenter
             return 'fa-solid fa-rotate-right';
         }
 
+        if ($this->action_type == 'note_added') {
+            return 'fas fa-sticky-note';
+        }
+
         return 'fa-solid fa-rotate-right';
 
     }

app/Services/Saml.php

@@ -209,7 +209,7 @@ class Saml
                 }
             }
 
-            $custom_settings = preg_split('/\r\n|\r|\n/', $setting->saml_custom_settings);
+            $custom_settings = preg_split('/\r\n|\r|\n/', $setting->saml_custom_settings ?? '');
             if ($custom_settings) {
                 foreach ($custom_settings as $custom_setting) {
                     $split = explode('=', $custom_setting, 2);

app/View/Label.php

@@ -116,12 +116,9 @@ class Label implements View
                         }
                     }
               
-                if ($template->getSupport2DBarcode()) {
+            if ($template->getSupport2DBarcode()) {
                     $barcode2DType = $settings->label2_2d_type;
-                    $barcode2DType = ($barcode2DType == 'default') ? 
+                if (($barcode2DType != 'none') && (!is_null($barcode2DType))) {
-                        $settings->barcode_type :
-                        $barcode2DType;
-                    if (($barcode2DType != 'none') && (!is_null($barcode2DType))) {
                         switch ($settings->label2_2d_target) {
                             case 'ht_tag': 
                                 $barcode2DTarget = route('ht/assetTag', $asset->asset_tag); 

composer.json

@@ -20,6 +20,7 @@
     "php": "^8.1",
     "ext-curl": "*",
     "ext-fileinfo": "*",
+    "ext-iconv": "*",
     "ext-json": "*",
     "ext-mbstring": "*",
     "ext-pdo": "*",
@@ -55,6 +56,7 @@
     "nunomaduro/collision": "^7.0",
     "okvpn/clock-lts": "^1.0",
     "onelogin/php-saml": "^3.4",
+    "onnov/detect-encoding": "^2.0",
     "osa-eg/laravel-teams-notification": "^2.1",
     "paragonie/constant_time_encoding": "^2.3",
     "paragonie/sodium_compat": "^1.19",

composer.lock

@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "0750e3a427347b2a56a05a8b9b533d48",
+    "content-hash": "2a6e7f5e039ee2f40605aefc5c5baf08",
     "packages": [
         {
             "name": "alek13/slack",
@@ -5574,6 +5574,70 @@
             ],
             "time": "2024-05-30T15:14:26+00:00"
         },
+        {
+            "name": "onnov/detect-encoding",
+            "version": "v2.0.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/onnov/detect-encoding.git",
+                "reference": "6a8159ac3e6178ae043244b9d66a9b2701121e07"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/onnov/detect-encoding/zipball/6a8159ac3e6178ae043244b9d66a9b2701121e07",
+                "reference": "6a8159ac3e6178ae043244b9d66a9b2701121e07",
+                "shasum": ""
+            },
+            "require": {
+                "ext-iconv": "*",
+                "php": ">=7.3"
+            },
+            "require-dev": {
+                "infection/infection": "*",
+                "phpbench/phpbench": "*",
+                "phpcompatibility/php-compatibility": "*",
+                "phpmd/phpmd": "*",
+                "phpstan/phpstan": "*",
+                "phpstan/phpstan-strict-rules": "*",
+                "phpunit/phpunit": "*",
+                "roave/backward-compatibility-check": "*",
+                "squizlabs/php_codesniffer": "*"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Onnov\\DetectEncoding\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "onnov",
+                    "email": "oblnn@yandex.ru"
+                }
+            ],
+            "description": "Text encoding definition class instead of mb_detect_encoding. Defines: utf-8, windows-1251, koi8-r, iso-8859-5, ibm866, .....",
+            "homepage": "https://github.com/onnov/detect-encoding",
+            "keywords": [
+                "cyrillic",
+                "encoding",
+                "ibm866",
+                "iconv",
+                "iso-8859-5",
+                "koi8-r",
+                "mb_detect_encoding",
+                "utf-8",
+                "windows-1251"
+            ],
+            "support": {
+                "issues": "https://github.com/onnov/detect-encoding/issues",
+                "source": "https://github.com/onnov/detect-encoding/tree/v2.0.0"
+            },
+            "time": "2021-01-04T14:29:34+00:00"
+        },
         {
             "name": "osa-eg/laravel-teams-notification",
             "version": "v2.1.2",
@@ -16570,6 +16634,7 @@
         "php": "^8.1",
         "ext-curl": "*",
         "ext-fileinfo": "*",
+        "ext-iconv": "*",
         "ext-json": "*",
         "ext-mbstring": "*",
         "ext-pdo": "*"

config/session.php

@@ -172,7 +172,7 @@ return [
     | More info: https://bootstrap-table.com/docs/extensions/cookie/#cookiestorage
     */
 
-    'bs_table_storage' => env('BS_TABLE_STORAGE', 'cookieStorage'),
+    'bs_table_storage' => env('BS_TABLE_STORAGE', 'localStorage'),
 
 
     /*

config/version.php

@@ -1,10 +1,10 @@
 <?php
 return array (
-  'app_version' => 'v7.1.15',
+  'app_version' => 'v7.1.16',
-  'full_app_version' => 'v7.1.15 - build 16052-g25bfd3e84',
+  'full_app_version' => 'v7.1.16 - build 16564-gfb857ccf5',
-  'build_version' => '16052',
+  'build_version' => '16564',
   'prerelease_version' => '',
-  'hash_version' => 'g25bfd3e84',
+  'hash_version' => 'gfb857ccf5',
-  'full_hash' => 'v7.1.15-105-g25bfd3e84',
+  'full_hash' => 'v7.1.16-510-gfb857ccf5',
-  'branch' => 'master',
+  'branch' => 'develop',
 );

docker/startup_alpine.sh

@@ -103,6 +103,7 @@ php artisan migrate --force
 php artisan config:clear
 php artisan config:cache
 
+touch /var/www/html/storage/logs/laravel.log
 chown -R apache:root /var/www/html/storage/logs/laravel.log
 
 export APACHE_LOG_DIR=/var/log/apache2

package-lock.json

@@ -15,7 +15,7 @@
                 "bootstrap-colorpicker": "^2.5.3",
                 "bootstrap-datepicker": "^1.10.0",
                 "bootstrap-less": "^3.3.8",
-                "bootstrap-table": "1.23.5",
+                "bootstrap-table": "1.24.0",
                 "canvas-confetti": "^1.9.3",
                 "chart.js": "^2.9.4",
                 "clipboard": "^2.0.11",
@@ -31,7 +31,7 @@
                 "less-loader": "^6.0",
                 "list.js": "^1.5.0",
                 "morris.js": "github:morrisjs/morris.js",
-                "papaparse": "5.4.1",
+                "papaparse": "5.5.1",
                 "select2": "4.0.13",
                 "sheetjs": "^2.0.0",
                 "signature_pad": "^4.2.0",
@@ -3705,9 +3705,9 @@
             "license": "MIT"
         },
         "node_modules/bootstrap-table": {
-            "version": "1.23.5",
+            "version": "1.24.0",
-            "resolved": "https://registry.npmjs.org/bootstrap-table/-/bootstrap-table-1.23.5.tgz",
+            "resolved": "https://registry.npmjs.org/bootstrap-table/-/bootstrap-table-1.24.0.tgz",
-            "integrity": "sha512-9WByoSpJvA73gi2YYIlX6IWR74oZtBmSixul/Th8FTBtBd/kZRpbKESGTjhA3BA3AYTnfyY8Iy1KeRWPlV2GWQ==",
+            "integrity": "sha512-dyRf5PQwTgFHj9yjuPXa+GIf4JpuQhsgD1CJrOqhw40qI2gTb3mJfRdoBc7iF2bqzOl+k0RnbAlhSPbGe4VS+w==",
             "peerDependencies": {
                 "jquery": "3"
             }
@@ -8368,9 +8368,9 @@
             "license": "(MIT AND Zlib)"
         },
         "node_modules/papaparse": {
-            "version": "5.4.1",
+            "version": "5.5.1",
-            "resolved": "https://registry.npmjs.org/papaparse/-/papaparse-5.4.1.tgz",
+            "resolved": "https://registry.npmjs.org/papaparse/-/papaparse-5.5.1.tgz",
-            "integrity": "sha512-HipMsgJkZu8br23pW15uvo6sib6wne/4woLZPlFf3rpDyMe9ywEXUsuD7+6K9PRkJlVT51j/sCOYDKGGS3ZJrw=="
+            "integrity": "sha512-EuEKUhyxrHVozD7g3/ztsJn6qaKse8RPfR6buNB2dMJvdtXNhcw8jccVi/LxNEY3HVrV6GO6Z4OoeCG9Iy9wpA=="
         },
         "node_modules/param-case": {
             "version": "3.0.4",

package.json

@@ -35,7 +35,7 @@
         "bootstrap-colorpicker": "^2.5.3",
         "bootstrap-datepicker": "^1.10.0",
         "bootstrap-less": "^3.3.8",
-        "bootstrap-table": "1.23.5",
+        "bootstrap-table": "1.24.0",
         "canvas-confetti": "^1.9.3",
         "chart.js": "^2.9.4",
         "clipboard": "^2.0.11",
@@ -51,7 +51,7 @@
         "less-loader": "^6.0",
         "list.js": "^1.5.0",
         "morris.js": "github:morrisjs/morris.js",
-        "papaparse": "5.4.1",
+        "papaparse": "5.5.1",
         "select2": "4.0.13",
         "sheetjs": "^2.0.0",
         "signature_pad": "^4.2.0",

public/css/build/app.css

@@ -1414,4 +1414,8 @@ input[type="radio"]:checked::before {
   filter: brightness(70%);
   font-size: 70%;
 }
+/** this is needed to override ekko-lightboxes card view styles **/
+.bootstrap-table .fixed-table-container .table tbody tr .card-view {
+  display: table-row !important;
+}
 

public/css/build/overrides.css

@@ -1045,4 +1045,8 @@ input[type="radio"]:checked::before {
   filter: brightness(70%);
   font-size: 70%;
 }
+/** this is needed to override ekko-lightboxes card view styles **/
+.bootstrap-table .fixed-table-container .table tbody tr .card-view {
+  display: table-row !important;
+}
 

public/css/dist/all.css

@@ -21008,7 +21008,7 @@ hr {
 @charset "UTF-8";
 /**
  * @author zhixin wen <wenzhixin2010@gmail.com>
- * version: 1.23.5
+ * version: 1.24.0
  * https://github.com/wenzhixin/bootstrap-table/
  */
 /* stylelint-disable annotation-no-unknown, max-line-length */
@@ -22749,6 +22749,10 @@ input[type="radio"]:checked::before {
   filter: brightness(70%);
   font-size: 70%;
 }
+/** this is needed to override ekko-lightboxes card view styles **/
+.bootstrap-table .fixed-table-container .table tbody tr .card-view {
+  display: table-row !important;
+}
 
 
 .select2-container {
@@ -24280,4 +24284,8 @@ input[type="radio"]:checked::before {
   filter: brightness(70%);
   font-size: 70%;
 }
+/** this is needed to override ekko-lightboxes card view styles **/
+.bootstrap-table .fixed-table-container .table tbody tr .card-view {
+  display: table-row !important;
+}
 

public/css/dist/bootstrap-table.css

@@ -1,7 +1,7 @@
 @charset "UTF-8";
 /**
  * @author zhixin wen <wenzhixin2010@gmail.com>
- * version: 1.23.5
+ * version: 1.24.0
  * https://github.com/wenzhixin/bootstrap-table/
  */
 /* stylelint-disable annotation-no-unknown, max-line-length */

public/js/build/app.js

@@ -614,7 +614,7 @@ If you want to pass additional variables to the modal (In the Category Create on
 $(function () {
   var baseUrl = $('meta[name="baseUrl"]').attr('content');
   //handle modal-add-interstitial calls
-  var model, select, refreshSelector;
+  var model, select, refreshSelector, hasnopayload;
   if ($('#createModal').length == 0) {
     $('body').append('<div class="modal fade" id="createModal"></div><!-- /.modal -->');
   }
@@ -623,6 +623,7 @@ $(function () {
     model = link.data("dependency");
     select = link.data("select");
     refreshSelector = link.data("refresh");
+    hasnopayload = link.data("hasnopayload");
     $('#createModal').load(link.attr('href'), function () {
       // this sets the focus to be the name field
       $('#modal-name').focus();
@@ -692,11 +693,13 @@ $(function () {
           $('#modal_error_msg').html(error_message).show();
           return false;
         }
-        var id = result.payload.id;
+        if (!hasnopayload) {
-        var name = result.payload.name || result.payload.first_name + " " + result.payload.last_name;
+          var id = result.payload.id;
-        if (!id || !name) {
+          var name = result.payload.name || result.payload.first_name + " " + result.payload.last_name;
-          console.error("Could not find resulting name or ID from modal-create. Name: " + name + ", id: " + id);
+          if (!id || !name) {
-          return false;
+            console.error("Could not find resulting name or ID from modal-create. Name: " + name + ", id: " + id);
+            return false;
+          }
         }
         $('#createModal').modal('hide');
         $('#createModal').html("");

public/js/dist/all.js

@@ -59547,7 +59547,7 @@ If you want to pass additional variables to the modal (In the Category Create on
 $(function () {
   var baseUrl = $('meta[name="baseUrl"]').attr('content');
   //handle modal-add-interstitial calls
-  var model, select, refreshSelector;
+  var model, select, refreshSelector, hasnopayload;
   if ($('#createModal').length == 0) {
     $('body').append('<div class="modal fade" id="createModal"></div><!-- /.modal -->');
   }
@@ -59556,6 +59556,7 @@ $(function () {
     model = link.data("dependency");
     select = link.data("select");
     refreshSelector = link.data("refresh");
+    hasnopayload = link.data("hasnopayload");
     $('#createModal').load(link.attr('href'), function () {
       // this sets the focus to be the name field
       $('#modal-name').focus();
@@ -59625,11 +59626,13 @@ $(function () {
           $('#modal_error_msg').html(error_message).show();
           return false;
         }
-        var id = result.payload.id;
+        if (!hasnopayload) {
-        var name = result.payload.name || result.payload.first_name + " " + result.payload.last_name;
+          var id = result.payload.id;
-        if (!id || !name) {
+          var name = result.payload.name || result.payload.first_name + " " + result.payload.last_name;
-          console.error("Could not find resulting name or ID from modal-create. Name: " + name + ", id: " + id);
+          if (!id || !name) {
-          return false;
+            console.error("Could not find resulting name or ID from modal-create. Name: " + name + ", id: " + id);
+            return false;
+          }
         }
         $('#createModal').modal('hide');
         $('#createModal').html("");

public/js/dist/bootstrap-table.js

@@ -976,9 +976,9 @@
   	/* eslint-disable es/no-symbol -- required for testing */
   	var NATIVE_SYMBOL = requireSymbolConstructorDetection();
 
-  	useSymbolAsUid = NATIVE_SYMBOL
+  	useSymbolAsUid = NATIVE_SYMBOL &&
-  	  && !Symbol.sham
+  	  !Symbol.sham &&
-  	  && typeof Symbol.iterator == 'symbol';
+  	  typeof Symbol.iterator == 'symbol';
   	return useSymbolAsUid;
   }
 
@@ -1129,10 +1129,10 @@
   	var store = sharedStore.exports = globalThis[SHARED] || defineGlobalProperty(SHARED, {});
 
   	(store.versions || (store.versions = [])).push({
-  	  version: '3.38.1',
+  	  version: '3.39.0',
   	  mode: IS_PURE ? 'pure' : 'global',
   	  copyright: '© 2014-2024 Denis Pushkarev (zloirock.ru)',
-  	  license: 'https://github.com/zloirock/core-js/blob/v3.38.1/LICENSE',
+  	  license: 'https://github.com/zloirock/core-js/blob/v3.39.0/LICENSE',
   	  source: 'https://github.com/zloirock/core-js'
   	});
   	return sharedStore.exports;
@@ -4691,7 +4691,7 @@
   	  (!CORRECT_NEW || MISSED_STICKY || UNSUPPORTED_DOT_ALL || UNSUPPORTED_NCG || fails(function () {
   	    re2[MATCH] = false;
   	    // RegExp constructor can alter flags and IsRegExp works correct with @@match
-  	    // eslint-disable-next-line sonar/inconsistent-function-call -- required for testing
+  	    // eslint-disable-next-line sonarjs/inconsistent-function-call -- required for testing
   	    return NativeRegExp(re1) !== re1 || NativeRegExp(re2) === re2 || String(NativeRegExp(re1, 'i')) !== '/a/i';
   	  }));
 
@@ -6893,26 +6893,21 @@
 
   var Utils = {
     getBootstrapVersion: function getBootstrapVersion() {
+      var _window$bootstrap, _$$fn;
       var bootstrapVersion = 5;
-      try {
+      if (typeof window !== 'undefined' && (_window$bootstrap = window.bootstrap) !== null && _window$bootstrap !== void 0 && (_window$bootstrap = _window$bootstrap.Tooltip) !== null && _window$bootstrap !== void 0 && _window$bootstrap.VERSION) {
-        var rawVersion = $.fn.dropdown.Constructor.VERSION;
+        var rawVersion = window.bootstrap.Tooltip.VERSION;
-
-        // Only try to parse VERSION if it is defined.
-        // It is undefined in older versions of Bootstrap (tested with 3.1.1).
         if (rawVersion !== undefined) {
           bootstrapVersion = parseInt(rawVersion, 10);
         }
-      } catch (e) {
+      } else if (typeof $ !== 'undefined' && (_$$fn = $.fn) !== null && _$$fn !== void 0 && (_$$fn = _$$fn.dropdown) !== null && _$$fn !== void 0 && (_$$fn = _$$fn.Constructor) !== null && _$$fn !== void 0 && _$$fn.VERSION) {
-        // ignore
+        var _rawVersion = $.fn.dropdown.Constructor.VERSION;
-      }
+
-      try {
+        // Only try to parse VERSION if it is defined.
-        // eslint-disable-next-line no-undef
+        // It is undefined in older versions of Bootstrap (tested with 3.1.1).
-        var _rawVersion = bootstrap.Tooltip.VERSION;
         if (_rawVersion !== undefined) {
           bootstrapVersion = parseInt(_rawVersion, 10);
         }
-      } catch (e) {
-        // ignore
       }
       return bootstrapVersion;
     },
@@ -7342,6 +7337,7 @@
           return true;
         }
       } catch (e) {
+        console.error(e);
         return false;
       }
       return false;
@@ -7770,7 +7766,7 @@
     }
   };
 
-  var VERSION = '1.23.5';
+  var VERSION = '1.24.0';
   var bootstrapVersion = Utils.getBootstrapVersion();
   var CONSTANTS = {
     3: {
@@ -8597,7 +8593,9 @@
         this.options.columns = Utils.extend(true, [], columns, this.options.columns);
         this.columns = [];
         this.fieldsColumnsIndex = [];
-        Utils.setFieldIndex(this.options.columns);
+        if (this.optionsColumnsChanged !== false) {
+          Utils.setFieldIndex(this.options.columns);
+        }
         this.options.columns.forEach(function (columns, i) {
           columns.forEach(function (_column, j) {
             var column = Utils.extend({}, BootstrapTable.COLUMN_DEFAULTS, _column, {
@@ -9343,42 +9341,49 @@
                 }
               }
               if (typeof value === 'string' || typeof value === 'number') {
-                if (_this5.options.strictSearch && "".concat(value).toLowerCase() === searchText || _this5.options.regexSearch && Utils.regexCompare(value, rawSearchText)) {
+                if (_this5.options.strictSearch) {
-                  return true;
+                  if ("".concat(value).toLowerCase() === searchText) {
-                }
+                    return true;
-                var largerSmallerEqualsRegex = /(?:(<=|=>|=<|>=|>|<)(?:\s+)?(-?\d+)?|(-?\d+)?(\s+)?(<=|=>|=<|>=|>|<))/gm;
+                  }
-                var matches = largerSmallerEqualsRegex.exec(_this5.searchText);
+                } else if (_this5.options.regexSearch) {
-                var comparisonCheck = false;
+                  if (Utils.regexCompare(value, rawSearchText)) {
-                if (matches) {
+                    return true;
-                  var operator = matches[1] || "".concat(matches[5], "l");
+                  }
-                  var comparisonValue = matches[2] || matches[3];
+                } else {
-                  var int = parseInt(value, 10);
+                  var largerSmallerEqualsRegex = /(?:(<=|=>|=<|>=|>|<)(?:\s+)?(-?\d+)?|(-?\d+)?(\s+)?(<=|=>|=<|>=|>|<))/gm;
-                  var comparisonInt = parseInt(comparisonValue, 10);
+                  var matches = largerSmallerEqualsRegex.exec(_this5.searchText);
-                  switch (operator) {
+                  var comparisonCheck = false;
-                    case '>':
+                  if (matches) {
-                    case '<l':
+                    var operator = matches[1] || "".concat(matches[5], "l");
-                      comparisonCheck = int > comparisonInt;
+                    var comparisonValue = matches[2] || matches[3];
-                      break;
+                    var int = parseInt(value, 10);
-                    case '<':
+                    var comparisonInt = parseInt(comparisonValue, 10);
-                    case '>l':
+                    switch (operator) {
-                      comparisonCheck = int < comparisonInt;
+                      case '>':
-                      break;
+                      case '<l':
-                    case '<=':
+                        comparisonCheck = int > comparisonInt;
-                    case '=<':
+                        break;
-                    case '>=l':
+                      case '<':
-                    case '=>l':
+                      case '>l':
-                      comparisonCheck = int <= comparisonInt;
+                        comparisonCheck = int < comparisonInt;
-                      break;
+                        break;
-                    case '>=':
+                      case '<=':
-                    case '=>':
+                      case '=<':
-                    case '<=l':
+                      case '>=l':
-                    case '=<l':
+                      case '=>l':
-                      comparisonCheck = int >= comparisonInt;
+                        comparisonCheck = int <= comparisonInt;
-                      break;
+                        break;
+                      case '>=':
+                      case '=>':
+                      case '<=l':
+                      case '=<l':
+                        comparisonCheck = int >= comparisonInt;
+                        break;
+                    }
+                  }
+                  if (comparisonCheck || "".concat(value).toLowerCase().includes(searchText)) {
+                    return true;
                   }
-                }
-                if (comparisonCheck || "".concat(value).toLowerCase().includes(searchText)) {
-                  return true;
                 }
               }
             }
@@ -9456,7 +9461,7 @@
           html.push("<div class=\"".concat(this.constants.classes.pull, "-").concat(opts.paginationDetailHAlign, " pagination-detail\">"));
         }
         if (this.paginationParts.includes('pageInfo') || this.paginationParts.includes('pageInfoShort')) {
-          var totalRows = this.options.totalRows + (this.options.sidePagination === 'client' && this.options.paginationLoadMore && !this._paginationLoaded ? ' +' : '');
+          var totalRows = this.options.totalRows + (this.options.sidePagination === 'client' && this.options.paginationLoadMore && !this._paginationLoaded && this.totalPages > 1 ? ' +' : '');
           var paginationInfo = this.paginationParts.includes('pageInfoShort') ? opts.formatDetailPagination(totalRows) : opts.formatShowingRows(this.pageFrom, this.pageTo, totalRows, opts.totalNotFiltered);
           html.push("<span class=\"pagination-info\">\n      ".concat(paginationInfo, "\n      </span>"));
         }
@@ -9686,14 +9691,14 @@
             data_["data-".concat(k)] = _typeof(v) === 'object' ? JSON.stringify(v) : v;
           }
         }
-        var tr = Utils.h('tr', _objectSpread2(_objectSpread2({}, attributes), {}, {
+        var tr = Utils.h('tr', _objectSpread2(_objectSpread2({
           id: Array.isArray(item) ? undefined : item._id,
           class: style && style.classes || (Array.isArray(item) ? undefined : item._class),
           style: style && style.css || (Array.isArray(item) ? undefined : item._style),
           'data-index': i,
           'data-uniqueid': Utils.getItemField(item, this.options.uniqueId, false),
           'data-has-detail-view': this.options.detailView && Utils.calculateObjectValue(null, this.options.detailFilter, [i, item]) ? 'true' : undefined
-        }, data_));
+        }, attributes), data_));
         var trChildren = [];
         var detailViewTemplate = '';
         if (Utils.hasDetailViewIcon(this.options)) {
@@ -9717,6 +9722,7 @@
             class: _this7.header.classes[j] ? [_this7.header.classes[j]] : [],
             style: _this7.header.styles[j] ? [_this7.header.styles[j]] : []
           };
+          var cardViewClass = "card-view card-view-field-".concat(field);
           if ((_this7.fromHtml || _this7.autoMergeCells) && typeof value_ === 'undefined') {
             if (!column.checkbox && !column.radio) {
               return;
@@ -9731,15 +9737,15 @@
 
           // handle class, style, id, rowspan, colspan and title of td
           for (var _i10 = 0, _arr = ['class', 'style', 'id', 'rowspan', 'colspan', 'title']; _i10 < _arr.length; _i10++) {
-            var _item = _arr[_i10];
+            var attr = _arr[_i10];
-            var _value = _item["_".concat(field, "_").concat(_item)];
+            var _value = item["_".concat(field, "_").concat(attr)];
             if (!_value) {
               continue;
             }
-            if (attrs[_item]) {
+            if (attrs[attr]) {
-              attrs[_item].push(_value);
+              attrs[attr].push(_value);
             } else {
-              attrs[_item] = _value;
+              attrs[attr] = _value;
             }
           }
           var cellStyle = Utils.calculateObjectValue(_this7.header, _this7.header.cellStyles[j], [value_, item, i, field], {});
@@ -9784,7 +9790,7 @@
             var valueNodes = _this7.header.formatters[j] && (typeof value === 'string' || value instanceof Node || value instanceof $) ? Utils.htmlToNodes(value) : [];
             item[_this7.header.stateField] = value === true || !!value_ || value && value.checked;
             return Utils.h(_this7.options.cardView ? 'div' : 'td', {
-              class: [_this7.options.cardView ? 'card-view' : 'bs-checkbox', column.class],
+              class: [_this7.options.cardView ? cardViewClass : 'bs-checkbox', column.class],
               style: _this7.options.cardView ? undefined : attrs.style
             }, [Utils.h('label', {}, [Utils.h('input', {
               'data-index': i,
@@ -9798,7 +9804,7 @@
           if (_this7.options.cardView) {
             if (_this7.options.smartDisplay && value === '') {
               return Utils.h('div', {
-                class: 'card-view'
+                class: cardViewClass
               });
             }
             var cardTitle = _this7.options.showHeader ? Utils.h('span', {
@@ -9807,7 +9813,7 @@
               html: Utils.getFieldTitle(_this7.columns, field)
             }) : '';
             return Utils.h('div', {
-              class: 'card-view'
+              class: cardViewClass
             }, [cardTitle, Utils.h('span', {
               class: ['card-view-value', cellStyle.classes],
               style: attrs.style
@@ -10452,6 +10458,7 @@
         if (Utils.compareObjects(this.options, options, true)) {
           return;
         }
+        this.optionsColumnsChanged = !!options.columns;
         this.options = Utils.extend(this.options, options);
         this.trigger('refresh-options', this.options);
         this.destroy();
@@ -10591,6 +10598,10 @@
         }
         var row = this.data[params.index];
         var originalIndex = this.options.data.indexOf(row);
+        if (originalIndex === -1) {
+          this.append([params.row]);
+          return;
+        }
         this.data.splice(params.index, 0, params.row);
         this.options.data.splice(originalIndex, 0, params.row);
         this.initSearch();
@@ -11109,6 +11120,7 @@
     }, {
       key: "destroy",
       value: function destroy() {
+        clearTimeout(this.timeoutId_);
         this.$el.insertBefore(this.$container);
         $(this.options.toolbar).insertBefore(this.$el);
         this.$container.next().remove();
@@ -11499,7 +11511,7 @@
     }
   }
   function _createClass(e, r, t) {
-    return r && _defineProperties(e.prototype, r), Object.defineProperty(e, "prototype", {
+    return _defineProperties(e.prototype, r), Object.defineProperty(e, "prototype", {
       writable: !1
     }), e;
   }
@@ -11551,11 +11563,11 @@
     for (; !{}.hasOwnProperty.call(t, o) && null !== (t = _getPrototypeOf(t)););
     return t;
   }
-  function _superPropGet(t, e, r, o) {
+  function _superPropGet(t, o, e, r) {
-    var p = _get(_getPrototypeOf(t.prototype ), e, r);
+    var p = _get(_getPrototypeOf(t.prototype ), o, e);
-    return function (t) {
+    return "function" == typeof p ? function (t) {
-      return p.apply(r, t);
+      return p.apply(e, t);
-    } ;
+    } : p;
   }
   function _toPrimitive(t, r) {
     if ("object" != typeof t || !t) return t;
@@ -11969,9 +11981,9 @@
   	/* eslint-disable es/no-symbol -- required for testing */
   	var NATIVE_SYMBOL = requireSymbolConstructorDetection();
 
-  	useSymbolAsUid = NATIVE_SYMBOL
+  	useSymbolAsUid = NATIVE_SYMBOL &&
-  	  && !Symbol.sham
+  	  !Symbol.sham &&
-  	  && typeof Symbol.iterator == 'symbol';
+  	  typeof Symbol.iterator == 'symbol';
   	return useSymbolAsUid;
   }
 
@@ -12122,10 +12134,10 @@
   	var store = sharedStore.exports = globalThis[SHARED] || defineGlobalProperty(SHARED, {});
 
   	(store.versions || (store.versions = [])).push({
-  	  version: '3.38.1',
+  	  version: '3.39.0',
   	  mode: IS_PURE ? 'pure' : 'global',
   	  copyright: '© 2014-2024 Denis Pushkarev (zloirock.ru)',
-  	  license: 'https://github.com/zloirock/core-js/blob/v3.38.1/LICENSE',
+  	  license: 'https://github.com/zloirock/core-js/blob/v3.39.0/LICENSE',
   	  source: 'https://github.com/zloirock/core-js'
   	});
   	return sharedStore.exports;
@@ -14131,7 +14143,7 @@
     }
   }
   function _createClass(e, r, t) {
-    return r && _defineProperties(e.prototype, r), Object.defineProperty(e, "prototype", {
+    return _defineProperties(e.prototype, r), Object.defineProperty(e, "prototype", {
       writable: !1
     }), e;
   }
@@ -14239,21 +14251,21 @@
     for (; !{}.hasOwnProperty.call(t, o) && null !== (t = _getPrototypeOf(t)););
     return t;
   }
-  function _superPropGet(t, e, r, o) {
+  function _superPropGet(t, o, e, r) {
-    var p = _get(_getPrototypeOf(1 & o ? t.prototype : t), e, r);
+    var p = _get(_getPrototypeOf(1 & r ? t.prototype : t), o, e);
-    return 2 & o ? function (t) {
+    return 2 & r && "function" == typeof p ? function (t) {
-      return p.apply(r, t);
+      return p.apply(e, t);
     } : p;
   }
   function _toPrimitive(t, r) {
     if ("object" != typeof t || !t) return t;
     var e = t[Symbol.toPrimitive];
     if (void 0 !== e) {
-      var i = e.call(t, r || "default");
+      var i = e.call(t, r);
       if ("object" != typeof i) return i;
       throw new TypeError("@@toPrimitive must return a primitive value.");
     }
-    return ("string" === r ? String : Number)(t);
+    return (String )(t);
   }
   function _toPropertyKey(t) {
     var i = _toPrimitive(t, "string");
@@ -14664,9 +14676,9 @@
   	/* eslint-disable es/no-symbol -- required for testing */
   	var NATIVE_SYMBOL = requireSymbolConstructorDetection();
 
-  	useSymbolAsUid = NATIVE_SYMBOL
+  	useSymbolAsUid = NATIVE_SYMBOL &&
-  	  && !Symbol.sham
+  	  !Symbol.sham &&
-  	  && typeof Symbol.iterator == 'symbol';
+  	  typeof Symbol.iterator == 'symbol';
   	return useSymbolAsUid;
   }
 
@@ -14817,10 +14829,10 @@
   	var store = sharedStore.exports = globalThis[SHARED] || defineGlobalProperty(SHARED, {});
 
   	(store.versions || (store.versions = [])).push({
-  	  version: '3.38.1',
+  	  version: '3.39.0',
   	  mode: IS_PURE ? 'pure' : 'global',
   	  copyright: '© 2014-2024 Denis Pushkarev (zloirock.ru)',
-  	  license: 'https://github.com/zloirock/core-js/blob/v3.38.1/LICENSE',
+  	  license: 'https://github.com/zloirock/core-js/blob/v3.39.0/LICENSE',
   	  source: 'https://github.com/zloirock/core-js'
   	});
   	return sharedStore.exports;
@@ -17797,7 +17809,7 @@
     }
   }
   function _createClass(e, r, t) {
-    return r && _defineProperties(e.prototype, r), Object.defineProperty(e, "prototype", {
+    return _defineProperties(e.prototype, r), Object.defineProperty(e, "prototype", {
       writable: !1
     }), e;
   }
@@ -17927,11 +17939,11 @@
     for (; !{}.hasOwnProperty.call(t, o) && null !== (t = _getPrototypeOf(t)););
     return t;
   }
-  function _superPropGet(t, e, r, o) {
+  function _superPropGet(t, o, e, r) {
-    var p = _get(_getPrototypeOf(t.prototype ), e, r);
+    var p = _get(_getPrototypeOf(t.prototype ), o, e);
-    return function (t) {
+    return "function" == typeof p ? function (t) {
-      return p.apply(r, t);
+      return p.apply(e, t);
-    } ;
+    } : p;
   }
   function _toPrimitive(t, r) {
     if ("object" != typeof t || !t) return t;
@@ -18352,9 +18364,9 @@
   	/* eslint-disable es/no-symbol -- required for testing */
   	var NATIVE_SYMBOL = requireSymbolConstructorDetection();
 
-  	useSymbolAsUid = NATIVE_SYMBOL
+  	useSymbolAsUid = NATIVE_SYMBOL &&
-  	  && !Symbol.sham
+  	  !Symbol.sham &&
-  	  && typeof Symbol.iterator == 'symbol';
+  	  typeof Symbol.iterator == 'symbol';
   	return useSymbolAsUid;
   }
 
@@ -18505,10 +18517,10 @@
   	var store = sharedStore.exports = globalThis[SHARED] || defineGlobalProperty(SHARED, {});
 
   	(store.versions || (store.versions = [])).push({
-  	  version: '3.38.1',
+  	  version: '3.39.0',
   	  mode: IS_PURE ? 'pure' : 'global',
   	  copyright: '© 2014-2024 Denis Pushkarev (zloirock.ru)',
-  	  license: 'https://github.com/zloirock/core-js/blob/v3.38.1/LICENSE',
+  	  license: 'https://github.com/zloirock/core-js/blob/v3.39.0/LICENSE',
   	  source: 'https://github.com/zloirock/core-js'
   	});
   	return sharedStore.exports;
@@ -21568,6 +21580,7 @@
       pageNumber: 'bs.table.pageNumber',
       pageList: 'bs.table.pageList',
       hiddenColumns: 'bs.table.hiddenColumns',
+      columns: 'bs.table.columns',
       cardView: 'bs.table.cardView',
       customView: 'bs.table.customView',
       searchText: 'bs.table.searchText',
@@ -21585,6 +21598,9 @@
       return navigator.cookieEnabled;
     },
     isCookieEnabled: function isCookieEnabled(that, cookieName) {
+      if (cookieName === 'bs.table.columns') {
+        return that.options.cookiesEnabled.includes('bs.table.hiddenColumns');
+      }
       return that.options.cookiesEnabled.includes(cookieName);
     },
     setCookie: function setCookie(that, cookieName, cookieValue) {
@@ -21741,6 +21757,7 @@
     return _createClass(_class, [{
       key: "init",
       value: function init() {
+        var _this = this;
         if (this.options.cookie) {
           if (this.options.cookieStorage === 'cookieStorage' && !UtilsCookie.isCookieSupportedByBrowser()) {
             throw new Error('Cookies are not enabled in this browser.');
@@ -21756,6 +21773,7 @@
           try {
             filterByCookie = JSON.parse(filterByCookieValue);
           } catch (e) {
+            console.error(e);
             throw new Error('Could not parse the json of the filterBy cookie!');
           }
           this.filterColumns = filterByCookie ? filterByCookie : {};
@@ -21765,24 +21783,23 @@
           this._filterControlValuesLoaded = false;
           this.options.cookiesEnabled = typeof this.options.cookiesEnabled === 'string' ? this.options.cookiesEnabled.replace('[', '').replace(']', '').replace(/'/g, '').replace(/ /g, '').split(',') : this.options.cookiesEnabled;
           if (this.options.filterControl) {
-            var that = this;
             this.$el.on('column-search.bs.table', function (e, field, text) {
               var isNewField = true;
-              for (var i = 0; i < that._filterControls.length; i++) {
+              for (var i = 0; i < _this._filterControls.length; i++) {
-                if (that._filterControls[i].field === field) {
+                if (_this._filterControls[i].field === field) {
-                  that._filterControls[i].text = text;
+                  _this._filterControls[i].text = text;
                   isNewField = false;
                   break;
                 }
               }
               if (isNewField) {
-                that._filterControls.push({
+                _this._filterControls.push({
                   field: field,
                   text: text
                 });
               }
-              UtilsCookie.setCookie(that, UtilsCookie.cookieIds.filterControl, JSON.stringify(that._filterControls));
+              UtilsCookie.setCookie(_this, UtilsCookie.cookieIds.filterControl, JSON.stringify(_this._filterControls));
-            }).on('created-controls.bs.table', UtilsCookie.initCookieFilters(that));
+            }).on('created-controls.bs.table', UtilsCookie.initCookieFilters(this));
           }
         }
         _superPropGet(_class, "init", this)([]);
@@ -21912,6 +21929,9 @@
         UtilsCookie.setCookie(this, UtilsCookie.cookieIds.hiddenColumns, JSON.stringify(this.getHiddenColumns().map(function (column) {
           return column.field;
         })));
+        UtilsCookie.setCookie(this, UtilsCookie.cookieIds.columns, JSON.stringify(this.columns.map(function (column) {
+          return column.field;
+        })));
       }
     }, {
       key: "_toggleAllColumns",
@@ -21926,6 +21946,9 @@
         UtilsCookie.setCookie(this, UtilsCookie.cookieIds.hiddenColumns, JSON.stringify(this.getHiddenColumns().map(function (column) {
           return column.field;
         })));
+        UtilsCookie.setCookie(this, UtilsCookie.cookieIds.columns, JSON.stringify(this.columns.map(function (column) {
+          return column.field;
+        })));
       }
     }, {
       key: "toggleView",
@@ -22008,15 +22031,20 @@
         var cardViewCookie = UtilsCookie.getCookie(this, UtilsCookie.cookieIds.cardView);
         var customViewCookie = UtilsCookie.getCookie(this, UtilsCookie.cookieIds.customView);
         var hiddenColumnsCookieValue = UtilsCookie.getCookie(this, UtilsCookie.cookieIds.hiddenColumns);
+        var columnsCookieValue = UtilsCookie.getCookie(this, UtilsCookie.cookieIds.columns);
         var hiddenColumnsCookie = {};
+        var columnsCookie = {};
         try {
           hiddenColumnsCookie = JSON.parse(hiddenColumnsCookieValue);
+          columnsCookie = JSON.parse(columnsCookieValue);
         } catch (e) {
-          throw new Error('Could not parse the json of the hidden columns cookie!', hiddenColumnsCookieValue);
+          console.error(e);
+          throw new Error('Could not parse the json of the columns cookie!');
         }
         try {
           sortPriorityCookie = JSON.parse(sortPriorityCookie);
         } catch (e) {
+          console.error(e);
           throw new Error('Could not parse the json of the sortPriority cookie!', sortPriorityCookie);
         }
         if (!sortPriorityCookie) {
@@ -22050,12 +22078,15 @@
         }
         this.customViewDefaultView = customViewCookie === 'true';
         if (hiddenColumnsCookie) {
+          columnsCookie = columnsCookie || this.columns.map(function (column) {
+            return column.field;
+          });
           var _iterator2 = _createForOfIteratorHelper(this.columns),
             _step2;
           try {
             for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
               var column = _step2.value;
-              if (!column.switchable) {
+              if (!column.switchable || !columnsCookie.includes(column.field)) {
                 continue;
               }
               column.visible = this.isSelectionColumn(column) || !hiddenColumnsCookie.includes(column.field);
@@ -22070,14 +22101,13 @@
     }, {
       key: "getCookies",
       value: function getCookies() {
-        var bootstrapTable = this;
         var cookies = {};
         for (var _i = 0, _Object$entries = Object.entries(UtilsCookie.cookieIds); _i < _Object$entries.length; _i++) {
           var _Object$entries$_i = _slicedToArray(_Object$entries[_i], 2),
             key = _Object$entries$_i[0],
             value = _Object$entries$_i[1];
-          cookies[key] = UtilsCookie.getCookie(bootstrapTable, value);
+          cookies[key] = UtilsCookie.getCookie(this, value);
-          if (key === 'columns' || key === 'hiddenColumns' || key === 'sortPriority') {
+          if (['columns', 'hiddenColumns', 'sortPriority'].includes(key)) {
             cookies[key] = JSON.parse(cookies[key]);
           }
         }
@@ -22094,12 +22124,11 @@
     }, {
       key: "configureStorage",
       value: function configureStorage() {
-        var that = this;
         this._storage = {};
         switch (this.options.cookieStorage) {
           case 'cookieStorage':
             this._storage.setItem = function (cookieName, cookieValue) {
-              document.cookie = [cookieName, '=', encodeURIComponent(cookieValue), "; expires=".concat(UtilsCookie.calculateExpiration(that.options.cookieExpire)), that.options.cookiePath ? "; path=".concat(that.options.cookiePath) : '', that.options.cookieDomain ? "; domain=".concat(that.options.cookieDomain) : '', that.options.cookieSecure ? '; secure' : '', ";SameSite=".concat(that.options.cookieSameSite)].join('');
+              document.cookie = [cookieName, '=', encodeURIComponent(cookieValue), "; expires=".concat(UtilsCookie.calculateExpiration(this.options.cookieExpire)), this.options.cookiePath ? "; path=".concat(this.options.cookiePath) : '', this.options.cookieDomain ? "; domain=".concat(this.options.cookieDomain) : '', this.options.cookieSecure ? '; secure' : '', ";SameSite=".concat(this.options.cookieSameSite)].join('');
             };
             this._storage.getItem = function (cookieName) {
               var value = "; ".concat(document.cookie);
@@ -22107,7 +22136,7 @@
               return parts.length === 2 ? decodeURIComponent(parts.pop().split(';').shift()) : null;
             };
             this._storage.removeItem = function (cookieName) {
-              document.cookie = [encodeURIComponent(cookieName), '=', '; expires=Thu, 01 Jan 1970 00:00:00 GMT', that.options.cookiePath ? "; path=".concat(that.options.cookiePath) : '', that.options.cookieDomain ? "; domain=".concat(that.options.cookieDomain) : '', ";SameSite=".concat(that.options.cookieSameSite)].join('');
+              document.cookie = [encodeURIComponent(cookieName), '=', '; expires=Thu, 01 Jan 1970 00:00:00 GMT', this.options.cookiePath ? "; path=".concat(this.options.cookiePath) : '', this.options.cookieDomain ? "; domain=".concat(this.options.cookieDomain) : '', ";SameSite=".concat(this.options.cookieSameSite)].join('');
             };
             break;
           case 'localStorage':
@@ -22137,13 +22166,13 @@
               throw new Error('The following options must be set while using the customStorage: cookieCustomStorageSet, cookieCustomStorageGet and cookieCustomStorageDelete');
             }
             this._storage.setItem = function (cookieName, cookieValue) {
-              Utils.calculateObjectValue(that.options, that.options.cookieCustomStorageSet, [cookieName, cookieValue], '');
+              Utils.calculateObjectValue(this.options, this.options.cookieCustomStorageSet, [cookieName, cookieValue], '');
             };
             this._storage.getItem = function (cookieName) {
-              return Utils.calculateObjectValue(that.options, that.options.cookieCustomStorageGet, [cookieName], '');
+              return Utils.calculateObjectValue(this.options, this.options.cookieCustomStorageGet, [cookieName], '');
             };
             this._storage.removeItem = function (cookieName) {
-              Utils.calculateObjectValue(that.options, that.options.cookieCustomStorageDelete, [cookieName], '');
+              Utils.calculateObjectValue(this.options, this.options.cookieCustomStorageDelete, [cookieName], '');
             };
             break;
           default:
@@ -22178,7 +22207,7 @@
     }
   }
   function _createClass(e, r, t) {
-    return r && _defineProperties(e.prototype, r), Object.defineProperty(e, "prototype", {
+    return _defineProperties(e.prototype, r), Object.defineProperty(e, "prototype", {
       writable: !1
     }), e;
   }
@@ -22230,11 +22259,11 @@
     for (; !{}.hasOwnProperty.call(t, o) && null !== (t = _getPrototypeOf(t)););
     return t;
   }
-  function _superPropGet(t, e, r, o) {
+  function _superPropGet(t, o, e, r) {
-    var p = _get(_getPrototypeOf(t.prototype ), e, r);
+    var p = _get(_getPrototypeOf(t.prototype ), o, e);
-    return function (t) {
+    return "function" == typeof p ? function (t) {
-      return p.apply(r, t);
+      return p.apply(e, t);
-    } ;
+    } : p;
   }
   function _toPrimitive(t, r) {
     if ("object" != typeof t || !t) return t;
@@ -22648,9 +22677,9 @@
   	/* eslint-disable es/no-symbol -- required for testing */
   	var NATIVE_SYMBOL = requireSymbolConstructorDetection();
 
-  	useSymbolAsUid = NATIVE_SYMBOL
+  	useSymbolAsUid = NATIVE_SYMBOL &&
-  	  && !Symbol.sham
+  	  !Symbol.sham &&
-  	  && typeof Symbol.iterator == 'symbol';
+  	  typeof Symbol.iterator == 'symbol';
   	return useSymbolAsUid;
   }
 
@@ -22801,10 +22830,10 @@
   	var store = sharedStore.exports = globalThis[SHARED] || defineGlobalProperty(SHARED, {});
 
   	(store.versions || (store.versions = [])).push({
-  	  version: '3.38.1',
+  	  version: '3.39.0',
   	  mode: IS_PURE ? 'pure' : 'global',
   	  copyright: '© 2014-2024 Denis Pushkarev (zloirock.ru)',
-  	  license: 'https://github.com/zloirock/core-js/blob/v3.38.1/LICENSE',
+  	  license: 'https://github.com/zloirock/core-js/blob/v3.39.0/LICENSE',
   	  source: 'https://github.com/zloirock/core-js'
   	});
   	return sharedStore.exports;
@@ -24630,7 +24659,7 @@
     }
   }
   function _createClass(e, r, t) {
-    return r && _defineProperties(e.prototype, r), Object.defineProperty(e, "prototype", {
+    return _defineProperties(e.prototype, r), Object.defineProperty(e, "prototype", {
       writable: !1
     }), e;
   }
@@ -24712,11 +24741,11 @@
     for (; !{}.hasOwnProperty.call(t, o) && null !== (t = _getPrototypeOf(t)););
     return t;
   }
-  function _superPropGet(t, e, r, o) {
+  function _superPropGet(t, o, e, r) {
-    var p = _get(_getPrototypeOf(t.prototype ), e, r);
+    var p = _get(_getPrototypeOf(t.prototype ), o, e);
-    return function (t) {
+    return "function" == typeof p ? function (t) {
-      return p.apply(r, t);
+      return p.apply(e, t);
-    } ;
+    } : p;
   }
   function _toPrimitive(t, r) {
     if ("object" != typeof t || !t) return t;
@@ -25137,9 +25166,9 @@
   	/* eslint-disable es/no-symbol -- required for testing */
   	var NATIVE_SYMBOL = requireSymbolConstructorDetection();
 
-  	useSymbolAsUid = NATIVE_SYMBOL
+  	useSymbolAsUid = NATIVE_SYMBOL &&
-  	  && !Symbol.sham
+  	  !Symbol.sham &&
-  	  && typeof Symbol.iterator == 'symbol';
+  	  typeof Symbol.iterator == 'symbol';
   	return useSymbolAsUid;
   }
 
@@ -25290,10 +25319,10 @@
   	var store = sharedStore.exports = globalThis[SHARED] || defineGlobalProperty(SHARED, {});
 
   	(store.versions || (store.versions = [])).push({
-  	  version: '3.38.1',
+  	  version: '3.39.0',
   	  mode: IS_PURE ? 'pure' : 'global',
   	  copyright: '© 2014-2024 Denis Pushkarev (zloirock.ru)',
-  	  license: 'https://github.com/zloirock/core-js/blob/v3.38.1/LICENSE',
+  	  license: 'https://github.com/zloirock/core-js/blob/v3.39.0/LICENSE',
   	  source: 'https://github.com/zloirock/core-js'
   	});
   	return sharedStore.exports;
@@ -29823,7 +29852,7 @@ if(xr(e,"index.xml"))throw new Error("Unsupported NUMBERS 09 file");throw new Er
     }
   }
   function _createClass(e, r, t) {
-    return r && _defineProperties(e.prototype, r), Object.defineProperty(e, "prototype", {
+    return _defineProperties(e.prototype, r), Object.defineProperty(e, "prototype", {
       writable: !1
     }), e;
   }
@@ -29875,11 +29904,11 @@ if(xr(e,"index.xml"))throw new Error("Unsupported NUMBERS 09 file");throw new Er
     for (; !{}.hasOwnProperty.call(t, o) && null !== (t = _getPrototypeOf(t)););
     return t;
   }
-  function _superPropGet(t, e, r, o) {
+  function _superPropGet(t, o, e, r) {
-    var p = _get(_getPrototypeOf(t.prototype ), e, r);
+    var p = _get(_getPrototypeOf(t.prototype ), o, e);
-    return function (t) {
+    return "function" == typeof p ? function (t) {
-      return p.apply(r, t);
+      return p.apply(e, t);
-    } ;
+    } : p;
   }
   function _toPrimitive(t, r) {
     if ("object" != typeof t || !t) return t;
@@ -30293,9 +30322,9 @@ if(xr(e,"index.xml"))throw new Error("Unsupported NUMBERS 09 file");throw new Er
   	/* eslint-disable es/no-symbol -- required for testing */
   	var NATIVE_SYMBOL = requireSymbolConstructorDetection();
 
-  	useSymbolAsUid = NATIVE_SYMBOL
+  	useSymbolAsUid = NATIVE_SYMBOL &&
-  	  && !Symbol.sham
+  	  !Symbol.sham &&
-  	  && typeof Symbol.iterator == 'symbol';
+  	  typeof Symbol.iterator == 'symbol';
   	return useSymbolAsUid;
   }
 
@@ -30446,10 +30475,10 @@ if(xr(e,"index.xml"))throw new Error("Unsupported NUMBERS 09 file");throw new Er
   	var store = sharedStore.exports = globalThis[SHARED] || defineGlobalProperty(SHARED, {});
 
   	(store.versions || (store.versions = [])).push({
-  	  version: '3.38.1',
+  	  version: '3.39.0',
   	  mode: IS_PURE ? 'pure' : 'global',
   	  copyright: '© 2014-2024 Denis Pushkarev (zloirock.ru)',
-  	  license: 'https://github.com/zloirock/core-js/blob/v3.38.1/LICENSE',
+  	  license: 'https://github.com/zloirock/core-js/blob/v3.39.0/LICENSE',
   	  source: 'https://github.com/zloirock/core-js'
   	});
   	return sharedStore.exports;
@@ -32278,7 +32307,7 @@ if(xr(e,"index.xml"))throw new Error("Unsupported NUMBERS 09 file");throw new Er
     }
   }
   function _createClass(e, r, t) {
-    return r && _defineProperties(e.prototype, r), Object.defineProperty(e, "prototype", {
+    return _defineProperties(e.prototype, r), Object.defineProperty(e, "prototype", {
       writable: !1
     }), e;
   }
@@ -32414,11 +32443,11 @@ if(xr(e,"index.xml"))throw new Error("Unsupported NUMBERS 09 file");throw new Er
     for (; !{}.hasOwnProperty.call(t, o) && null !== (t = _getPrototypeOf(t)););
     return t;
   }
-  function _superPropGet(t, e, r, o) {
+  function _superPropGet(t, o, e, r) {
-    var p = _get(_getPrototypeOf(t.prototype ), e, r);
+    var p = _get(_getPrototypeOf(t.prototype ), o, e);
-    return function (t) {
+    return "function" == typeof p ? function (t) {
-      return p.apply(r, t);
+      return p.apply(e, t);
-    } ;
+    } : p;
   }
   function _toConsumableArray(r) {
     return _arrayWithoutHoles(r) || _iterableToArray(r) || _unsupportedIterableToArray(r) || _nonIterableSpread();
@@ -32842,9 +32871,9 @@ if(xr(e,"index.xml"))throw new Error("Unsupported NUMBERS 09 file");throw new Er
   	/* eslint-disable es/no-symbol -- required for testing */
   	var NATIVE_SYMBOL = requireSymbolConstructorDetection();
 
-  	useSymbolAsUid = NATIVE_SYMBOL
+  	useSymbolAsUid = NATIVE_SYMBOL &&
-  	  && !Symbol.sham
+  	  !Symbol.sham &&
-  	  && typeof Symbol.iterator == 'symbol';
+  	  typeof Symbol.iterator == 'symbol';
   	return useSymbolAsUid;
   }
 
@@ -32995,10 +33024,10 @@ if(xr(e,"index.xml"))throw new Error("Unsupported NUMBERS 09 file");throw new Er
   	var store = sharedStore.exports = globalThis[SHARED] || defineGlobalProperty(SHARED, {});
 
   	(store.versions || (store.versions = [])).push({
-  	  version: '3.38.1',
+  	  version: '3.39.0',
   	  mode: IS_PURE ? 'pure' : 'global',
   	  copyright: '© 2014-2024 Denis Pushkarev (zloirock.ru)',
-  	  license: 'https://github.com/zloirock/core-js/blob/v3.38.1/LICENSE',
+  	  license: 'https://github.com/zloirock/core-js/blob/v3.39.0/LICENSE',
   	  source: 'https://github.com/zloirock/core-js'
   	});
   	return sharedStore.exports;

public/mix-manifest.json

@@ -1,9 +1,9 @@
 {
-    "/js/build/app.js": "/js/build/app.js?id=65d7af7b9fa7fd0e05737526a0d1d282",
+    "/js/build/app.js": "/js/build/app.js?id=578c0308b8a324cc78c7786da9406022",
     "/css/dist/skins/skin-black-dark.css": "/css/dist/skins/skin-black-dark.css?id=06c13e817cc022028b3f4a33c0ca303a",
     "/css/dist/skins/_all-skins.css": "/css/dist/skins/_all-skins.css?id=e71ef4171dee5da63af390966ac60ffc",
-    "/css/build/overrides.css": "/css/build/overrides.css?id=776ca1fc6f89c40adc7050439f107f50",
+    "/css/build/overrides.css": "/css/build/overrides.css?id=6528155ed5ed8fddf4047de7f0d0298d",
-    "/css/build/app.css": "/css/build/app.css?id=81072cf10a543742f928390c9a40791d",
+    "/css/build/app.css": "/css/build/app.css?id=3422f2ca2056b952c3c361adf00c10b8",
     "/css/build/AdminLTE.css": "/css/build/AdminLTE.css?id=4ea0068716c1bb2434d87a16d51b98c9",
     "/css/dist/skins/skin-yellow.css": "/css/dist/skins/skin-yellow.css?id=7b315b9612b8fde8f9c5b0ddb6bba690",
     "/css/dist/skins/skin-yellow-dark.css": "/css/dist/skins/skin-yellow-dark.css?id=ea22079836a432d7f46a5d390c445e13",
@@ -19,7 +19,7 @@
     "/css/dist/skins/skin-blue.css": "/css/dist/skins/skin-blue.css?id=f677207c6cf9678eb539abecb408c374",
     "/css/dist/skins/skin-blue-dark.css": "/css/dist/skins/skin-blue-dark.css?id=6ea836d8126de101081c49abbdb89417",
     "/css/dist/skins/skin-black.css": "/css/dist/skins/skin-black.css?id=76482123f6c70e866d6b971ba91de7bb",
-    "/css/dist/all.css": "/css/dist/all.css?id=7ecc2067a5edde786df1acd2775ba035",
+    "/css/dist/all.css": "/css/dist/all.css?id=18ebb9c284b49dcf6c8e4fdb923ad923",
     "/css/dist/signature-pad.css": "/css/dist/signature-pad.css?id=6a89d3cd901305e66ced1cf5f13147f7",
     "/css/dist/signature-pad.min.css": "/css/dist/signature-pad.min.css?id=6a89d3cd901305e66ced1cf5f13147f7",
     "/js/select2/i18n/af.js": "/js/select2/i18n/af.js?id=4f6fcd73488ce79fae1b7a90aceaecde",
@@ -90,8 +90,8 @@
     "/css/webfonts/fa-solid-900.woff2": "/css/webfonts/fa-solid-900.woff2?id=109ad919b74a62a8a223361da1651bbc",
     "/css/webfonts/fa-v4compatibility.ttf": "/css/webfonts/fa-v4compatibility.ttf?id=53c2e50ef821f7b8dd514611d5e0772c",
     "/css/webfonts/fa-v4compatibility.woff2": "/css/webfonts/fa-v4compatibility.woff2?id=331c85bd61ffa93af09273d1bc2add5a",
-    "/js/dist/bootstrap-table-locale-all.min.js": "/js/dist/bootstrap-table-locale-all.min.js?id=c5445e15be5ce91a9ffef05e08ad6898",
+    "/js/dist/bootstrap-table-locale-all.min.js": "/js/dist/bootstrap-table-locale-all.min.js?id=02dfc50d5b951dc6d260bd508968d319",
-    "/js/dist/bootstrap-table-en-US.min.js": "/js/dist/bootstrap-table-en-US.min.js?id=0f6e85ae692d03a3b11cab445ff263ab",
+    "/js/dist/bootstrap-table-en-US.min.js": "/js/dist/bootstrap-table-en-US.min.js?id=1c350eabf064c309f67d6779e5cc4afa",
     "/css/dist/skins/_all-skins.min.css": "/css/dist/skins/_all-skins.min.css?id=e71ef4171dee5da63af390966ac60ffc",
     "/css/dist/skins/skin-black-dark.min.css": "/css/dist/skins/skin-black-dark.min.css?id=06c13e817cc022028b3f4a33c0ca303a",
     "/css/dist/skins/skin-black.min.css": "/css/dist/skins/skin-black.min.css?id=76482123f6c70e866d6b971ba91de7bb",
@@ -108,8 +108,8 @@
     "/css/dist/skins/skin-red.min.css": "/css/dist/skins/skin-red.min.css?id=44bf834f2110504a793dadec132a5898",
     "/css/dist/skins/skin-yellow-dark.min.css": "/css/dist/skins/skin-yellow-dark.min.css?id=ea22079836a432d7f46a5d390c445e13",
     "/css/dist/skins/skin-yellow.min.css": "/css/dist/skins/skin-yellow.min.css?id=7b315b9612b8fde8f9c5b0ddb6bba690",
-    "/css/dist/bootstrap-table.css": "/css/dist/bootstrap-table.css?id=c384582a6ba08903af353be861ffe74e",
+    "/css/dist/bootstrap-table.css": "/css/dist/bootstrap-table.css?id=ceded08e0cc745a83c13647035b03406",
     "/js/build/vendor.js": "/js/build/vendor.js?id=89dffa552c6e3abe3a2aac6c9c7b466b",
-    "/js/dist/bootstrap-table.js": "/js/dist/bootstrap-table.js?id=b4c3069f1a292527a96c058b77b28d69",
+    "/js/dist/bootstrap-table.js": "/js/dist/bootstrap-table.js?id=61285c8ac5ea7b46002ea8c451c94e60",
-    "/js/dist/all.js": "/js/dist/all.js?id=21e041dec60e0785db6d64961b13a9b0"
+    "/js/dist/all.js": "/js/dist/all.js?id=eeeac92878ac0b207ad7f39d593f62c3"
 }

resources/assets/js/snipeit_modals.js

@@ -28,7 +28,7 @@ $(function () {
 
   var baseUrl = $('meta[name="baseUrl"]').attr('content');
   //handle modal-add-interstitial calls
-  var model, select, refreshSelector;
+  var model, select, refreshSelector, hasnopayload;
 
   if($('#createModal').length == 0) {
     $('body').append('<div class="modal fade" id="createModal"></div><!-- /.modal -->');
@@ -40,6 +40,7 @@ $(function () {
       select = link.data("select");
       refreshSelector = link.data("refresh");
 
+      hasnopayload = link.data("hasnopayload");
 
       $('#createModal').load(link.attr('href'),function () {
 
@@ -122,11 +123,13 @@ $(function () {
                 $('#modal_error_msg').html(error_message).show();
                 return false;
             }
-            var id = result.payload.id;
+            if(!hasnopayload) {
-            var name = result.payload.name || (result.payload.first_name + " " + result.payload.last_name);
+                var id = result.payload.id;
-            if(!id || !name) {
+                var name = result.payload.name || (result.payload.first_name + " " + result.payload.last_name);
-                console.error("Could not find resulting name or ID from modal-create. Name: "+name+", id: "+id);
+                if (!id || !name) {
-                return false;
+                    console.error("Could not find resulting name or ID from modal-create. Name: " + name + ", id: " + id);
+                    return false;
+                }
             }
             $('#createModal').modal('hide');
             $('#createModal').html("");

resources/assets/less/overrides.less

@@ -1159,3 +1159,8 @@ input[type="radio"]:checked::before {
   filter: brightness(70%);
   font-size: 70%;
 }
+
+/** this is needed to override ekko-lightboxes card view styles **/
+.bootstrap-table .fixed-table-container .table tbody tr .card-view {
+  display: table-row !important;
+}

resources/lang/aa-ER/admin/settings/general.php

@@ -70,7 +70,6 @@ return [
     'footer_text'               => 'crwdns1987:0crwdne1987:0',
     'footer_text_help'          => 'crwdns1988:0crwdne1988:0',
     'general_settings'			=> 'crwdns1297:0crwdne1297:0',
-    'general_settings_keywords' => 'crwdns12084:0crwdne12084:0',
     'general_settings_help'     => 'crwdns6341:0crwdne6341:0',
     'generate_backup'			=> 'crwdns1427:0crwdne1427:0',
     'google_workspaces'         => 'crwdns12080:0crwdne12080:0',
@@ -154,7 +153,6 @@ return [
     'php'                       => 'crwdns1120:0crwdne1120:0',
     'php_info'                  => 'crwdns12298:0crwdne12298:0',
     'php_overview'              => 'crwdns6367:0crwdne6367:0',
-    'php_overview_keywords'     => 'crwdns6369:0crwdne6369:0',
     'php_overview_help'         => 'crwdns6371:0crwdne6371:0',
     'php_gd_info'               => 'crwdns833:0crwdne833:0',
     'php_gd_warning'            => 'crwdns834:0crwdne834:0',
@@ -231,7 +229,6 @@ return [
     'update'                    => 'crwdns840:0crwdne840:0',
     'value'                     => 'crwdns841:0crwdne841:0',
     'brand'                     => 'crwdns1433:0crwdne1433:0',
-    'brand_keywords'            => 'crwdns6397:0crwdne6397:0',
     'brand_help'                => 'crwdns6399:0crwdne6399:0',
     'web_brand'                 => 'crwdns5916:0crwdne5916:0',
     'about_settings_title'      => 'crwdns1434:0crwdne1434:0',
@@ -319,21 +316,17 @@ return [
     'filter_by_keyword' => 'crwdns6431:0crwdne6431:0',
     'security' => 'crwdns6433:0crwdne6433:0',
     'security_title' => 'crwdns6435:0crwdne6435:0',
-    'security_keywords' => 'crwdns6437:0crwdne6437:0',
     'security_help' => 'crwdns6439:0crwdne6439:0',
-    'groups_keywords' => 'crwdns6441:0crwdne6441:0',
     'groups_help' => 'crwdns6443:0crwdne6443:0',
     'localization' => 'crwdns6445:0crwdne6445:0',
     'localization_title' => 'crwdns6447:0crwdne6447:0',
-    'localization_keywords' => 'crwdns6449:0crwdne6449:0',
     'localization_help' => 'crwdns6451:0crwdne6451:0',
     'notifications' => 'crwdns6453:0crwdne6453:0',
     'notifications_help' => 'crwdns11363:0crwdne11363:0',
     'asset_tags_help' => 'crwdns6457:0crwdne6457:0',
     'labels' => 'crwdns6459:0crwdne6459:0',
     'labels_title' => 'crwdns6461:0crwdne6461:0',
-    'labels_help' => 'crwdns6463:0crwdne6463:0',
+    'labels_help' => 'crwdns12840:0crwdne12840:0',
-    'purge_keywords' => 'crwdns6467:0crwdne6467:0',
     'purge_help' => 'crwdns6469:0crwdne6469:0',
     'ldap_extension_warning' => 'crwdns6471:0crwdne6471:0',
     'ldap_ad' => 'crwdns6473:0crwdne6473:0',
@@ -362,12 +355,14 @@ return [
     'label2_2d_type'          => 'crwdns11745:0crwdne11745:0',
     'label2_2d_type_help'     => 'crwdns11747:0crwdne11747:0',
     'label2_2d_target'        => 'crwdns11749:0crwdne11749:0',
-    'label2_2d_target_help'   => 'crwdns11751:0crwdne11751:0',
+    'label2_2d_target_help'   => 'crwdns12832:0crwdne12832:0',
     'label2_fields'           => 'crwdns11753:0crwdne11753:0',
     'label2_fields_help'      => 'crwdns11755:0crwdne11755:0',
     'help_asterisk_bold'    => 'crwdns11757:0crwdne11757:0',
     'help_blank_to_use'     => 'crwdns11759:0crwdne11759:0',
-    'help_default_will_use' => 'crwdns12828:0crwdne12828:0',
+    'help_default_will_use' => 'crwdns12834:0crwdne12834:0',
+    'asset_id'              => 'crwdns12836:0crwdne12836:0',
+    'data'               => 'crwdns12838:0crwdne12838:0',
     'default'               => 'crwdns11763:0crwdne11763:0',
     'none'                  => 'crwdns11765:0crwdne11765:0',
     'google_callback_help' => 'crwdns11615:0crwdne11615:0',
@@ -389,4 +384,17 @@ return [
     'due_checkin_days_help' => 'crwdns12682:0crwdne12682:0',
     'no_groups' => 'crwdns12760:0crwdne12760:0',
 
+
+    /* Keywords for settings overview help */
+    'keywords' => [
+        'brand'             => 'crwdns12842:0crwdne12842:0',
+        'general_settings'  => 'crwdns12844:0crwdne12844:0',
+        'groups'            => 'crwdns12846:0crwdne12846:0',
+        'labels'            => 'crwdns12848:0crwdne12848:0',
+        'localization'      => 'crwdns12850:0crwdne12850:0',
+        'php_overview'      => 'crwdns12852:0crwdne12852:0',
+        'purge'             => 'crwdns12854:0crwdne12854:0',
+        'security'          => 'crwdns12856:0crwdne12856:0',
+    ],
+
 ];

resources/lang/aa-ER/admin/settings/message.php

@@ -45,5 +45,6 @@ return [
         'error' => 'crwdns11381:0crwdne11381:0',
         'error_redirect' => 'crwdns11843:0crwdne11843:0',
         'error_misc' => 'crwdns11383:0crwdne11383:0',
+        'webhook_fail' => 'crwdns12830:0crwdne12830:0',
     ]
 ];

resources/lang/aa-ER/general.php

@@ -216,6 +216,12 @@ return [
     'no_results'			=> 'crwdns1074:0crwdne1074:0',
     'no'  					=> 'crwdns1075:0crwdne1075:0',
     'notes'  				=> 'crwdns1076:0crwdne1076:0',
+    'note_added'            => 'crwdns12858:0crwdne12858:0',
+    'add_note'              => 'crwdns12860:0crwdne12860:0',
+    'note_edited'            => 'crwdns12862:0crwdne12862:0',
+    'edit_note'              => 'crwdns12864:0crwdne12864:0',
+    'note_deleted'            => 'crwdns12866:0crwdne12866:0',
+    'delete_note'              => 'crwdns12868:0crwdne12868:0',
     'order_number'          => 'crwdns1829:0crwdne1829:0',
     'only_deleted'          => 'crwdns10520:0crwdne10520:0',
     'page_menu'				=> 'crwdns1276:0crwdne1276:0',
@@ -566,5 +572,8 @@ return [
     'import_asset_tag_exists' => 'crwdns12692:0crwdne12692:0',
     'countries_manually_entered_help' => 'crwdns12702:0crwdne12702:0',
     'accessories_assigned' => 'crwdns12800:0crwdne12800:0',
+    'user_managed_passwords' => 'crwdns12870:0crwdne12870:0',
+    'user_managed_passwords_disallow' => 'crwdns12872:0crwdne12872:0',
+    'user_managed_passwords_allow' => 'crwdns12874:0crwdne12874:0',
 
 ];

resources/lang/af-ZA/admin/settings/general.php

@@ -70,7 +70,6 @@ return [
     'footer_text'               => 'Additional Footer Text ',
     'footer_text_help'          => 'This text will appear in the right-side footer. Links are allowed using <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>. Line breaks, headers, images, etc may result in unpredictable results.',
     'general_settings'			=> 'Algemene instellings',
-    'general_settings_keywords' => 'company support, signature, acceptance, email format, username format, images, per page, thumbnail, eula, gravatar, tos, dashboard, privacy',
     'general_settings_help'     => 'Default EULA and more',
     'generate_backup'			=> 'Genereer rugsteun',
     'google_workspaces'         => 'Google Workspaces',
@@ -154,7 +153,6 @@ return [
     'php'                       => 'PHP weergawe',
     'php_info'                  => 'PHP info',
     'php_overview'              => 'PHP',
-    'php_overview_keywords'     => 'phpinfo, system, info',
     'php_overview_help'         => 'PHP System info',
     'php_gd_info'               => 'Jy moet php-gd installeer om QR-kodes te vertoon, sien installeringsinstruksies.',
     'php_gd_warning'            => 'PHP Image Processing en GD plugin is NIE geïnstalleer nie.',
@@ -231,7 +229,6 @@ return [
     'update'                    => 'Opdateer instellings',
     'value'                     => 'waarde',
     'brand'                     => 'Handelsmerk',
-    'brand_keywords'            => 'footer, logo, print, theme, skin, header, colors, color, css',
     'brand_help'                => 'Logo, Site Name',
     'web_brand'                 => 'Web Branding Type',
     'about_settings_title'      => 'Oor instellings',
@@ -319,21 +316,17 @@ return [
     'filter_by_keyword' => 'Filter by setting keyword',
     'security' => 'Security',
     'security_title' => 'Update Security Settings',
-    'security_keywords' => 'password, passwords, requirements, two factor, two-factor, common passwords, remote login, logout, authentication',
     'security_help' => 'Two-factor, Password Restrictions',
-    'groups_keywords' => 'permissions, permission groups, authorization',
     'groups_help' => 'Account permission groups',
     'localization' => 'Localization',
     'localization_title' => 'Update Localization Settings',
-    'localization_keywords' => 'localization, currency, local, locale, time zone, timezone, international, internatinalization, language, languages, translation',
     'localization_help' => 'Language, date display',
     'notifications' => 'Notifications',
     'notifications_help' => 'Email Alerts & Audit Settings',
     'asset_tags_help' => 'Incrementing and prefixes',
     'labels' => 'Labels',
     'labels_title' => 'Update Label Settings',
-    'labels_help' => 'Label sizes &amp; settings',
+    'labels_help' => 'Barcodes &amp; label settings',
-    'purge_keywords' => 'permanently delete',
     'purge_help' => 'Verwyder verwyderde rekords',
     'ldap_extension_warning' => 'It does not look like the LDAP extension is installed or enabled on this server. You can still save your settings, but you will need to enable the LDAP extension for PHP before LDAP syncing or login will work.',
     'ldap_ad' => 'LDAP/AD',
@@ -362,12 +355,14 @@ return [
     'label2_2d_type'          => '2D Barcode Type',
     'label2_2d_type_help'     => 'Format for 2D barcodes',
     'label2_2d_target'        => '2D Barcode Target',
-    'label2_2d_target_help'   => 'The URL the 2D barcode points to when scanned',
+    'label2_2d_target_help'   => 'The data that will be contained in the 2D barcode',
     'label2_fields'           => 'Field Definitions',
     'label2_fields_help'      => 'Fields can be added, removed, and reordered in the left column. For each field, multiple options for Label and DataSource can be added, removed, and reordered in the right column.',
     'help_asterisk_bold'    => 'Text entered as <code>**text**</code> will be displayed as bold',
     'help_blank_to_use'     => 'Leave blank to use the value from <code>:setting_name</code>',
-    'help_default_will_use' => '<br>Note that the value of the barcodes must comply with the respective barcode spec in order to be successfully generated. Please see <a href="https://snipe-it.readme.io/docs/barcodes">the documentation <i class="fa fa-external-link"></i></a> for more details. ',
+    'help_default_will_use' => '<code>:default</code> will use the value from <code>:setting_name</code>. <br>Note that the value of the barcodes must comply with the respective barcode spec in order to be successfully generated. Please see <a href="https://snipe-it.readme.io/docs/barcodes">the documentation <i class="fa fa-external-link"></i></a> for more details. ',
+    'asset_id'              => 'Asset ID',
+    'data'               => 'Data',
     'default'               => 'Default',
     'none'                  => 'None',
     'google_callback_help' => 'This should be entered as the callback URL in your Google OAuth app settings in your organization&apos;s <strong><a href="https://console.cloud.google.com/" target="_blank">Google developer console <i class="fa fa-external-link" aria-hidden="true"></i></a></strong>.',
@@ -389,4 +384,17 @@ return [
     'due_checkin_days_help' => 'How many days before the expected checkin of an asset should it be listed in the "Due for checkin" page?',
     'no_groups' => 'No groups have been created yet. Visit <code>Admin Settings > Permission Groups</code> to add one.',
 
+
+    /* Keywords for settings overview help */
+    'keywords' => [
+        'brand'             => 'footer, logo, print, theme, skin, header, colors, color, css',
+        'general_settings'  => 'company support, signature, acceptance, email format, username format, images, per page, thumbnail, eula, gravatar, tos, dashboard, privacy',
+        'groups'            => 'permissions, permission groups, authorization',
+        'labels'            => 'labels, barcodes, barcode, sheets, print, upc, qr, 1d, 2d',
+        'localization'      => 'localization, currency, local, locale, time zone, timezone, international, internatinalization, language, languages, translation',
+        'php_overview'      => 'phpinfo, system, info',
+        'purge'             => 'permanently delete',
+        'security'          => 'password, passwords, requirements, two factor, two-factor, common passwords, remote login, logout, authentication',
+    ],
+
 ];

resources/lang/af-ZA/admin/settings/message.php

@@ -45,5 +45,6 @@ return [
         'error' => 'Something went wrong. :app responded with: :error_message',
         'error_redirect' => 'ERROR: 301/302 :endpoint returns a redirect. For security reasons, we don’t follow redirects. Please use the actual endpoint.',
         'error_misc' => 'Something went wrong. :( ',
+        'webhook_fail' => ' webhook notification failed: Check to make sure the URL is still valid.',
     ]
 ];

resources/lang/af-ZA/general.php

@@ -216,6 +216,12 @@ return [
     'no_results'			=> 'Geen resultate.',
     'no'  					=> 'Geen',
     'notes'  				=> 'notas',
+    'note_added'            => 'Note Added',
+    'add_note'              => 'Add Note',
+    'note_edited'            => 'Note Edited',
+    'edit_note'              => 'Edit Note',
+    'note_deleted'            => 'Note Deleted',
+    'delete_note'              => 'Delete Note',
     'order_number'          => 'Bestellingnommer',
     'only_deleted'          => 'Only Deleted Assets',
     'page_menu'				=> 'Wys _MENU_ items',
@@ -567,5 +573,8 @@ return [
     'import_asset_tag_exists' => 'An asset with the asset tag :asset_tag already exists and an update was not requested. No change was made.',
     'countries_manually_entered_help' => 'Values with an asterisk (*) were manually entered and do not match existing ISO 3166 dropdown values',
     'accessories_assigned' => 'Assigned Accessories',
+    'user_managed_passwords' => 'Password Management',
+    'user_managed_passwords_disallow' => 'Disallow users from managing their own passwords',
+    'user_managed_passwords_allow' => 'Allow users to manage their own passwords',
 
 ];

resources/lang/am-ET/admin/settings/general.php

@@ -70,7 +70,6 @@ return [
     'footer_text'               => 'Additional Footer Text ',
     'footer_text_help'          => 'This text will appear in the right-side footer. Links are allowed using <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>. Line breaks, headers, images, etc may result in unpredictable results.',
     'general_settings'			=> 'General Settings',
-    'general_settings_keywords' => 'company support, signature, acceptance, email format, username format, images, per page, thumbnail, eula, gravatar, tos, dashboard, privacy',
     'general_settings_help'     => 'Default EULA and more',
     'generate_backup'			=> 'Generate Backup',
     'google_workspaces'         => 'Google Workspaces',
@@ -154,7 +153,6 @@ return [
     'php'                       => 'PHP Version',
     'php_info'                  => 'PHP info',
     'php_overview'              => 'PHP',
-    'php_overview_keywords'     => 'phpinfo, system, info',
     'php_overview_help'         => 'PHP System info',
     'php_gd_info'               => 'You must install php-gd to display QR codes, see install instructions.',
     'php_gd_warning'            => 'PHP Image Processing and GD plugin is NOT installed.',
@@ -231,7 +229,6 @@ return [
     'update'                    => 'Update Settings',
     'value'                     => 'Value',
     'brand'                     => 'Branding',
-    'brand_keywords'            => 'footer, logo, print, theme, skin, header, colors, color, css',
     'brand_help'                => 'Logo, Site Name',
     'web_brand'                 => 'Web Branding Type',
     'about_settings_title'      => 'About Settings',
@@ -319,21 +316,17 @@ return [
     'filter_by_keyword' => 'Filter by setting keyword',
     'security' => 'Security',
     'security_title' => 'Update Security Settings',
-    'security_keywords' => 'password, passwords, requirements, two factor, two-factor, common passwords, remote login, logout, authentication',
     'security_help' => 'Two-factor, Password Restrictions',
-    'groups_keywords' => 'permissions, permission groups, authorization',
     'groups_help' => 'Account permission groups',
     'localization' => 'Localization',
     'localization_title' => 'Update Localization Settings',
-    'localization_keywords' => 'localization, currency, local, locale, time zone, timezone, international, internatinalization, language, languages, translation',
     'localization_help' => 'Language, date display',
     'notifications' => 'Notifications',
     'notifications_help' => 'Email Alerts & Audit Settings',
     'asset_tags_help' => 'Incrementing and prefixes',
     'labels' => 'Labels',
     'labels_title' => 'Update Label Settings',
-    'labels_help' => 'Label sizes &amp; settings',
+    'labels_help' => 'Barcodes &amp; label settings',
-    'purge_keywords' => 'permanently delete',
     'purge_help' => 'Purge Deleted Records',
     'ldap_extension_warning' => 'It does not look like the LDAP extension is installed or enabled on this server. You can still save your settings, but you will need to enable the LDAP extension for PHP before LDAP syncing or login will work.',
     'ldap_ad' => 'LDAP/AD',
@@ -362,12 +355,14 @@ return [
     'label2_2d_type'          => '2D Barcode Type',
     'label2_2d_type_help'     => 'Format for 2D barcodes',
     'label2_2d_target'        => '2D Barcode Target',
-    'label2_2d_target_help'   => 'The URL the 2D barcode points to when scanned',
+    'label2_2d_target_help'   => 'The data that will be contained in the 2D barcode',
     'label2_fields'           => 'Field Definitions',
     'label2_fields_help'      => 'Fields can be added, removed, and reordered in the left column. For each field, multiple options for Label and DataSource can be added, removed, and reordered in the right column.',
     'help_asterisk_bold'    => 'Text entered as <code>**text**</code> will be displayed as bold',
     'help_blank_to_use'     => 'Leave blank to use the value from <code>:setting_name</code>',
-    'help_default_will_use' => '<br>Note that the value of the barcodes must comply with the respective barcode spec in order to be successfully generated. Please see <a href="https://snipe-it.readme.io/docs/barcodes">the documentation <i class="fa fa-external-link"></i></a> for more details. ',
+    'help_default_will_use' => '<code>:default</code> will use the value from <code>:setting_name</code>. <br>Note that the value of the barcodes must comply with the respective barcode spec in order to be successfully generated. Please see <a href="https://snipe-it.readme.io/docs/barcodes">the documentation <i class="fa fa-external-link"></i></a> for more details. ',
+    'asset_id'              => 'Asset ID',
+    'data'               => 'Data',
     'default'               => 'Default',
     'none'                  => 'None',
     'google_callback_help' => 'This should be entered as the callback URL in your Google OAuth app settings in your organization&apos;s <strong><a href="https://console.cloud.google.com/" target="_blank">Google developer console <i class="fa fa-external-link" aria-hidden="true"></i></a></strong>.',
@@ -389,4 +384,17 @@ return [
     'due_checkin_days_help' => 'How many days before the expected checkin of an asset should it be listed in the "Due for checkin" page?',
     'no_groups' => 'No groups have been created yet. Visit <code>Admin Settings > Permission Groups</code> to add one.',
 
+
+    /* Keywords for settings overview help */
+    'keywords' => [
+        'brand'             => 'footer, logo, print, theme, skin, header, colors, color, css',
+        'general_settings'  => 'company support, signature, acceptance, email format, username format, images, per page, thumbnail, eula, gravatar, tos, dashboard, privacy',
+        'groups'            => 'permissions, permission groups, authorization',
+        'labels'            => 'labels, barcodes, barcode, sheets, print, upc, qr, 1d, 2d',
+        'localization'      => 'localization, currency, local, locale, time zone, timezone, international, internatinalization, language, languages, translation',
+        'php_overview'      => 'phpinfo, system, info',
+        'purge'             => 'permanently delete',
+        'security'          => 'password, passwords, requirements, two factor, two-factor, common passwords, remote login, logout, authentication',
+    ],
+
 ];

resources/lang/am-ET/admin/settings/message.php

@@ -45,5 +45,6 @@ return [
         'error' => 'Something went wrong. :app responded with: :error_message',
         'error_redirect' => 'ERROR: 301/302 :endpoint returns a redirect. For security reasons, we don’t follow redirects. Please use the actual endpoint.',
         'error_misc' => 'Something went wrong. :( ',
+        'webhook_fail' => ' webhook notification failed: Check to make sure the URL is still valid.',
     ]
 ];

resources/lang/am-ET/general.php

@@ -216,6 +216,12 @@ return [
     'no_results'			=> 'No Results.',
     'no'  					=> 'No',
     'notes'  				=> 'Notes',
+    'note_added'            => 'Note Added',
+    'add_note'              => 'Add Note',
+    'note_edited'            => 'Note Edited',
+    'edit_note'              => 'Edit Note',
+    'note_deleted'            => 'Note Deleted',
+    'delete_note'              => 'Delete Note',
     'order_number'          => 'Order Number',
     'only_deleted'          => 'Only Deleted Assets',
     'page_menu'				=> 'Showing _MENU_ items',
@@ -567,5 +573,8 @@ return [
     'import_asset_tag_exists' => 'An asset with the asset tag :asset_tag already exists and an update was not requested. No change was made.',
     'countries_manually_entered_help' => 'Values with an asterisk (*) were manually entered and do not match existing ISO 3166 dropdown values',
     'accessories_assigned' => 'Assigned Accessories',
+    'user_managed_passwords' => 'Password Management',
+    'user_managed_passwords_disallow' => 'Disallow users from managing their own passwords',
+    'user_managed_passwords_allow' => 'Allow users to manage their own passwords',
 
 ];

resources/lang/ar-SA/admin/settings/general.php

@@ -70,7 +70,6 @@ return [
     'footer_text'               => 'إضافة نص لتذييل الصفحة ',
     'footer_text_help'          => 'سيظهر هذا النص في تذييل الجانب الأيمن. يُسمح باستخدام الروابط باستخدام < href="https://help.github.com/articles/github-flavored-markdown/">eGithub بنكهة markdown</a>. فواصل الأسطر، رؤوس، الصور، الخ قد يؤدي إلى نتائج غير متوقعة.',
     'general_settings'			=> 'الاعدادات العامة',
-    'general_settings_keywords' => 'دعم الشركة، التوقيع، القبول، تنسيق البريد الإلكتروني، تنسيق اسم المستخدم، الصور، لكل صفحة، صورة مصغرة، إيولا، الجاذبية، التصورات، لوحة التحكم، الخصوصية',
     'general_settings_help'     => 'اتفاقية ترخيص المستخدم الافتراضية والمزيد',
     'generate_backup'			=> 'إنشاء النسخ الاحتياطي',
     'google_workspaces'         => 'مساحات عمل جوجل',
@@ -154,7 +153,6 @@ return [
     'php'                       => 'نسخة فب',
     'php_info'                  => 'PHP info',
     'php_overview'              => 'PHP',
-    'php_overview_keywords'     => 'phpinfo, النظام, معلومات',
     'php_overview_help'         => 'معلومات نظام PHP',
     'php_gd_info'               => 'يجب تثبيت فب-غ لعرض رموز قر، راجع تعليمات التثبيت.',
     'php_gd_warning'            => 'لم يتم تثبيت فب معالجة الصور و غ المساعد.',
@@ -231,7 +229,6 @@ return [
     'update'                    => 'إعدادات التحديث',
     'value'                     => 'القيمة',
     'brand'                     => 'العلامات التجارية',
-    'brand_keywords'            => 'قدم, الشعار, الطباعة, الموضوع, الجلد , الرأس , الألوان , الألوان',
     'brand_help'                => 'الشعار ، اسم الموقع',
     'web_brand'                 => 'نوع العلامات التجارية للويب',
     'about_settings_title'      => 'حول الإعدادات',
@@ -319,21 +316,17 @@ return [
     'filter_by_keyword' => 'تصفية عن طريق إعداد الكلمة المفتاحية',
     'security' => 'أمان',
     'security_title' => 'تحديث إعدادات الأمان',
-    'security_keywords' => 'كلمة المرور، كلمة المرور، كلمات المرور، المتطلبات، عاملان، كلمات المرور الشائعة، تسجيل الدخول، المصادقة',
     'security_help' => 'عاملين، قيود كلمة المرور',
-    'groups_keywords' => 'الأذونات، مجموعات الأذونات، تفويض',
     'groups_help' => 'مجموعات إذن الحساب',
     'localization' => 'التعريب',
     'localization_title' => 'تحديث إعدادات التعريب',
-    'localization_keywords' => 'التعميم، العملة، المحلية المحلية، المحلية والمنطقة الزمنية، المنطقة الزمنية، الدولية، الاستيعاب، اللغة، الترجمة',
     'localization_help' => 'اللغة، عرض التاريخ',
     'notifications' => 'الإشعارات',
     'notifications_help' => 'إعدادات تنبيهات ومراجعة حسابات البريد الإلكتروني',
     'asset_tags_help' => 'زيادة والبادئات',
     'labels' => 'التسميات',
     'labels_title' => 'تحديث إعدادات التسمية',
-    'labels_help' => 'أحجام التسمية &amp; الإعدادات',
+    'labels_help' => 'Barcodes &amp; label settings',
-    'purge_keywords' => 'حذف نهائيًا',
     'purge_help' => 'تطهير السجلات المحذوفة',
     'ldap_extension_warning' => 'لا يبدو أن ملحق LDAP مثبت أو مفعّل على هذا الخادم. لا يزال بإمكانك حفظ الإعدادات الخاصة بك، ولكن ستحتاج إلى تمكين ملحق LDAP لـ PHP قبل أن تعمل مزامنة LDAP أو تسجيل الدخول.',
     'ldap_ad' => 'LDAP/AD',
@@ -362,12 +355,14 @@ return [
     'label2_2d_type'          => '2D نوع الباركود',
     'label2_2d_type_help'     => 'تنسيق الباركود ثنائية الأبعاد',
     'label2_2d_target'        => 'هدف الباركود 2D',
-    'label2_2d_target_help'   => 'عنوان URL الباركود 2D يشير إلى عندما يتم مسحه',
+    'label2_2d_target_help'   => 'The data that will be contained in the 2D barcode',
     'label2_fields'           => 'تعاريف الحقل',
     'label2_fields_help'      => 'يمكن إضافة الحقول وإزالتها وإعادة ترتيبها في العمود الأيسر. لكل حقل ، يمكن إضافة خيارات متعددة للتسمية و DataSource ، وإزالتها وإعادة ترتيبها في العمود الأيمن.',
     'help_asterisk_bold'    => 'النص الذي تم إدخاله كـ <code>**text**</code> سيتم عرضه بالخط العريض',
     'help_blank_to_use'     => 'اتركه فارغاً لاستخدام القيمة من <code>:setting_name</code>',
-    'help_default_will_use' => '<br>Note that the value of the barcodes must comply with the respective barcode spec in order to be successfully generated. Please see <a href="https://snipe-it.readme.io/docs/barcodes">the documentation <i class="fa fa-external-link"></i></a> for more details. ',
+    'help_default_will_use' => '<code>:default</code> will use the value from <code>:setting_name</code>. <br>Note that the value of the barcodes must comply with the respective barcode spec in order to be successfully generated. Please see <a href="https://snipe-it.readme.io/docs/barcodes">the documentation <i class="fa fa-external-link"></i></a> for more details. ',
+    'asset_id'              => 'Asset ID',
+    'data'               => 'Data',
     'default'               => 'الافتراضي',
     'none'                  => 'لا',
     'google_callback_help' => 'يجب إدخال هذا كعنوان URL لرد الاتصال في إعدادات تطبيق Google OAuth في مؤسستك&apos;s <strong><a href="https://console.cloud.google.com/" target="_blank">Google developer <i class="fa fa-external-link" aria-hidden="true"></i></a></strong>.',
@@ -389,4 +384,17 @@ return [
     'due_checkin_days_help' => 'How many days before the expected checkin of an asset should it be listed in the "Due for checkin" page?',
     'no_groups' => 'No groups have been created yet. Visit <code>Admin Settings > Permission Groups</code> to add one.',
 
+
+    /* Keywords for settings overview help */
+    'keywords' => [
+        'brand'             => 'قدم, الشعار, الطباعة, الموضوع, الجلد , الرأس , الألوان , الألوان',
+        'general_settings'  => 'دعم الشركة، التوقيع، القبول، تنسيق البريد الإلكتروني، تنسيق اسم المستخدم، الصور، لكل صفحة، صورة مصغرة، إيولا، الجاذبية، التصورات، لوحة التحكم، الخصوصية',
+        'groups'            => 'الأذونات، مجموعات الأذونات، تفويض',
+        'labels'            => 'labels, barcodes, barcode, sheets, print, upc, qr, 1d, 2d',
+        'localization'      => 'التعميم، العملة، المحلية المحلية، المحلية والمنطقة الزمنية، المنطقة الزمنية، الدولية، الاستيعاب، اللغة، الترجمة',
+        'php_overview'      => 'phpinfo, النظام, معلومات',
+        'purge'             => 'حذف نهائيًا',
+        'security'          => 'كلمة المرور، كلمة المرور، كلمات المرور، المتطلبات، عاملان، كلمات المرور الشائعة، تسجيل الدخول، المصادقة',
+    ],
+
 ];

resources/lang/ar-SA/admin/settings/message.php

@@ -45,5 +45,6 @@ return [
         'error' => 'حدث خطأ ما. استجاب :app :error_message',
         'error_redirect' => 'خطأ: 301/302 :endpoint يرجع إعادة توجيه. لأسباب أمنية، نحن لا نتابع إعادة التوجيه. الرجاء استخدام نقطة النهاية الفعلية.',
         'error_misc' => 'حدث خطأ ما. :( ',
+        'webhook_fail' => ' webhook notification failed: Check to make sure the URL is still valid.',
     ]
 ];

resources/lang/ar-SA/general.php

@@ -216,6 +216,12 @@ return [
     'no_results'			=> 'لا يوجد نتائج.',
     'no'  					=> 'لا',
     'notes'  				=> 'مُلاحظات',
+    'note_added'            => 'Note Added',
+    'add_note'              => 'Add Note',
+    'note_edited'            => 'Note Edited',
+    'edit_note'              => 'Edit Note',
+    'note_deleted'            => 'Note Deleted',
+    'delete_note'              => 'Delete Note',
     'order_number'          => 'رقم الأمر',
     'only_deleted'          => 'الأصول المحذوفة فقط',
     'page_menu'				=> 'عرض عناصر _MENU_',
@@ -567,5 +573,8 @@ return [
     'import_asset_tag_exists' => 'An asset with the asset tag :asset_tag already exists and an update was not requested. No change was made.',
     'countries_manually_entered_help' => 'Values with an asterisk (*) were manually entered and do not match existing ISO 3166 dropdown values',
     'accessories_assigned' => 'Assigned Accessories',
+    'user_managed_passwords' => 'Password Management',
+    'user_managed_passwords_disallow' => 'Disallow users from managing their own passwords',
+    'user_managed_passwords_allow' => 'Allow users to manage their own passwords',
 
 ];

resources/lang/bg-BG/admin/settings/general.php

@@ -70,7 +70,6 @@ return [
     'footer_text'               => 'Допълнителен текст във футъра',
     'footer_text_help'          => 'Този текст ще се визуализира в дясната част на футъра. Връзки могат да бъдат добавяни с използването на <a href="https://help.github.com/articles/github-flavored-markdown/">Github тип markdown</a>. Нови редове, хедър тагове, изображения и т.н. могат да доведат до непредвидими резултати.',
     'general_settings'			=> 'Общи настройки',
-    'general_settings_keywords' => 'поддръжка, подписи, получаване, формат на е-майл, формат на потребителско име, снимки, страници, иконки, EULA, Gravatar, tos, панели, поверителност',
     'general_settings_help'     => 'Общи условия и други',
     'generate_backup'			=> 'Създаване на архив',
     'google_workspaces'         => 'Google Workspaces',
@@ -154,7 +153,6 @@ return [
     'php'                       => 'PHP версия',
     'php_info'                  => 'PHP info',
     'php_overview'              => 'PHP',
-    'php_overview_keywords'     => 'phpinfo, система, информация',
     'php_overview_help'         => 'PHP Системна информация',
     'php_gd_info'               => 'Необходимо е да инсталирате php-gd, за да визуализирате QR кодове. Моля прегледайте инструкцията за инсталация.',
     'php_gd_warning'            => 'php-gd НЕ е инсталиран.',
@@ -231,7 +229,6 @@ return [
     'update'                    => 'Обновяване на настройките',
     'value'                     => 'Стойност',
     'brand'                     => 'Брандиране',
-    'brand_keywords'            => 'долен колонтитул, лого, печат, тема, скин, горен колонтитул, цветове, css',
     'brand_help'                => 'Лого, Име на сайт',
     'web_brand'                 => 'Тип уеб брандиране',
     'about_settings_title'      => 'Относно настройките',
@@ -319,21 +316,17 @@ return [
     'filter_by_keyword' => 'Филтър по ключова дума',
     'security' => 'Сигурност',
     'security_title' => 'Обнови настройките за сигурност',
-    'security_keywords' => 'парола, парили, изисквания, двустепенна идентификация, двустепенна-идентификация, общи пароли, отдалечен вход, изход, идентификация',
     'security_help' => 'Двустепенна идентификация, ограничения на пароли',
-    'groups_keywords' => 'права за достъп, групи за достъп, упълномощаване',
     'groups_help' => 'Групи с разрешения за акаунт',
     'localization' => 'Локализация',
     'localization_title' => 'Обнови настройките за локализация',
-    'localization_keywords' => 'локализация, валута, местен, място, часова зона, международен, интернационализация, език, езици, превод',
     'localization_help' => 'Език, дата формат',
     'notifications' => 'Известия',
     'notifications_help' => 'Настройки на е-майл известия',
     'asset_tags_help' => 'Автоматично номериране и префикси',
     'labels' => 'Етикети',
     'labels_title' => 'Обнови настройките на етикета',
-    'labels_help' => 'Размер на етикета &amp; настройки',
+    'labels_help' => 'Barcodes &amp; label settings',
-    'purge_keywords' => 'изтриване за постоянно',
     'purge_help' => 'Пречисти изтрити записи',
     'ldap_extension_warning' => 'Изглежда, че нямате инсталирани LDAP разширения или не са пуснати на сървъра. Вие можете все пак да запишите настройките, но ще трябва да включите LDAP разширенията за PHP преди да синхронизирате с LDAP, в противен случай няма да можете да се логнете.',
     'ldap_ad' => 'LDAP/AD',
@@ -362,12 +355,14 @@ return [
     'label2_2d_type'          => '2D тип на баркод',
     'label2_2d_type_help'     => 'Формат на 2D баркод',
     'label2_2d_target'        => '2D баркод адрес',
-    'label2_2d_target_help'   => 'Къде да сочи URL адреса на 2D баркода, когато се сканира',
+    'label2_2d_target_help'   => 'The data that will be contained in the 2D barcode',
     'label2_fields'           => 'Настройки на полета',
     'label2_fields_help'      => 'Полетата могат да бъдат добавяни, премахване и подреждани от лявата колона. За всяко едно поле, множество настройки могат да бъдат добавяни премахвани и подреждани в дясната колона.',
     'help_asterisk_bold'    => 'Текста въведен като <code>**text**</code> ,ще бъде показан удебелено',
     'help_blank_to_use'     => 'Оставете празно за да се ползва стойност от <code>:setting_name</code>',
-    'help_default_will_use' => '<br>Note that the value of the barcodes must comply with the respective barcode spec in order to be successfully generated. Please see <a href="https://snipe-it.readme.io/docs/barcodes">the documentation <i class="fa fa-external-link"></i></a> for more details. ',
+    'help_default_will_use' => '<code>:default</code> will use the value from <code>:setting_name</code>. <br>Note that the value of the barcodes must comply with the respective barcode spec in order to be successfully generated. Please see <a href="https://snipe-it.readme.io/docs/barcodes">the documentation <i class="fa fa-external-link"></i></a> for more details. ',
+    'asset_id'              => 'Asset ID',
+    'data'               => 'Data',
     'default'               => 'Подразбиране',
     'none'                  => 'Няма',
     'google_callback_help' => 'Това трябва да се въведе като callback URL във вашият Google OAuth настройки за вашата организация &apos;s <strong><a href="https://console.cloud.google.com/" target="_blank">Google developer console <i class="fa fa-external-link" aria-hidden="true"></i></a></strong>.',
@@ -389,4 +384,17 @@ return [
     'due_checkin_days_help' => 'How many days before the expected checkin of an asset should it be listed in the "Due for checkin" page?',
     'no_groups' => 'No groups have been created yet. Visit <code>Admin Settings > Permission Groups</code> to add one.',
 
+
+    /* Keywords for settings overview help */
+    'keywords' => [
+        'brand'             => 'долен колонтитул, лого, печат, тема, скин, горен колонтитул, цветове, css',
+        'general_settings'  => 'поддръжка, подписи, получаване, формат на е-майл, формат на потребителско име, снимки, страници, иконки, EULA, Gravatar, tos, панели, поверителност',
+        'groups'            => 'права за достъп, групи за достъп, упълномощаване',
+        'labels'            => 'labels, barcodes, barcode, sheets, print, upc, qr, 1d, 2d',
+        'localization'      => 'локализация, валута, местен, място, часова зона, международен, интернационализация, език, езици, превод',
+        'php_overview'      => 'phpinfo, система, информация',
+        'purge'             => 'изтриване за постоянно',
+        'security'          => 'парола, парили, изисквания, двустепенна идентификация, двустепенна-идентификация, общи пароли, отдалечен вход, изход, идентификация',
+    ],
+
 ];

resources/lang/bg-BG/admin/settings/message.php

@@ -45,5 +45,6 @@ return [
         'error' => 'Възникна грешка. :app върна грешка: :error_message',
         'error_redirect' => 'Грешка 301/302 :endpoint върна пренасочване. От съображения за сигурност, ние не отваряме пренасочванията. Моля ползвайте действителната крайна точка.',
         'error_misc' => 'Възникна грешка. :( ',
+        'webhook_fail' => ' webhook notification failed: Check to make sure the URL is still valid.',
     ]
 ];

resources/lang/bg-BG/general.php

@@ -216,6 +216,12 @@ return [
     'no_results'			=> 'Няма резултат.',
     'no'  					=> 'Не',
     'notes'  				=> 'Бележки',
+    'note_added'            => 'Note Added',
+    'add_note'              => 'Add Note',
+    'note_edited'            => 'Note Edited',
+    'edit_note'              => 'Edit Note',
+    'note_deleted'            => 'Note Deleted',
+    'delete_note'              => 'Delete Note',
     'order_number'          => 'Номер на поръчка',
     'only_deleted'          => 'Само изтрити активи',
     'page_menu'				=> 'Показване на _MENU_ записа',
@@ -567,5 +573,8 @@ return [
     'import_asset_tag_exists' => 'An asset with the asset tag :asset_tag already exists and an update was not requested. No change was made.',
     'countries_manually_entered_help' => 'Values with an asterisk (*) were manually entered and do not match existing ISO 3166 dropdown values',
     'accessories_assigned' => 'Assigned Accessories',
+    'user_managed_passwords' => 'Password Management',
+    'user_managed_passwords_disallow' => 'Disallow users from managing their own passwords',
+    'user_managed_passwords_allow' => 'Allow users to manage their own passwords',
 
 ];

resources/lang/ca-ES/admin/settings/general.php

@@ -70,7 +70,6 @@ return [
     'footer_text'               => 'Additional Footer Text ',
     'footer_text_help'          => 'This text will appear in the right-side footer. Links are allowed using <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>. Line breaks, headers, images, etc may result in unpredictable results.',
     'general_settings'			=> 'General Settings',
-    'general_settings_keywords' => 'company support, signature, acceptance, email format, username format, images, per page, thumbnail, eula, gravatar, tos, dashboard, privacy',
     'general_settings_help'     => 'Default EULA and more',
     'generate_backup'			=> 'Generate Backup',
     'google_workspaces'         => 'Google Workspaces',
@@ -154,7 +153,6 @@ return [
     'php'                       => 'PHP Version',
     'php_info'                  => 'PHP info',
     'php_overview'              => 'PHP',
-    'php_overview_keywords'     => 'phpinfo, system, info',
     'php_overview_help'         => 'PHP System info',
     'php_gd_info'               => 'You must install php-gd to display QR codes, see install instructions.',
     'php_gd_warning'            => 'PHP Image Processing and GD plugin is NOT installed.',
@@ -231,7 +229,6 @@ return [
     'update'                    => 'Update Settings',
     'value'                     => 'Value',
     'brand'                     => 'Branding',
-    'brand_keywords'            => 'footer, logo, print, theme, skin, header, colors, color, css',
     'brand_help'                => 'Logo, Site Name',
     'web_brand'                 => 'Web Branding Type',
     'about_settings_title'      => 'About Settings',
@@ -319,21 +316,17 @@ return [
     'filter_by_keyword' => 'Filter by setting keyword',
     'security' => 'Security',
     'security_title' => 'Update Security Settings',
-    'security_keywords' => 'password, passwords, requirements, two factor, two-factor, common passwords, remote login, logout, authentication',
     'security_help' => 'Two-factor, Password Restrictions',
-    'groups_keywords' => 'permissions, permission groups, authorization',
     'groups_help' => 'Account permission groups',
     'localization' => 'Localization',
     'localization_title' => 'Update Localization Settings',
-    'localization_keywords' => 'localization, currency, local, locale, time zone, timezone, international, internatinalization, language, languages, translation',
     'localization_help' => 'Language, date display',
     'notifications' => 'Notifications',
     'notifications_help' => 'Email Alerts & Audit Settings',
     'asset_tags_help' => 'Incrementing and prefixes',
     'labels' => 'Labels',
     'labels_title' => 'Update Label Settings',
-    'labels_help' => 'Label sizes &amp; settings',
+    'labels_help' => 'Barcodes &amp; label settings',
-    'purge_keywords' => 'permanently delete',
     'purge_help' => 'Purge Deleted Records',
     'ldap_extension_warning' => 'It does not look like the LDAP extension is installed or enabled on this server. You can still save your settings, but you will need to enable the LDAP extension for PHP before LDAP syncing or login will work.',
     'ldap_ad' => 'LDAP/AD',
@@ -362,12 +355,14 @@ return [
     'label2_2d_type'          => '2D Barcode Type',
     'label2_2d_type_help'     => 'Format for 2D barcodes',
     'label2_2d_target'        => '2D Barcode Target',
-    'label2_2d_target_help'   => 'The URL the 2D barcode points to when scanned',
+    'label2_2d_target_help'   => 'The data that will be contained in the 2D barcode',
     'label2_fields'           => 'Field Definitions',
     'label2_fields_help'      => 'Fields can be added, removed, and reordered in the left column. For each field, multiple options for Label and DataSource can be added, removed, and reordered in the right column.',
     'help_asterisk_bold'    => 'Text entered as <code>**text**</code> will be displayed as bold',
     'help_blank_to_use'     => 'Leave blank to use the value from <code>:setting_name</code>',
-    'help_default_will_use' => '<br>Note that the value of the barcodes must comply with the respective barcode spec in order to be successfully generated. Please see <a href="https://snipe-it.readme.io/docs/barcodes">the documentation <i class="fa fa-external-link"></i></a> for more details. ',
+    'help_default_will_use' => '<code>:default</code> will use the value from <code>:setting_name</code>. <br>Note that the value of the barcodes must comply with the respective barcode spec in order to be successfully generated. Please see <a href="https://snipe-it.readme.io/docs/barcodes">the documentation <i class="fa fa-external-link"></i></a> for more details. ',
+    'asset_id'              => 'Asset ID',
+    'data'               => 'Data',
     'default'               => 'Default',
     'none'                  => 'None',
     'google_callback_help' => 'This should be entered as the callback URL in your Google OAuth app settings in your organization&apos;s <strong><a href="https://console.cloud.google.com/" target="_blank">Google developer console <i class="fa fa-external-link" aria-hidden="true"></i></a></strong>.',
@@ -389,4 +384,17 @@ return [
     'due_checkin_days_help' => 'How many days before the expected checkin of an asset should it be listed in the "Due for checkin" page?',
     'no_groups' => 'No groups have been created yet. Visit <code>Admin Settings > Permission Groups</code> to add one.',
 
+
+    /* Keywords for settings overview help */
+    'keywords' => [
+        'brand'             => 'footer, logo, print, theme, skin, header, colors, color, css',
+        'general_settings'  => 'company support, signature, acceptance, email format, username format, images, per page, thumbnail, eula, gravatar, tos, dashboard, privacy',
+        'groups'            => 'permissions, permission groups, authorization',
+        'labels'            => 'labels, barcodes, barcode, sheets, print, upc, qr, 1d, 2d',
+        'localization'      => 'localization, currency, local, locale, time zone, timezone, international, internatinalization, language, languages, translation',
+        'php_overview'      => 'phpinfo, system, info',
+        'purge'             => 'permanently delete',
+        'security'          => 'password, passwords, requirements, two factor, two-factor, common passwords, remote login, logout, authentication',
+    ],
+
 ];

resources/lang/ca-ES/admin/settings/message.php

@@ -45,5 +45,6 @@ return [
         'error' => 'Something went wrong. :app responded with: :error_message',
         'error_redirect' => 'ERROR: 301/302 :endpoint returns a redirect. For security reasons, we don’t follow redirects. Please use the actual endpoint.',
         'error_misc' => 'Something went wrong. :( ',
+        'webhook_fail' => ' webhook notification failed: Check to make sure the URL is still valid.',
     ]
 ];

resources/lang/ca-ES/general.php

@@ -216,6 +216,12 @@ return [
     'no_results'			=> 'No Results.',
     'no'  					=> 'No',
     'notes'  				=> 'Notes',
+    'note_added'            => 'Note Added',
+    'add_note'              => 'Add Note',
+    'note_edited'            => 'Note Edited',
+    'edit_note'              => 'Edit Note',
+    'note_deleted'            => 'Note Deleted',
+    'delete_note'              => 'Delete Note',
     'order_number'          => 'Order Number',
     'only_deleted'          => 'Only Deleted Assets',
     'page_menu'				=> 'Showing _MENU_ items',
@@ -567,5 +573,8 @@ return [
     'import_asset_tag_exists' => 'An asset with the asset tag :asset_tag already exists and an update was not requested. No change was made.',
     'countries_manually_entered_help' => 'Values with an asterisk (*) were manually entered and do not match existing ISO 3166 dropdown values',
     'accessories_assigned' => 'Assigned Accessories',
+    'user_managed_passwords' => 'Password Management',
+    'user_managed_passwords_disallow' => 'Disallow users from managing their own passwords',
+    'user_managed_passwords_allow' => 'Allow users to manage their own passwords',
 
 ];

resources/lang/chr-US/admin/settings/general.php

@@ -70,7 +70,6 @@ return [
     'footer_text'               => 'Additional Footer Text ',
     'footer_text_help'          => 'This text will appear in the right-side footer. Links are allowed using <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>. Line breaks, headers, images, etc may result in unpredictable results.',
     'general_settings'			=> 'General Settings',
-    'general_settings_keywords' => 'company support, signature, acceptance, email format, username format, images, per page, thumbnail, eula, gravatar, tos, dashboard, privacy',
     'general_settings_help'     => 'Default EULA and more',
     'generate_backup'			=> 'Generate Backup',
     'google_workspaces'         => 'Google Workspaces',
@@ -154,7 +153,6 @@ return [
     'php'                       => 'PHP Version',
     'php_info'                  => 'PHP info',
     'php_overview'              => 'PHP',
-    'php_overview_keywords'     => 'phpinfo, system, info',
     'php_overview_help'         => 'PHP System info',
     'php_gd_info'               => 'You must install php-gd to display QR codes, see install instructions.',
     'php_gd_warning'            => 'PHP Image Processing and GD plugin is NOT installed.',
@@ -231,7 +229,6 @@ return [
     'update'                    => 'Update Settings',
     'value'                     => 'Value',
     'brand'                     => 'Branding',
-    'brand_keywords'            => 'footer, logo, print, theme, skin, header, colors, color, css',
     'brand_help'                => 'Logo, Site Name',
     'web_brand'                 => 'Web Branding Type',
     'about_settings_title'      => 'About Settings',
@@ -319,21 +316,17 @@ return [
     'filter_by_keyword' => 'Filter by setting keyword',
     'security' => 'Security',
     'security_title' => 'Update Security Settings',
-    'security_keywords' => 'password, passwords, requirements, two factor, two-factor, common passwords, remote login, logout, authentication',
     'security_help' => 'Two-factor, Password Restrictions',
-    'groups_keywords' => 'permissions, permission groups, authorization',
     'groups_help' => 'Account permission groups',
     'localization' => 'Localization',
     'localization_title' => 'Update Localization Settings',
-    'localization_keywords' => 'localization, currency, local, locale, time zone, timezone, international, internatinalization, language, languages, translation',
     'localization_help' => 'Language, date display',
     'notifications' => 'Notifications',
     'notifications_help' => 'Email Alerts & Audit Settings',
     'asset_tags_help' => 'Incrementing and prefixes',
     'labels' => 'Labels',
     'labels_title' => 'Update Label Settings',
-    'labels_help' => 'Label sizes &amp; settings',
+    'labels_help' => 'Barcodes &amp; label settings',
-    'purge_keywords' => 'permanently delete',
     'purge_help' => 'Purge Deleted Records',
     'ldap_extension_warning' => 'It does not look like the LDAP extension is installed or enabled on this server. You can still save your settings, but you will need to enable the LDAP extension for PHP before LDAP syncing or login will work.',
     'ldap_ad' => 'LDAP/AD',
@@ -362,12 +355,14 @@ return [
     'label2_2d_type'          => '2D Barcode Type',
     'label2_2d_type_help'     => 'Format for 2D barcodes',
     'label2_2d_target'        => '2D Barcode Target',
-    'label2_2d_target_help'   => 'The URL the 2D barcode points to when scanned',
+    'label2_2d_target_help'   => 'The data that will be contained in the 2D barcode',
     'label2_fields'           => 'Field Definitions',
     'label2_fields_help'      => 'Fields can be added, removed, and reordered in the left column. For each field, multiple options for Label and DataSource can be added, removed, and reordered in the right column.',
     'help_asterisk_bold'    => 'Text entered as <code>**text**</code> will be displayed as bold',
     'help_blank_to_use'     => 'Leave blank to use the value from <code>:setting_name</code>',
-    'help_default_will_use' => '<br>Note that the value of the barcodes must comply with the respective barcode spec in order to be successfully generated. Please see <a href="https://snipe-it.readme.io/docs/barcodes">the documentation <i class="fa fa-external-link"></i></a> for more details. ',
+    'help_default_will_use' => '<code>:default</code> will use the value from <code>:setting_name</code>. <br>Note that the value of the barcodes must comply with the respective barcode spec in order to be successfully generated. Please see <a href="https://snipe-it.readme.io/docs/barcodes">the documentation <i class="fa fa-external-link"></i></a> for more details. ',
+    'asset_id'              => 'Asset ID',
+    'data'               => 'Data',
     'default'               => 'Default',
     'none'                  => 'None',
     'google_callback_help' => 'This should be entered as the callback URL in your Google OAuth app settings in your organization&apos;s <strong><a href="https://console.cloud.google.com/" target="_blank">Google developer console <i class="fa fa-external-link" aria-hidden="true"></i></a></strong>.',
@@ -389,4 +384,17 @@ return [
     'due_checkin_days_help' => 'How many days before the expected checkin of an asset should it be listed in the "Due for checkin" page?',
     'no_groups' => 'No groups have been created yet. Visit <code>Admin Settings > Permission Groups</code> to add one.',
 
+
+    /* Keywords for settings overview help */
+    'keywords' => [
+        'brand'             => 'footer, logo, print, theme, skin, header, colors, color, css',
+        'general_settings'  => 'company support, signature, acceptance, email format, username format, images, per page, thumbnail, eula, gravatar, tos, dashboard, privacy',
+        'groups'            => 'permissions, permission groups, authorization',
+        'labels'            => 'labels, barcodes, barcode, sheets, print, upc, qr, 1d, 2d',
+        'localization'      => 'localization, currency, local, locale, time zone, timezone, international, internatinalization, language, languages, translation',
+        'php_overview'      => 'phpinfo, system, info',
+        'purge'             => 'permanently delete',
+        'security'          => 'password, passwords, requirements, two factor, two-factor, common passwords, remote login, logout, authentication',
+    ],
+
 ];

resources/lang/chr-US/admin/settings/message.php

@@ -45,5 +45,6 @@ return [
         'error' => 'Something went wrong. :app responded with: :error_message',
         'error_redirect' => 'ERROR: 301/302 :endpoint returns a redirect. For security reasons, we don’t follow redirects. Please use the actual endpoint.',
         'error_misc' => 'Something went wrong. :( ',
+        'webhook_fail' => ' webhook notification failed: Check to make sure the URL is still valid.',
     ]
 ];

resources/lang/chr-US/general.php

@@ -216,6 +216,12 @@ return [
     'no_results'			=> 'No Results.',
     'no'  					=> 'No',
     'notes'  				=> 'Notes',
+    'note_added'            => 'Note Added',
+    'add_note'              => 'Add Note',
+    'note_edited'            => 'Note Edited',
+    'edit_note'              => 'Edit Note',
+    'note_deleted'            => 'Note Deleted',
+    'delete_note'              => 'Delete Note',
     'order_number'          => 'Order Number',
     'only_deleted'          => 'Only Deleted Assets',
     'page_menu'				=> 'Showing _MENU_ items',
@@ -567,5 +573,8 @@ return [
     'import_asset_tag_exists' => 'An asset with the asset tag :asset_tag already exists and an update was not requested. No change was made.',
     'countries_manually_entered_help' => 'Values with an asterisk (*) were manually entered and do not match existing ISO 3166 dropdown values',
     'accessories_assigned' => 'Assigned Accessories',
+    'user_managed_passwords' => 'Password Management',
+    'user_managed_passwords_disallow' => 'Disallow users from managing their own passwords',
+    'user_managed_passwords_allow' => 'Allow users to manage their own passwords',
 
 ];

resources/lang/cs-CZ/admin/settings/general.php

@@ -70,7 +70,6 @@ return [
     'footer_text'               => 'Další text do zápatí ',
     'footer_text_help'          => 'Tento text se zobrazí v pravém zápatí. Odkazy jsou povoleny pomocí <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>. Zalamování řádků, záhlaví, obrázky atd. mohou mít za následek nepředvídatelné výsledky.',
     'general_settings'			=> 'Obecné nastavení',
-    'general_settings_keywords' => 'podpora společnosti, podpis, přijetí, e-mailový formát, formát uživatelského jména, obrázky, na stránku, náhled, eula, gravatar, toky, nástěnka, soukromí',
     'general_settings_help'     => 'Výchozí EULA a další',
     'generate_backup'			=> 'Vytvořit zálohu',
     'google_workspaces'         => 'Pracovní prostory Google',
@@ -154,7 +153,6 @@ return [
     'php'                       => 'Verze PHP',
     'php_info'                  => 'PHP info',
     'php_overview'              => 'PHP',
-    'php_overview_keywords'     => 'phpinfo, systém, info',
     'php_overview_help'         => 'PHP System info',
     'php_gd_info'               => 'Je nutné nainstalovat php-gd pro zobrazení QR kódů. Více v instalační příručce.',
     'php_gd_warning'            => 'PHP pluginy pro zpracování obrazu a GD nejsou nainstalovány.',
@@ -231,7 +229,6 @@ return [
     'update'                    => 'Upravit nastavení',
     'value'                     => 'Hodnota',
     'brand'                     => 'Opatřit značkou',
-    'brand_keywords'            => 'zápatí, logo, tisk, motiv, skin, záhlaví, barvy, css',
     'brand_help'                => 'Logo, název webu',
     'web_brand'                 => 'Typ webového brandingu',
     'about_settings_title'      => 'O nastavení',
@@ -319,21 +316,17 @@ return [
     'filter_by_keyword' => 'Filtrovat podle klíčového slova',
     'security' => 'Zabezpečení',
     'security_title' => 'Aktualizovat nastavení zabezpečení',
-    'security_keywords' => 'heslo, hesla, požadavky, dvou fázové, dvou-fázové, běžná hesla, vzdálené přihlášení, odhlášení, autentifikace',
     'security_help' => 'Dvou-faktorové, Omezení hesel',
-    'groups_keywords' => 'oprávnění, skupiny oprávnění, autorizace',
     'groups_help' => 'Skupiny oprávnění k účtu',
     'localization' => 'Lokalizace',
     'localization_title' => 'Aktualizovat nastavení lokalizace',
-    'localization_keywords' => 'lokalizace, měna, místní, místní, časové pásmo, mezinárodní, internatinalizace, jazyk, jazyky, překlad',
     'localization_help' => 'Jazyk, zobrazení data',
     'notifications' => 'Oznámení',
     'notifications_help' => 'E-mailová oznámení a inventura',
     'asset_tags_help' => 'Nárůst a prefixy',
     'labels' => 'Štítky',
     'labels_title' => 'Upravit nastavení štítků',
-    'labels_help' => 'Velikost štítků &amp; nastavení',
+    'labels_help' => 'Barcodes &amp; label settings',
-    'purge_keywords' => 'trvale odstranit',
     'purge_help' => 'Vymazat smazané záznamy',
     'ldap_extension_warning' => 'Nevypadá to, že LDAP rozšíření je nainstalováno nebo povoleno na tomto serveru. Stále můžete uložit vaše nastavení, ale budete muset povolit LDAP rozšíření pro PHP, než bude fungovat LDAP synchronizace nebo přihlášení.',
     'ldap_ad' => 'LDAP/AD',
@@ -362,12 +355,14 @@ return [
     'label2_2d_type'          => 'Typ 2D čárového kódu',
     'label2_2d_type_help'     => 'Formát pro 2D čárové kódy',
     'label2_2d_target'        => 'Cíl 2D čárového kódu',
-    'label2_2d_target_help'   => 'Adresa URL 2D čárového kódu při naskenování',
+    'label2_2d_target_help'   => 'The data that will be contained in the 2D barcode',
     'label2_fields'           => 'Definice polí',
     'label2_fields_help'      => 'Pole lze přidat, odstranit a seřadit v levém sloupci. Pro každé pole lze přidat více možností pro popisek a DataSource a odstranit a přeřadit je v pravém sloupci.',
     'help_asterisk_bold'    => 'Text zadaný jako <code>**text**</code> bude zobrazen tučně',
     'help_blank_to_use'     => 'Ponechte prázdné pro použití hodnoty z <code>:setting_name</code>',
-    'help_default_will_use' => '<br>Note that the value of the barcodes must comply with the respective barcode spec in order to be successfully generated. Please see <a href="https://snipe-it.readme.io/docs/barcodes">the documentation <i class="fa fa-external-link"></i></a> for more details. ',
+    'help_default_will_use' => '<code>:default</code> will use the value from <code>:setting_name</code>. <br>Note that the value of the barcodes must comply with the respective barcode spec in order to be successfully generated. Please see <a href="https://snipe-it.readme.io/docs/barcodes">the documentation <i class="fa fa-external-link"></i></a> for more details. ',
+    'asset_id'              => 'Asset ID',
+    'data'               => 'Data',
     'default'               => 'Výchozí',
     'none'                  => 'Nic',
     'google_callback_help' => 'Toto by mělo být zadáno jako URL zpětného volání v nastavení aplikace Google OAuth ve vaší organizaci&apos;s <strong><a href="https://console.cloud.google.com/" target="_blank">vývojová konzole Google <i class="fa fa-external-link" aria-hidden="true"></i></a></strong>.',
@@ -389,4 +384,17 @@ return [
     'due_checkin_days_help' => 'How many days before the expected checkin of an asset should it be listed in the "Due for checkin" page?',
     'no_groups' => 'No groups have been created yet. Visit <code>Admin Settings > Permission Groups</code> to add one.',
 
+
+    /* Keywords for settings overview help */
+    'keywords' => [
+        'brand'             => 'zápatí, logo, tisk, motiv, skin, záhlaví, barvy, css',
+        'general_settings'  => 'podpora společnosti, podpis, přijetí, e-mailový formát, formát uživatelského jména, obrázky, na stránku, náhled, eula, gravatar, toky, nástěnka, soukromí',
+        'groups'            => 'oprávnění, skupiny oprávnění, autorizace',
+        'labels'            => 'labels, barcodes, barcode, sheets, print, upc, qr, 1d, 2d',
+        'localization'      => 'lokalizace, měna, místní, místní, časové pásmo, mezinárodní, internatinalizace, jazyk, jazyky, překlad',
+        'php_overview'      => 'phpinfo, systém, info',
+        'purge'             => 'trvale odstranit',
+        'security'          => 'heslo, hesla, požadavky, dvou fázové, dvou-fázové, běžná hesla, vzdálené přihlášení, odhlášení, autentifikace',
+    ],
+
 ];

resources/lang/cs-CZ/admin/settings/message.php

@@ -45,5 +45,6 @@ return [
         'error' => 'Něco se pokazilo. :app odpověděla v: :error_message',
         'error_redirect' => 'CHYBA: 301/302 :endpoint vrací přesměrování. Z bezpečnostních důvodů nesledujeme přesměrování. Použijte prosím skutečný koncový bod.',
         'error_misc' => 'Něco se nepovedlo.',
+        'webhook_fail' => ' webhook notification failed: Check to make sure the URL is still valid.',
     ]
 ];

resources/lang/cs-CZ/general.php

@@ -216,6 +216,12 @@ return [
     'no_results'			=> 'Žádné výsledky.',
     'no'  					=> 'Ne',
     'notes'  				=> 'Poznámky',
+    'note_added'            => 'Note Added',
+    'add_note'              => 'Add Note',
+    'note_edited'            => 'Note Edited',
+    'edit_note'              => 'Edit Note',
+    'note_deleted'            => 'Note Deleted',
+    'delete_note'              => 'Delete Note',
     'order_number'          => 'Číslo objednávky',
     'only_deleted'          => 'Pouze odstraněné položky',
     'page_menu'				=> 'Zobrazuji _MENU_ položky',
@@ -567,5 +573,8 @@ return [
     'import_asset_tag_exists' => 'An asset with the asset tag :asset_tag already exists and an update was not requested. No change was made.',
     'countries_manually_entered_help' => 'Values with an asterisk (*) were manually entered and do not match existing ISO 3166 dropdown values',
     'accessories_assigned' => 'Assigned Accessories',
+    'user_managed_passwords' => 'Password Management',
+    'user_managed_passwords_disallow' => 'Disallow users from managing their own passwords',
+    'user_managed_passwords_allow' => 'Allow users to manage their own passwords',
 
 ];

resources/lang/cy-GB/admin/settings/general.php

@@ -70,7 +70,6 @@ return [
     'footer_text'               => 'Testun Troedyn Ychwanegol ',
     'footer_text_help'          => 'Dangosir y text yma ir ochor dde yn y troedyn. Mae lincs yn dderbyniol gan defnyddio <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>. Line breaks, headers, images, etc may result in unpredictable results.',
     'general_settings'			=> 'Gosodiadau Cyffredinol',
-    'general_settings_keywords' => 'company support, signature, acceptance, email format, username format, images, per page, thumbnail, eula, gravatar, tos, dashboard, privacy',
     'general_settings_help'     => 'Default EULA and more',
     'generate_backup'			=> 'Creu copi-wrth-gefn',
     'google_workspaces'         => 'Google Workspaces',
@@ -154,7 +153,6 @@ return [
     'php'                       => 'Fersiwn PHP',
     'php_info'                  => 'PHP info',
     'php_overview'              => 'PHP',
-    'php_overview_keywords'     => 'phpinfo, system, info',
     'php_overview_help'         => 'PHP System info',
     'php_gd_info'               => 'Rhaid gossod php-gd i weld codau QR, gweler y canllaawiau gosod.',
     'php_gd_warning'            => 'NID yw PHP IMage Processing a\'r plugin GD wedi osod.',
@@ -231,7 +229,6 @@ return [
     'update'                    => 'Diweddaru Gosodiadau',
     'value'                     => 'Gwerth',
     'brand'                     => 'Brandio',
-    'brand_keywords'            => 'footer, logo, print, theme, skin, header, colors, color, css',
     'brand_help'                => 'Logo, Enw\'r Wefan',
     'web_brand'                 => 'Web Branding Type',
     'about_settings_title'      => 'Amdan Gosodiadau',
@@ -319,21 +316,17 @@ return [
     'filter_by_keyword' => 'Filter by setting keyword',
     'security' => 'Diogelwch',
     'security_title' => 'Update Security Settings',
-    'security_keywords' => 'password, passwords, requirements, two factor, two-factor, common passwords, remote login, logout, authentication',
     'security_help' => 'Two-factor, Password Restrictions',
-    'groups_keywords' => 'permissions, permission groups, authorization',
     'groups_help' => 'Account permission groups',
     'localization' => 'Localization',
     'localization_title' => 'Update Localization Settings',
-    'localization_keywords' => 'localization, currency, local, locale, time zone, timezone, international, internatinalization, language, languages, translation',
     'localization_help' => 'Language, date display',
     'notifications' => 'Notifications',
     'notifications_help' => 'Email Alerts & Audit Settings',
     'asset_tags_help' => 'Incrementing and prefixes',
     'labels' => 'Labelau',
     'labels_title' => 'Update Label Settings',
-    'labels_help' => 'Label sizes &amp; settings',
+    'labels_help' => 'Barcodes &amp; label settings',
-    'purge_keywords' => 'permanently delete',
     'purge_help' => 'Clirio cofnodion sydd wedi\'i dileu',
     'ldap_extension_warning' => 'It does not look like the LDAP extension is installed or enabled on this server. You can still save your settings, but you will need to enable the LDAP extension for PHP before LDAP syncing or login will work.',
     'ldap_ad' => 'LDAP/AD',
@@ -362,12 +355,14 @@ return [
     'label2_2d_type'          => 'Math Barcode 2D',
     'label2_2d_type_help'     => 'Format for 2D barcodes',
     'label2_2d_target'        => '2D Barcode Target',
-    'label2_2d_target_help'   => 'The URL the 2D barcode points to when scanned',
+    'label2_2d_target_help'   => 'The data that will be contained in the 2D barcode',
     'label2_fields'           => 'Field Definitions',
     'label2_fields_help'      => 'Fields can be added, removed, and reordered in the left column. For each field, multiple options for Label and DataSource can be added, removed, and reordered in the right column.',
     'help_asterisk_bold'    => 'Text entered as <code>**text**</code> will be displayed as bold',
     'help_blank_to_use'     => 'Leave blank to use the value from <code>:setting_name</code>',
-    'help_default_will_use' => '<br>Note that the value of the barcodes must comply with the respective barcode spec in order to be successfully generated. Please see <a href="https://snipe-it.readme.io/docs/barcodes">the documentation <i class="fa fa-external-link"></i></a> for more details. ',
+    'help_default_will_use' => '<code>:default</code> will use the value from <code>:setting_name</code>. <br>Note that the value of the barcodes must comply with the respective barcode spec in order to be successfully generated. Please see <a href="https://snipe-it.readme.io/docs/barcodes">the documentation <i class="fa fa-external-link"></i></a> for more details. ',
+    'asset_id'              => 'Asset ID',
+    'data'               => 'Data',
     'default'               => 'Default',
     'none'                  => 'None',
     'google_callback_help' => 'This should be entered as the callback URL in your Google OAuth app settings in your organization&apos;s <strong><a href="https://console.cloud.google.com/" target="_blank">Google developer console <i class="fa fa-external-link" aria-hidden="true"></i></a></strong>.',
@@ -389,4 +384,17 @@ return [
     'due_checkin_days_help' => 'How many days before the expected checkin of an asset should it be listed in the "Due for checkin" page?',
     'no_groups' => 'No groups have been created yet. Visit <code>Admin Settings > Permission Groups</code> to add one.',
 
+
+    /* Keywords for settings overview help */
+    'keywords' => [
+        'brand'             => 'footer, logo, print, theme, skin, header, colors, color, css',
+        'general_settings'  => 'company support, signature, acceptance, email format, username format, images, per page, thumbnail, eula, gravatar, tos, dashboard, privacy',
+        'groups'            => 'permissions, permission groups, authorization',
+        'labels'            => 'labels, barcodes, barcode, sheets, print, upc, qr, 1d, 2d',
+        'localization'      => 'localization, currency, local, locale, time zone, timezone, international, internatinalization, language, languages, translation',
+        'php_overview'      => 'phpinfo, system, info',
+        'purge'             => 'permanently delete',
+        'security'          => 'password, passwords, requirements, two factor, two-factor, common passwords, remote login, logout, authentication',
+    ],
+
 ];

resources/lang/cy-GB/admin/settings/message.php

@@ -45,5 +45,6 @@ return [
         'error' => 'Something went wrong. :app responded with: :error_message',
         'error_redirect' => 'ERROR: 301/302 :endpoint returns a redirect. For security reasons, we don’t follow redirects. Please use the actual endpoint.',
         'error_misc' => 'Something went wrong. :( ',
+        'webhook_fail' => ' webhook notification failed: Check to make sure the URL is still valid.',
     ]
 ];

resources/lang/cy-GB/general.php

@@ -216,6 +216,12 @@ return [
     'no_results'			=> 'Dim canlyniadau.',
     'no'  					=> 'Na',
     'notes'  				=> 'Nodiadau',
+    'note_added'            => 'Note Added',
+    'add_note'              => 'Add Note',
+    'note_edited'            => 'Note Edited',
+    'edit_note'              => 'Edit Note',
+    'note_deleted'            => 'Note Deleted',
+    'delete_note'              => 'Delete Note',
     'order_number'          => 'Rhif Archeb',
     'only_deleted'          => 'Only Deleted Assets',
     'page_menu'				=> 'Showing _MENU_ items',
@@ -567,5 +573,8 @@ return [
     'import_asset_tag_exists' => 'An asset with the asset tag :asset_tag already exists and an update was not requested. No change was made.',
     'countries_manually_entered_help' => 'Values with an asterisk (*) were manually entered and do not match existing ISO 3166 dropdown values',
     'accessories_assigned' => 'Assigned Accessories',
+    'user_managed_passwords' => 'Password Management',
+    'user_managed_passwords_disallow' => 'Disallow users from managing their own passwords',
+    'user_managed_passwords_allow' => 'Allow users to manage their own passwords',
 
 ];

resources/lang/da-DK/admin/settings/general.php

@@ -70,7 +70,6 @@ return [
     'footer_text'               => 'Ekstra footer tekst ',
     'footer_text_help'          => 'Denne tekst vil vises i footeren i højre side. Der kan anvendes links ved hjælp af <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>. Linjeskift, headere, billeder etc. kan føre til uforudsigelige resultater.',
     'general_settings'			=> 'Generelle indstillinger',
-    'general_settings_keywords' => 'firma support, signatur, accept, e-mail format, brugernavn format, billeder, per side, miniaturebillede, eula, gravatar, tos, instrumentbræt, privatliv',
     'general_settings_help'     => 'Standard slutbrugerlicens og mere',
     'generate_backup'			=> 'Generer sikkerhedskopiering',
     'google_workspaces'         => 'Google Workspaces',
@@ -154,7 +153,6 @@ return [
     'php'                       => 'PHP Version',
     'php_info'                  => 'PHP info',
     'php_overview'              => 'PHP',
-    'php_overview_keywords'     => 'phpinfo, system, info',
     'php_overview_help'         => 'Php System info',
     'php_gd_info'               => 'Du skal installere php-gd for at vise QR-koder, se installationsvejledningen.',
     'php_gd_warning'            => 'PHP Image Processing og GD plugin er IKKE installeret.',
@@ -231,7 +229,6 @@ return [
     'update'                    => 'Opdater indstillinger',
     'value'                     => 'Værdi',
     'brand'                     => 'Branding',
-    'brand_keywords'            => 'footer, logo, print, tema, hud, header, farver, farve, css',
     'brand_help'                => 'Logo, Webstedsnavn',
     'web_brand'                 => 'Web Branding Type',
     'about_settings_title'      => 'Om indstillinger',
@@ -319,21 +316,17 @@ return [
     'filter_by_keyword' => 'Filtrer efter indstilling af søgeord',
     'security' => 'Sikkerhed',
     'security_title' => 'Opdater Sikkerhedsindstillinger',
-    'security_keywords' => 'adgangskode, adgangskoder, krav, to faktor, to-faktor, almindelige adgangskoder, fjernlogin, logout, godkendelse',
     'security_help' => 'To-faktor, Adgangskodebegrænsninger',
-    'groups_keywords' => 'tilladelser, tilladelsesgrupper, tilladelse',
     'groups_help' => 'Konto tilladelsesgrupper',
     'localization' => 'Lokalisering',
     'localization_title' => 'Opdater Lokaliseringsindstillinger',
-    'localization_keywords' => 'lokalisering, valuta, lokal, lokal, tidszone, international, internatinalisering, sprog, oversættelse',
     'localization_help' => 'Sprog og datovisning',
     'notifications' => 'Notifikationer',
     'notifications_help' => 'E-Mail Advarsler Og Revisionsindstillinger',
     'asset_tags_help' => 'Stigende og præfikser',
     'labels' => 'Etiketter',
     'labels_title' => 'Opdater Etiketindstillinger',
-    'labels_help' => 'Etiketstørrelser &amp; indstillinger',
+    'labels_help' => 'Barcodes &amp; label settings',
-    'purge_keywords' => 'slet permanent',
     'purge_help' => 'Ryd slettet poster',
     'ldap_extension_warning' => 'Det ser ikke ud som om LDAP- udvidelsen er installeret eller aktiveret på denne server. Du kan stadig gemme dine indstillinger, men du bliver nødt til at aktivere LDAP-udvidelsen til PHP, før LDAP-synkronisering eller login vil virke.',
     'ldap_ad' => 'LDAP/AD',
@@ -362,12 +355,14 @@ return [
     'label2_2d_type'          => '2D stregkode type',
     'label2_2d_type_help'     => 'Format for 2D stregkoder',
     'label2_2d_target'        => '2D Stregkode Mål',
-    'label2_2d_target_help'   => 'URL\'en 2D stregkode peger på, når der scannes',
+    'label2_2d_target_help'   => 'The data that will be contained in the 2D barcode',
     'label2_fields'           => 'Feltdefinitioner',
     'label2_fields_help'      => 'Felter kan tilføjes, fjernes og omordnes i venstre kolonne. For hvert felt kan flere muligheder for Label og DataSource tilføjes, fjernes og omordnet i den rigtige kolonne.',
     'help_asterisk_bold'    => 'Tekst indtastet som <code>**text**</code> vil blive vist som fed',
     'help_blank_to_use'     => 'Efterlad blank for at bruge værdien fra <code>:setting_name</code>',
-    'help_default_will_use' => '<br>Note that the value of the barcodes must comply with the respective barcode spec in order to be successfully generated. Please see <a href="https://snipe-it.readme.io/docs/barcodes">the documentation <i class="fa fa-external-link"></i></a> for more details. ',
+    'help_default_will_use' => '<code>:default</code> will use the value from <code>:setting_name</code>. <br>Note that the value of the barcodes must comply with the respective barcode spec in order to be successfully generated. Please see <a href="https://snipe-it.readme.io/docs/barcodes">the documentation <i class="fa fa-external-link"></i></a> for more details. ',
+    'asset_id'              => 'Asset ID',
+    'data'               => 'Data',
     'default'               => 'Standard',
     'none'                  => 'Ingen',
     'google_callback_help' => 'Dette skal indtastes som callback URL i dine Google OAuth app indstillinger i din organisation&apos;s <strong><a href="https://console.cloud.google.com/" target="_blank">Google udvikler konsol <i class="fa fa-external-link" aria-hidden="true"></i></a></strong>.',
@@ -389,4 +384,17 @@ return [
     'due_checkin_days_help' => 'How many days before the expected checkin of an asset should it be listed in the "Due for checkin" page?',
     'no_groups' => 'No groups have been created yet. Visit <code>Admin Settings > Permission Groups</code> to add one.',
 
+
+    /* Keywords for settings overview help */
+    'keywords' => [
+        'brand'             => 'footer, logo, print, tema, hud, header, farver, farve, css',
+        'general_settings'  => 'firma support, signatur, accept, e-mail format, brugernavn format, billeder, per side, miniaturebillede, eula, gravatar, tos, instrumentbræt, privatliv',
+        'groups'            => 'tilladelser, tilladelsesgrupper, tilladelse',
+        'labels'            => 'labels, barcodes, barcode, sheets, print, upc, qr, 1d, 2d',
+        'localization'      => 'lokalisering, valuta, lokal, lokal, tidszone, international, internatinalisering, sprog, oversættelse',
+        'php_overview'      => 'phpinfo, system, info',
+        'purge'             => 'slet permanent',
+        'security'          => 'adgangskode, adgangskoder, krav, to faktor, to-faktor, almindelige adgangskoder, fjernlogin, logout, godkendelse',
+    ],
+
 ];

resources/lang/da-DK/admin/settings/message.php

@@ -45,5 +45,6 @@ return [
         'error' => 'Noget gik galt. :app svarede med: :error_message',
         'error_redirect' => 'FEJL: 301/302: endpoint returnerer en omdirigering. Af sikkerhedsmæssige årsager følger vi ikke omdirigeringer. Brug det faktiske slutpunkt.',
         'error_misc' => 'Noget gik galt. :( ',
+        'webhook_fail' => ' webhook notification failed: Check to make sure the URL is still valid.',
     ]
 ];

resources/lang/da-DK/general.php

@@ -216,6 +216,12 @@ return [
     'no_results'			=> 'Ingen Resultater.',
     'no'  					=> 'Nej',
     'notes'  				=> 'Noter',
+    'note_added'            => 'Note Added',
+    'add_note'              => 'Add Note',
+    'note_edited'            => 'Note Edited',
+    'edit_note'              => 'Edit Note',
+    'note_deleted'            => 'Note Deleted',
+    'delete_note'              => 'Delete Note',
     'order_number'          => 'Ordrenummer',
     'only_deleted'          => 'Kun slettede aktiver',
     'page_menu'				=> 'Viser _MENU_ emner',
@@ -567,5 +573,8 @@ return [
     'import_asset_tag_exists' => 'An asset with the asset tag :asset_tag already exists and an update was not requested. No change was made.',
     'countries_manually_entered_help' => 'Values with an asterisk (*) were manually entered and do not match existing ISO 3166 dropdown values',
     'accessories_assigned' => 'Assigned Accessories',
+    'user_managed_passwords' => 'Password Management',
+    'user_managed_passwords_disallow' => 'Disallow users from managing their own passwords',
+    'user_managed_passwords_allow' => 'Allow users to manage their own passwords',
 
 ];

resources/lang/de-DE/admin/settings/general.php

@@ -70,7 +70,6 @@ return [
     'footer_text'               => 'Zusätzlicher Fußzeilentext ',
     'footer_text_help'          => 'Dieser Text wird in der rechten Fußzeile angezeigt. Links sind erlaubt mit <a href="https://help.github.com/articles/github-flavored-markdown/">Github Flavored Markdown</a>. Zeilenumbrüche, Kopfzeilen, Bilder usw. können zu unvorhersehbaren Verhalten führen.',
     'general_settings'			=> 'Allgemeine Einstellungen',
-    'general_settings_keywords' => 'Firmenunterstützung, Unterschrift, Akzeptanz, E-Mail-Format, Benutzernamenformat, Bilder, pro Seite, Vorschaubilder, EULA, Gravatar, TOS, Dashboard, Privatsphäre',
     'general_settings_help'     => 'Standard EULA und mehr',
     'generate_backup'			=> 'Backup erstellen',
     'google_workspaces'         => 'Google Workspaces',
@@ -154,7 +153,6 @@ return [
     'php'                       => 'PHP Version',
     'php_info'                  => 'PHP Info',
     'php_overview'              => 'PHP',
-    'php_overview_keywords'     => 'php Info, System, Info',
     'php_overview_help'         => 'PHP-Systeminfo',
     'php_gd_info'               => 'Um QR-Codes anzeigen zu können muss php-gd installiert sein, siehe Installationshinweise.',
     'php_gd_warning'            => 'PHP Image Processing and GD Plugin ist NICHT installiert.',
@@ -231,7 +229,6 @@ return [
     'update'                    => 'Einstellungen übernehmen',
     'value'                     => 'Wert',
     'brand'                     => 'Branding',
-    'brand_keywords'            => 'Fußzeile, Logo, Druck, Theme, Skin, Header, Farben, Farbe, CSS',
     'brand_help'                => 'Logo, Seitenname',
     'web_brand'                 => 'Web Branding Typ',
     'about_settings_title'      => 'Über Einstellungen',
@@ -319,21 +316,17 @@ return [
     'filter_by_keyword' => 'Nach Stichwort filtern',
     'security' => 'Sicherheit',
     'security_title' => 'Sicherheitseinstellungen aktualisieren',
-    'security_keywords' => 'Passwort, Passwörter, Anforderungen, Zwei-Faktor, Zwei-Faktor, übliche Passwörter, Remote-Login, Logout, Authentifizierung',
     'security_help' => 'Zwei-Faktor, Passwort-Einschränkungen',
-    'groups_keywords' => 'Berechtigungen, Berechtigungsgruppen, Autorisierung',
     'groups_help' => 'Account-Berechtigungsgruppen',
     'localization' => 'Lokalisierung',
     'localization_title' => 'Lokalisierungseinstellungen aktualisieren',
-    'localization_keywords' => 'Lokalisierung, Währung, lokal, Lokal, Zeitzone, International, Internationalisierung, Sprache, Sprachen, Übersetzung',
     'localization_help' => 'Sprache, Datumsanzeige',
     'notifications' => 'Benachrichtigungen',
     'notifications_help' => 'E-Mail-Benachrichtigungen & Audit-Einstellungen',
     'asset_tags_help' => 'Inkrementieren und Präfixe',
     'labels' => 'Etiketten',
     'labels_title' => 'Etiketten-Einstellungen aktualisieren',
-    'labels_help' => 'Labelgrößen &amp; Einstellungen',
+    'labels_help' => 'Barcodes &amp; label settings',
-    'purge_keywords' => 'Endgültig löschen',
     'purge_help' => 'Gelöschte Einträge bereinigen',
     'ldap_extension_warning' => 'Es sieht nicht so aus, als ob die LDAP-Erweiterung auf diesem Server installiert oder aktiviert ist. Sie können Ihre Einstellungen trotzdem speichern, aber Sie müssen die LDAP-Erweiterung für PHP aktivieren, bevor die LDAP-Synchronisierung oder der Login funktioniert.',
     'ldap_ad' => 'LDAP/AD',
@@ -362,12 +355,14 @@ return [
     'label2_2d_type'          => '2D Barcode Typ',
     'label2_2d_type_help'     => 'Format für 2D Barcodes',
     'label2_2d_target'        => '2D Barcode Ausgabe',
-    'label2_2d_target_help'   => 'Die URL, auf die der 2D Barcode beim Scannen verweist',
+    'label2_2d_target_help'   => 'Die Daten, die im 2D Barcode enthalten sein werden',
     'label2_fields'           => 'Felddefinitionen',
     'label2_fields_help'      => 'Felder können in der linken Spalte hinzugefügt, entfernt und neu sortiert werden. In jedem Feld können mehrere Optionen für Label und Datenquelle in der rechten Spalte hinzugefügt, entfernt und neu angeordnet werden.',
     'help_asterisk_bold'    => 'Der eingegebene Text <code>**text**</code> wird in Fettschrift angezeigt',
     'help_blank_to_use'     => 'Leer lassen, um den Wert von <code>:setting_name</code> zu verwenden',
-    'help_default_will_use' => '<br>Note that the value of the barcodes must comply with the respective barcode spec in order to be successfully generated. Please see <a href="https://snipe-it.readme.io/docs/barcodes">the documentation <i class="fa fa-external-link"></i></a> for more details. ',
+    'help_default_will_use' => '<code>:default</code> will use the value from <code>:setting_name</code>. <br>Note that the value of the barcodes must comply with the respective barcode spec in order to be successfully generated. Please see <a href="https://snipe-it.readme.io/docs/barcodes">the documentation <i class="fa fa-external-link"></i></a> for more details. ',
+    'asset_id'              => 'Asset ID',
+    'data'               => 'Data',
     'default'               => 'Standard',
     'none'                  => 'Nichts',
     'google_callback_help' => 'Dies sollte als Callback-URL in den Google OAuth App-Einstellungen in deinem Unternehmen eingegeben werden&apos;s <strong><a href="https://console.cloud.google.com/" target="_blank">Google Developer Konsole <i class="fa fa-external-link" aria-hidden="true"></i></a></strong>.',
@@ -389,4 +384,17 @@ return [
     'due_checkin_days_help' => 'Wie viele Tage vor dem voraussichtlichen Check-in eines Vermögenswerts soll dieser auf der Seite „Zur Eincheckzeit fällig“ aufgeführt werden?',
     'no_groups' => 'Es wurden noch keine Gruppen erstellt. Navigieren Sie zu <code>Admin-Einstellungen > Berechtigungsgruppen</code>, um eine hinzuzufügen.',
 
+
+    /* Keywords for settings overview help */
+    'keywords' => [
+        'brand'             => 'Fußzeile, Logo, Druck, Theme, Skin, Header, Farben, Farbe, CSS',
+        'general_settings'  => 'Firmenunterstützung, Unterschrift, Akzeptanz, E-Mail-Format, Benutzernamenformat, Bilder, pro Seite, Vorschaubilder, EULA, Gravatar, TOS, Dashboard, Privatsphäre',
+        'groups'            => 'Berechtigungen, Berechtigungsgruppen, Autorisierung',
+        'labels'            => 'labels, barcodes, barcode, sheets, print, upc, qr, 1d, 2d',
+        'localization'      => 'Lokalisierung, Währung, lokal, Lokal, Zeitzone, International, Internationalisierung, Sprache, Sprachen, Übersetzung',
+        'php_overview'      => 'php Info, System, Info',
+        'purge'             => 'Endgültig löschen',
+        'security'          => 'Passwort, Passwörter, Anforderungen, Zwei-Faktor, Zwei-Faktor, übliche Passwörter, Remote-Login, Logout, Authentifizierung',
+    ],
+
 ];

resources/lang/de-DE/admin/settings/message.php

@@ -45,5 +45,6 @@ return [
         'error' => 'Etwas ist schief gelaufen. :app antwortete mit: :error_message',
         'error_redirect' => 'FEHLER: 301/302 :endpoint gibt eine Umleitung zurück. Aus Sicherheitsgründen folgen wir keinen Umleitungen. Bitte verwenden Sie den aktuellen Endpunkt.',
         'error_misc' => 'Etwas ist schiefgelaufen. :( ',
+        'webhook_fail' => '',
     ]
 ];

resources/lang/de-DE/general.php

@@ -216,6 +216,12 @@ return [
     'no_results'			=> 'Keine Treffer.',
     'no'  					=> 'Nein',
     'notes'  				=> 'Notizen',
+    'note_added'            => 'Note Added',
+    'add_note'              => 'Add Note',
+    'note_edited'            => 'Note Edited',
+    'edit_note'              => 'Edit Note',
+    'note_deleted'            => 'Note Deleted',
+    'delete_note'              => 'Delete Note',
     'order_number'          => 'Bestellnummer',
     'only_deleted'          => 'Nur gelöschte Gegenstände',
     'page_menu'				=> 'Zeige _MENU_ Einträge',
@@ -567,5 +573,8 @@ return [
     'import_asset_tag_exists' => 'Ein Asset mit dem Asset-Tag :asset_tag ist bereits vorhanden und es wurde keine Aktualisierung angefordert. Es wurden keine Änderungen vorgenommen.',
     'countries_manually_entered_help' => 'Werte mit einem Sternchen (*) wurden manuell eingegeben und stimmen nicht mit vorhandenen Dropdown-Werten nach ISO 3166 überein',
     'accessories_assigned' => 'Assigned Accessories',
+    'user_managed_passwords' => 'Password Management',
+    'user_managed_passwords_disallow' => 'Disallow users from managing their own passwords',
+    'user_managed_passwords_allow' => 'Allow users to manage their own passwords',
 
 ];

resources/lang/de-if/admin/settings/general.php

@@ -70,7 +70,6 @@ return [
     'footer_text'               => 'Zusätzlicher Fußzeilentext ',
     'footer_text_help'          => 'Dieser Text wird in der rechten Fußzeile angezeigt. Links sind erlaubt mit <a href="https://help.github.com/articles/github-flavored-markdown/">Github Flavored Markdown</a>. Zeilenumbrüche, Kopfzeilen, Bilder usw. können zu unvorhersehbaren Ergebnissen führen.',
     'general_settings'			=> 'Allgemeine Einstellungen',
-    'general_settings_keywords' => 'firmenunterstützung, Unterschrift, Akzeptanz, E-Mail-Format, Benutzername Format, Bilder, pro Seite, Vorschaubilder, eula, gravatar, tos, Dashboard, Privatsphäre',
     'general_settings_help'     => 'Standard EULA und mehr',
     'generate_backup'			=> 'Backup erstellen',
     'google_workspaces'         => 'Google Arbeitsbereiche',
@@ -154,7 +153,6 @@ return [
     'php'                       => 'PHP Version',
     'php_info'                  => 'PHP Info',
     'php_overview'              => 'PHP',
-    'php_overview_keywords'     => 'phpinfo, System, Info',
     'php_overview_help'         => 'PHP-Systeminfo',
     'php_gd_info'               => 'Um QR-Codes anzeigen zu können muss php-gd installiert sein, siehe Installationsanweisungen.',
     'php_gd_warning'            => 'PHP Image Processing and GD Plugin ist NICHT installiert.',
@@ -231,7 +229,6 @@ return [
     'update'                    => 'Einstellungen aktualisieren',
     'value'                     => 'Wert',
     'brand'                     => 'Branding',
-    'brand_keywords'            => 'Fußzeile, Logo, Druck, Thema, Skin, Header, Farben, Farbe, CSS',
     'brand_help'                => 'Logo, Seitenname',
     'web_brand'                 => 'Web Branding Typ',
     'about_settings_title'      => 'Über Einstellungen',
@@ -319,21 +316,17 @@ return [
     'filter_by_keyword' => 'Nach Stichwort filtern',
     'security' => 'Sicherheit',
     'security_title' => 'Sicherheitseinstellungen aktualisieren',
-    'security_keywords' => 'Passwort, Passwörter, Anforderungen, Zwei-Faktor, Zwei-Faktor, übliche Passwörter, Remote-Login, Logout, Authentifizierung',
     'security_help' => 'Zwei-Faktor, Passwort-Einschränkungen',
-    'groups_keywords' => 'berechtigungen, Berechtigungsgruppen, Autorisierung',
     'groups_help' => 'Account-Berechtigungsgruppen',
     'localization' => 'Lokalisierung',
     'localization_title' => 'Lokalisierungseinstellungen aktualisieren',
-    'localization_keywords' => 'lokalisierung, Währung, lokal, Lokal, Zeitzone, International, Internationalisierung, Sprache, Sprachen, Übersetzung',
     'localization_help' => 'Sprache, Datumsanzeige',
     'notifications' => 'Benachrichtigungen',
     'notifications_help' => 'E-Mail-Benachrichtigungen & Audit-Einstellungen',
     'asset_tags_help' => 'Inkrementieren und Präfixe',
     'labels' => 'Etiketten',
     'labels_title' => 'Etiketten-Einstellungen aktualisieren',
-    'labels_help' => 'Etikettengrößen &amp; Einstellungen',
+    'labels_help' => 'Barcodes &amp; label settings',
-    'purge_keywords' => 'Endgültig löschen',
     'purge_help' => 'Gelöschte Einträge bereinigen',
     'ldap_extension_warning' => 'Es sieht nicht so aus, als ob die LDAP-Erweiterung auf diesem Server installiert oder aktiviert ist. Du kannst deine Einstellungen trotzdem speichern, aber du musst die LDAP-Erweiterung für PHP aktivieren, bevor die LDAP-Synchronisierung oder der Login funktioniert.',
     'ldap_ad' => 'LDAP/AD',
@@ -362,12 +355,14 @@ return [
     'label2_2d_type'          => '2D Barcode Typ',
     'label2_2d_type_help'     => 'Format für 2D Barcodes',
     'label2_2d_target'        => '2D Barcode Ausgabe',
-    'label2_2d_target_help'   => 'Die URL, auf die der 2D Barcode beim Scannen verweist',
+    'label2_2d_target_help'   => 'Die Daten, die im 2D Barcode enthalten sein werden',
     'label2_fields'           => 'Felddefinitionen',
     'label2_fields_help'      => 'Felder können in der linken Spalte hinzugefügt, entfernt und neu sortiert werden. In jedem Feld können mehrere Optionen für Label und Datenquelle in der rechten Spalte hinzugefügt, entfernt und neu angeordnet werden.',
     'help_asterisk_bold'    => 'Der eingegebene Text <code>**text**</code> wird in Fettschrift angezeigt',
     'help_blank_to_use'     => 'Leer lassen, um den Wert von <code>:setting_name</code> zu verwenden',
-    'help_default_will_use' => '<br>Note that the value of the barcodes must comply with the respective barcode spec in order to be successfully generated. Please see <a href="https://snipe-it.readme.io/docs/barcodes">the documentation <i class="fa fa-external-link"></i></a> for more details. ',
+    'help_default_will_use' => '<code>:default</code> will use the value from <code>:setting_name</code>. <br>Note that the value of the barcodes must comply with the respective barcode spec in order to be successfully generated. Please see <a href="https://snipe-it.readme.io/docs/barcodes">the documentation <i class="fa fa-external-link"></i></a> for more details. ',
+    'asset_id'              => 'Asset ID',
+    'data'               => 'Data',
     'default'               => 'Standard',
     'none'                  => 'Nichts',
     'google_callback_help' => 'Dies sollte als Callback-URL in den Google OAuth App-Einstellungen in deinem Unternehmen eingegeben werden&apos;s <strong><a href="https://console.cloud.google.com/" target="_blank">Google Developer Konsole <i class="fa fa-external-link" aria-hidden="true"></i></a></strong>.',
@@ -389,4 +384,17 @@ return [
     'due_checkin_days_help' => 'Wie viele Tage vor dem voraussichtlichen Check-in eines Vermögenswerts soll dieser auf der Seite „Zur Eincheckzeit fällig“ aufgeführt werden?',
     'no_groups' => 'Es wurden noch keine Gruppen erstellt. Navigiere zu <code>Admin-Einstellungen > Berechtigungsgruppen</code>, um eine hinzuzufügen.',
 
+
+    /* Keywords for settings overview help */
+    'keywords' => [
+        'brand'             => 'Fußzeile, Logo, Druck, Thema, Skin, Header, Farben, Farbe, CSS',
+        'general_settings'  => 'firmenunterstützung, Unterschrift, Akzeptanz, E-Mail-Format, Benutzername Format, Bilder, pro Seite, Vorschaubilder, eula, gravatar, tos, Dashboard, Privatsphäre',
+        'groups'            => 'berechtigungen, Berechtigungsgruppen, Autorisierung',
+        'labels'            => 'labels, barcodes, barcode, sheets, print, upc, qr, 1d, 2d',
+        'localization'      => 'lokalisierung, Währung, lokal, Lokal, Zeitzone, International, Internationalisierung, Sprache, Sprachen, Übersetzung',
+        'php_overview'      => 'phpinfo, System, Info',
+        'purge'             => 'Endgültig löschen',
+        'security'          => 'Passwort, Passwörter, Anforderungen, Zwei-Faktor, Zwei-Faktor, übliche Passwörter, Remote-Login, Logout, Authentifizierung',
+    ],
+
 ];

resources/lang/de-if/admin/settings/message.php

@@ -45,5 +45,6 @@ return [
         'error' => 'Etwas ist schiefgelaufen. :app antwortete mit: :error_message',
         'error_redirect' => 'FEHLER: 301/302 :endpoint gibt eine Umleitung zurück. Aus Sicherheitsgründen folgen wir keine Umleitungen. Bitte verwende den aktuellen Endpunkt.',
         'error_misc' => 'Etwas ist schiefgelaufen! :( ',
+        'webhook_fail' => '',
     ]
 ];

resources/lang/de-if/general.php

@@ -216,6 +216,12 @@ return [
     'no_results'			=> 'Keine Treffer.',
     'no'  					=> 'Nein',
     'notes'  				=> 'Anmerkungen',
+    'note_added'            => 'Note Added',
+    'add_note'              => 'Add Note',
+    'note_edited'            => 'Note Edited',
+    'edit_note'              => 'Edit Note',
+    'note_deleted'            => 'Note Deleted',
+    'delete_note'              => 'Delete Note',
     'order_number'          => 'Auftragsnummer',
     'only_deleted'          => 'Nur gelöschte Assets',
     'page_menu'				=> 'Zeige _MENU_ Einträge',
@@ -567,5 +573,8 @@ return [
     'import_asset_tag_exists' => 'Ein Asset mit dem Asset-Tag :asset_tag ist bereits vorhanden und es wurde keine Aktualisierung angefordert. Es wurden keine Änderungen vorgenommen.',
     'countries_manually_entered_help' => 'Werte mit einem Sternchen (*) wurden manuell eingegeben und stimmen nicht mit vorhandenen Dropdown-Werten nach ISO 3166 überein',
     'accessories_assigned' => 'Assigned Accessories',
+    'user_managed_passwords' => 'Password Management',
+    'user_managed_passwords_disallow' => 'Disallow users from managing their own passwords',
+    'user_managed_passwords_allow' => 'Allow users to manage their own passwords',
 
 ];

resources/lang/el-GR/admin/settings/general.php

@@ -70,7 +70,6 @@ return [
     'footer_text'               => 'Πρόσθετο κείμενο Footer',
     'footer_text_help'          => 'Αυτό το κείμενο θα εμφανιστεί στο υποσέλιδο στη δεξιά πλευρά. Οι σύνδεσμοι επιτρέπονται χρησιμοποιώντας την <a href="https://help.github.com/articles/github-flavored-markdown/"> Github flavored markdown </a>. Διακοπή γραμμής, κεφαλίδες, εικόνες κ.λπ. μπορεί να οδηγήσουν σε απρόβλεπτα αποτελέσματα.',
     'general_settings'			=> 'Γενικές ρυθμίσεις',
-    'general_settings_keywords' => 'υποστήριξη της εταιρείας, υπογραφή, αποδοχή, μορφή ηλεκτρονικού ταχυδρομείου, μορφή ονόματος χρήστη, εικόνες, ανά σελίδα, μικρογραφία, eula, gravatar, tos, ταμπλό, ιδιωτικότητα',
     'general_settings_help'     => 'Προεπιλογή EULA και άλλα',
     'generate_backup'			=> 'Δημιουργία Αντίγραφου Ασφαλείας',
     'google_workspaces'         => 'Χώροι Εργασίας Google',
@@ -154,7 +153,6 @@ return [
     'php'                       => 'Έκδοση PHP',
     'php_info'                  => 'PHP info',
     'php_overview'              => 'PHP',
-    'php_overview_keywords'     => 'phpinfo, σύστημα, πληροφορίες',
     'php_overview_help'         => 'Πληροφορίες συστήματος PHP',
     'php_gd_info'               => 'Πρέπει να εγκαταστήσετε το php-gd για να εμφανίσετε τους QR κώδικες, δείτε τις οδηγίες εγκατάστασης.',
     'php_gd_warning'            => 'Η επεξεργασία εικόνας PHP και το πρόσθετο GD ΔΕΝ έχουν εγκατασταθεί.',
@@ -231,7 +229,6 @@ return [
     'update'                    => 'Ενημέρωση ρυθμίσεων',
     'value'                     => 'Τιμή',
     'brand'                     => 'Μάρκα',
-    'brand_keywords'            => 'υποσέλιδο, λογότυπο, εκτύπωση, θέμα, δέρμα, κεφαλίδα, χρώματα, χρώμα, css',
     'brand_help'                => 'Λογότυπο, Όνομα Ιστοσελίδας',
     'web_brand'                 => 'Τύπος Μάρκετινγκ Web',
     'about_settings_title'      => 'Σχετικά με τις ρυθμίσεις',
@@ -319,21 +316,17 @@ return [
     'filter_by_keyword' => 'Φιλτράρισμα κατά ρύθμιση λέξης-κλειδιού',
     'security' => 'Ασφάλεια',
     'security_title' => 'Ενημέρωση Ρυθμίσεων Ασφαλείας',
-    'security_keywords' => 'κωδικός πρόσβασης, κωδικοί πρόσβασης, απαιτήσεις, δύο παράγοντες, δύο παράγοντες, κοινοί κωδικοί πρόσβασης, απομακρυσμένη σύνδεση, αποσύνδεση, έλεγχος ταυτότητας',
     'security_help' => 'Δύο Παράγοντες, Περιορισμοί Κωδικού Πρόσβασης',
-    'groups_keywords' => 'άδειες, ομάδες δικαιωμάτων, εξουσιοδότηση',
     'groups_help' => 'Ομάδες δικαιωμάτων λογαριασμού',
     'localization' => 'Τοπικοποίηση',
     'localization_title' => 'Ενημέρωση Ρυθμίσεων Τοπικοποίησης',
-    'localization_keywords' => 'τοπικοποίηση, νόμισμα, τοπική, τοπική, ζώνη ώρας, ζώνη ώρας, διεθνές, διαγεννητικότητα, γλώσσα, γλώσσες, μετάφραση',
     'localization_help' => 'Γλώσσα, εμφάνιση ημερομηνίας',
     'notifications' => 'Ειδοποιήσεις',
     'notifications_help' => 'Ρυθμίσεις Ειδοποιήσεων & Ελέγχου Email',
     'asset_tags_help' => 'Αυξήσεις και προθέματα',
     'labels' => 'Ετικέτες',
     'labels_title' => 'Ενημέρωση Ρυθμίσεων Ετικετών',
-    'labels_help' => 'Label sizes &amp; settings',
+    'labels_help' => 'Barcodes &amp; label settings',
-    'purge_keywords' => 'μόνιμη διαγραφή',
     'purge_help' => 'Καθαρισμός αρχείων που έχουν διαγραφεί',
     'ldap_extension_warning' => 'Δεν φαίνεται ότι η επέκταση LDAP είναι εγκατεστημένη ή ενεργοποιημένη σε αυτόν τον διακομιστή. Μπορείτε ακόμα να αποθηκεύσετε τις ρυθμίσεις σας, αλλά θα πρέπει να ενεργοποιήσετε την επέκταση LDAP για PHP πριν το συγχρονισμό LDAP ή σύνδεση θα λειτουργήσει.',
     'ldap_ad' => 'LDAP/AD',
@@ -362,12 +355,14 @@ return [
     'label2_2d_type'          => '2D Barcode Type',
     'label2_2d_type_help'     => 'Μορφή για barcodes 2D',
     'label2_2d_target'        => 'Στόχος 2D Barcode',
-    'label2_2d_target_help'   => 'Το URL των σημείων 2D γραμμωτού κώδικα όταν σαρωθεί',
+    'label2_2d_target_help'   => 'The data that will be contained in the 2D barcode',
     'label2_fields'           => 'Ορισμοί Πεδίων',
     'label2_fields_help'      => 'Τα πεδία μπορούν να προστεθούν, να αφαιρεθούν και να παραγγελθούν στην αριστερή στήλη. Για κάθε πεδίο, μπορούν να προστεθούν, να αφαιρεθούν πολλαπλές επιλογές για την Ετικέτα και την Πηγή Δεδομένων και να παραγγελθούν στη δεξιά στήλη.',
     'help_asterisk_bold'    => 'Το κείμενο που έχει εισαχθεί ως <code>**text**</code> θα εμφανιστεί ως έντονο',
     'help_blank_to_use'     => 'Αφήστε κενό για να χρησιμοποιήσετε την τιμή από <code>:setting_name</code>',
-    'help_default_will_use' => '<br>Note that the value of the barcodes must comply with the respective barcode spec in order to be successfully generated. Please see <a href="https://snipe-it.readme.io/docs/barcodes">the documentation <i class="fa fa-external-link"></i></a> for more details. ',
+    'help_default_will_use' => '<code>:default</code> will use the value from <code>:setting_name</code>. <br>Note that the value of the barcodes must comply with the respective barcode spec in order to be successfully generated. Please see <a href="https://snipe-it.readme.io/docs/barcodes">the documentation <i class="fa fa-external-link"></i></a> for more details. ',
+    'asset_id'              => 'Asset ID',
+    'data'               => 'Data',
     'default'               => 'Προεπιλογή',
     'none'                  => 'Κανένα',
     'google_callback_help' => 'Αυτό θα πρέπει να εισαχθεί ως το URL επιστροφής κλήσης στις ρυθμίσεις της εφαρμογής Google OAuth στον οργανισμό σας&apos;s <strong><a href="https://console.cloud.google.com/" target="_blank">κονσόλα προγραμματιστών Google <i class="fa fa-external-link" aria-hidden="true"></i></a></strong>.',
@@ -389,4 +384,17 @@ return [
     'due_checkin_days_help' => 'How many days before the expected checkin of an asset should it be listed in the "Due for checkin" page?',
     'no_groups' => 'No groups have been created yet. Visit <code>Admin Settings > Permission Groups</code> to add one.',
 
+
+    /* Keywords for settings overview help */
+    'keywords' => [
+        'brand'             => 'υποσέλιδο, λογότυπο, εκτύπωση, θέμα, δέρμα, κεφαλίδα, χρώματα, χρώμα, css',
+        'general_settings'  => 'υποστήριξη της εταιρείας, υπογραφή, αποδοχή, μορφή ηλεκτρονικού ταχυδρομείου, μορφή ονόματος χρήστη, εικόνες, ανά σελίδα, μικρογραφία, eula, gravatar, tos, ταμπλό, ιδιωτικότητα',
+        'groups'            => 'άδειες, ομάδες δικαιωμάτων, εξουσιοδότηση',
+        'labels'            => 'labels, barcodes, barcode, sheets, print, upc, qr, 1d, 2d',
+        'localization'      => 'τοπικοποίηση, νόμισμα, τοπική, τοπική, ζώνη ώρας, ζώνη ώρας, διεθνές, διαγεννητικότητα, γλώσσα, γλώσσες, μετάφραση',
+        'php_overview'      => 'phpinfo, σύστημα, πληροφορίες',
+        'purge'             => 'μόνιμη διαγραφή',
+        'security'          => 'κωδικός πρόσβασης, κωδικοί πρόσβασης, απαιτήσεις, δύο παράγοντες, δύο παράγοντες, κοινοί κωδικοί πρόσβασης, απομακρυσμένη σύνδεση, αποσύνδεση, έλεγχος ταυτότητας',
+    ],
+
 ];

resources/lang/el-GR/admin/settings/message.php

@@ -45,5 +45,6 @@ return [
         'error' => 'Κάτι πήγε στραβά. :app απάντησε με: :error_message',
         'error_redirect' => 'ΣΦΑΛΜΑ: 301/302:endpoint επιστρέφει μια ανακατεύθυνση. Για λόγους ασφαλείας, δεν ακολουθούμε ανακατευθύνσεις. Παρακαλούμε χρησιμοποιήστε το πραγματικό τελικό σημείο.',
         'error_misc' => 'Κάτι πήγε στραβά. :( ',
+        'webhook_fail' => ' webhook notification failed: Check to make sure the URL is still valid.',
     ]
 ];

resources/lang/el-GR/general.php

@@ -216,6 +216,12 @@ return [
     'no_results'			=> 'Δεν βρέθηκαν αποτελέσματα.',
     'no'  					=> '\'Οχι',
     'notes'  				=> 'Σημειώσεις',
+    'note_added'            => 'Note Added',
+    'add_note'              => 'Add Note',
+    'note_edited'            => 'Note Edited',
+    'edit_note'              => 'Edit Note',
+    'note_deleted'            => 'Note Deleted',
+    'delete_note'              => 'Delete Note',
     'order_number'          => 'Αριθμός παραγγελίας',
     'only_deleted'          => 'Μόνο Διαγραμμένα Περιουσιακά Στοιχεία',
     'page_menu'				=> 'Εμφάνιση _MENU_ αντικειμένων',
@@ -567,5 +573,8 @@ return [
     'import_asset_tag_exists' => 'An asset with the asset tag :asset_tag already exists and an update was not requested. No change was made.',
     'countries_manually_entered_help' => 'Values with an asterisk (*) were manually entered and do not match existing ISO 3166 dropdown values',
     'accessories_assigned' => 'Assigned Accessories',
+    'user_managed_passwords' => 'Password Management',
+    'user_managed_passwords_disallow' => 'Disallow users from managing their own passwords',
+    'user_managed_passwords_allow' => 'Allow users to manage their own passwords',
 
 ];

resources/lang/en-GB/admin/settings/general.php

@@ -70,7 +70,6 @@ return [
     'footer_text'               => 'Additional Footer Text ',
     'footer_text_help'          => 'This text will appear in the right-side footer. Links are allowed using <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavoured markdown</a>. Line breaks, headers, images, etc may result in unpredictable results.',
     'general_settings'			=> 'General Settings',
-    'general_settings_keywords' => 'company support, signature, acceptance, email format, username format, images, per page, thumbnail, eula, gravatar, tos, dashboard, privacy',
     'general_settings_help'     => 'Default EULA and more',
     'generate_backup'			=> 'Generate Backup',
     'google_workspaces'         => 'Google Workspaces',
@@ -154,7 +153,6 @@ return [
     'php'                       => 'PHP Version',
     'php_info'                  => 'PHP info',
     'php_overview'              => 'PHP',
-    'php_overview_keywords'     => 'phpinfo, system, info',
     'php_overview_help'         => 'PHP System info',
     'php_gd_info'               => 'You must install php-gd to display QR codes, see install instructions.',
     'php_gd_warning'            => 'PHP Image Processing and GD plugin is NOT installed.',
@@ -231,7 +229,6 @@ return [
     'update'                    => 'Update Settings',
     'value'                     => 'Value',
     'brand'                     => 'Branding',
-    'brand_keywords'            => 'footer, logo, print, theme, skin, header, colours, colour, css',
     'brand_help'                => 'Logo, Site Name & Skin',
     'web_brand'                 => 'Web Branding Type',
     'about_settings_title'      => 'About Settings',
@@ -319,21 +316,17 @@ return [
     'filter_by_keyword' => 'Filter by setting keyword',
     'security' => 'Security',
     'security_title' => 'Update Security Settings',
-    'security_keywords' => 'password, passwords, requirements, two factor, two-factor, common passwords, remote login, logout, authentication',
     'security_help' => 'Two-Factor, Password Restrictions',
-    'groups_keywords' => 'permissions, permission groups, authorization',
     'groups_help' => 'Account Permission Groups',
     'localization' => 'Localization',
     'localization_title' => 'Update Localization Settings',
-    'localization_keywords' => 'localization, currency, local, locale, time zone, timezone, international, internatinalization, language, languages, translation',
     'localization_help' => 'Language, Date & Currency Display',
     'notifications' => 'Notifications',
     'notifications_help' => 'Email Alerts & Audit Settings',
     'asset_tags_help' => 'Incrementing and prefixes',
     'labels' => 'Labels',
     'labels_title' => 'Update Label Settings',
-    'labels_help' => 'Label sizes &amp; settings',
+    'labels_help' => 'Barcodes &amp; label settings',
-    'purge_keywords' => 'permanently delete',
     'purge_help' => 'Purge Deleted Records',
     'ldap_extension_warning' => 'It does not look like the LDAP extension is installed or enabled on this server. You can still save your settings, but you will need to enable the LDAP extension for PHP before LDAP syncing or login will work.',
     'ldap_ad' => 'LDAP/AD',
@@ -362,12 +355,14 @@ return [
     'label2_2d_type'          => '2D Barcode Type',
     'label2_2d_type_help'     => 'Format for 2D barcodes',
     'label2_2d_target'        => '2D Barcode Target',
-    'label2_2d_target_help'   => 'The URL the 2D barcode points to when scanned',
+    'label2_2d_target_help'   => 'The data that will be contained in the 2D barcode',
     'label2_fields'           => 'Field Definitions',
     'label2_fields_help'      => 'Fields can be added, removed, and reordered in the left column. For each field, multiple options for Label and DataSource can be added, removed, and reordered in the right column.',
     'help_asterisk_bold'    => 'Text entered as <code>**text**</code> will be displayed as bold',
     'help_blank_to_use'     => 'Leave blank to use the value from <code>:setting_name</code>',
-    'help_default_will_use' => '<br>Note that the value of the barcodes must comply with the respective barcode spec in order to be successfully generated. Please see <a href="https://snipe-it.readme.io/docs/barcodes">the documentation <i class="fa fa-external-link"></i></a> for more details. ',
+    'help_default_will_use' => '<code>:default</code> will use the value from <code>:setting_name</code>. <br>Note that the value of the barcodes must comply with the respective barcode spec in order to be successfully generated. Please see <a href="https://snipe-it.readme.io/docs/barcodes">the documentation <i class="fa fa-external-link"></i></a> for more details. ',
+    'asset_id'              => 'Asset ID',
+    'data'               => 'Data',
     'default'               => 'Default',
     'none'                  => 'None',
     'google_callback_help' => 'This should be entered as the callback URL in your Google OAuth app settings in your organization&apos;s <strong><a href="https://console.cloud.google.com/" target="_blank">Google developer console <i class="fa fa-external-link" aria-hidden="true"></i></a></strong>.',
@@ -389,4 +384,17 @@ return [
     'due_checkin_days_help' => 'How many days before the expected checkin of an asset should it be listed in the "Due for checkin" page?',
     'no_groups' => 'No groups have been created yet. Visit <code>Admin Settings > Permission Groups</code> to add one.',
 
+
+    /* Keywords for settings overview help */
+    'keywords' => [
+        'brand'             => 'footer, logo, print, theme, skin, header, colours, colour, css',
+        'general_settings'  => 'company support, signature, acceptance, email format, username format, images, per page, thumbnail, eula, gravatar, tos, dashboard, privacy',
+        'groups'            => 'permissions, permission groups, authorization',
+        'labels'            => 'labels, barcodes, barcode, sheets, print, upc, qr, 1d, 2d',
+        'localization'      => 'localization, currency, local, locale, time zone, timezone, international, internatinalization, language, languages, translation',
+        'php_overview'      => 'phpinfo, system, info',
+        'purge'             => 'permanently delete',
+        'security'          => 'password, passwords, requirements, two factor, two-factor, common passwords, remote login, logout, authentication',
+    ],
+
 ];