Merge remote-tracking branch 'origin/develop'

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

# Conflicts:
#	config/version.php

config/version.php

@@ -1,10 +1,10 @@
 <?php
 return array (
-  'app_version' => 'v8.2.0',
-  'full_app_version' => 'v8.2.0 - build 19055-g6e56d5613',
-  'build_version' => '19055',
+  'app_version' => 'v8.2.1',
+  'full_app_version' => 'v8.2.1 - build 19068-g6ca49a20c',
+  'build_version' => '19068',
   'prerelease_version' => '',
-  'hash_version' => 'g6e56d5613',
-  'full_hash' => 'v8.2.0-176-g6e56d5613',
+  'hash_version' => 'g6ca49a20c',
+  'full_hash' => 'v8.2.1-10-g6ca49a20c',
   'branch' => 'master',
 );

resources/views/hardware/view.blade.php

@@ -1370,20 +1370,11 @@
                         <div class="col-md-12">
                             <table
                                     class="table table-striped snipe-table"
-                                    id="asseAuditHistory"
-
-                                    data-id-table="asseAuditHistory"
-
-
-
-
+                                    id="assetAuditHistory"
+                                    data-id-table="assetAuditHistory"
                                     data-side-pagination="server"
-
-
-
                                     data-sort-order="desc"
                                     data-sort-name="created_at"
-
                                     data-export-options='{
                          "fileName": "export-asset-{{  $asset->id }}-audits",
                          "ignoreColumn": ["actions","image","change","checkbox","checkincheckout","icon"]

resources/views/mail/markdown/checkout-accessory.blade.php

@@ -1,5 +1,5 @@
 @component('mail::message')
-# {{ trans('mail.hello') }} {{ $target->present()->fullName() }},
+# {{ trans('mail.hello') }}{{ $target->assignedto?->present()->fullName() ? ' ' . $target->assignedto->present()->fullName() . ',' : ',' }}
 
 {{ trans('mail.new_item_checked') }}
 

resources/views/mail/markdown/checkout-asset.blade.php

@@ -1,5 +1,5 @@
 @component('mail::message')
-# {{ trans('mail.hello') }} {{ $target->present()->fullName() }},
+# {{ trans('mail.hello') }}{{ $target->assignedto?->present()->fullName() ? ' ' . $target->assignedto->present()->fullName() . ',' : ',' }}
 
 {{ $introduction_line }}
 

resources/views/users/view.blade.php

@@ -990,7 +990,7 @@
                        "fileName": "export-{{ str_slug($user->name) }}-history-{{ date('Y-m-d') }}",
                        "ignoreColumn": ["actions","image","change","checkbox","checkincheckout","icon"]
                      }'
-                      data-url="{{ route('api.activity.index', ['target_id' => $user->id, 'item_type' => User::class]) }}">
+                      data-url="{{ route('api.activity.index', ['item_id' => $user->id, 'item_type' => User::class]) }}">
               </table>
 
           </div>