Merge branch 'release' into vatger

.github/translators.txt

@@ -428,4 +428,6 @@ Ohadp :: Hebrew
 cbridi :: Portuguese, Brazilian
 nanangsb :: Indonesian
 Michal Melich (michalmelich) :: Czech
-David (david-prv) :: German
+David (david-prv) :: German; German Informal
+Larry (lahoje) :: Swedish
+Marcia dos Santos (marciab80) :: Portuguese

app/Access/Oidc/OidcUserDetails.php

@@ -22,7 +22,7 @@ public function isFullyPopulated(bool $groupSyncActive): bool
         $hasEmpty = empty($this->externalId)
             || empty($this->email)
             || empty($this->name)
-            || ($groupSyncActive && empty($this->groups));
+            || ($groupSyncActive && $this->groups === null);
 
         return !$hasEmpty;
     }
@@ -57,15 +57,15 @@ protected static function getUserDisplayName(string $displayNameClaims, Provides
         return implode(' ', $displayName);
     }
 
-    protected static function getUserGroups(string $groupsClaim, ProvidesClaims $token): array
+    protected static function getUserGroups(string $groupsClaim, ProvidesClaims $token): ?array
     {
         if (empty($groupsClaim)) {
-            return [];
+            return null;
         }
 
         $groupsList = Arr::get($token->getAllClaims(), $groupsClaim);
         if (!is_array($groupsList)) {
-            return [];
+            return null;
         }
 
         return array_values(array_filter($groupsList, function ($val) {

app/Uploads/ImageRepo.php

@@ -166,7 +166,7 @@ public function updateImageDetails(Image $image, $updateDetails): Image
      */
     public function updateImageFile(Image $image, UploadedFile $file): void
     {
-        if ($file->getClientOriginalExtension() !== pathinfo($image->path, PATHINFO_EXTENSION)) {
+        if (strtolower($file->getClientOriginalExtension()) !== strtolower(pathinfo($image->path, PATHINFO_EXTENSION))) {
             throw new ImageUploadException(trans('errors.image_upload_replace_type'));
         }
 

app/Util/CspService.php

@@ -133,18 +133,30 @@ protected function getAllowedIframeHosts(): array
 
     protected function getAllowedIframeSources(): array
     {
-        $sources = config('app.iframe_sources', '');
-        $hosts = array_filter(explode(' ', $sources));
+        $sources = explode(' ', config('app.iframe_sources', ''));
+        $sources[] = $this->getDrawioHost();
 
-        // Extract drawing service url to allow embedding if active
+        return array_filter($sources);
+    }
+
+    /**
+     * Extract the host name of the configured drawio URL for use in CSP.
+     * Returns empty string if not in use.
+     */
+    protected function getDrawioHost(): string
+    {
         $drawioConfigValue = config('services.drawio');
-        if ($drawioConfigValue) {
-            $drawioSource = is_string($drawioConfigValue) ? $drawioConfigValue : 'https://embed.diagrams.net/';
-            $drawioSourceParsed = parse_url($drawioSource);
-            $drawioHost = $drawioSourceParsed['scheme'] . '://' . $drawioSourceParsed['host'];
-            $hosts[] = $drawioHost;
+        if (!$drawioConfigValue) {
+            return '';
+        }
+
+        $drawioSource = is_string($drawioConfigValue) ? $drawioConfigValue : 'https://embed.diagrams.net/';
+        $drawioSourceParsed = parse_url($drawioSource);
+        $drawioHost = $drawioSourceParsed['scheme'] . '://' . $drawioSourceParsed['host'];
+        if (isset($drawioSourceParsed['port'])) {
+            $drawioHost .= ':' . $drawioSourceParsed['port'];
         }
 
-        return $hosts;
+        return $drawioHost;
     }
 }

dev/licensing/js-library-licenses.txt

@@ -9,7 +9,7 @@ acorn
 License: MIT
 License File: node_modules/acorn/LICENSE
 Copyright: Copyright (C) 2012-2022 by various contributors (see AUTHORS)
-Source: https://github.com/acornjs/acorn.git
+Source: git+https://github.com/acornjs/acorn.git
 Link: https://github.com/acornjs/acorn
 -----------
 ajv
@@ -120,7 +120,7 @@ Link: https://github.com/juliangruber/brace-expansion
 braces
 License: MIT
 License File: node_modules/braces/LICENSE
-Copyright: Copyright (c) 2014-2018, Jon Schlinkert.
+Copyright: Copyright (c) 2014-present, Jon Schlinkert.
 Source: micromatch/braces
 Link: https://github.com/micromatch/braces
 -----------
@@ -1665,6 +1665,13 @@ Copyright: Copyright (c) Isaac Z. Schlueter and Contributors
 Source: git://github.com/isaacs/node-which.git
 Link: git://github.com/isaacs/node-which.git
 -----------
+word-wrap
+License: MIT
+License File: node_modules/word-wrap/LICENSE
+Copyright: Copyright (c) 2014-2016, Jon Schlinkert
+Source: jonschlinkert/word-wrap
+Link: https://github.com/jonschlinkert/word-wrap
+-----------
 wrap-ansi
 License: MIT
 License File: node_modules/wrap-ansi/license
@@ -1715,13 +1722,6 @@ Copyright: Copyright (c) Sindre Sorhus <************@*****.***> (https://sindres
 Source: sindresorhus/yocto-queue
 Link: sindresorhus/yocto-queue
 -----------
-@aashutoshrathi/word-wrap
-License: MIT
-License File: node_modules/@aashutoshrathi/word-wrap/LICENSE
-Copyright: Copyright (c) 2014-2016, Jon Schlinkert
-Source: git+https://github.com/aashutoshrathi/word-wrap.git
-Link: https://github.com/aashutoshrathi/word-wrap
------------
 @codemirror/autocomplete
 License: MIT
 License File: node_modules/@codemirror/autocomplete/LICENSE

lang/cs/preferences.php

@@ -20,14 +20,14 @@
     'shortcuts_overview_desc' => 'Správa klávesových zkratek, které můžete použít k navigaci systémového uživatelského rozhraní.',
 
     'notifications' => 'Nastavení upozornění',
-    'notifications_desc' => 'Ovládat e-mailová oznámení, která dostáváte při provádění určité aktivity v systému.',
+    'notifications_desc' => 'Nastavte si e-mailová oznámení, která dostanete při provedení určitých akcí v systému.',
     'notifications_opt_own_page_changes' => 'Upozornit na změny stránek u kterých jsem vlastníkem',
     'notifications_opt_own_page_comments' => 'Upozornit na komentáře na stránkách, které vlastním',
     'notifications_opt_comment_replies' => 'Upozornit na odpovědi na mé komentáře',
-    'notifications_save' => 'Uložit preference',
+    'notifications_save' => 'Uložit nastavení',
     'notifications_update_success' => 'Nastavení oznámení byla aktualizována!',
     'notifications_watched' => 'Sledované a ignorované položky',
-    'notifications_watched_desc' => 'Níže jsou položky, které mají vlastní nastavení hodinek. Chcete-li aktualizovat vaše předvolby, podívejte se na položku a pak najděte možnosti hodinek v postranním panelu.',
+    'notifications_watched_desc' => 'Níže jsou položky, které mají vlastní nastavení sledování. Chcete-li aktualizovat vaše předvolby, zobrazte položku a pak upravte možnosti sledování v postranním panelu.',
 
     'auth' => 'Přístup a zabezpečení',
     'auth_change_password' => 'Změnit heslo',

lang/cy/editor.php

@@ -7,7 +7,7 @@
  */
 return [
     // General editor terms
-    'general' => 'General',
+    'general' => 'Cyffredin',
     'advanced' => 'Advanced',
     'none' => 'Dim un',
     'cancel' => 'Canslo',
@@ -59,7 +59,7 @@
     'list_task' => 'Task list',
     'indent_increase' => 'Increase indent',
     'indent_decrease' => 'Decrease indent',
-    'table' => 'Table',
+    'table' => 'Bwrdd',
     'insert_image' => 'Insert image',
     'insert_image_title' => 'Insert/Edit Image',
     'insert_link' => 'Insert/edit link',

lang/de_informal/auth.php

@@ -91,7 +91,7 @@
     'mfa_option_totp_title' => 'Mobile App',
     'mfa_option_totp_desc' => 'Um Mehrfach-Faktor-Authentifizierung nutzen zu können, benötigst du eine mobile Anwendung, die TOTP unterstützt, wie Google Authenticator, Authy oder Microsoft Authenticator.',
     'mfa_option_backup_codes_title' => 'Backup Code',
-    'mfa_option_backup_codes_desc' => 'Erzeugt eine Reihe von einmalig nutzbaren Backup-Codes, welche Sie bei der Anmeldung eingeben, um Ihre Identität zu bestätigen. Achten Sie darauf diese an einem sicheren Ort aufzubewahren.',
+    'mfa_option_backup_codes_desc' => 'Erzeugt eine Reihe von einmalig nutzbaren Backup-Codes, welche Du bei der Anmeldung eingibst, um deine Identität zu bestätigen. Achte darauf diese an einem sicheren Ort aufzubewahren.',
     'mfa_gen_confirm_and_enable' => 'Bestätigen und aktivieren',
     'mfa_gen_backup_codes_title' => 'Backup-Codes einrichten',
     'mfa_gen_backup_codes_desc' => 'Speichere die folgende Liste der Codes an einem sicheren Ort. Wenn du auf das System zugreifst, kannst du einen der Codes als zweiten Authentifizierungsmechanismus verwenden.',

lang/hu/auth.php

@@ -91,7 +91,7 @@
     'mfa_option_totp_title' => 'Mobilalkalmazás',
     'mfa_option_totp_desc' => 'A többlépcsős azonosításhoz olyan mobilalkalmazásra lesz szükséged, amely támogatja a TOTP-t, például a Google Authenticator, az Authy vagy a Microsoft Authenticator.',
     'mfa_option_backup_codes_title' => 'Visszaállítási kulcsok',
-    'mfa_option_backup_codes_desc' => 'Generates a set of one-time-use backup codes which you\'ll enter on login to verify your identity. Make sure to store these in a safe & secure place.',
+    'mfa_option_backup_codes_desc' => 'Egyszer használatos biztonsági kódokat hoz létre, amelyeket bejelentkezéskor kell megadnia személyazonosságának igazolására. Ügyeljen arra, hogy ezeket biztonságos helyen tárolja.',
     'mfa_gen_confirm_and_enable' => 'Jóváhagyás és engedélyezés',
     'mfa_gen_backup_codes_title' => 'Visszaállítási kódok beállítása',
     'mfa_gen_backup_codes_desc' => 'Tárolja el egy biztonságos helyen az alábbi kódokat. Bejelentkezés során fel tudja használni őket másodlagos bejelentkezési kódként.',

lang/ja/auth.php

@@ -87,13 +87,13 @@
     'mfa_setup_reconfigure' => '再設定',
     'mfa_setup_remove_confirmation' => 'この多要素認証方法を削除してもよろしいですか？',
     'mfa_setup_action' => '設定',
-    'mfa_backup_codes_usage_limit_warning' => 'バックアップコードは残り5つ以下です。アカウントのロックアウトを防ぐため、コードがなくなる前に新しいセットを生成して保存してください。',
+    'mfa_backup_codes_usage_limit_warning' => '有効な確認コードは残り5つ以下です。アカウントのロックアウトを防ぐため、コードがなくなる前に新しいセットを生成して保存してください。',
     'mfa_option_totp_title' => 'モバイルアプリ',
     'mfa_option_totp_desc' => '多要素認証を使用するには、Google Authenticator、Authy、Microsoft AuthenticatorなどのTOTPをサポートするモバイルアプリケーションが必要です。',
-    'mfa_option_backup_codes_title' => 'バックアップコード',
-    'mfa_option_backup_codes_desc' => 'Generates a set of one-time-use backup codes which you\'ll enter on login to verify your identity. Make sure to store these in a safe & secure place.',
+    'mfa_option_backup_codes_title' => '確認コード',
+    'mfa_option_backup_codes_desc' => 'ログイン時に本人確認のために追加入力する1回限りの確認コードセットを生成します。 これは安全な場所に保管してください。',
     'mfa_gen_confirm_and_enable' => '確認して有効化',
-    'mfa_gen_backup_codes_title' => 'バックアップコードの設定',
+    'mfa_gen_backup_codes_title' => '確認コードの構成',
     'mfa_gen_backup_codes_desc' => '以下のコードのリストを安全な場所に保管してください。システムにアクセスする際、コードのいずれかを第二の認証手段として使用できます。',
     'mfa_gen_backup_codes_download' => 'コードをダウンロード',
     'mfa_gen_backup_codes_usage_warning' => '各コードは一度だけ使用できます',
@@ -108,10 +108,10 @@
     'mfa_verify_no_methods' => '手段が設定されていません',
     'mfa_verify_no_methods_desc' => 'アカウントの多要素認証手段が見つかりませんでした。アクセスする前に、少なくとも1つの手段を設定する必要があります。',
     'mfa_verify_use_totp' => 'モバイルアプリを利用して確認',
-    'mfa_verify_use_backup_codes' => 'バックアップコードを利用して確認',
-    'mfa_verify_backup_code' => 'バックアップコード',
-    'mfa_verify_backup_code_desc' => '残りのバックアップコードのいずれかを入力してください:',
-    'mfa_verify_backup_code_enter_here' => 'バックアップコードを入力',
+    'mfa_verify_use_backup_codes' => '確認コードによる検証',
+    'mfa_verify_backup_code' => '確認コード',
+    'mfa_verify_backup_code_desc' => '残りの確認コードのいずれかを入力してください:',
+    'mfa_verify_backup_code_enter_here' => '確認コードを入力',
     'mfa_verify_totp_desc' => 'モバイルアプリを利用して生成されたコードを入力してください:',
     'mfa_setup_login_notification' => '多要素認証が構成されました。設定された手段を利用して再度ログインしてください。',
 ];

lang/ja/errors.php

@@ -37,7 +37,7 @@
     'social_driver_not_found' => 'Social driverが見つかりません',
     'social_driver_not_configured' => 'あなたの:socialAccount設定は正しく構成されていません。',
     'invite_token_expired' => 'この招待リンクの有効期限が切れています。 代わりにアカウントのパスワードをリセットしてみてください。',
-    'login_user_not_found' => 'A user for this action could not be found.',
+    'login_user_not_found' => 'このアクションのユーザーが見つかりません。',
 
     // System
     'path_not_writable' => 'ファイルパス :filePath へアップロードできませんでした。サーバ上での書き込みが許可されているか確認してください。',

lang/pt/common.php

@@ -20,7 +20,7 @@
     'description' => 'Descrição',
     'role' => 'Cargo',
     'cover_image' => 'Imagem de capa',
-    'cover_image_description' => 'This image should be approximately 440x250px although it will be flexibly scaled & cropped to fit the user interface in different scenarios as required, so actual dimensions for display will differ.',
+    'cover_image_description' => 'Esta imagem deve ser de aproximadamente 440x250px, embora seja escalada de forma flexível e cortada para caber na interface do usuário em diferentes cenários conforme necessário, então, dimensões atuais para exibição serão diferentes.',
 
     // Actions
     'actions' => 'Ações',

lang/pt/preferences.php

@@ -25,23 +25,23 @@
     'notifications_opt_own_page_comments' => 'Notificar quando comentam páginas que possuo',
     'notifications_opt_comment_replies' => 'Notificar respostas aos meus comentários',
     'notifications_save' => 'Guardar preferências',
-    'notifications_update_success' => 'Notification preferences have been updated!',
-    'notifications_watched' => 'Watched & Ignored Items',
-    'notifications_watched_desc' => 'Below are the items that have custom watch preferences applied. To update your preferences for these, view the item then find the watch options in the sidebar.',
+    'notifications_update_success' => 'Preferências de notificação foram atualizadas!',
+    'notifications_watched' => 'Itens assistidos e ignorados',
+    'notifications_watched_desc' => 'Abaixo estão os itens que possuem preferências de seguir personalizadas aplicadas. Para atualizar suas preferências para estes, veja o item e encontre as opções de seguir na barra lateral.',
 
     'auth' => 'Acesso e Segurança',
     'auth_change_password' => 'Alterar Palavra-passe',
     'auth_change_password_desc' => 'Altere a palavra-passe que você usa para entrar no aplicativo. Ela deve ter pelo menos 8 caracteres.',
     'auth_change_password_success' => 'A palavra-passe foi atualizada!',
 
     'profile' => 'Detalhes Do Perfil',
-    'profile_desc' => 'Manage the details of your account which represents you to other users, in addition to details that are used for communication and system personalisation.',
+    'profile_desc' => 'Gerencie os detalhes de sua conta que o representam para outros usuários, além de detalhes que são usados para personalização do sistema e comunicação.',
     'profile_view_public' => 'Visualizar Perfil Público',
-    'profile_name_desc' => 'Configure your display name which will be visible to other users in the system through the activity you perform, and content you own.',
-    'profile_email_desc' => 'This email will be used for notifications and, depending on active system authentication, system access.',
-    'profile_email_no_permission' => 'Unfortunately you don\'t have permission to change your email address. If you want to change this, you\'d need to ask an administrator to change this for you.',
-    'profile_avatar_desc' => 'Select an image which will be used to represent yourself to others in the system. Ideally this image should be square and about 256px in width and height.',
-    'profile_admin_options' => 'Administrator Options',
+    'profile_name_desc' => 'Configure o seu nome de exibição que será visível para outros usuários no sistema através da atividade que você executa e do conteúdo você tem.',
+    'profile_email_desc' => 'Este e-mail será usado para notificações e, dependendo da autenticação ativa do sistema, acesso do sistema.',
+    'profile_email_no_permission' => 'Infelizmente você não tem permissão para alterar seu correio eletrônico. Se você quiser mudar isso, você precisa pedir a um administrador para alterar por você.',
+    'profile_avatar_desc' => 'Selecione uma imagem que será usada para lhe representar aos outros usuários do sistema. Idealmente, esta imagem deve ser quadrada e sobre 256px em largura e altura.',
+    'profile_admin_options' => 'Opções de administrador',
     'profile_admin_options_desc' => 'Additional administrator-level options, like those to manage role assignments, can be found for your user account in the "Settings > Users" area of the application.',
 
     'delete_account' => 'Excluir Conta',