Merge branch 'laravel_upgrade'

diff --cc app/Auth/User.php
Simple merge

diff --cc composer.json
index addde9b7edec3708c1afe056d62b2924021dee16,23ce97cd485cbe02f88268f50fba943a72f8b8f2..07111d985a63439633ce28f5b1f4e1db64b03e34
--- 1/composer.json
--- 2/composer.json
+++ b/composer.json
@@@ -29,11 -34,10 +34,10 @@@
          "onelogin/php-saml": "^4.0",
          "phpseclib/phpseclib": "~3.0",
          "pragmarx/google2fa": "^8.0",
-         "predis/predis": "^1.1.6",
+         "predis/predis": "^1.1",
          "socialiteproviders/discord": "^4.1",
          "socialiteproviders/gitlab": "^4.1",
 -        "socialiteproviders/microsoft-azure": "^4.1",
 +        "socialiteproviders/microsoft-azure": "^5.0.1",
          "socialiteproviders/okta": "^4.1",
          "socialiteproviders/slack": "^4.1",
          "socialiteproviders/twitch": "^5.3",

diff --cc composer.lock
index 9364f7b7cbca859111a1ef20fbcd5e1382465d2a,005f30fa383d2c470198256d4bba7f05e49e30e6..4323d89d5d80b2fb343679139cd84f55b1d86c0f
--- 1/composer.lock
--- 2/composer.lock
+++ b/composer.lock
@@@ -4,7 -4,7 +4,7 @@@
          "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
          "This file is @generated automatically"
      ],
-     "content-hash": "4780c46ffc4d1a09af810f62ca59e4a7",
 -    "content-hash": "48be80b0326176faa9775dca18a00fa2",
++    "content-hash": "d7893ec647ed43e272a21c9c01a9b2cb",
      "packages": [
          {
              "name": "aws/aws-crt-php",

diff --cc readme.md
Simple merge

diff --cc resources/lang/ar/settings.php
Simple merge

diff --cc resources/lang/bg/settings.php
Simple merge

diff --cc resources/lang/bs/settings.php
Simple merge

diff --cc resources/lang/ca/settings.php
Simple merge

diff --cc resources/lang/cs/settings.php
Simple merge

diff --cc resources/lang/da/settings.php
Simple merge

diff --cc resources/lang/de/settings.php
Simple merge

diff --cc resources/lang/de_informal/settings.php
Simple merge

diff --cc resources/lang/es/settings.php
Simple merge

diff --cc resources/lang/es_AR/settings.php
Simple merge

diff --cc resources/lang/et/entities.php
Simple merge

diff --cc resources/lang/et/settings.php
Simple merge

diff --cc resources/lang/fa/settings.php
Simple merge

diff --cc resources/lang/fr/settings.php
Simple merge

diff --cc resources/lang/he/settings.php
Simple merge

diff --cc resources/lang/hr/settings.php
Simple merge

diff --cc resources/lang/hu/settings.php
Simple merge

diff --cc resources/lang/id/settings.php
Simple merge

diff --cc resources/lang/it/settings.php
Simple merge

diff --cc resources/lang/ja/settings.php
Simple merge

diff --cc resources/lang/ko/settings.php
Simple merge

diff --cc resources/lang/lt/settings.php
Simple merge

diff --cc resources/lang/lv/auth.php
index 9d857de040901ec20819ff7ee4f06e5e05247d6a,e228bed0032e089432f1ac8c82c9fff668d61813..60dc3fda30885e07cb329e0fc28f2f71782df1ae
--- 1/resources/lang/lv/auth.php
--- 2/resources/lang/lv/auth.php
+++ b/resources/lang/lv/auth.php
@@@ -81,32 -79,32 +79,32 @@@ return 
      'mfa_setup_configured' => 'Divfaktoru autentifikācija jau ir nokonfigurēta',
      'mfa_setup_reconfigure' => 'Mainīt 2FA konfigurāciju',
      'mfa_setup_remove_confirmation' => 'Vai esi drošs, ka vēlies noņemt divfaktoru autentifikāciju?',
 -    'mfa_setup_action' => 'Setup',
 -    'mfa_backup_codes_usage_limit_warning' => 'You have less than 5 backup codes remaining, Please generate and store a new set before you run out of codes to prevent being locked out of your account.',
 -    'mfa_option_totp_title' => 'Mobile App',
 -    'mfa_option_totp_desc' => 'To use multi-factor authentication you\'ll need a mobile application that supports TOTP such as Google Authenticator, Authy or Microsoft Authenticator.',
 -    'mfa_option_backup_codes_title' => 'Backup Codes',
 -    'mfa_option_backup_codes_desc' => 'Securely store a set of one-time-use backup codes which you can enter to verify your identity.',
 -    'mfa_gen_confirm_and_enable' => 'Confirm and Enable',
 -    'mfa_gen_backup_codes_title' => 'Backup Codes Setup',
 -    'mfa_gen_backup_codes_desc' => 'Store the below list of codes in a safe place. When accessing the system you\'ll be able to use one of the codes as a second authentication mechanism.',
 -    'mfa_gen_backup_codes_download' => 'Download Codes',
 -    'mfa_gen_backup_codes_usage_warning' => 'Each code can only be used once',
 -    'mfa_gen_totp_title' => 'Mobile App Setup',
 -    'mfa_gen_totp_desc' => 'To use multi-factor authentication you\'ll need a mobile application that supports TOTP such as Google Authenticator, Authy or Microsoft Authenticator.',
 -    'mfa_gen_totp_scan' => 'Scan the QR code below using your preferred authentication app to get started.',
 -    'mfa_gen_totp_verify_setup' => 'Verify Setup',
 -    'mfa_gen_totp_verify_setup_desc' => 'Verify that all is working by entering a code, generated within your authentication app, in the input box below:',
 -    'mfa_gen_totp_provide_code_here' => 'Provide your app generated code here',
 -    'mfa_verify_access' => 'Verify Access',
 -    'mfa_verify_access_desc' => 'Your user account requires you to confirm your identity via an additional level of verification before you\'re granted access. Verify using one of your configured methods to continue.',
 -    'mfa_verify_no_methods' => 'No Methods Configured',
 -    'mfa_verify_no_methods_desc' => 'No multi-factor authentication methods could be found for your account. You\'ll need to set up at least one method before you gain access.',
 -    'mfa_verify_use_totp' => 'Verify using a mobile app',
 -    'mfa_verify_use_backup_codes' => 'Verify using a backup code',
 -    'mfa_verify_backup_code' => 'Backup Code',
 -    'mfa_verify_backup_code_desc' => 'Enter one of your remaining backup codes below:',
 -    'mfa_verify_backup_code_enter_here' => 'Enter backup code here',
 -    'mfa_verify_totp_desc' => 'Enter the code, generated using your mobile app, below:',
 -    'mfa_setup_login_notification' => 'Multi-factor method configured, Please now login again using the configured method.',
 +    'mfa_setup_action' => 'Iestatījumi',
 +    'mfa_backup_codes_usage_limit_warning' => 'Jums atlikuši mazāk kā 5 rezerves kodi. Lūdzu izveidojiet jaunu kodu komplektu pirms tie visi izlietoti, lai izvairītos no izslēgšanas no jūsu konta.',
 +    'mfa_option_totp_title' => 'Mobilā aplikācija',
 +    'mfa_option_totp_desc' => 'Lai lietotu vairākfaktoru autentifikāciju, jums būs nepieciešama mobilā aplikācija, kas atbalsta TOTP, piemēram, Google Authenticator, Authy vai Microsoft Authenticator.',
 +    'mfa_option_backup_codes_title' => 'Rezerves kodi',
 +    'mfa_option_backup_codes_desc' => 'Droši noglabājiet vienreizlietojamu rezerves kodu komplektu, ko varēsiet izmantot, lai verificētu savu identitāti.',
 +    'mfa_gen_confirm_and_enable' => 'Apstiprināt un ieslēgt',
 +    'mfa_gen_backup_codes_title' => 'Rezerves kodu iestatījumi',
 +    'mfa_gen_backup_codes_desc' => 'Noglabājiet zemāk esošo kodu sarakstu drošā vietā. Kad piekļūsiet sistēmai, jūs varēsiet izmantot vienu no kodiem kā papildus autentifikācijas mehānismu.',
 +    'mfa_gen_backup_codes_download' => 'Lejupielādēt kodus',
 +    'mfa_gen_backup_codes_usage_warning' => 'Katru kodu var izmantot tikai vienreiz',
 +    'mfa_gen_totp_title' => 'Mobilās aplikācijas iestatījumi',
 +    'mfa_gen_totp_desc' => 'Lai lietotu vairākfaktoru autentifikāciju, jums būs nepieciešama mobilā aplikācija, kas atbalsta TOTP, piemēram, Google Authenticator, Authy vai Microsoft Authenticator.',
 +    'mfa_gen_totp_scan' => 'Skenējiet zemāk esošo kvadrātkodu (QR) izmantojot savu autentifikācijas aplikāciju.',
 +    'mfa_gen_totp_verify_setup' => 'Verificēt iestatījumus',
 +    'mfa_gen_totp_verify_setup_desc' => 'Pārbaudiet, ka viss darbojas, zemāk esošajā laukā ievadot kodu, ko izveidojusi jūsu autentifikācijas aplikācijā:',
 +    'mfa_gen_totp_provide_code_here' => 'Norādīet jūsu aplikācijā izveidoto kodu šeit',
 +    'mfa_verify_access' => 'Verificēt piekļuvi',
 +    'mfa_verify_access_desc' => 'Jūsu lietotāja kontam nepieciešams verificēt jūsu identitāti ar papildus pārbaudes līmeni pirms piešķirta piekļuve. Verificējiet, izmantojot vienu no uzstādītajām metodēm, lai turpinātu.',
 +    'mfa_verify_no_methods' => 'Nav iestatīta neviena metode',
 +    'mfa_verify_no_methods_desc' => 'Jūsu kontam nav iestatīta neviena vairākfaktoru autentifikācijas metode. Jums būs nepieciešams iestatīt vismaz vienu metodi, lai iegūtu piekļuvi.',
 +    'mfa_verify_use_totp' => 'Verificēt, izmantojot mobilo aplikāciju',
 +    'mfa_verify_use_backup_codes' => 'Verificēt, izmantojot rezerves kodu',
 +    'mfa_verify_backup_code' => 'Rezerves kods',
 +    'mfa_verify_backup_code_desc' => 'Zemāk ievadiet vienu no jūsu atlikušajiem rezerves kodiem:',
 +    'mfa_verify_backup_code_enter_here' => 'Ievadiet rezerves kodu šeit',
 +    'mfa_verify_totp_desc' => 'Zemāk ievadiet kodu, kas izveidots mobilajā aplikācijā:',
 +    'mfa_setup_login_notification' => 'Vairākfaktoru metode iestatīta, lūdzu pieslēdzieties atkal izmantojot iestatīto metodi.',
- ];
+ ];

diff --cc resources/lang/lv/entities.php
Simple merge

diff --cc resources/lang/lv/settings.php
Simple merge

diff --cc resources/lang/nb/settings.php
Simple merge

diff --cc resources/lang/nl/auth.php
Simple merge

diff --cc resources/lang/nl/common.php
Simple merge

diff --cc resources/lang/nl/entities.php
Simple merge

diff --cc resources/lang/nl/settings.php
Simple merge

diff --cc resources/lang/pl/settings.php
Simple merge

diff --cc resources/lang/pt/settings.php
Simple merge

diff --cc resources/lang/pt_BR/settings.php
Simple merge

diff --cc resources/lang/ru/settings.php
Simple merge

diff --cc resources/lang/sk/settings.php
Simple merge

diff --cc resources/lang/sl/settings.php
Simple merge

diff --cc resources/lang/sv/settings.php
Simple merge

diff --cc resources/lang/tr/settings.php
Simple merge

diff --cc resources/lang/uk/settings.php
Simple merge

diff --cc resources/lang/vi/settings.php
Simple merge

diff --cc resources/lang/zh_CN/settings.php
Simple merge

diff --cc resources/lang/zh_TW/settings.php
Simple merge

diff --cc tests/Entity/PageContentTest.php
Simple merge

diff --cc tests/Uploads/AttachmentTest.php
Simple merge