Merge remote-tracking branch 'origin/release/13.0' into dev

opf · Sep 29, 2023 · a324c0b · a324c0b
2 parents 3904a54 + 74234e0
commit a324c0b
Show file tree

Hide file tree

Showing 73 changed files with 545 additions and 448 deletions.
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -10,7 +10,7 @@ Please get in touch with us using our [develompment forum](https://community.ope
 
 We eat our own ice cream so we use OpenProject for roadmap planning and team collaboration. Please have a look at the following pages:
 
-- [Product roadmap](https://community.openproject.org/projects/openproject/work_packages?query_id=1993)
+- [Product roadmap](https://community.openproject.org/projects/openproject/roadmap)
 - [Wish list](https://community.openproject.org/projects/openproject/work_packages?query_id=180)
 - [Bug backlog board](https://community.openproject.org/projects/openproject/boards/2905)
 - [Report a bug](https://www.openproject.org/docs/development/report-a-bug/)
@@ -110,7 +110,7 @@ which are not labelled as `work in progress` by us.
 
 ## Security
 
-If you notice a security issue in OpenProject, please send us a gpg encrypted email to [email protected] and describe the issue you found. Download our public gpg key [here](https://pgp.mit.edu/pks/lookup?op=get&search=0x7D669C6D47533958).
+If you notice a security issue in OpenProject, please send us a gpg encrypted email to [email protected] and describe the issue you found. [Download OpenProject security team public gpg key](https://keys.openpgp.org/vks/v1/by-fingerprint/BDCFE01EDE84EA199AE172CE7D669C6D47533958).
 
 Please include a description on how to reproduce the issue if possible. Our security team will get your email and will attempt to reproduce and fix the issue as soon as possible.
 

diff --git a/app/views/principals/_global_roles.html.erb b/app/views/principals/_global_roles.html.erb
@@ -50,7 +50,7 @@ See COPYRIGHT and LICENSE files for more details.
                 <div class="generic-table--sort-header-outer">
                   <div class="generic-table--sort-header">
                     <span>
-                      <%= Role.model_name.human %>
+                      <%= GlobalRole.model_name.human %>
                     </span>
                   </div>
                 </div>

diff --git a/app/views/roles/index.html.erb b/app/views/roles/index.html.erb
@@ -110,5 +110,3 @@ See COPYRIGHT and LICENSE files for more details.
 </div>
 
 <%= pagination_links_full @roles %>
-
-<p><%= link_to t(:label_permissions_report), :action => 'report' %></p>
diff --git a/config/locales/crowdin/af.yml b/config/locales/crowdin/af.yml
@@ -926,13 +926,14 @@ af:
     models:
       attachment: "Lêer"
       attribute_help_text: "Attribute help text"
-      forum: "Forum"
+      category: "Kategorie"
       comment: "Opmerking"
       custom_action: "Custom action"
       custom_field: "Pasgemaakte veld"
+      'doorkeeper/application': "OAuth application"
+      forum: "Forum"
+      global_role: "Global role"
       group: "Groep"
-      category: "Kategorie"
-      status: "Werkspakket status"
       member: "Lid"
       news: "Nuus"
       notification:
@@ -944,14 +945,14 @@ af:
       role:
         one: "Rol"
         other: "Rolle"
+      status: "Werkspakket status"
       type: "Soort"
       user: "Gebruiker"
       version: "Weergawe"
-      wiki: "Wiki"
-      wiki_page: "Wiki bladsy"
       workflow: "Werksvloei"
       work_package: "Werkspakket"
-      'doorkeeper/application': "OAuth application"
+      wiki: "Wiki"
+      wiki_page: "Wiki bladsy"
   errors:
     header_invalid_fields:
       one: "There was a problem with the following field:"

diff --git a/config/locales/crowdin/ar.yml b/config/locales/crowdin/ar.yml
@@ -938,13 +938,14 @@ ar:
     models:
       attachment: "ملف"
       attribute_help_text: "Attribute help text"
-      forum: "المنتدى"
+      category: "الفئة"
       comment: "تعليق"
       custom_action: "Custom action"
       custom_field: "حقل مخصص"
+      'doorkeeper/application': "OAuth application"
+      forum: "المنتدى"
+      global_role: "Global role"
       group: "مجموعة"
-      category: "الفئة"
-      status: "حالة مجموعة العمل"
       member: "عضو"
       news: "الأخبار"
       notification:
@@ -964,14 +965,14 @@ ar:
         few: "دور"
         many: "دور"
         other: "دور"
+      status: "حالة مجموعة العمل"
       type: "النّوع"
       user: "المستخدم"
       version: "الإصدار"
-      wiki: "Wiki"
-      wiki_page: "صفحة وِيكيبيديا"
       workflow: "سير العمل"
       work_package: "مجموعة العمل"
-      'doorkeeper/application': "OAuth application"
+      wiki: "Wiki"
+      wiki_page: "صفحة وِيكيبيديا"
   errors:
     header_invalid_fields:
       zero: "There were problems with the following fields:"

diff --git a/config/locales/crowdin/az.yml b/config/locales/crowdin/az.yml
@@ -926,13 +926,14 @@ az:
     models:
       attachment: "File"
       attribute_help_text: "Attribute help text"
-      forum: "Forum"
+      category: "Category"
       comment: "Comment"
       custom_action: "Custom action"
       custom_field: "Custom field"
+      'doorkeeper/application': "OAuth application"
+      forum: "Forum"
+      global_role: "Global role"
       group: "Group"
-      category: "Category"
-      status: "Work package status"
       member: "Member"
       news: "News"
       notification:
@@ -944,14 +945,14 @@ az:
       role:
         one: "Role"
         other: "Roles"
+      status: "Work package status"
       type: "Type"
       user: "User"
       version: "Version"
-      wiki: "Wiki"
-      wiki_page: "Wiki page"
       workflow: "Workflow"
       work_package: "Work package"
-      'doorkeeper/application': "OAuth application"
+      wiki: "Wiki"
+      wiki_page: "Wiki page"
   errors:
     header_invalid_fields:
       one: "There was a problem with the following field:"

diff --git a/config/locales/crowdin/be.yml b/config/locales/crowdin/be.yml
@@ -932,13 +932,14 @@ be:
     models:
       attachment: "File"
       attribute_help_text: "Attribute help text"
-      forum: "Forum"
+      category: "Category"
       comment: "Comment"
       custom_action: "Custom action"
       custom_field: "Карыстальніцкае поле"
+      'doorkeeper/application': "OAuth application"
+      forum: "Forum"
+      global_role: "Global role"
       group: "Group"
-      category: "Category"
-      status: "Work package status"
       member: "Member"
       news: "News"
       notification:
@@ -954,14 +955,14 @@ be:
         few: "Roles"
         many: "Roles"
         other: "Roles"
+      status: "Work package status"
       type: "Type"
       user: "User"
       version: "Version"
-      wiki: "Wiki"
-      wiki_page: "Wiki page"
       workflow: "Workflow"
       work_package: "Work package"
-      'doorkeeper/application': "OAuth application"
+      wiki: "Wiki"
+      wiki_page: "Wiki page"
   errors:
     header_invalid_fields:
       one: "There was a problem with the following field:"

diff --git a/config/locales/crowdin/bg.yml b/config/locales/crowdin/bg.yml
@@ -926,13 +926,14 @@ bg:
     models:
       attachment: "Файл"
       attribute_help_text: "Attribute help text"
-      forum: "Форум"
+      category: "Категория"
       comment: "Коментар"
       custom_action: "Custom action"
       custom_field: "Потребителски полета"
+      'doorkeeper/application': "OAuth application"
+      forum: "Форум"
+      global_role: "Global role"
       group: "Група"
-      category: "Категория"
-      status: "Статус на работен пакет"
       member: "Член"
       news: "Новини"
       notification:
@@ -944,14 +945,14 @@ bg:
       role:
         one: "Роля"
         other: "Роли"
+      status: "Статус на работен пакет"
       type: "Тип"
       user: "Потребител"
       version: "Версия"
-      wiki: "Wiki"
-      wiki_page: "Wiki страница"
       workflow: "Работен поток"
       work_package: "Работен пакет"
-      'doorkeeper/application': "OAuth application"
+      wiki: "Wiki"
+      wiki_page: "Wiki страница"
   errors:
     header_invalid_fields:
       one: "There was a problem with the following field:"

diff --git a/config/locales/crowdin/ca.yml b/config/locales/crowdin/ca.yml
@@ -922,13 +922,14 @@ ca:
     models:
       attachment: "Fitxer"
       attribute_help_text: "Texts d'ajuda d'atributs"
-      forum: "Fòrum"
+      category: "Categoria"
       comment: "Comentari"
       custom_action: "Accions personalitzades"
       custom_field: "Camp personalitzat"
+      'doorkeeper/application': "Aplicació OAuth"
+      forum: "Fòrum"
+      global_role: "Global role"
       group: "Grup"
-      category: "Categoria"
-      status: "Estat del paquet de treball"
       member: "Membre"
       news: "Notícies"
       notification:
@@ -940,14 +941,14 @@ ca:
       role:
         one: "Rol"
         other: "Rols"
+      status: "Estat del paquet de treball"
       type: "Classe"
       user: "Usuari"
       version: "Versió"
-      wiki: "Wiki"
-      wiki_page: "Pàgina wiki"
       workflow: "Flux de treball"
       work_package: "Paquet de treball"
-      'doorkeeper/application': "Aplicació OAuth"
+      wiki: "Wiki"
+      wiki_page: "Pàgina wiki"
   errors:
     header_invalid_fields:
       one: "There was a problem with the following field:"

diff --git a/config/locales/crowdin/ckb-IR.yml b/config/locales/crowdin/ckb-IR.yml
@@ -926,13 +926,14 @@ ckb-IR:
     models:
       attachment: "File"
       attribute_help_text: "Attribute help text"
-      forum: "Forum"
+      category: "Category"
       comment: "Comment"
       custom_action: "Custom action"
       custom_field: "Custom field"
+      'doorkeeper/application': "OAuth application"
+      forum: "Forum"
+      global_role: "Global role"
       group: "Group"
-      category: "Category"
-      status: "Work package status"
       member: "Member"
       news: "News"
       notification:
@@ -944,14 +945,14 @@ ckb-IR:
       role:
         one: "Role"
         other: "Roles"
+      status: "Work package status"
       type: "Type"
       user: "User"
       version: "Version"
-      wiki: "Wiki"
-      wiki_page: "Wiki page"
       workflow: "Workflow"
       work_package: "Work package"
-      'doorkeeper/application': "OAuth application"
+      wiki: "Wiki"
+      wiki_page: "Wiki page"
   errors:
     header_invalid_fields:
       one: "There was a problem with the following field:"

diff --git a/config/locales/crowdin/cs.yml b/config/locales/crowdin/cs.yml
@@ -932,13 +932,14 @@ cs:
     models:
       attachment: "Soubor"
       attribute_help_text: "Text nápovědy pro atribut"
-      forum: "Fórum"
+      category: "Kategorie"
       comment: "Komentář"
       custom_action: "Vlastní akce"
       custom_field: "Vlastní pole"
+      'doorkeeper/application': "OAuth aplikace"
+      forum: "Fórum"
+      global_role: "Global role"
       group: "Skupina"
-      category: "Kategorie"
-      status: "Stav pracovního balíčku"
       member: "Člen"
       news: "Novinky"
       notification:
@@ -954,14 +955,14 @@ cs:
         few: "Role"
         many: "Role"
         other: "Role"
+      status: "Stav pracovního balíčku"
       type: "Typ"
       user: "Uživatel"
       version: "Verze"
-      wiki: "Wiki"
-      wiki_page: "Stránka wiki"
       workflow: "Pracovní postup"
       work_package: "Pracovní balíček"
-      'doorkeeper/application': "OAuth aplikace"
+      wiki: "Wiki"
+      wiki_page: "Stránka wiki"
   errors:
     header_invalid_fields:
       one: "Došlo k potížím s následujícím polem:"

diff --git a/config/locales/crowdin/da.yml b/config/locales/crowdin/da.yml
@@ -924,13 +924,14 @@ da:
     models:
       attachment: "Fil"
       attribute_help_text: "Attribute help text"
-      forum: "Forum"
+      category: "Kategori"
       comment: "Kommentér"
       custom_action: "Custom action"
       custom_field: "Selvvalgt felt"
+      'doorkeeper/application': "OAuth application"
+      forum: "Forum"
+      global_role: "Global role"
       group: "Gruppe"
-      category: "Kategori"
-      status: "Status for arbejdspakke"
       member: "Medlem"
       news: "Nyheder"
       notification:
@@ -942,14 +943,14 @@ da:
       role:
         one: "Rolle"
         other: "Rollee"
+      status: "Status for arbejdspakke"
       type: "Type"
       user: "Bruger"
       version: "Version"
-      wiki: "Wiki"
-      wiki_page: "Wiki-side"
       workflow: "Arbejdsgang"
       work_package: "Arbejdspakke"
-      'doorkeeper/application': "OAuth application"
+      wiki: "Wiki"
+      wiki_page: "Wiki-side"
   errors:
     header_invalid_fields:
       one: "There was a problem with the following field:"

diff --git a/config/locales/crowdin/de.yml b/config/locales/crowdin/de.yml
@@ -921,13 +921,14 @@ de:
     models:
       attachment: "Datei"
       attribute_help_text: "Hilfe-Text für Attribute"
-      forum: "Forum"
+      category: "Kategorie"
       comment: "Kommentar"
       custom_action: "Benutzerdefinierte Aktion"
       custom_field: "Benutzerdefiniertes Feld"
+      'doorkeeper/application': "OAuth-Anwendung"
+      forum: "Forum"
+      global_role: "Global role"
       group: "Gruppe"
-      category: "Kategorie"
-      status: "Arbeitspaket-Status"
       member: "Mitglied"
       news: "Neuigkeiten"
       notification:
@@ -939,14 +940,14 @@ de:
       role:
         one: "Rolle"
         other: "Rollen"
+      status: "Arbeitspaket-Status"
       type: "Typ"
       user: "Benutzer"
       version: "Version"
-      wiki: "Wiki"
-      wiki_page: "Wiki-Seite"
       workflow: "Workflow"
       work_package: "Arbeitspaket"
-      'doorkeeper/application': "OAuth-Anwendung"
+      wiki: "Wiki"
+      wiki_page: "Wiki-Seite"
   errors:
     header_invalid_fields:
       one: "Bei dem folgenden Feld traten Fehler auf:"