Merge remote-tracking branch 'origin/develop'

Author: snipe

resources/views/users/view.blade.php

@@ -990,7 +990,7 @@ class="table table-striped snipe-table"
                        "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>