Merge remote-tracking branch 'origin/develop'

Signed-off-by: snipe <[email protected]>

# Conflicts:
#	config/version.php
#	public/css/build/app.css
#	public/css/build/app.css.map
#	public/css/dist/all.css
#	public/mix-manifest.json

Author: snipe

app/Http/Controllers/UploadedFilesController.php

@@ -139,7 +139,7 @@ public function destroy($object_type, $id, $file_id) : RedirectResponse
 
 
         // Check for the file
-        $log = Actionlog::find($file_id)->where('item_type', self::$map_object_type[$object_type])
+        $log = Actionlog::where('id',$file_id)->where('item_type', self::$map_object_type[$object_type])
             ->where('item_id', $object->id)->first();
 
         if ($log) {

config/version.php

@@ -1,10 +1,10 @@
 <?php
 return array (
-  'app_version' => 'v8.3.0',
-  'full_app_version' => 'v8.3.0 - build 19559-g0ba8f5cc5',
-  'build_version' => '19559',
+  'app_version' => 'v8.3.1',
+  'full_app_version' => 'v8.3.1 - build 19577-g7dd493da3',
+  'build_version' => '19577',
   'prerelease_version' => '',
-  'hash_version' => 'g0ba8f5cc5',
-  'full_hash' => 'v8.3.0-489-g0ba8f5cc5',
+  'hash_version' => 'g7dd493da3',
+  'full_hash' => 'v8.3.1-15-g7dd493da3',
   'branch' => 'master',
 );

public/css/build/app.css

@@ -3,7 +3,7 @@
     "/css/dist/skins/skin-black-dark.css": "/css/dist/skins/skin-black-dark.css?id=bf1a348eae3e60c62b8879953f7df14c",
     "/css/dist/skins/_all-skins.css": "/css/dist/skins/_all-skins.css?id=146086d653897e2557af5e68f6f8c56f",
     "/css/build/overrides.css": "/css/build/overrides.css?id=76e64b2cfa4ab7008e0f57bc6de5e05e",
-    "/css/build/app.css": "/css/build/app.css?id=84cb527ec7ce2ff26744420d6f4df96f",
+    "/css/build/app.css": "/css/build/app.css?id=f7d812bf80d5a8a68619e54b84a312c3",
     "/css/build/AdminLTE.css": "/css/build/AdminLTE.css?id=bdf169bc2141f453390614c138cdce95",
     "/css/dist/skins/skin-yellow.css": "/css/dist/skins/skin-yellow.css?id=e1e6e1c64cf14fc350585aaeb0e42f6b",
     "/css/dist/skins/skin-yellow-dark.css": "/css/dist/skins/skin-yellow-dark.css?id=08ae1b3e66008966ce5d600ea3ad04a2",
@@ -19,7 +19,7 @@
     "/css/dist/skins/skin-blue.css": "/css/dist/skins/skin-blue.css?id=68a92d85c8e351dfb38a835307f126ec",
     "/css/dist/skins/skin-blue-dark.css": "/css/dist/skins/skin-blue-dark.css?id=cbb20ad6182b658f34117bf96a621b63",
     "/css/dist/skins/skin-black.css": "/css/dist/skins/skin-black.css?id=84e2ee950ae04444988b37038e5a3951",
-    "/css/dist/all.css": "/css/dist/all.css?id=db8c87683d06d40dc1d6c788a311fa1e",
+    "/css/dist/all.css": "/css/dist/all.css?id=35c306b2b83b910fe67915589c703fc3",
     "/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",

public/css/build/app.css.map

@@ -376,10 +376,6 @@ a.accordion-header {
   /* adjust based on your layout */
 }
 
-.skin-blue .main-header .navbar .dropdown-menu li a {
-  color: #333;
-}
-
 a.logo.no-hover a:hover {
   background-color: transparent;
 }

public/css/dist/all.css

@@ -627,11 +627,11 @@
         'site_default' => 'Site Default',
         'default_blue' => 'Default Blue',
         'blue_dark' => 'Blue (Dark Mode)',
-        'green' => 'Green Dark',
+        'green' => 'Green',
         'green_dark' => 'Green (Dark Mode)',
-        'red' => 'Red Dark',
+        'red' => 'Red',
         'red_dark' => 'Red (Dark Mode)',
-        'orange' => 'Orange Dark',
+        'orange' => 'Orange',
         'orange_dark' => 'Orange (Dark Mode)',
         'black' => 'Black',
         'black_dark' => 'Black (Dark Mode)',

public/mix-manifest.json

@@ -378,7 +378,11 @@ class="form-inline"
                                             @if (isset($asset->location))
                                                 <li>
                                                     <x-icon type="locations" class="fa-fw" />
-                                                     {{ $asset->location->name }}</li>
+                                                     {{ $asset->location->parent?->name }}
+                                                        @if ($asset->location->parent)
+                                                            <i class="fas fa-long-arrow-alt-right" aria-hidden="true"></i>
+                                                        @endif
+                                                        {{ $asset->location->name }}</li>
                                                 <li>{{ $asset->location->address }}
                                                     @if ($asset->location->address2!='')
                                                         {{ $asset->location->address2 }}