Merge remote-tracking branch 'origin/develop'

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

# Conflicts:
#	config/version.php

Author: snipe

app/Models/Asset.php

@@ -1187,7 +1187,9 @@ public function scopeDeployed($query)
 
     public function scopeRequestableAssets($query)
     {
-        return Company::scopeCompanyables($query->where('requestable', '=', 1))
+        $table = $query->getModel()->getTable();
+
+        return Company::scopeCompanyables($query->where($table.'.requestable', '=', 1))
         ->whereHas('assetstatus', function ($query) {
             $query->where(function ($query) {
                 $query->where('deployable', '=', 1)

config/version.php

@@ -1,10 +1,10 @@
 <?php
 return array (
-  'app_version' => 'v6.0.1',
-  'full_app_version' => 'v6.0.1 - build 7863-g90a4ce572',
-  'build_version' => '7863',
+  'app_version' => 'v6.0.2',
+  'full_app_version' => 'v6.0.2 - build 7880-g43c5b412c',
+  'build_version' => '7880',
   'prerelease_version' => '',
-  'hash_version' => 'g90a4ce572',
-  'full_hash' => 'v6.0.1-111-g90a4ce572',
+  'hash_version' => 'g43c5b412c',
+  'full_hash' => 'v6.0.2-128-g43c5b412c',
   'branch' => 'master',
-);
+);

resources/lang/af/account/general.php

@@ -0,0 +1,12 @@
+<?php
+
+return array(
+    'personal_api_keys' => 'Personal API Keys',
+    'api_key_warning' => 'When generating an API token, be sure to copy it down immediately as they
+                    will not be visible to you again.',
+    'api_base_url' => 'Your API base url is located at:',
+    'api_base_url_endpoint' => '/&lt;endpoint&gt;',
+    'api_token_expiration_time' => 'API tokens are set to expire in:',
+    'api_reference' => 'Please check the <a href="https://snipe-it.readme.io/reference" target="_blank">API reference</a> to
+                    find specific API endpoints and additional API documentation.',
+);

resources/lang/af/admin/hardware/message.php

@@ -16,6 +16,7 @@
         'error'   			=> 'Bate is nie opgedateer nie, probeer asseblief weer',
         'success' 			=> 'Bate is suksesvol opgedateer.',
         'nothing_updated'	=>  'Geen velde is gekies nie, dus niks is opgedateer nie.',
+        'no_assets_selected'  =>  'No assets were selected, so nothing was updated.',
     ],
 
     'restore' => [

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

@@ -28,6 +28,7 @@
     'auto_increment_prefix'		=> 'Voorvoegsel (opsioneel)',
     'auto_incrementing_help'    => 'Enable auto-incrementing asset tags first to set this',
     'backups'					=> 'rugsteun',
+    'backups_help'              => 'Create, download, and restore backups ',
     'backups_restoring'         => 'Restoring from Backup',
     'backups_upload'            => 'Upload Backup',
     'backups_path'              => 'Backups on the server are stored in <code>:path</code>',
@@ -84,6 +85,7 @@
      'ldap_client_tls_key'       => 'LDAP Client-Side TLS key',
     'ldap_login_test_help'      => 'Enter a valid LDAP username and password from the base DN you specified above to test whether your LDAP login is configured correctly. YOU MUST SAVE YOUR UPDATED LDAP SETTINGS FIRST.',
     'ldap_login_sync_help'      => 'This only tests that LDAP can sync correctly. If your LDAP Authentication query is not correct, users may still not be able to login. YOU MUST SAVE YOUR UPDATED LDAP SETTINGS FIRST.',
+    'ldap_manager'              => 'LDAP Manager',
     'ldap_server'               => 'LDAP-bediener',
     'ldap_server_help'          => 'Dit moet begin met ldap: // (vir unencrypted of TLS) of ldaps: // (vir SSL)',
     'ldap_server_cert'			=> 'LDAP SSL-sertifikaat-validering',

resources/lang/af/admin/settings/table.php

@@ -0,0 +1,6 @@
+<?php
+
+return array(
+    'created'   => 'Created',
+    'size' => 'Size',
+);

resources/lang/af/admin/users/general.php

@@ -22,9 +22,10 @@
     'view_user'         => 'Sien gebruiker: naam',
     'usercsv'           => 'CSV-lêer',
     'two_factor_admin_optin_help' => 'Jou huidige administrasie-instellings laat selektiewe handhawing van twee-faktor-verifikasie toe.',
-    'two_factor_enrolled' => '2FA-toestel ingeskryf',
-    'two_factor_active'   => '2FA aktief',
-    'user_deactivated'  => 'User is de-activated',
+    'two_factor_enrolled' => '2FA Device Enrolled ',
+    'two_factor_active'   => '2FA Active ',
+    'user_deactivated'  => 'User cannot login',
+    'user_activated'  => 'User can login',
     'activation_status_warning' => 'Do not change activation status',
     'group_memberships_helpblock' => 'Only superadmins may edit group memberships.',
     'superadmin_permission_warning' => 'Only superadmins may grant a user superadmin access.',
@@ -34,4 +35,8 @@
     'warning_deletion_information' => 'You are about to delete the :count user(s) listed below. Super admin names are highlighted in red.',
     'update_user_asssets_status' => 'Update all assets for these users to this status',
     'checkin_user_properties' => 'Check in all properties associated with these users',
+    'remote_label'   => 'This is a remote user',
+    'remote'   => 'Remote',
+    'remote_help' => 'This can be useful if you need to filter by remote users who never or rarely come into your physical locations.',
+    'not_remote_label' => 'This is not a remote user',
 ];

resources/lang/af/admin/users/table.php

@@ -10,7 +10,7 @@
     'email'      			=> 'e-pos',
     'employee_num'      	=> 'Werknemer No.',
     'first_name' 			=> 'Eerste naam',
-    'groupnotes'			=> 'Kies \'n groep om aan die gebruiker toe te ken, onthou dat \'n gebruiker die regte van die groep wat hulle toegewys is, aanvaar.',
+    'groupnotes'			=> 'Select a group to assign to the user, remember that a user takes on the permissions of the group they are assigned. Use ctrl+click (or cmd+click on MacOS) to deselect groups.',
     'id'         			=> 'id',
     'inherit'  				=> 'erf',
     'job' 					=> 'Werkstitel',

resources/lang/af/auth.php

@@ -0,0 +1,20 @@
+<?php
+
+return array(
+
+    /*
+    |--------------------------------------------------------------------------
+    | Authentication Language Lines
+    |--------------------------------------------------------------------------
+    |
+    | The following language lines are used during authentication for various
+    | messages that we need to display to the user. You are free to modify
+    | these language lines according to your application's requirements.
+    |
+    */
+
+    'failed' => 'These credentials do not match our records.',
+    'password' => 'The provided password is incorrect.',
+    'throttle' => 'Too many login attempts. Please try again in :seconds seconds.',
+
+);

resources/lang/af/general.php

@@ -1,6 +1,6 @@
 <?php
 
-    return [
+return [
     'accessories'			=> 'bykomstighede',
     'activated'			    => 'geaktiveer',
     'accessory'				=> 'Bykomstigheid',
@@ -26,6 +26,7 @@
     'audit'				    => 'oudit',
     'audit_report'			=> 'Ouditlogboek',
     'assets'				=> 'bates',
+    'assigned_to'           => 'Assigned to :name',
     'avatar_delete'         => 'Verwyder Avatar',
     'avatar_upload'         => 'Laai avatar op',
     'back'      			=> 'terug',
@@ -114,6 +115,7 @@
     'files'                 => 'Files',
     'file_name'				=> 'lêer',
     'file_type'             => 'File Type',
+    'filesize'              => 'File Size',
     'file_uploads'			=> 'Lêeroplaaie',
     'file_upload'           => 'File Upload',
     'generate'				=> 'genereer',
@@ -229,6 +231,7 @@
     'show_current'  		=> 'Show Current',
     'sign_in'				=> 'Teken in',
     'signature'             => 'Handtekening',
+    'signed_off_by'         => 'Signed Off By',
     'skin'       			=> 'Skin',
     'slack_msg_note'        => 'A slack message will be sent',
     'slack_test_msg'        => 'Oh hai! Looks like your Slack integration with Snipe-IT is working!',
@@ -237,6 +240,7 @@
     'state'  				=> 'staat',
     'status_labels'			=> 'Status etikette',
     'status'    			=> 'status',
+    'accept_eula'           => 'Acceptance Agreement',
     'supplier'              => 'verskaffer',
     'suppliers'  			=> 'Verskaffers',
     'sure_to_delete'    => 'Is jy seker jy wil verwyder',
@@ -350,4 +354,7 @@
     'checkout_tooltip' => 'Check this item out',
     'checkin_tooltip' => 'Check this item in',
     'checkout_user_tooltip' => 'Check this item out to a user',
-];
+    'maintenance_mode'      => 'The service is temporarily unavailable for system updates. Please check back later.',
+    'maintenance_mode_title' => 'System Temporarily Unavailable',
+    'ldap_import'           => 'User password should not be managed by LDAP. (This allows you to send forgotten password requests.)',
+];