references/openproject
1
0
Fork 0
mirror of https://github.com/opf/openproject.git synced 2026-06-14 03:30:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' into ruby-3.3.1

Browse Source
This commit is contained in:
Klaus Zanders
2024-04-29 08:03:08 +02:00
committed by GitHub
parent ef6ce07179 db0c7a0f14
commit da8e575e36
221 changed files with 9589 additions and 9920 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gemfile
+4 -4
View File
@@ -115,6 +115,8 @@ gem "ruby-duration", "~> 3.2.0"
# released.
gem "mail", "= 2.8.1"
gem "csv", "~> 3.3"
# provide compatible filesystem information for available storage
gem "sys-filesystem", "~> 1.4.0", require: false
@@ -264,7 +266,7 @@ group :test do
gem "capybara-screenshot", "~> 1.0.17"
gem "cuprite", "~> 0.15.0"
gem "selenium-devtools"
gem "selenium-webdriver", "~> 4.19.0"
gem "selenium-webdriver", "~> 4.20"
gem "fuubar", "~> 2.5.0"
gem "timecop", "~> 0.9.0"
@@ -383,6 +385,4 @@ end
gem "openproject-octicons", "~>19.10.0"
gem "openproject-octicons_helper", "~>19.10.0"
gem "openproject-primer_view_components", "~>0.29.0"
gem "csv", "~> 3.3"
gem "openproject-primer_view_components", "~>0.29.1"
Gemfile.lock
+9 -9
View File
@@ -341,8 +341,8 @@ GEM
activerecord (>= 4.0.0, < 7.2)
awrence (1.2.1)
aws-eventstream (1.3.0)
aws-partitions (1.916.0)
aws-sdk-core (3.192.1)
aws-partitions (1.920.0)
aws-sdk-core (3.193.0)
aws-eventstream (~> 1, >= 1.3.0)
aws-partitions (~> 1, >= 1.651.0)
aws-sigv4 (~> 1.8)
@@ -773,7 +773,7 @@ GEM
actionview
openproject-octicons (= 19.10.0)
railties
openproject-primer_view_components (0.29.0)
openproject-primer_view_components (0.29.1)
actionview (>= 5.0.0)
activesupport (>= 5.0.0)
openproject-octicons (>= 19.9.0)
@@ -789,7 +789,7 @@ GEM
activerecord (>= 6.1)
request_store (~> 1.4)
parallel (1.24.0)
parallel_tests (4.7.0)
parallel_tests (4.7.1)
parallel
parser (3.3.1.0)
ast (~> 2.4.1)
@@ -1025,9 +1025,9 @@ GEM
crass (~> 1.0.2)
nokogiri (>= 1.12.0)
secure_headers (6.5.0)
selenium-devtools (0.123.0)
selenium-devtools (0.124.0)
selenium-webdriver (~> 4.2)
selenium-webdriver (4.19.0)
selenium-webdriver (4.20.1)
base64 (~> 0.2)
rexml (~> 3.2, >= 3.2.5)
rubyzip (>= 1.2.2, < 3.0)
@@ -1047,7 +1047,7 @@ GEM
spreadsheet (1.3.1)
bigdecimal
ruby-ole
spring (4.2.0)
spring (4.2.1)
spring-commands-rspec (1.0.4)
spring (>= 0.9.1)
spring-commands-rubocop (0.4.0)
@@ -1270,7 +1270,7 @@ DEPENDENCIES
openproject-octicons (~> 19.10.0)
openproject-octicons_helper (~> 19.10.0)
openproject-openid_connect!
openproject-primer_view_components (~> 0.29.0)
openproject-primer_view_components (~> 0.29.1)
openproject-recaptcha!
openproject-reporting!
openproject-storages!
@@ -1327,7 +1327,7 @@ DEPENDENCIES
sanitize (~> 6.1.0)
secure_headers (~> 6.5.0)
selenium-devtools
selenium-webdriver (~> 4.19.0)
selenium-webdriver (~> 4.20)
semantic (~> 1.6.1)
shoulda-context (~> 2.0)
shoulda-matchers (~> 6.0)
app/components/members/index_page_header_component.html.erb
+1 -1
View File
@@ -1,7 +1,7 @@
<%=
render(Primer::OpenProject::PageHeader.new) do |header|
header.with_title { page_title }
header.with_breadcrumbs(breadcrumb_items)
header.with_breadcrumbs(breadcrumb_items, selected_item_font_weight: current_breadcrumb_element == page_title ? :bold : :normal)
header.with_action_button(scheme: :primary,
mobile_icon: :plus,
app/components/projects/index_page_header_component.html.erb
+1 -1
View File
@@ -2,7 +2,7 @@
render(Primer::OpenProject::PageHeader.new) do |header|
if show_state?
header.with_title(data: { 'test-selector': 'project-query-name'}) { page_title }
header.with_breadcrumbs(breadcrumb_items)
header.with_breadcrumbs(breadcrumb_items, selected_item_font_weight: current_breadcrumb_element == page_title ? :bold : :normal)
if query_saveable?
header.with_action_text { t('lists.can_be_saved_as') }
app/forms/work_packages/progress_form.rb
+1
View File
@@ -171,6 +171,7 @@ class WorkPackages::ProgressForm < ApplicationForm
data = { "work-packages--progress--preview-progress-target": "progressInput",
"work-packages--progress--touched-field-marker-target": "progressInput",
action: "input->work-packages--progress--touched-field-marker#markFieldAsTouched" }
if @focused_field == name
data[:"work-packages--progress--focus-field-target"] = "fieldToFocus"
end
app/helpers/frontend_asset_helper.rb
+8 -3
View File
@@ -58,8 +58,13 @@ module FrontendAssetHelper
private
def frontend_asset_path(unhashed_file_name)
"/assets/frontend/#{::OpenProject::Assets.lookup_asset(unhashed_file_name)}"
def lookup_frontend_asset(unhashed_file_name)
hashed_file_name = ::OpenProject::Assets.lookup_asset(unhashed_file_name)
frontend_asset_path(hashed_file_name)
end
def frontend_asset_path(file_name)
"/assets/frontend/#{file_name}"
end
def variable_asset_path(path)
@@ -72,7 +77,7 @@ module FrontendAssetHelper
else
# we do not need to take care about Rails.application.config.relative_url_root
# because in this case javascript|stylesheet_include_tag will add it automatically.
frontend_asset_path(path)
lookup_frontend_asset(path)
end
end
end
app/views/account/_login.html.erb
+1 -1
View File
@@ -73,7 +73,7 @@ See COPYRIGHT and LICENSE files for more details.
</div>
<div class="form--field">
<label class="form--label">
<label class="form--label" for="login-pulldown">
&nbsp;
</label>
<input type="submit" name="login" id="login-pulldown"
config/locales/crowdin/af.yml
+1 -1
View File
@@ -3573,7 +3573,7 @@ af:
link: link
plugin_openproject_auth_plugins:
name: "OpenProject Auth Plugins"
description: "Integration of OmniAuth strategy providers for authentication in Openproject."
description: "Integration of OmniAuth strategy providers for authentication in OpenProject."
plugin_openproject_auth_saml:
name: "OmniAuth SAML / Single-Sign On"
description: "Adds the OmniAuth SAML provider to OpenProject"
config/locales/crowdin/ar.yml
+1 -1
View File
@@ -3719,7 +3719,7 @@ ar:
link: link
plugin_openproject_auth_plugins:
name: "OpenProject Auth Plugins"
description: "Integration of OmniAuth strategy providers for authentication in Openproject."
description: "Integration of OmniAuth strategy providers for authentication in OpenProject."
plugin_openproject_auth_saml:
name: "OmniAuth SAML / Single-Sign On"
description: "Adds the OmniAuth SAML provider to OpenProject"
config/locales/crowdin/az.yml
+1 -1
View File
@@ -3573,7 +3573,7 @@ az:
link: link
plugin_openproject_auth_plugins:
name: "OpenProject Auth Plugins"
description: "Integration of OmniAuth strategy providers for authentication in Openproject."
description: "Integration of OmniAuth strategy providers for authentication in OpenProject."
plugin_openproject_auth_saml:
name: "OmniAuth SAML / Single-Sign On"
description: "Adds the OmniAuth SAML provider to OpenProject"
config/locales/crowdin/be.yml
+1 -1
View File
@@ -3647,7 +3647,7 @@ be:
link: link
plugin_openproject_auth_plugins:
name: "OpenProject Auth Plugins"
description: "Integration of OmniAuth strategy providers for authentication in Openproject."
description: "Integration of OmniAuth strategy providers for authentication in OpenProject."
plugin_openproject_auth_saml:
name: "OmniAuth SAML / Single-Sign On"
description: "Adds the OmniAuth SAML provider to OpenProject"
config/locales/crowdin/bg.yml
+1 -1
View File
@@ -3573,7 +3573,7 @@ bg:
link: link
plugin_openproject_auth_plugins:
name: "OpenProject Auth Plugins"
description: "Integration of OmniAuth strategy providers for authentication in Openproject."
description: "Integration of OmniAuth strategy providers for authentication in OpenProject."
plugin_openproject_auth_saml:
name: "OmniAuth SAML / Single-Sign On"
description: "Adds the OmniAuth SAML provider to OpenProject"
config/locales/crowdin/ca.yml
+1 -1
View File
@@ -3562,7 +3562,7 @@ ca:
link: link
plugin_openproject_auth_plugins:
name: "OpenProject Auth Plugins"
description: "Integration of OmniAuth strategy providers for authentication in Openproject."
description: "Integration of OmniAuth strategy providers for authentication in OpenProject."
plugin_openproject_auth_saml:
name: "OmniAuth SAML / Single-Sign On"
description: "Adds the OmniAuth SAML provider to OpenProject"
config/locales/crowdin/ckb-IR.yml
+1 -1
View File
@@ -3573,7 +3573,7 @@ ckb-IR:
link: link
plugin_openproject_auth_plugins:
name: "OpenProject Auth Plugins"
description: "Integration of OmniAuth strategy providers for authentication in Openproject."
description: "Integration of OmniAuth strategy providers for authentication in OpenProject."
plugin_openproject_auth_saml:
name: "OmniAuth SAML / Single-Sign On"
description: "Adds the OmniAuth SAML provider to OpenProject"
config/locales/crowdin/cs.yml
+4 -4
View File
@@ -1488,8 +1488,8 @@ cs:
x_hours_abbreviated:
one: "1 h"
few: "%{count} hodin"
many: ""
other: ""
many: "%{count} hodin"
other: "%{count} hodin"
x_weeks:
one: "1 týden"
few: "%{count} týdnů"
@@ -1568,7 +1568,7 @@ cs:
error_can_not_delete_entry: "Nelze odstranit položku"
error_can_not_delete_custom_field: "Nelze odstranit vlastní pole"
error_can_not_delete_in_use_archived_undisclosed: "V archivovaných projektech jsou obsaženy také pracovní balíčky. Musíte požádat správce, aby provedl smazání, aby zjistil, které projekty jsou dotčeny."
error_can_not_delete_in_use_archived_work_packages: "V archivovaných projektech jsou také pracovní balíčky. Nejprve musíte projekty znovu aktivovat, než budete moci změnit typ příslušných pracovních balíčků: %{archived_projects}"
error_can_not_delete_in_use_archived_work_packages: "V archivovaných projektech jsou také pracovní balíčky. Nejprve musíte projekty znovu aktivovat, než budete moci změnit typ příslušných pracovních balíčků: %{archived_projects_urls}"
error_can_not_delete_type:
explanation: 'Tento typ obsahuje pracovní balíčky a nelze je odstranit. Všechny dotčené pracovní balíčky můžete vidět v <a target="_blank" href="%{url}">tomto zobrazení</a>.'
error_can_not_delete_standard_type: "Standartní typy se nedají odstranit."
@@ -3645,7 +3645,7 @@ cs:
link: odkaz
plugin_openproject_auth_plugins:
name: "OpenProject Auth pluginy"
description: "Integrace poskytovatelů strategie OmniAuth pro ověřování v Openproject."
description: "Integration of OmniAuth strategy providers for authentication in OpenProject."
plugin_openproject_auth_saml:
name: "OmniAuth SAML / Single-Sign On"
description: "Přidá poskytovatele SAML OmniAuth do OpenProject"
config/locales/crowdin/da.yml
+1 -1
View File
@@ -3569,7 +3569,7 @@ da:
link: link
plugin_openproject_auth_plugins:
name: "OpenProject Auth Plugins"
description: "Integration of OmniAuth strategy providers for authentication in Openproject."
description: "Integration of OmniAuth strategy providers for authentication in OpenProject."
plugin_openproject_auth_saml:
name: "OmniAuth SAML / Single-Sign On"
description: "Adds the OmniAuth SAML provider to OpenProject"
config/locales/crowdin/de.yml
+1 -1
View File
@@ -3567,7 +3567,7 @@ de:
link: Link
plugin_openproject_auth_plugins:
name: "OpenProject Auth Plugins"
description: "Integration von externen Authentifizierungsanbietern in Openproject."
description: "Integration of OmniAuth strategy providers for authentication in OpenProject."
plugin_openproject_auth_saml:
name: "OmniAuth SAML / Single-Sign An"
description: "Fügt den OmniAuth SAML-Anbieter zu OpenProject hinzu"
config/locales/crowdin/el.yml
+1 -1
View File
@@ -3567,7 +3567,7 @@ el:
link: link
plugin_openproject_auth_plugins:
name: "OpenProject Auth Plugins"
description: "Integration of OmniAuth strategy providers for authentication in Openproject."
description: "Integration of OmniAuth strategy providers for authentication in OpenProject."
plugin_openproject_auth_saml:
name: "OmniAuth SAML / Single-Sign On"
description: "Adds the OmniAuth SAML provider to OpenProject"
config/locales/crowdin/eo.yml
+1 -1
View File
@@ -3573,7 +3573,7 @@ eo:
link: link
plugin_openproject_auth_plugins:
name: "OpenProject Auth Plugins"
description: "Integration of OmniAuth strategy providers for authentication in Openproject."
description: "Integration of OmniAuth strategy providers for authentication in OpenProject."
plugin_openproject_auth_saml:
name: "OmniAuth SAML / Single-Sign On"
description: "Adds the OmniAuth SAML provider to OpenProject"
config/locales/crowdin/es.yml
+14 -14
View File
@@ -261,7 +261,7 @@ es:
lists:
active: "Proyectos activos"
my: "Mis proyectos"
favored: "Favored projects"
favored: "Proyectos favoritos"
archived: "Proyectos archivados"
my_private: "Mis listas de proyectos privados"
new:
@@ -991,13 +991,13 @@ es:
only_same_project_categories_allowed: "La categoría de un paquete de trabajo debe estar en el mismo proyecto que el paquete de trabajo."
does_not_exist: "La categoría especificada no existe."
estimated_hours:
cant_be_inferior_to_remaining_work: "Cannot be lower than Remaining work."
must_be_set_when_remaining_work_is_set: "Required when Remaining work is set."
only_values_greater_or_equal_zeroes_allowed: "Must be >= 0."
cant_be_inferior_to_remaining_work: "No puede ser inferior al Trabajo restante."
must_be_set_when_remaining_work_is_set: "Obligatorio cuando el Trabajo restante está establecido."
only_values_greater_or_equal_zeroes_allowed: "Debe ser >= 0."
format: "%{message}"
remaining_hours:
cant_exceed_work: "Cannot be higher than Work."
must_be_set_when_work_is_set: "Required when Work is set."
cant_exceed_work: "No puede ser superior a Trabajo."
must_be_set_when_work_is_set: "Obligatorio cuando Trabajo está establecido."
format: "%{message}"
readonly_status: "El paquete de trabajo está en un estado de sólo lectura por lo que sus atributos no se pueden cambiar."
type:
@@ -1261,7 +1261,7 @@ es:
button_edit: "Editar"
button_edit_associated_wikipage: "Editar página Wiki asociada: %{page_title}"
button_expand_all: "Expandir todos"
button_favorite: "Mark as favorite"
button_favorite: "Marcar como favorito"
button_filter: "Filtro"
button_generate: "Generar"
button_list: "Lista"
@@ -1289,7 +1289,7 @@ es:
button_unarchive: "Desarchivar"
button_uncheck_all: "Deseleccionar todos"
button_unlock: "Desbloquear"
button_unfavorite: "Remove from favorites"
button_unfavorite: "Eliminar de favoritos"
button_unwatch: "No controlar más"
button_update: "Actualizar"
button_upgrade: "Mejorar"
@@ -1653,9 +1653,9 @@ es:
file_links_journal: >
A partir de ahora, la actividad relacionada con los enlaces de archivos (archivos almacenados en almacenamiento externo) aparecerá aquí en la pestaña Actividad. La siguiente representa la actividad relativa a los enlaces que ya existían:
progress_calculation_adjusted_from_disabled_mode: >-
Progress calculation automatically <a href="%{href}" target="_blank">set to work-based mode and adjusted with version update</a>.
Cálculo de progreso automático <a href="%{href}" target="_blank">establecido en modo de trabajo y ajustado con la actualización de versión</a>.
progress_calculation_adjusted: >-
Progress calculation automatically <a href="%{href}" target="_blank">adjusted with version update</a>.
Cálculo de progreso automático <a href="%{href}" target="_blank">ajustado con la actualización de versión</a>.
links:
configuration_guide: "Guía de configuración"
get_in_touch: "¿Tiene alguna pregunta? Póngase en contacto con nosotros."
@@ -1911,7 +1911,7 @@ es:
label_enterprise_support: "Soporte empresarial"
label_enterprise_addon: "Extensión Enterprise"
label_environment: "Entorno"
label_estimates_and_progress: "Estimates and progress"
label_estimates_and_progress: "Estimaciones y progreso"
label_equals: "es"
label_everywhere: "todo"
label_example: "Ejemplo"
@@ -2023,7 +2023,7 @@ es:
label_membership_plural: "Afiliaciones"
lable_membership_added: "Miembro añadido"
lable_membership_updated: "Miembro actualizado"
label_menu: "Menu"
label_menu: "Menú"
label_menu_badge:
pre_alpha: "pre-alfa"
alpha: "alfa"
@@ -2125,7 +2125,7 @@ es:
label_percent_complete: "% compleado"
label_project_activity: "Actividad del proyecto"
label_project_attribute_plural: "Atributos del proyecto"
label_project_attribute_manage_link: "Manage project attributes"
label_project_attribute_manage_link: "Administrar atributos del proyecto"
label_project_count: "Número total de proyectos"
label_project_copy_notifications: "Enviar notificaciones por correo electrónico durante la copia del proyecto"
label_project_latest: "Últimos proyectos"
@@ -3568,7 +3568,7 @@ es:
link: enlace
plugin_openproject_auth_plugins:
name: "Plugins Auth de OpenProject"
description: "Integración de los proveedores de estrategia de OmniAuth para la autentificación en Openproject."
description: "Integration of OmniAuth strategy providers for authentication in OpenProject."
plugin_openproject_auth_saml:
name: "OmniAuth SAML / Inicio de sesión único"
description: "Añade el proveedor OmniAuth SAML a OpenProject"
config/locales/crowdin/et.yml
+1 -1
View File
@@ -3573,7 +3573,7 @@ et:
link: link
plugin_openproject_auth_plugins:
name: "OpenProject Auth Plugins"
description: "Integration of OmniAuth strategy providers for authentication in Openproject."
description: "Integration of OmniAuth strategy providers for authentication in OpenProject."
plugin_openproject_auth_saml:
name: "OmniAuth SAML / Single-Sign On"
description: "Adds the OmniAuth SAML provider to OpenProject"
config/locales/crowdin/eu.yml
+1 -1
View File
@@ -3573,7 +3573,7 @@ eu:
link: link
plugin_openproject_auth_plugins:
name: "OpenProject Auth Plugins"
description: "Integration of OmniAuth strategy providers for authentication in Openproject."
description: "Integration of OmniAuth strategy providers for authentication in OpenProject."
plugin_openproject_auth_saml:
name: "OmniAuth SAML / Single-Sign On"
description: "Adds the OmniAuth SAML provider to OpenProject"
config/locales/crowdin/fa.yml
+1 -1
View File
@@ -3573,7 +3573,7 @@ fa:
link: link
plugin_openproject_auth_plugins:
name: "OpenProject Auth Plugins"
description: "Integration of OmniAuth strategy providers for authentication in Openproject."
description: "Integration of OmniAuth strategy providers for authentication in OpenProject."
plugin_openproject_auth_saml:
name: "OmniAuth SAML / Single-Sign On"
description: "Adds the OmniAuth SAML provider to OpenProject"
config/locales/crowdin/fi.yml
+1 -1
View File
@@ -3573,7 +3573,7 @@ fi:
link: link
plugin_openproject_auth_plugins:
name: "OpenProject Auth Plugins"
description: "Integration of OmniAuth strategy providers for authentication in Openproject."
description: "Integration of OmniAuth strategy providers for authentication in OpenProject."
plugin_openproject_auth_saml:
name: "OmniAuth SAML / Single-Sign On"
description: "Adds the OmniAuth SAML provider to OpenProject"
config/locales/crowdin/fil.yml
+1 -1
View File
@@ -3571,7 +3571,7 @@ fil:
link: link
plugin_openproject_auth_plugins:
name: "OpenProject Auth Plugins"
description: "Integration of OmniAuth strategy providers for authentication in Openproject."
description: "Integration of OmniAuth strategy providers for authentication in OpenProject."
plugin_openproject_auth_saml:
name: "OmniAuth SAML / Single-Sign On"
description: "Adds the OmniAuth SAML provider to OpenProject"
config/locales/crowdin/fr.yml
+1 -1
View File
@@ -3572,7 +3572,7 @@ fr:
link: lien
plugin_openproject_auth_plugins:
name: "Plugins d'authentification OpenProject"
description: "Intégration des fournisseurs de stratégie OmniAuth pour l'authentification dans Openproject."
description: "Integration of OmniAuth strategy providers for authentication in OpenProject."
plugin_openproject_auth_saml:
name: "OmniAuth SAML / authentification unique"
description: "Ajoute le fournisseur SAML OmniAuth à OpenProject"
config/locales/crowdin/he.yml
+1 -1
View File
@@ -3647,7 +3647,7 @@ he:
link: link
plugin_openproject_auth_plugins:
name: "OpenProject Auth Plugins"
description: "Integration of OmniAuth strategy providers for authentication in Openproject."
description: "Integration of OmniAuth strategy providers for authentication in OpenProject."
plugin_openproject_auth_saml:
name: "OmniAuth SAML / Single-Sign On"
description: "Adds the OmniAuth SAML provider to OpenProject"
config/locales/crowdin/hi.yml
+1 -1
View File
@@ -3571,7 +3571,7 @@ hi:
link: link
plugin_openproject_auth_plugins:
name: "OpenProject Auth Plugins"
description: "Integration of OmniAuth strategy providers for authentication in Openproject."
description: "Integration of OmniAuth strategy providers for authentication in OpenProject."
plugin_openproject_auth_saml:
name: "OmniAuth SAML / Single-Sign On"
description: "Adds the OmniAuth SAML provider to OpenProject"
config/locales/crowdin/hr.yml
+1 -1
View File
@@ -3610,7 +3610,7 @@ hr:
link: link
plugin_openproject_auth_plugins:
name: "OpenProject Auth Plugins"
description: "Integration of OmniAuth strategy providers for authentication in Openproject."
description: "Integration of OmniAuth strategy providers for authentication in OpenProject."
plugin_openproject_auth_saml:
name: "OmniAuth SAML / Single-Sign On"
description: "Adds the OmniAuth SAML provider to OpenProject"
config/locales/crowdin/hu.yml
+1 -1
View File
@@ -3569,7 +3569,7 @@ hu:
link: link
plugin_openproject_auth_plugins:
name: "OpenProject Auth Plugins"
description: "Integration of OmniAuth strategy providers for authentication in Openproject."
description: "Integration of OmniAuth strategy providers for authentication in OpenProject."
plugin_openproject_auth_saml:
name: "OmniAuth SAML / Single-Sign On"
description: "Adds the OmniAuth SAML provider to OpenProject"
config/locales/crowdin/id.yml
+1 -1
View File
@@ -3525,7 +3525,7 @@ id:
link: link
plugin_openproject_auth_plugins:
name: "OpenProject Auth Plugins"
description: "Integration of OmniAuth strategy providers for authentication in Openproject."
description: "Integration of OmniAuth strategy providers for authentication in OpenProject."
plugin_openproject_auth_saml:
name: "OmniAuth SAML / Single-Sign On"
description: "Adds the OmniAuth SAML provider to OpenProject"
config/locales/crowdin/it.yml
+1 -1
View File
@@ -3570,7 +3570,7 @@ it:
link: link
plugin_openproject_auth_plugins:
name: "Plugin Autenticazione OpenProject"
description: "Integrazione dei fornitori di strategie OmniAuth per l'autenticazione in Openproject."
description: "Integration of OmniAuth strategy providers for authentication in OpenProject."
plugin_openproject_auth_saml:
name: "OmniAuth SAML / Single-Sign On"
description: "Aggiunge il provider OmniAuth SAML a OpenProject"
config/locales/crowdin/ja.yml
+1 -1
View File
@@ -3531,7 +3531,7 @@ ja:
link: link
plugin_openproject_auth_plugins:
name: "OpenProject Auth Plugins"
description: "Integration of OmniAuth strategy providers for authentication in Openproject."
description: "Integration of OmniAuth strategy providers for authentication in OpenProject."
plugin_openproject_auth_saml:
name: "OmniAuth SAML / Single-Sign On"
description: "Adds the OmniAuth SAML provider to OpenProject"
config/locales/crowdin/js-es.yml
+2 -2
View File
@@ -378,7 +378,7 @@ es:
label_added_time_by: 'Agregado por <a href="%{authorLink}">%{author}</a> a las %{age}'
label_ago: "días antes"
label_all: "todos"
label_all_uppercase: "All"
label_all_uppercase: "Todos"
label_all_work_packages: "todos los paquetes de trabajo"
label_and: "y"
label_ascending: "Ascendente"
@@ -420,7 +420,7 @@ es:
label_expand_project_menu: "Expandir menú de proyecto"
label_export: "Exportar"
label_export_preparing: "La exportación se está preparando y se descargará en breve."
label_favored: "Favored"
label_favored: "Favoritos"
label_filename: "Archivo"
label_filesize: "Tamaño"
label_general: "General"
config/locales/crowdin/js-lt.yml
+2 -2
View File
@@ -378,7 +378,7 @@ lt:
label_added_time_by: 'Pridėjo <a href="%{authorLink}">%{author}</a> %{age}'
label_ago: "dienų prieš"
label_all: "visi"
label_all_uppercase: "All"
label_all_uppercase: "Visi"
label_all_work_packages: "visi darbų paketai"
label_and: "ir"
label_ascending: "Didėjančia tvarka"
@@ -420,7 +420,7 @@ lt:
label_expand_project_menu: "Išskleisti projekto meniu"
label_export: "Eksportuoti"
label_export_preparing: "Eksportas ruošiamas ir greitai bus parsiųstas."
label_favored: "Favored"
label_favored: "Mėgstami"
label_filename: "Failas"
label_filesize: "Dydis"
label_general: "Bendra"
config/locales/crowdin/js-zh-TW.yml
+1 -1
View File
@@ -199,7 +199,7 @@ zh-TW:
new_group: "新增群組"
reset_to_defaults: "重設為預設值"
enterprise:
text_reprieve_days_left: "剩下 %{days} days 測試結束"
text_reprieve_days_left: "剩下 %{days} 天測試結束"
text_expired: "已過期"
trial:
confirmation: "確認您的電子郵件地址"
config/locales/crowdin/ka.yml
+1 -1
View File
@@ -3573,7 +3573,7 @@ ka:
link: ბმული
plugin_openproject_auth_plugins:
name: "OpenProject Auth Plugins"
description: "Integration of OmniAuth strategy providers for authentication in Openproject."
description: "Integration of OmniAuth strategy providers for authentication in OpenProject."
plugin_openproject_auth_saml:
name: "OmniAuth SAML / Single-Sign On"
description: "Adds the OmniAuth SAML provider to OpenProject"
config/locales/crowdin/kk.yml
+1 -1
View File
@@ -3573,7 +3573,7 @@ kk:
link: link
plugin_openproject_auth_plugins:
name: "OpenProject Auth Plugins"
description: "Integration of OmniAuth strategy providers for authentication in Openproject."
description: "Integration of OmniAuth strategy providers for authentication in OpenProject."
plugin_openproject_auth_saml:
name: "OmniAuth SAML / Single-Sign On"
description: "Adds the OmniAuth SAML provider to OpenProject"
config/locales/crowdin/ko.yml
+1 -1
View File
@@ -3532,7 +3532,7 @@ ko:
link: 링크
plugin_openproject_auth_plugins:
name: "OpenProject 인증 플러그인"
description: "인증을 위해 OpenProject에서 OmniAuth 정책 공급자를 통합합니다."
description: "Integration of OmniAuth strategy providers for authentication in OpenProject."
plugin_openproject_auth_saml:
name: "OmniAuth SAML/Single-Sign On"
description: "OpenProject에 OmniAuth SAML 공급자를 추가합니다"
config/locales/crowdin/lt.yml
+7 -7
View File
@@ -261,7 +261,7 @@ lt:
lists:
active: "Aktyvūs projektai"
my: "Mano projektai"
favored: "Favored projects"
favored: "Mėgiami projektai"
archived: "Archyvuoti projektai"
my_private: "Mano privatūs projektų sąrašai"
new:
@@ -1291,7 +1291,7 @@ lt:
button_edit: "Redaguoti"
button_edit_associated_wikipage: "Redaguoti susijusį Wiki puslapį: %{page_title}"
button_expand_all: "Išskleisti visus"
button_favorite: "Mark as favorite"
button_favorite: "Žymėti kaip mėgiamą"
button_filter: "Filtras"
button_generate: "Generuoti"
button_list: "Sąrašas"
@@ -1319,7 +1319,7 @@ lt:
button_unarchive: "Išarchyvuoti"
button_uncheck_all: "Atžymėti visus"
button_unlock: "Atrakinti"
button_unfavorite: "Remove from favorites"
button_unfavorite: "Išimti iš mėgiamų"
button_unwatch: "Nestebėti"
button_update: "Atnaujinti"
button_upgrade: "Atnaujinti"
@@ -1977,7 +1977,7 @@ lt:
label_enterprise_support: "„Enterprise“ palaikymas"
label_enterprise_addon: "Enterprise priedas"
label_environment: "Aplinka"
label_estimates_and_progress: "Estimates and progress"
label_estimates_and_progress: "Įvertinimai ir eiga"
label_equals: "yra"
label_everywhere: "visur"
label_example: "Pavyzdys"
@@ -2089,7 +2089,7 @@ lt:
label_membership_plural: "Narystės"
lable_membership_added: "Narys pridėtas"
lable_membership_updated: "Narys atnaujintas"
label_menu: "Menu"
label_menu: "Meniu"
label_menu_badge:
pre_alpha: "pre-alfa"
alpha: "alfa"
@@ -2191,7 +2191,7 @@ lt:
label_percent_complete: "% baigta"
label_project_activity: "Projekto aktyvumas"
label_project_attribute_plural: "Projekto atributai"
label_project_attribute_manage_link: "Manage project attributes"
label_project_attribute_manage_link: "Valdyti projekto atributus"
label_project_count: "Bendras projektų skaičius"
label_project_copy_notifications: "Vykstant projekto kopijavimui siųsti pranešimus į el. paštą"
label_project_latest: "Naujausi projektai"
@@ -3639,7 +3639,7 @@ lt:
link: nuoroda
plugin_openproject_auth_plugins:
name: "OpenProject Auth Priedai"
description: "Openproject autentifikacijos OmniAuth strategijos teikėjų integracija."
description: "Integration of OmniAuth strategy providers for authentication in OpenProject."
plugin_openproject_auth_saml:
name: "OmniAuth SAML / Vienas prisijungimas"
description: "Prideda OmniAuth SAML tiekėja į OpenProject"
config/locales/crowdin/lv.yml
+1 -1
View File
@@ -3610,7 +3610,7 @@ lv:
link: link
plugin_openproject_auth_plugins:
name: "OpenProject Auth Plugins"
description: "Integration of OmniAuth strategy providers for authentication in Openproject."
description: "Integration of OmniAuth strategy providers for authentication in OpenProject."
plugin_openproject_auth_saml:
name: "OmniAuth SAML / Single-Sign On"
description: "Adds the OmniAuth SAML provider to OpenProject"
config/locales/crowdin/mn.yml
+1 -1
View File
@@ -3573,7 +3573,7 @@ mn:
link: link
plugin_openproject_auth_plugins:
name: "OpenProject Auth Plugins"
description: "Integration of OmniAuth strategy providers for authentication in Openproject."
description: "Integration of OmniAuth strategy providers for authentication in OpenProject."
plugin_openproject_auth_saml:
name: "OmniAuth SAML / Single-Sign On"
description: "Adds the OmniAuth SAML provider to OpenProject"
config/locales/crowdin/ms.yml
+1 -1
View File
@@ -3535,7 +3535,7 @@ ms:
link: pautan
plugin_openproject_auth_plugins:
name: "OpenProject Auth Plugins"
description: "Integration of OmniAuth strategy providers for authentication in Openproject."
description: "Integration of OmniAuth strategy providers for authentication in OpenProject."
plugin_openproject_auth_saml:
name: "OmniAuth SAML / Single-Sign On"
description: "Adds the OmniAuth SAML provider to OpenProject"
config/locales/crowdin/ne.yml
+1 -1
View File
@@ -3573,7 +3573,7 @@ ne:
link: link
plugin_openproject_auth_plugins:
name: "OpenProject Auth Plugins"
description: "Integration of OmniAuth strategy providers for authentication in Openproject."
description: "Integration of OmniAuth strategy providers for authentication in OpenProject."
plugin_openproject_auth_saml:
name: "OmniAuth SAML / Single-Sign On"
description: "Adds the OmniAuth SAML provider to OpenProject"
config/locales/crowdin/nl.yml
+1 -1
View File
@@ -3568,7 +3568,7 @@ nl:
link: link
plugin_openproject_auth_plugins:
name: "OpenProject Auth Plugins"
description: "Integration of OmniAuth strategy providers for authentication in Openproject."
description: "Integration of OmniAuth strategy providers for authentication in OpenProject."
plugin_openproject_auth_saml:
name: "OmniAuth SAML / Single-Sign On"
description: "Adds the OmniAuth SAML provider to OpenProject"
config/locales/crowdin/no.yml
+1 -1
View File
@@ -3573,7 +3573,7 @@
link: kobling
plugin_openproject_auth_plugins:
name: "OpenProject Auth utvidelse"
description: "Integrering av OmniAuth strategileverandører for autentisering i Openproject."
description: "Integration of OmniAuth strategy providers for authentication in OpenProject."
plugin_openproject_auth_saml:
name: "OmniAuth SAML / Enkeltpålogging på"
description: "Legger til OmniAuth SAML leverandør til OpenProject"
config/locales/crowdin/pl.yml
+1 -1
View File
@@ -3641,7 +3641,7 @@ pl:
link: link
plugin_openproject_auth_plugins:
name: "Wtyczki uwierzytelniające OpenProject"
description: "Integracja dostawców strategii OmniAuth w celu uwierzytelniania w Openproject."
description: "Integration of OmniAuth strategy providers for authentication in OpenProject."
plugin_openproject_auth_saml:
name: "SAML OmniAuth / pojedyncze logowanie"
description: "Dodaje dostawcę SAML OmniAuth do OpenProject"
config/locales/crowdin/pt-BR.yml
+1 -1
View File
@@ -3569,7 +3569,7 @@ pt-BR:
link: link
plugin_openproject_auth_plugins:
name: "Plugins OpenProject Auth"
description: "Integração de fornecedores de estratégias OmniAuth para autenticação no Openproject."
description: "Integration of OmniAuth strategy providers for authentication in OpenProject."
plugin_openproject_auth_saml:
name: "OmniAuth SAML/Início de sessão único"
description: "Adiciona o fornecedor SAML OmniAuth ao OpenProject"
config/locales/crowdin/pt-PT.yml
+1 -1
View File
@@ -3568,7 +3568,7 @@ pt-PT:
link: link
plugin_openproject_auth_plugins:
name: "Plugins de autenticação OpenProject"
description: "Integração de fornecedores de estratégias OmniAuth para autenticação no Openproject."
description: "Integration of OmniAuth strategy providers for authentication in OpenProject."
plugin_openproject_auth_saml:
name: "OmniAuth SAML/Início de sessão único"
description: "Adiciona o fornecedor SAML OmniAuth ao OpenProject"
config/locales/crowdin/ro.yml
+1 -1
View File
@@ -3609,7 +3609,7 @@ ro:
link: link
plugin_openproject_auth_plugins:
name: "OpenProject Auth Plugins"
description: "Integration of OmniAuth strategy providers for authentication in Openproject."
description: "Integration of OmniAuth strategy providers for authentication in OpenProject."
plugin_openproject_auth_saml:
name: "OmniAuth SAML / Single-Sign On"
description: "Adds the OmniAuth SAML provider to OpenProject"
config/locales/crowdin/ru.yml
+1 -1
View File
@@ -3642,7 +3642,7 @@ ru:
link: ссылка
plugin_openproject_auth_plugins:
name: "Плагины аутентификации OpenProject"
description: "Интеграция поставщиков стратегий OmniAuth для аутентификации в Openproject."
description: "Integration of OmniAuth strategy providers for authentication in OpenProject."
plugin_openproject_auth_saml:
name: "OmniAuth SAML / Однозначный вход"
description: "Добавляет поставщика OmniAuth SAML в OpenProject"
config/locales/crowdin/rw.yml
+1 -1
View File
@@ -3573,7 +3573,7 @@ rw:
link: link
plugin_openproject_auth_plugins:
name: "OpenProject Auth Plugins"
description: "Integration of OmniAuth strategy providers for authentication in Openproject."
description: "Integration of OmniAuth strategy providers for authentication in OpenProject."
plugin_openproject_auth_saml:
name: "OmniAuth SAML / Single-Sign On"
description: "Adds the OmniAuth SAML provider to OpenProject"
config/locales/crowdin/si.yml
+1 -1
View File
@@ -3573,7 +3573,7 @@ si:
link: link
plugin_openproject_auth_plugins:
name: "OpenProject Auth Plugins"
description: "Integration of OmniAuth strategy providers for authentication in Openproject."
description: "Integration of OmniAuth strategy providers for authentication in OpenProject."
plugin_openproject_auth_saml:
name: "OmniAuth SAML / Single-Sign On"
description: "Adds the OmniAuth SAML provider to OpenProject"
config/locales/crowdin/sk.yml
+1 -1
View File
@@ -3646,7 +3646,7 @@ sk:
link: link
plugin_openproject_auth_plugins:
name: "OpenProject Auth Plugins"
description: "Integration of OmniAuth strategy providers for authentication in Openproject."
description: "Integration of OmniAuth strategy providers for authentication in OpenProject."
plugin_openproject_auth_saml:
name: "OmniAuth SAML / Single-Sign On"
description: "Adds the OmniAuth SAML provider to OpenProject"
config/locales/crowdin/sl.yml
+1 -1
View File
@@ -3644,7 +3644,7 @@ sl:
link: link
plugin_openproject_auth_plugins:
name: "OpenProject Auth Plugins"
description: "Integration of OmniAuth strategy providers for authentication in Openproject."
description: "Integration of OmniAuth strategy providers for authentication in OpenProject."
plugin_openproject_auth_saml:
name: "OmniAuth SAML / Single-Sign On"
description: "Adds the OmniAuth SAML provider to OpenProject"
config/locales/crowdin/sr.yml
+1 -1
View File
@@ -3610,7 +3610,7 @@ sr:
link: link
plugin_openproject_auth_plugins:
name: "OpenProject Auth Plugins"
description: "Integration of OmniAuth strategy providers for authentication in Openproject."
description: "Integration of OmniAuth strategy providers for authentication in OpenProject."
plugin_openproject_auth_saml:
name: "OmniAuth SAML / Single-Sign On"
description: "Adds the OmniAuth SAML provider to OpenProject"
config/locales/crowdin/sv.yml
+1 -1
View File
@@ -3569,7 +3569,7 @@ sv:
link: link
plugin_openproject_auth_plugins:
name: "OpenProject Auth Plugins"
description: "Integration of OmniAuth strategy providers for authentication in Openproject."
description: "Integration of OmniAuth strategy providers for authentication in OpenProject."
plugin_openproject_auth_saml:
name: "OmniAuth SAML / Single-Sign On"
description: "Adds the OmniAuth SAML provider to OpenProject"
config/locales/crowdin/th.yml
+1 -1
View File
@@ -3536,7 +3536,7 @@ th:
link: link
plugin_openproject_auth_plugins:
name: "OpenProject Auth Plugins"
description: "Integration of OmniAuth strategy providers for authentication in Openproject."
description: "Integration of OmniAuth strategy providers for authentication in OpenProject."
plugin_openproject_auth_saml:
name: "OmniAuth SAML / Single-Sign On"
description: "Adds the OmniAuth SAML provider to OpenProject"
config/locales/crowdin/tr.yml
+1 -1
View File
@@ -3568,7 +3568,7 @@ tr:
link: link
plugin_openproject_auth_plugins:
name: "OpenProject Auth Plugins"
description: "Integration of OmniAuth strategy providers for authentication in Openproject."
description: "Integration of OmniAuth strategy providers for authentication in OpenProject."
plugin_openproject_auth_saml:
name: "OmniAuth SAML / Single-Sign On"
description: "Adds the OmniAuth SAML provider to OpenProject"
config/locales/crowdin/uk.yml
+1 -1
View File
@@ -3638,7 +3638,7 @@ uk:
link: посилання
plugin_openproject_auth_plugins:
name: "Плагіни OpenProject Auth"
description: "Інтеграція постачальників стратегії OmniAuth для автентифікації в OpenProject."
description: "Integration of OmniAuth strategy providers for authentication in OpenProject."
plugin_openproject_auth_saml:
name: "OmniAuth SAML / Служба єдиного входу"
description: "Додає постачальника OmniAuth SAML в OpenProject"
config/locales/crowdin/uz.yml
+1 -1
View File
@@ -3573,7 +3573,7 @@ uz:
link: link
plugin_openproject_auth_plugins:
name: "OpenProject Auth Plugins"
description: "Integration of OmniAuth strategy providers for authentication in Openproject."
description: "Integration of OmniAuth strategy providers for authentication in OpenProject."
plugin_openproject_auth_saml:
name: "OmniAuth SAML / Single-Sign On"
description: "Adds the OmniAuth SAML provider to OpenProject"
config/locales/crowdin/vi.yml
+1 -1
View File
@@ -3537,7 +3537,7 @@ vi:
link: link
plugin_openproject_auth_plugins:
name: "OpenProject Auth Plugins"
description: "Integration of OmniAuth strategy providers for authentication in Openproject."
description: "Integration of OmniAuth strategy providers for authentication in OpenProject."
plugin_openproject_auth_saml:
name: "OmniAuth SAML / Single-Sign On"
description: "Adds the OmniAuth SAML provider to OpenProject"
config/locales/crowdin/zh-CN.yml
+5 -5
View File
@@ -1619,9 +1619,9 @@ zh-CN:
file_links_journal: >
从现在开始，与文件链接（存储在外部存储器中的文件）相关的活动将出现在“活动”选项卡中。以下是与已经存在的链接相关的活动的表示：
progress_calculation_adjusted_from_disabled_mode: >-
Progress calculation automatically <a href="%{href}" target="_blank">set to work-based mode and adjusted with version update</a>.
进度计算自动<a href="%{href}" target="_blank">设置为基于工时的模式，并随版本更新而调整</a>。
progress_calculation_adjusted: >-
Progress calculation automatically <a href="%{href}" target="_blank">adjusted with version update</a>.
进度计算自动<a href="%{href}" target="_blank">设置为基于工时的模式，并随版本更新而调整</a>。
links:
configuration_guide: "配置指南"
get_in_touch: "遇到问题了？与我们联系。"
@@ -1877,7 +1877,7 @@ zh-CN:
label_enterprise_support: "企业支持"
label_enterprise_addon: "企业版附加组件"
label_environment: "环境"
label_estimates_and_progress: "Estimates and progress"
label_estimates_and_progress: "预估和进度"
label_equals: "是"
label_everywhere: "任何位置"
label_example: "示例"
@@ -1989,7 +1989,7 @@ zh-CN:
label_membership_plural: "成员资格"
lable_membership_added: "已添加成员"
lable_membership_updated: "已更新成员"
label_menu: "Menu"
label_menu: "菜单"
label_menu_badge:
pre_alpha: "pre-beta"
alpha: "alpha"
@@ -2091,7 +2091,7 @@ zh-CN:
label_percent_complete: "% 完成"
label_project_activity: "项目活动"
label_project_attribute_plural: "项目属性"
label_project_attribute_manage_link: "Manage project attributes"
label_project_attribute_manage_link: "管理项目属性"
label_project_count: "项目总数"
label_project_copy_notifications: "在项目复制期间发送电子邮件通知"
label_project_latest: "最新的项目"
config/locales/crowdin/zh-TW.yml
+1 -1
View File
@@ -3534,7 +3534,7 @@ zh-TW:
link: 連結
plugin_openproject_auth_plugins:
name: "OpenProject 認證外掛"
description: "Integration of OmniAuth strategy providers for authentication in Openproject."
description: "Integration of OmniAuth strategy providers for authentication in OpenProject."
plugin_openproject_auth_saml:
name: "OmniAuth SAML / Single-Sign On"
description: "Adds the OmniAuth SAML provider to OpenProject"
config/locales/en.yml
+1 -1
View File
@@ -3857,7 +3857,7 @@ Project attributes and sections are defined in the <a href=%{admin_settings_url}
plugin_openproject_auth_plugins:
name: "OpenProject Auth Plugins"
description: "Integration of OmniAuth strategy providers for authentication in Openproject."
description: "Integration of OmniAuth strategy providers for authentication in OpenProject."
plugin_openproject_auth_saml:
name: "OmniAuth SAML / Single-Sign On"
description: "Adds the OmniAuth SAML provider to OpenProject"
docs/api/apiv3/components/schemas/project_storage_model.yml
+2 -2
View File
@@ -80,12 +80,12 @@ properties:
allOf:
- $ref: './link.yml'
- description: |-
A link to open project strorage.
A link to OpenProject strorage.
openWithConnectionEnsured:
allOf:
- $ref: './link.yml'
- description: |-
A link to open project storage with making sure user has access to it.
A link to OpenProject storage with making sure user has access to it.
# Conditions
docs/enterprise-guide/enterprise-cloud-guide/enterprise-cloud-faq/README.md
+1 -1
View File
@@ -31,7 +31,7 @@ The data center (AWS) we use for Enterprise cloud edition is ISO27001 certified.
For more information please visit the [information regarding security measures](https://www.openproject.org/legal/data-processing-agreement/technical-and-organizational-data-security-measures) on our website.
## How to change the Open Project Enterprise cloud creators account?
## How to change the OpenProject Enterprise cloud creators account?
Users (who are administrators) can change email addresses and accounts of other users, but not their own account. Single administrators can change their own account/email address by creating a second administrator account and using the new administrator to change data of the first administrator. The second administrator could be deactivated again afterwards by the first administrator. Normal users CAN change their own email address, just not their login.
docs/enterprise-guide/support/script/op-support-data.sh
+2 -2
View File
@@ -210,7 +210,7 @@ echo "---"
#CHECK FOR INSTALLED OPENPROJECT
echo "Checking for Open Project installed packages and version..."
echo "Checking for OpenProject installed packages and version..."
yum_fp=`which yum`
if [ -z $yum_fp ]; then yum_fp="dummynonexists"; fi
@@ -223,6 +223,6 @@ if [ -z $openproject_fp ]; then openproject_fp="dummynonexists"; fi
if [ -f $openproject_fp ];
then echo OpenProject is installed in Version...; $openproject_fp run bundle exec rake version
else
echo "Open Project seems not to be installed."
echo "OpenProject seems not to be installed."
fi
docs/release-notes/12/12-2-1/README.md
+1 -1
View File
@@ -59,7 +59,7 @@ For more information on this setting and how to configure it for your installati
- Fixed: Error message on subprojects boards \[[#43755](https://community.openproject.org/wp/43755)\]
- Fixed: New HTTPS flag is poorly documented and breaks quick start docker containers \[[#43759](https://community.openproject.org/wp/43759)\]
- Fixed: Wrong days highlighted as weekend in Gantt diagram \[[#43762](https://community.openproject.org/wp/43762)\]
- Fixed: Open Project Docker Installation \[[#43767](https://community.openproject.org/wp/43767)\]
- Fixed: OpenProject Docker Installation \[[#43767](https://community.openproject.org/wp/43767)\]
- Fixed: Unable to see activities in work package \[[#43773](https://community.openproject.org/wp/43773)\]
- Fixed: Timeline shows bar at wrong time after collapsing a group \[[#43775](https://community.openproject.org/wp/43775)\]
docs/system-admin-guide/authentication/openid-providers/README.md
+1 -1
View File
@@ -91,7 +91,7 @@ After pressing **CREATE** you will get a pop-up window like the following
### Step 3: Add Google as an OpenID Provider to OpenProject
1. Login as Open Project Administrator
1. Login as OpenProject Administrator
2. navigate to -> *Administration* -> *Authentication* and choose -> *OpenID providers*.
1. **Name** Choose Google
2. **Display Name** (e.g. **EXAMPLE.COM SSO**)
docs/system-admin-guide/integrations/README.md
+1 -1
View File
@@ -73,7 +73,7 @@ Currently, there is no direct integration between OpenProject and Timesheet. If
## Time Tracker for OpenProject
[Time Tracker](https://open-time-tracker.com/) is a mobile app that records time spent on tasks and logs it to your Open Project instance. We provide a [short instruction](../../user-guide/time-and-costs/time-tracking/time-tracker-integration/) how to set it up and use it. Please keep in mind that it is not developed by OpenProject and is not supported by us.
[Time Tracker](https://open-time-tracker.com/) is a mobile app that records time spent on tasks and logs it to your OpenProject instance. We provide a [short instruction](../../user-guide/time-and-costs/time-tracking/time-tracker-integration/) how to set it up and use it. Please keep in mind that it is not developed by OpenProject and is not supported by us.
## Toggl
docs/system-admin-guide/projects/project-attributes/README.md
+1 -3
View File
@@ -6,9 +6,7 @@ description: Viewing, creating and modifying project attributes in OpenProject
keywords: project attributes, create, project settings
---
# Project attributes (Enterprise add-on)
> **Please note:** Project attributes are an Enterprise add-on and will only be displayed here for Enterprise on-premises and Enterprise cloud.
# Project attributes
Project attributes are custom fields that allow you to communicate key information relevant to a project in the [Project Overview](../../../user-guide/project-overview) page.
docs/system-admin-guide/projects/project-lists/README.md
+2
View File
@@ -16,6 +16,8 @@ To configure project lists, navigate to **Administration settings** → **Projec
## Modify and add columns
> **Please note:** The ability to configure which project attributes are visible as columns in project lists is an Enterprise add-on and will only be displayed here for Enterprise on-premises and Enterprise cloud.
Here, you can view a list of *chips*, or little rectangles with names of project attributes. Each one represents a column in the Project list tables. You can drag and drop these around to change the order in which they appear.
To add a new project attribute as a column, click on the field with the label **Add columns** (where it says *Select a column*). You will be shown a list of existing project attributes. You can type in a keyword to search through this list and find the project attribute you would like to add.
docs/user-guide/projects/project-settings/project-attributes/README.md
+1 -1
View File
@@ -8,7 +8,7 @@ keywords: project attributes, project settings, enable, disable, project admin
# Project attributes
**[Project attributes]**(#project-attributes) are a set of project-level custom fields that let you display certain types of information relevant to your project in the [Project overview](../../../project-overview) page.
**Project attributes**are a set of project-level custom fields that let you display certain types of information relevant to your project in the [Project overview](../../../project-overview) page.
This guide is aimed at project administrators who want to enable or disable certain project attributes for their project.
frontend/package-lock.json
Generated
+197 -346
View File
File diff suppressed because it is too large Load Diff
frontend/package.json
+3 -4
View File
@@ -98,7 +98,7 @@
"@ngneat/content-loader": "^7.0.0",
"@ngx-formly/core": "^6.1.4",
"@openproject/octicons-angular": "^19.10.0",
"@openproject/primer-view-components": "^0.29.0",
"@openproject/primer-view-components": "^0.29.1",
"@openproject/reactivestates": "^3.0.1",
"@primer/css": "^21.2.2",
"@types/hotwired__turbo": "^8.0.1",
@@ -121,10 +121,10 @@
"dragula": "^3.7.3",
"expose-loader": "^0.7.5",
"flatpickr": "^4.6.13",
"fuse.js": "^3.4.5",
"glob": "^7.1.4",
"hammerjs": "^2.0.8",
"i18n-js": "^4.3.0",
"idiomorph": "^0.3.0",
"jquery": "^3.5.1",
"jquery-ui": "1.13.2",
"jquery-ujs": "^1.2.2",
@@ -136,7 +136,6 @@
"mime": "^2.5.2",
"moment": "^2.30.1",
"moment-timezone": "^0.5.45",
"morphdom": "^2.7.2",
"mousetrap": "~1.6.3",
"ng-dynamic-component": "^10.7.0",
"ng2-charts": "^4.1.1",
@@ -178,6 +177,6 @@
"generate-typings": "tsc -d -p src/tsconfig.app.json"
},
"overrides": {
"@primer/view-components": "npm:@openproject/primer-view-components@^0.29.0"
"@primer/view-components": "npm:@openproject/primer-view-components@^0.29.1"
}
}
frontend/src/app/app.module.ts
+4
View File
@@ -148,6 +148,9 @@ import {
import {
DraggableAutocompleteComponent,
} from 'core-app/shared/components/autocompleter/draggable-autocomplete/draggable-autocomplete.component';
import {
AttributeHelpTextComponent,
} from 'core-app/shared/components/attribute-help-texts/attribute-help-text.component';
export function initializeServices(injector:Injector) {
return () => {
@@ -330,5 +333,6 @@ export class OpenProjectModule {
registerCustomElement('opce-macro-wp-quickinfo', WorkPackageQuickinfoMacroComponent, { injector });
registerCustomElement('opce-ckeditor-augmented-textarea', CkeditorAugmentedTextareaComponent, { injector });
registerCustomElement('opce-draggable-autocompleter', DraggableAutocompleteComponent, { injector });
registerCustomElement('opce-attribute-help-text', AttributeHelpTextComponent, { injector });
}
}
frontend/src/app/core/setup/init-vendors.ts
-2
View File
@@ -58,8 +58,6 @@ require('moment/locale/en-gb');
require('jquery.caret');
// Text highlight for autocompleter
require('mark.js/dist/jquery.mark.min');
// Micro Text fuzzy search library
require('fuse.js');
require('moment-timezone/builds/moment-timezone-with-data.min');
// eslint-disable-next-line import/extensions,import/no-extraneous-dependencies
frontend/src/stimulus/controllers/dynamic/work-packages/progress/preview-progress.controller.ts
+3 -3
View File
@@ -30,7 +30,7 @@
import { Controller } from '@hotwired/stimulus';
import { debounce } from 'lodash';
import morphdom from 'morphdom';
import Idiomorph from 'idiomorph/dist/idiomorph.cjs';
interface TurboBeforeFrameRenderEventDetail {
render:(currentElement:HTMLElement, newElement:HTMLElement) => void;
@@ -48,7 +48,7 @@ export default class PreviewProgressController extends Controller {
private frameMorphRenderer:(event:CustomEvent<TurboBeforeFrameRenderEventDetail>) => void;
connect() {
this.debouncedPreview = debounce((event:Event) => { void this.preview(event); }, 500);
this.debouncedPreview = debounce((event:Event) => { void this.preview(event); }, 100);
// TODO: Ideally morphing in this single controller should not be necessary.
// Turbo supports morphing, by adding the <turbo-frame refresh="morph"> attribute.
// However, it has a bug, and it doesn't morphs when reloading the frame via javascript.
@@ -56,7 +56,7 @@ export default class PreviewProgressController extends Controller {
// this code and just use <turbo-frame refresh="morph"> instead.
this.frameMorphRenderer = (event:CustomEvent<TurboBeforeFrameRenderEventDetail>) => {
event.detail.render = (currentElement:HTMLElement, newElement:HTMLElement) => {
morphdom(currentElement, newElement, { childrenOnly: true });
Idiomorph.morph(currentElement, newElement, { ignoreActiveValue: true });
};
};
frontend/src/turbo/setup.ts
-11
View File
@@ -2,7 +2,6 @@ import '../typings/shims.d.ts';
import * as Turbo from '@hotwired/turbo';
import { registerDialogStreamAction } from './dialog-stream-action';
import { addTurboEventListeners } from './turbo-event-listeners';
import morphdom from 'morphdom';
import { ModalDialogElement } from '@openproject/primer-view-components/app/components/primer/alpha/modal_dialog';
// Disable default turbo-drive for now as we don't need it for now AND it breaks angular routing
@@ -31,13 +30,3 @@ document.addEventListener('turbo:submit-end', (event:CustomEvent) => {
dialog && dialog.close(true);
}
});
interface TurboBeforeFrameRenderEventDetail {
render:(currentElement:HTMLElement, newElement:HTMLElement) => void;
}
document.addEventListener('turbo:before-frame-render', (event:CustomEvent<TurboBeforeFrameRenderEventDetail>) => {
event.detail.render = (currentElement:HTMLElement, newElement:HTMLElement) => {
morphdom(currentElement, newElement, { childrenOnly: true });
};
});
frontend/src/typings/idiomorph.d.ts
Vendored
+52
View File
@@ -0,0 +1,52 @@
/*
* -- copyright
* OpenProject is an open source project management software.
* Copyright (C) 2024 the OpenProject GmbH
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License version 3.
*
* OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
* Copyright (C) 2006-2013 Jean-Philippe Lang
* Copyright (C) 2010-2013 the ChiliProject Team
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*
* See COPYRIGHT and LICENSE files for more details.
* ++
*/
declare module 'idiomorph/dist/idiomorph.cjs' {
export const Idiomorph:{
morph(oldNode:Element|Document, newContent?:string|Element|Iterable<Element>|null, options?:{
morphStyle?:'innerHTML'|'outerHTML';
ignoreActive?:boolean;
ignoreActiveValue?:boolean;
head?:{
style?:'merge'|'append'|'morph'|'none';
};
callbacks?:{
beforeNodeAdded?:(node:ChildNode) => void|boolean;
afterNodeAdded?:(node:ChildNode) => void;
beforeNodeMorphed?:(oldNode:Element, newNode:Element) => void|boolean;
afterNodeMorphed?:(oldNode:Element, newNode:Element) => void;
beforeNodeRemoved?:(node:ChildNode) => void|boolean;
afterNodeRemoved?:(node:ChildNode) => void;
};
})
};
export = Idiomorph;
}
modules/auth_plugins/openproject-auth_plugins.gemspec
+1 -1
View File
@@ -4,7 +4,7 @@ Gem::Specification.new do |s|
s.authors = "OpenProject GmbH"
s.email = "info@openproject.com"
s.summary = "OpenProject Auth Plugins"
s.description = "Integration of OmniAuth strategy providers for authentication in Openproject."
s.description = "Integration of OmniAuth strategy providers for authentication in OpenProject."
s.license = "GPLv3"
s.files = Dir["{app,config,db,lib}/**/*"] + %w(doc/CHANGELOG.md README.md)
modules/avatars/app/views/settings/_openproject_avatars.html.erb
+1 -1
View File
@@ -1,5 +1,5 @@
<% manager = ::OpenProject::Avatars::AvatarManager %>
<% html_title t(:label_administration), 'Openproject Avatars' %>
<% html_title t(:label_administration), 'OpenProject Avatars' %>
<fieldset class="form--fieldset">
<legend class="form--fieldset-legend" title="<%= t 'avatars.label_gravatar' %>"><%= t 'avatars.label_gravatar' %></legend>
modules/bim/config/locales/crowdin/zh-TW.seeders.yml
+3 -3
View File
@@ -87,7 +87,7 @@ zh-TW:
You can change this welcome text [here]({{opSetting:base_url}}/admin/settings/general).
projects:
demo-construction-project:
name: "(Demo) Construction project"
name: "(示範) 營建專案"
status_explanation: All tasks and the sub-projects are on schedule. The people involved know their tasks. The system is completely set up.
description: This is a short summary of the goals of this demo construction project.
news:
@@ -149,12 +149,12 @@ zh-TW:
options:
name: 里程碑
demo-planning-constructing-project:
name: "(Demo) Planning & constructing"
name: "(示範) 規劃 & 興建"
status_explanation: All tasks are on schedule. The people involved know their tasks. The system is completely set up.
description: This is a short summary of the goals of this demo planning and constructing project.
news:
item_0:
title: Welcome to your demo project
title: 歡迎來到您的示範專案
summary: |
We are glad you joined.
In this module you can communicate project news to your team members.
modules/gitlab_integration/README.md
+1 -1
View File
@@ -139,7 +139,7 @@ A typical workflow on GitLab side would be:
You will have to configure both **OpenProject** and **Gitlab** for the integration to work.
In case of **Docker** installation, follow the official OpenProject documentation [here](https://www.openproject.org/docs/installation-and-operations/installation/docker/#openproject-plugins). If for some reason the installation with Docker described in the official documentation does not work for you, you can try building your own docker image:
* Clone from the Openproject Repo: `git clone https://github.com/opf/openproject.git --branch=stable/14 --depth=1 .`
* Clone from the OpenProject Repo: `git clone https://github.com/opf/openproject.git --branch=stable/14 --depth=1 .`
* Clone the plugin inside the modules folder: `git clone https://github.com/btey/openproject-gitlab-integration.git --depth=1 modules/gitlab_integration`
* Apply the changes below in Gemfile.lock and Gemfile.modules (the same ones you would do in a manual install).
* Build the container: `docker build -t openproject-docker --file=docker/prod/Dockerfile .`
modules/grids/config/locales/crowdin/js-es.yml
+2 -2
View File
@@ -43,8 +43,8 @@ es:
title: 'Subproyectos'
no_results: 'No hay subproyectos.'
project_favorites:
title: 'Project favorites'
no_results: 'You currently have no project favorites. Click on the star icon in the project dashboard to add one to your favorites.'
title: 'Proyectos favoritos'
no_results: 'Actualmente no tiene ningún proyecto favorito. Haga clic en el icono de la estrella en el panel de control del proyecto para añadirlo a sus favoritos.'
time_entries_current_user:
title: 'Mi tiempo invertido'
displayed_days: 'Días mostrados en el widget:'
modules/grids/config/locales/crowdin/js-lt.yml
+2 -2
View File
@@ -43,8 +43,8 @@ lt:
title: 'Sub-projektai'
no_results: 'Nėra subprojektų.'
project_favorites:
title: 'Project favorites'
no_results: 'You currently have no project favorites. Click on the star icon in the project dashboard to add one to your favorites.'
title: 'Projekto mėgiami'
no_results: 'Jūs šiuo metu neturite projekto mėgiamų. Spauskite žvaigždutės piktogramą projekto skydelyje, kad pridėtumėte prie jūsų mėgstamų.'
time_entries_current_user:
title: 'Mano sugaištas laikas'
displayed_days: 'Valdiklyje rodomos dienos:'
modules/grids/config/locales/crowdin/js-zh-CN.yml
+1 -1
View File
@@ -44,7 +44,7 @@ zh-CN:
no_results: '无子项目。'
project_favorites:
title: '项目收藏'
no_results: 'You currently have no project favorites. Click on the star icon in the project dashboard to add one to your favorites.'
no_results: '您目前没有项目收藏夹。单击项目仪表板中的星形图标，将一个项目添加到您的收藏夹。'
time_entries_current_user:
title: '我花费的时间'
displayed_days: '微件中显示的天数：'
modules/grids/config/locales/crowdin/js-zh-TW.yml
+3 -3
View File
@@ -8,7 +8,7 @@ zh-TW:
text: "Some widgets, like the work package graph widget, are only available in the Enterprise edition."
link: '企業版。'
widgets:
missing_permission: "You don't have the necessary permissions to view this widget."
missing_permission: "您沒有必要的權限來檢視此部件。"
custom_text:
title: '自訂文字'
documents:
@@ -43,8 +43,8 @@ zh-TW:
title: '子專案'
no_results: '無子專案'
project_favorites:
title: 'Project favorites'
no_results: 'You currently have no project favorites. Click on the star icon in the project dashboard to add one to your favorites.'
title: '專案收藏'
no_results: '您目前沒有收藏的項目。點擊項目儀表板中的星形圖示將其新增到您的收藏夾中。'
time_entries_current_user:
title: '我的耗時'
displayed_days: '小工具顯示天數'
modules/ldap_groups/config/locales/crowdin/cs.yml
+1 -1
View File
@@ -50,7 +50,7 @@ cs:
add_new: 'Přidat synchronizovanou LDAP skupinu'
destroy:
title: 'Odstranit synchronizovanou skupinu %{name}'
confirmation: "Pokud budete pokračovat, synchronizovaný filtr %{name} a všechny skupiny %{groups_count} vytvořené prostřednictvím tohoto filtru budou odstraněny."
confirmation: "Pokud budete pokračovat, synchronizovaná skupina %{name} a všichni uživatelé %{users_count} synchronizovaní přes ni budou odstraněni."
info: "Poznámka: Samotná OpenProject skupina a členové přidaní mimo tuto LDAP synchronizaci nebudou odstraněni."
verification: "Zadejte název skupiny %{name} pro ověření odstranění."
help_text_html: |
modules/meeting/config/locales/crowdin/es.yml
+1 -1
View File
@@ -99,7 +99,7 @@ es:
attachments:
text: "Los archivos adjuntos están a disposición de todos los participantes en la reunión. También puede arrastrarlos y soltarlos en las notas de los puntos del orden del día."
copy:
title: "Copy meeting: %{title}"
title: "Copiar reunión %{title}"
attachments: "Copiar adjuntos"
attachments_text: "Copie todos los archivos adjuntos a la nueva reunión"
agenda: "Copiar agenda"
modules/meeting/config/locales/crowdin/lt.yml
+1 -1
View File
@@ -101,7 +101,7 @@ lt:
attachments:
text: "Prisegti failai prieinami visiems susitikimo dalyviams. Taipogi galite nutempti juos į plano elemento pastabas."
copy:
title: "Copy meeting: %{title}"
title: "Kopijuoti susitikimą: %{title}"
attachments: "Kopijuoti priedus"
attachments_text: "Perkopijuoti visus prisegtus failus į naują susitikimą"
agenda: "Kopijuoti dienotvarkę"
modules/meeting/config/locales/crowdin/zh-CN.yml
+1 -1
View File
@@ -98,7 +98,7 @@ zh-CN:
attachments:
text: "所有与会者都可以查看附件。您还可以将这些文件拖放到议程项目注释中。"
copy:
title: "Copy meeting: %{title}"
title: "复制会议： %{title}"
attachments: "复制附件"
attachments_text: "将所有附件复制到新会议"
agenda: "复制议程"
modules/meeting/config/locales/crowdin/zh-TW.yml
+20 -20
View File
@@ -42,11 +42,11 @@ zh-TW:
start_time: "開始時間"
start_time_hour: "開始時間"
meeting_agenda_item:
title: "Title"
author: "Author"
duration_in_minutes: "min"
description: "Notes"
presenter: "Presenter"
title: "標題"
author: "作者"
duration_in_minutes: "分鐘"
description: "備註"
presenter: "簡報者"
errors:
messages:
invalid_time_format: "不是有效時間。所需格式: HH:MM"
@@ -96,11 +96,11 @@ zh-TW:
label_start_date: "開始日期"
meeting:
attachments:
text: "Attached files are available to all meeting participants. You can also drag and drop these into agenda item notes."
text: "所有會議參與者都可以使用附件， 您也可以將它們拖放到議程項目註釋中。"
copy:
title: "Copy meeting: %{title}"
attachments: "Copy attachments"
attachments_text: "Copy over all attached files to the new meeting"
title: "複製會議 %{title}"
attachments: "複製附件"
attachments_text: "將所有附件複製到新會議"
agenda: "複製議程"
agenda_text: "複製舊會議之議程"
email:
@@ -154,9 +154,9 @@ zh-TW:
label_meeting_delete: "刪除會議"
label_meeting_created_by: "建立者"
label_meeting_last_updated: "最後更新於"
label_agenda_items: "Agenda items"
label_agenda_items_reordered: "reordered"
label_agenda_item_remove: "Remove from agenda"
label_agenda_items: "議程"
label_agenda_items_reordered: "重新排列"
label_agenda_item_remove: "從議程中刪除"
label_agenda_item_undisclosed_wp: "工作項目 #%{id} 非可見"
label_agenda_item_deleted_wp: "已將引用的工作項目刪除"
label_agenda_item_actions: "議程項目行動"
@@ -165,18 +165,18 @@ zh-TW:
label_agenda_item_move_up: "向上移 "
label_agenda_item_move_down: "向下移 "
label_agenda_item_add_notes: "新增註記"
label_agenda_item_work_package: "Agenda item work package"
text_agenda_item_title: 'Agenda item "%{title}"'
text_agenda_work_package_deleted: 'Agenda item for deleted work package'
text_deleted_agenda_item: 'Deleted agenda item'
label_initial_meeting_details: "Meeting"
label_agenda_item_work_package: "議程項目工作包"
text_agenda_item_title: '議程項目 "%{title}"'
text_agenda_work_package_deleted: '已刪除工作包的議程項目'
text_deleted_agenda_item: '已刪除的議程項目'
label_initial_meeting_details: "會議"
label_meeting_details: "會議詳情"
label_meeting_details_edit: "編輯會議詳情"
label_meeting_state: "Meeting status"
label_meeting_state: "會議狀態"
label_meeting_state_open: "開啟"
label_meeting_state_open_html: "<i>Open</i>"
label_meeting_state_open_html: "<i>開啟</i>"
label_meeting_state_closed: "關閉"
label_meeting_state_closed_html: "<i>Closed</i>"
label_meeting_state_closed_html: "<i>關閉</i>"
label_meeting_reopen_action: "重新開啟會議"
label_meeting_close_action: "關閉會議"
text_meeting_open_description: "本次會議已開放。您可以新增/移除議程項目並隨時編輯它們。會議結束後，關閉後鎖定起來。"
modules/openid_connect/config/locales/crowdin/af.yml
+1 -1
View File
@@ -1,7 +1,7 @@
af:
plugin_openproject_openid_connect:
name: "OpenProject OpenID Connect"
description: "Adds OmniAuth OpenID Connect strategy providers to Openproject."
description: "Adds OmniAuth OpenID Connect strategy providers to OpenProject."
logout_warning: >
You have been logged out. The contents of any form you submit may be lost. Please [log in].
activemodel:
modules/openid_connect/config/locales/crowdin/ar.yml
+1 -1
View File
@@ -1,7 +1,7 @@
ar:
plugin_openproject_openid_connect:
name: "OpenProject OpenID Connect"
description: "Adds OmniAuth OpenID Connect strategy providers to Openproject."
description: "Adds OmniAuth OpenID Connect strategy providers to OpenProject."
logout_warning: >
You have been logged out. The contents of any form you submit may be lost. Please [log in].
activemodel:
modules/openid_connect/config/locales/crowdin/az.yml
+1 -1
View File
@@ -1,7 +1,7 @@
az:
plugin_openproject_openid_connect:
name: "OpenProject OpenID Connect"
description: "Adds OmniAuth OpenID Connect strategy providers to Openproject."
description: "Adds OmniAuth OpenID Connect strategy providers to OpenProject."
logout_warning: >
You have been logged out. The contents of any form you submit may be lost. Please [log in].
activemodel:
modules/openid_connect/config/locales/crowdin/be.yml
+1 -1
View File
@@ -1,7 +1,7 @@
be:
plugin_openproject_openid_connect:
name: "OpenProject OpenID Connect"
description: "Adds OmniAuth OpenID Connect strategy providers to Openproject."
description: "Adds OmniAuth OpenID Connect strategy providers to OpenProject."
logout_warning: >
You have been logged out. The contents of any form you submit may be lost. Please [log in].
activemodel:
modules/openid_connect/config/locales/crowdin/bg.yml
+1 -1
View File
@@ -1,7 +1,7 @@
bg:
plugin_openproject_openid_connect:
name: "OpenProject OpenID Connect"
description: "Adds OmniAuth OpenID Connect strategy providers to Openproject."
description: "Adds OmniAuth OpenID Connect strategy providers to OpenProject."
logout_warning: >
You have been logged out. The contents of any form you submit may be lost. Please [log in].
activemodel:
modules/openid_connect/config/locales/crowdin/ca.yml
+1 -1
View File
@@ -1,7 +1,7 @@
ca:
plugin_openproject_openid_connect:
name: "OpenProject OpenID Connect"
description: "Adds OmniAuth OpenID Connect strategy providers to Openproject."
description: "Adds OmniAuth OpenID Connect strategy providers to OpenProject."
logout_warning: >
S'ha tancat la teva sessió. Es poden haver perdut els continguts de qualsevol formulari sotmès. Si us plau, [inicia sessió].
activemodel:

Some files were not shown because too many files have changed in this diff Show More