Merge remote-tracking branch 'origin/develop'

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

# Conflicts:
#	config/version.php
#	public/js/build/vendor.js
#	public/js/dist/all.js
#	public/mix-manifest.json

Author: snipe

.github/workflows/tests-postgres.yml

@@ -21,7 +21,9 @@ jobs:
       fail-fast: false
       matrix:
         php-version:
+          - "8.1"
           - "8.2"
+          - "8.3"
 
     name: PHP ${{ matrix.php-version }}
 

config/version.php

@@ -1,10 +1,10 @@
 <?php
 return array (
-  'app_version' => 'v7.0.7',
-  'full_app_version' => 'v7.0.7 - build 14172-ge50296870',
-  'build_version' => '14172',
+  'app_version' => 'v7.0.8',
+  'full_app_version' => 'v7.0.8 - build 14243-g2e2f59b29',
+  'build_version' => '14243',
   'prerelease_version' => '',
-  'hash_version' => 'ge50296870',
-  'full_hash' => 'v7.0.7-53-ge50296870',
+  'hash_version' => 'g2e2f59b29',
+  'full_hash' => 'v7.0.8-57-g2e2f59b29',
   'branch' => 'master',
 );

package-lock.json

@@ -26,7 +26,7 @@
     },
     "dependencies": {
         "@fortawesome/fontawesome-free": "^6.5.2",
-        "acorn": "^8.11.2",
+        "acorn": "^8.12.0",
         "acorn-import-assertions": "^1.9.0",
         "admin-lte": "^2.4.18",
         "ajv": "^6.12.6",
@@ -43,7 +43,7 @@
         "imagemin": "^8.0.1",
         "jquery-slimscroll": "^1.3.8",
         "jquery-ui": "^1.13.3",
-        "jquery-validation": "^1.20.0",
+        "jquery-validation": "^1.20.1",
         "jquery.iframe-transport": "^1.0.0",
         "jspdf-autotable": "^3.8.2",
         "less": "^4.2.0",

package.json

@@ -29,6 +29,7 @@
     "/css/webfonts/fa-solid-900.woff2": "/css/webfonts/fa-solid-900.woff2?id=96d16b1bdb177fd796c810b9e706c780",
     "/css/webfonts/fa-v4compatibility.ttf": "/css/webfonts/fa-v4compatibility.ttf?id=8994b282f9f3b7a00380bb1e2731a4bf",
     "/css/webfonts/fa-v4compatibility.woff2": "/css/webfonts/fa-v4compatibility.woff2?id=111e341dba724e1df946e8d1f406a7bd",
+    "/js/dist/bootstrap-table-locale-all.min.js": "/js/dist/bootstrap-table-locale-all.min.js?id=7373e7d7017cceca6c32928080cea0fb",
     "/css/dist/bootstrap-table.css": "/css/dist/bootstrap-table.css?id=5f79123a6750afd34dbf565faec3dda3",
     "/js/build/vendor.js": "/js/build/vendor.js?id=e27070bdbc5fce3bfd132b952d641fd6",
     "/js/dist/bootstrap-table.js": "/js/dist/bootstrap-table.js?id=e5918703a22f8992c4c98f1dbbecb8f7",

public/js/dist/bootstrap-table-locale-all.min.js

@@ -122,8 +122,8 @@
     'ldap_test'                 => 'crwdns6349:0crwdne6349:0',
     'ldap_test_sync'            => 'crwdns6351:0crwdne6351:0',
     'license'                   => 'crwdns1989:0crwdne1989:0',
-    'load_remote'               => 'crwdns12086:0crwdne12086:0',
-    'load_remote_help_text'		=> 'crwdns12088:0crwdne12088:0',
+    'load_remote'               => 'crwdns12292:0crwdne12292:0',
+    'load_remote_help_text'		=> 'crwdns12294:0crwdne12294:0',
     'login'                     => 'crwdns6353:0crwdne6353:0',
     'login_attempt'             => 'crwdns6355:0crwdne6355:0',
     'login_ip'                  => 'crwdns6357:0crwdne6357:0',
@@ -375,5 +375,6 @@
     'timezone' => 'crwdns11831:0crwdne11831:0',
     'profile_edit'          => 'crwdns12280:0crwdne12280:0',
     'profile_edit_help'          => 'crwdns12282:0crwdne12282:0',
+    'default_avatar' => 'crwdns12296:0crwdne12296:0',
 
 ];

public/mix-manifest.json

@@ -548,6 +548,8 @@
         'license_seats'  => 'crwdns12142:0crwdne12142:0',
         'consumables'  => 'crwdns12144:0crwdne12144:0',
         'components'  => 'crwdns12146:0crwdne12146:0',
-    ]
+    ],
+    'more_info' => 'crwdns12288:0crwdne12288:0',
+    'quickscan_bulk_help' => 'crwdns12290:0crwdne12290:0',
 
 ];

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

@@ -122,8 +122,8 @@
     'ldap_test'                 => 'Test LDAP',
     'ldap_test_sync'            => 'Test LDAP Synchronization',
     'license'                   => 'Software License',
-    'load_remote'               => 'Use Gravatar',
-    'load_remote_help_text'		=> 'Uncheck this box if your install cannot load scripts from the outside internet. This will prevent Snipe-IT from trying load images from Gravatar.',
+    'load_remote'               => 'Load Remote Avatars',
+    'load_remote_help_text'		=> 'Uncheck this box if your install cannot load scripts from the outside internet. This will prevent Snipe-IT from trying load avatars from Gravatar or other outside sources.',
     'login'                     => 'Login Attempts',
     'login_attempt'             => 'Login Attempt',
     'login_ip'                  => 'IP Address',
@@ -375,5 +375,6 @@
     'timezone' => 'Timezone',
     'profile_edit'          => 'Edit Profile',
     'profile_edit_help'          => 'Allow users to edit their own profiles.',
+    'default_avatar' => 'Upload default avatar',
 
 ];

resources/lang/aa-ER/general.php

@@ -549,6 +549,8 @@
         'license_seats'  => ':count License Seat|:count License Seats',
         'consumables'  => ':count Consumable|:count Consumables',
         'components'  => ':count Component|:count Components',
-    ]
+    ],
+    'more_info' => 'Meer inligting',
+    'quickscan_bulk_help' => 'Checking this box will edit the asset record to reflect this new location. Leaving it unchecked will simply note the location in the audit log. Note that if this asset is checked out, it will not change the location of the person, asset or location it is checked out to.',
 
 ];