From be4ea06fdf5dafa1ef42914045168e0f8edc557e Mon Sep 17 00:00:00 2001 From: Guilherme Chaguri Date: Tue, 29 Nov 2022 18:18:47 -0300 Subject: [PATCH 01/36] (Bug) Fix reservations count from spaces in availabilities export --- app/views/exports/availabilities_index.xlsx.axlsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/exports/availabilities_index.xlsx.axlsx b/app/views/exports/availabilities_index.xlsx.axlsx index c08414983..58748e4c4 100644 --- a/app/views/exports/availabilities_index.xlsx.axlsx +++ b/app/views/exports/availabilities_index.xlsx.axlsx @@ -88,7 +88,7 @@ if Setting.get('spaces_module') ((a.end_at - a.start_at) / slot_duration.minutes).to_i.times do |i| start_at = a.start_at + (i * slot_duration).minutes end_at = a.start_at + (i * slot_duration).minutes + slot_duration.minutes - reservations = a.slots.where(start_at: start_at).count + reservations = a.slots_reservations.where(slots: { start_at: start_at }).count data = [ start_at.to_date, From 21168904636367ee4fafac024b2cb45fa6aba93f Mon Sep 17 00:00:00 2001 From: Sylvain Date: Thu, 1 Dec 2022 16:47:29 +0100 Subject: [PATCH 02/36] New translations en.yml (French) --- config/locales/fr.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/config/locales/fr.yml b/config/locales/fr.yml index 62458c1c7..5d0be1fa3 100644 --- a/config/locales/fr.yml +++ b/config/locales/fr.yml @@ -474,6 +474,7 @@ fr: type: "Type" male: "Homme" female: "Femme" + deleted_user: "Deleted user" #initial price's category for events, created to replace the old "reduced amount" property price_category: reduced_fare: "Tarif réduit" From 0de98185bba03fc720256032d07cc56f06116ce3 Mon Sep 17 00:00:00 2001 From: Sylvain Date: Thu, 1 Dec 2022 16:47:30 +0100 Subject: [PATCH 03/36] New translations app.admin.en.yml (French) --- config/locales/app.admin.fr.yml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/config/locales/app.admin.fr.yml b/config/locales/app.admin.fr.yml index 2996db4cc..b762d2a73 100644 --- a/config/locales/app.admin.fr.yml +++ b/config/locales/app.admin.fr.yml @@ -1653,11 +1653,20 @@ fr: version: "Version de l'application" members: "Nombre de membres" admins: "Nombre d'administrateurs" + managers: "Number of managers" availabilities: "Nombre de disponibilités les 7 dernier jours" reservations: "Nombre de réservations durant 7 dernier jours" + orders: "Number of store orders during the last 7 days" plans: "Le module d'abonnements est-il actif ?" spaces: "Le module d'espaces est-il actif ?" online_payment: "Le module de paiement par carte bancaire est-il actif ?" + gateway: "The payment gateway used to collect online payments" + wallet: "Is the wallet module active?" + statistics: "Is the statistics module active?" + trainings: "Is the trainings module active?" + public_agenda: "Is the public_agenda module active?" + machines: "Is the machines module active?" + store: "Is the store module active?" invoices: "Le module est facturation est-il actif ?" openlab: "Le module de partage de projets (OpenLab) est-il actif ?" tracking_id_info_html: "Pour activer les suivi statistique des visites utilisant Google Analytics V4, définissez ici votre ID de suivi. Il se présente sous la forme G-XXXXXX-X. Visitez le site web de Google Analytics pour en obtenir un.
Attention : si vous activez cette fonctionnalité, un cookie sera créé. Pensez à l'indiquer dans votre politique de confidentialité, ci-dessus." From 24b59b7ed601cf372e00668a87551a267b6aa70d Mon Sep 17 00:00:00 2001 From: Sylvain Date: Thu, 1 Dec 2022 16:47:31 +0100 Subject: [PATCH 04/36] New translations en.yml (Spanish) --- config/locales/es.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/config/locales/es.yml b/config/locales/es.yml index 75b12142c..2940a041e 100644 --- a/config/locales/es.yml +++ b/config/locales/es.yml @@ -474,6 +474,7 @@ es: type: "Tipo" male: "Hombre" female: "Mujer" + deleted_user: "Deleted user" #initial price's category for events, created to replace the old "reduced amount" property price_category: reduced_fare: "Tarifa reducida" From f15980ff8500d215b8c6f5a0d0bfad7ccfd1fc0e Mon Sep 17 00:00:00 2001 From: Sylvain Date: Thu, 1 Dec 2022 16:47:33 +0100 Subject: [PATCH 05/36] New translations app.admin.en.yml (Spanish) --- config/locales/app.admin.es.yml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/config/locales/app.admin.es.yml b/config/locales/app.admin.es.yml index 46ff635b9..925ef94c9 100644 --- a/config/locales/app.admin.es.yml +++ b/config/locales/app.admin.es.yml @@ -1653,11 +1653,20 @@ es: version: "Application version" members: "Number of members" admins: "Number of administrators" + managers: "Number of managers" availabilities: "Number of availabilities of the last 7 days" reservations: "Number of reservations during the last 7 days" + orders: "Number of store orders during the last 7 days" plans: "Is the subscription module active?" spaces: "Is the space management module active?" online_payment: "Is the online payment module active?" + gateway: "The payment gateway used to collect online payments" + wallet: "Is the wallet module active?" + statistics: "Is the statistics module active?" + trainings: "Is the trainings module active?" + public_agenda: "Is the public_agenda module active?" + machines: "Is the machines module active?" + store: "Is the store module active?" invoices: "Is the invoicing module active?" openlab: "Is the project sharing module (OpenLab) active?" tracking_id_info_html: "To enable the statistical tracking of the visits using Google Analytics V4, set your tracking ID here. It is in the form G-XXXXXX. Visit the Google Analytics website to get one.
Warning: if you enable this feature, a cookie will be created. Remember to write it down in your privacy policy, above." From a3c2e04d2ee5f1c79694b98c439cbbf968593bab Mon Sep 17 00:00:00 2001 From: Sylvain Date: Thu, 1 Dec 2022 16:47:34 +0100 Subject: [PATCH 06/36] New translations en.yml (German) --- config/locales/de.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/config/locales/de.yml b/config/locales/de.yml index c49b7ac31..ce2d3a54d 100644 --- a/config/locales/de.yml +++ b/config/locales/de.yml @@ -474,6 +474,7 @@ de: type: "Typ" male: "Männlich" female: "Weiblich" + deleted_user: "Deleted user" #initial price's category for events, created to replace the old "reduced amount" property price_category: reduced_fare: "Ermäßigter Tarif" From b0038c55a8263484dbf1aecc71ce92dcca711273 Mon Sep 17 00:00:00 2001 From: Sylvain Date: Thu, 1 Dec 2022 16:47:35 +0100 Subject: [PATCH 07/36] New translations app.admin.en.yml (German) --- config/locales/app.admin.de.yml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/config/locales/app.admin.de.yml b/config/locales/app.admin.de.yml index 0491d24f2..7ecd05bbd 100644 --- a/config/locales/app.admin.de.yml +++ b/config/locales/app.admin.de.yml @@ -1653,11 +1653,20 @@ de: version: "Anwendungsversion" members: "Mitgliederanzahl" admins: "Anzahl der Administratoren" + managers: "Number of managers" availabilities: "Anzahl der Verfügbarkeiten der letzten 7 Tage" reservations: "Anzahl der Reservierungen in den letzten 7 Tagen" + orders: "Number of store orders during the last 7 days" plans: "Ist das Abonnement-Modul aktiv?" spaces: "Ist das Raum-Management-Modul aktiv?" online_payment: "Ist das Online-Zahlungsmodul aktiv?" + gateway: "The payment gateway used to collect online payments" + wallet: "Is the wallet module active?" + statistics: "Is the statistics module active?" + trainings: "Is the trainings module active?" + public_agenda: "Is the public_agenda module active?" + machines: "Is the machines module active?" + store: "Is the store module active?" invoices: "Ist das Rechnungsmodul aktiv?" openlab: "Ist das Projektteilungsmodul (OpenLab) aktiv?" tracking_id_info_html: "Um die statistische Analyse der Besuche mithilfe von Google Analytics V4 zu ermöglichen, tragen Sie hier Ihre Tracking-ID in der Form G-XXXXXX ein. Besuchen Sie die Google Analytics Website, um eine Tracking-ID zu erstellen.
Warnung: wenn Sie dieses Feature aktivieren, wird ein Cookie erstellt. Denken Sie daran, es oben in Ihrer Datenschutzrichtlinie darauf hingewiesen werden." From 920b9fd6e85f9cf632683fdb53dbac7967bd02bb Mon Sep 17 00:00:00 2001 From: Sylvain Date: Thu, 1 Dec 2022 16:47:37 +0100 Subject: [PATCH 08/36] New translations en.yml (Norwegian) --- config/locales/no.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/config/locales/no.yml b/config/locales/no.yml index 6a05cc42a..5c68b5f96 100644 --- a/config/locales/no.yml +++ b/config/locales/no.yml @@ -474,6 +474,7 @@ type: "Type" male: "Mann" female: "Kvinne" + deleted_user: "Deleted user" #initial price's category for events, created to replace the old "reduced amount" property price_category: reduced_fare: "Redusert avgift" From f1be1851353d51ffe1598b9cd056ab20a44f20fb Mon Sep 17 00:00:00 2001 From: Sylvain Date: Thu, 1 Dec 2022 16:47:38 +0100 Subject: [PATCH 09/36] New translations app.admin.en.yml (Norwegian) --- config/locales/app.admin.no.yml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/config/locales/app.admin.no.yml b/config/locales/app.admin.no.yml index 2402060c8..02deb2a2c 100644 --- a/config/locales/app.admin.no.yml +++ b/config/locales/app.admin.no.yml @@ -1653,11 +1653,20 @@ version: "Application version" members: "Number of members" admins: "Number of administrators" + managers: "Number of managers" availabilities: "Number of availabilities of the last 7 days" reservations: "Number of reservations during the last 7 days" + orders: "Number of store orders during the last 7 days" plans: "Is the subscription module active?" spaces: "Is the space management module active?" online_payment: "Is the online payment module active?" + gateway: "The payment gateway used to collect online payments" + wallet: "Is the wallet module active?" + statistics: "Is the statistics module active?" + trainings: "Is the trainings module active?" + public_agenda: "Is the public_agenda module active?" + machines: "Is the machines module active?" + store: "Is the store module active?" invoices: "Is the invoicing module active?" openlab: "Is the project sharing module (OpenLab) active?" tracking_id_info_html: "To enable the statistical tracking of the visits using Google Analytics V4, set your tracking ID here. It is in the form G-XXXXXX. Visit the Google Analytics website to get one.
Warning: if you enable this feature, a cookie will be created. Remember to write it down in your privacy policy, above." From 0b125f2c81ff6db42792cdb77b48d20cbcdef112 Mon Sep 17 00:00:00 2001 From: Sylvain Date: Thu, 1 Dec 2022 16:47:39 +0100 Subject: [PATCH 10/36] New translations en.yml (Portuguese) --- config/locales/pt.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/config/locales/pt.yml b/config/locales/pt.yml index b41bbfa06..638ed419a 100644 --- a/config/locales/pt.yml +++ b/config/locales/pt.yml @@ -474,6 +474,7 @@ pt: type: "Tipo" male: "Homem" female: "Mulher" + deleted_user: "Deleted user" #initial price's category for events, created to replace the old "reduced amount" property price_category: reduced_fare: "Tarifa reduzida" From 88010eea5fb5db5788b0081bf40d2e9050df53da Mon Sep 17 00:00:00 2001 From: Sylvain Date: Thu, 1 Dec 2022 16:47:42 +0100 Subject: [PATCH 11/36] New translations app.admin.en.yml (Portuguese) --- config/locales/app.admin.pt.yml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/config/locales/app.admin.pt.yml b/config/locales/app.admin.pt.yml index e6b848614..33619140f 100644 --- a/config/locales/app.admin.pt.yml +++ b/config/locales/app.admin.pt.yml @@ -1653,11 +1653,20 @@ pt: version: "Versão do aplicativo" members: "Número de membros" admins: "Número de administradores" + managers: "Number of managers" availabilities: "Número de disponibilidades dos últimos 7 dias" reservations: "Número de reservas nos últimos 7 dias" + orders: "Number of store orders during the last 7 days" plans: "O módulo de assinatura está ativo?" spaces: "O módulo de gerenciamento de espaço está ativo?" online_payment: "O módulo de pagamento online está ativo?" + gateway: "The payment gateway used to collect online payments" + wallet: "Is the wallet module active?" + statistics: "Is the statistics module active?" + trainings: "Is the trainings module active?" + public_agenda: "Is the public_agenda module active?" + machines: "Is the machines module active?" + store: "Is the store module active?" invoices: "O módulo de faturação está ativo?" openlab: "O módulo de compartilhamento de projetos (OpenLab) está ativo?" tracking_id_info_html: "Para ativar o rastreamento estatístico das visitas usando o Google Analytics, defina seu ID de rastreamento aqui. Está na forma de G-XXXXXX. Visite o site do Google Analytics para obter um.
Aviso: se você ativar este recurso, um cookie será criado. Lembre-se de escrevê-lo na sua política de privacidade." From 3796000e743a09ae3f0ffc90e42b5a0956024c77 Mon Sep 17 00:00:00 2001 From: Sylvain Date: Thu, 1 Dec 2022 16:47:43 +0100 Subject: [PATCH 12/36] New translations en.yml (Zulu) --- config/locales/zu.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/config/locales/zu.yml b/config/locales/zu.yml index 4d580eb98..44f522b4d 100644 --- a/config/locales/zu.yml +++ b/config/locales/zu.yml @@ -474,6 +474,7 @@ zu: type: "crwdns3759:0crwdne3759:0" male: "crwdns3761:0crwdne3761:0" female: "crwdns3763:0crwdne3763:0" + deleted_user: "crwdns31747:0crwdne31747:0" #initial price's category for events, created to replace the old "reduced amount" property price_category: reduced_fare: "crwdns3765:0crwdne3765:0" From 4ab53112aa53b7ccbbd74bfd0482c9bab8c06709 Mon Sep 17 00:00:00 2001 From: Sylvain Date: Thu, 1 Dec 2022 16:47:44 +0100 Subject: [PATCH 13/36] New translations app.admin.en.yml (Zulu) --- config/locales/app.admin.zu.yml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/config/locales/app.admin.zu.yml b/config/locales/app.admin.zu.yml index 27d20ae23..2f075770b 100644 --- a/config/locales/app.admin.zu.yml +++ b/config/locales/app.admin.zu.yml @@ -1653,11 +1653,20 @@ zu: version: "crwdns27010:0crwdne27010:0" members: "crwdns27012:0crwdne27012:0" admins: "crwdns27014:0crwdne27014:0" + managers: "crwdns31729:0crwdne31729:0" availabilities: "crwdns27016:0crwdne27016:0" reservations: "crwdns27018:0crwdne27018:0" + orders: "crwdns31731:0crwdne31731:0" plans: "crwdns27020:0crwdne27020:0" spaces: "crwdns27022:0crwdne27022:0" online_payment: "crwdns27024:0crwdne27024:0" + gateway: "crwdns31733:0crwdne31733:0" + wallet: "crwdns31735:0crwdne31735:0" + statistics: "crwdns31737:0crwdne31737:0" + trainings: "crwdns31739:0crwdne31739:0" + public_agenda: "crwdns31741:0crwdne31741:0" + machines: "crwdns31743:0crwdne31743:0" + store: "crwdns31745:0crwdne31745:0" invoices: "crwdns27026:0crwdne27026:0" openlab: "crwdns27028:0crwdne27028:0" tracking_id_info_html: "crwdns27030:0crwdne27030:0" From 401128836d1730bfe56dfb678590b48602be5607 Mon Sep 17 00:00:00 2001 From: Sylvain Date: Thu, 1 Dec 2022 20:02:06 +0100 Subject: [PATCH 14/36] New translations en.yml (French) --- config/locales/fr.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/locales/fr.yml b/config/locales/fr.yml index 5d0be1fa3..99ad4c9c0 100644 --- a/config/locales/fr.yml +++ b/config/locales/fr.yml @@ -474,7 +474,7 @@ fr: type: "Type" male: "Homme" female: "Femme" - deleted_user: "Deleted user" + deleted_user: "Utilisateur supprimé" #initial price's category for events, created to replace the old "reduced amount" property price_category: reduced_fare: "Tarif réduit" From d6af7f6d8eef02a4c3fde4b0f43ad40672dcd8e7 Mon Sep 17 00:00:00 2001 From: Sylvain Date: Thu, 1 Dec 2022 20:02:09 +0100 Subject: [PATCH 15/36] New translations app.admin.en.yml (French) --- config/locales/app.admin.fr.yml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/config/locales/app.admin.fr.yml b/config/locales/app.admin.fr.yml index b762d2a73..75971a2db 100644 --- a/config/locales/app.admin.fr.yml +++ b/config/locales/app.admin.fr.yml @@ -1653,20 +1653,20 @@ fr: version: "Version de l'application" members: "Nombre de membres" admins: "Nombre d'administrateurs" - managers: "Number of managers" + managers: "Nombre de gestionnaires" availabilities: "Nombre de disponibilités les 7 dernier jours" reservations: "Nombre de réservations durant 7 dernier jours" - orders: "Number of store orders during the last 7 days" + orders: "Nombre de commandes dans la boutique au cours des 7 derniers jours" plans: "Le module d'abonnements est-il actif ?" spaces: "Le module d'espaces est-il actif ?" online_payment: "Le module de paiement par carte bancaire est-il actif ?" - gateway: "The payment gateway used to collect online payments" - wallet: "Is the wallet module active?" - statistics: "Is the statistics module active?" - trainings: "Is the trainings module active?" - public_agenda: "Is the public_agenda module active?" - machines: "Is the machines module active?" - store: "Is the store module active?" + gateway: "La passerelle de paiement utilisée pour collecter les paiements en ligne" + wallet: "Le module porte-monnaie est-il actif ?" + statistics: "Le module de statistiques est-il actif ?" + trainings: "Le module de formation est-il actif ?" + public_agenda: "Le module d'agenda public est-il actif ?" + machines: "Le module machines est-il actif ?" + store: "Le module boutique est-il actif ?" invoices: "Le module est facturation est-il actif ?" openlab: "Le module de partage de projets (OpenLab) est-il actif ?" tracking_id_info_html: "Pour activer les suivi statistique des visites utilisant Google Analytics V4, définissez ici votre ID de suivi. Il se présente sous la forme G-XXXXXX-X. Visitez le site web de Google Analytics pour en obtenir un.
Attention : si vous activez cette fonctionnalité, un cookie sera créé. Pensez à l'indiquer dans votre politique de confidentialité, ci-dessus." From d8e2d6f4ef689ce532287782b9cdb982a6e06241 Mon Sep 17 00:00:00 2001 From: Sylvain Date: Thu, 1 Dec 2022 20:02:10 +0100 Subject: [PATCH 16/36] New translations app.admin.en.yml (Spanish) --- config/locales/app.admin.es.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/locales/app.admin.es.yml b/config/locales/app.admin.es.yml index 925ef94c9..77b2de597 100644 --- a/config/locales/app.admin.es.yml +++ b/config/locales/app.admin.es.yml @@ -1664,7 +1664,7 @@ es: wallet: "Is the wallet module active?" statistics: "Is the statistics module active?" trainings: "Is the trainings module active?" - public_agenda: "Is the public_agenda module active?" + public_agenda: "Is the public agenda module active?" machines: "Is the machines module active?" store: "Is the store module active?" invoices: "Is the invoicing module active?" From 2739f2a1e24e65e58003ab3d075ce876b03e897e Mon Sep 17 00:00:00 2001 From: Sylvain Date: Thu, 1 Dec 2022 20:02:12 +0100 Subject: [PATCH 17/36] New translations app.admin.en.yml (German) --- config/locales/app.admin.de.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/locales/app.admin.de.yml b/config/locales/app.admin.de.yml index 7ecd05bbd..810a9613a 100644 --- a/config/locales/app.admin.de.yml +++ b/config/locales/app.admin.de.yml @@ -1664,7 +1664,7 @@ de: wallet: "Is the wallet module active?" statistics: "Is the statistics module active?" trainings: "Is the trainings module active?" - public_agenda: "Is the public_agenda module active?" + public_agenda: "Is the public agenda module active?" machines: "Is the machines module active?" store: "Is the store module active?" invoices: "Ist das Rechnungsmodul aktiv?" From 4defd7b5539819dbab82764a7e64d9f7b0d8b5d2 Mon Sep 17 00:00:00 2001 From: Sylvain Date: Thu, 1 Dec 2022 20:02:13 +0100 Subject: [PATCH 18/36] New translations app.admin.en.yml (Norwegian) --- config/locales/app.admin.no.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/locales/app.admin.no.yml b/config/locales/app.admin.no.yml index 02deb2a2c..524bec6a1 100644 --- a/config/locales/app.admin.no.yml +++ b/config/locales/app.admin.no.yml @@ -1664,7 +1664,7 @@ wallet: "Is the wallet module active?" statistics: "Is the statistics module active?" trainings: "Is the trainings module active?" - public_agenda: "Is the public_agenda module active?" + public_agenda: "Is the public agenda module active?" machines: "Is the machines module active?" store: "Is the store module active?" invoices: "Is the invoicing module active?" From aaa9c6170e18430b67ee671fef2e0b9c25edda5a Mon Sep 17 00:00:00 2001 From: Sylvain Date: Thu, 1 Dec 2022 20:02:15 +0100 Subject: [PATCH 19/36] New translations app.admin.en.yml (Portuguese) --- config/locales/app.admin.pt.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/locales/app.admin.pt.yml b/config/locales/app.admin.pt.yml index 33619140f..356485bb8 100644 --- a/config/locales/app.admin.pt.yml +++ b/config/locales/app.admin.pt.yml @@ -1664,7 +1664,7 @@ pt: wallet: "Is the wallet module active?" statistics: "Is the statistics module active?" trainings: "Is the trainings module active?" - public_agenda: "Is the public_agenda module active?" + public_agenda: "Is the public agenda module active?" machines: "Is the machines module active?" store: "Is the store module active?" invoices: "O módulo de faturação está ativo?" From f808ed6fc7e867064634ad9424c639f44ddaf27d Mon Sep 17 00:00:00 2001 From: Sylvain Date: Fri, 2 Dec 2022 18:08:44 +0100 Subject: [PATCH 20/36] New translations app.shared.en.yml (French) --- config/locales/app.shared.fr.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/locales/app.shared.fr.yml b/config/locales/app.shared.fr.yml index 963aa0cc7..37bcfda27 100644 --- a/config/locales/app.shared.fr.yml +++ b/config/locales/app.shared.fr.yml @@ -110,7 +110,7 @@ fr: password_input: new_password: "Nouveau mot de passe" confirm_password: "Confirmez le mot de passe" - password_too_short: "Le mot de passe est trop court (doit contenir au moins 8 caractères)" + password_too_short: "Le mot de passe est trop court (doit contenir au moins 12 caractères)" confirmation_mismatch: "La confirmation ne concorde pas avec le mot de passe." #project edition form project: From 5aadc2edc77f603cc554b67ff7b3196fa9d0f074 Mon Sep 17 00:00:00 2001 From: Sylvain Date: Fri, 2 Dec 2022 18:08:44 +0100 Subject: [PATCH 21/36] New translations app.shared.en.yml (Spanish) --- config/locales/app.shared.es.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/locales/app.shared.es.yml b/config/locales/app.shared.es.yml index c6ed0eae9..5385f39d2 100644 --- a/config/locales/app.shared.es.yml +++ b/config/locales/app.shared.es.yml @@ -110,7 +110,7 @@ es: password_input: new_password: "New password" confirm_password: "Confirm password" - password_too_short: "Password is too short (must be at least 8 characters)" + password_too_short: "Password is too short (must be at least 12 characters)" confirmation_mismatch: "Confirmation mismatch with password." #project edition form project: From f3ac4c975c8542eacf81a989148f0b269f8bec47 Mon Sep 17 00:00:00 2001 From: Sylvain Date: Fri, 2 Dec 2022 18:08:45 +0100 Subject: [PATCH 22/36] New translations app.shared.en.yml (German) --- config/locales/app.shared.de.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/locales/app.shared.de.yml b/config/locales/app.shared.de.yml index 551b3aa37..c80bd85aa 100644 --- a/config/locales/app.shared.de.yml +++ b/config/locales/app.shared.de.yml @@ -110,7 +110,7 @@ de: password_input: new_password: "New password" confirm_password: "Confirm password" - password_too_short: "Password is too short (must be at least 8 characters)" + password_too_short: "Password is too short (must be at least 12 characters)" confirmation_mismatch: "Confirmation mismatch with password." #project edition form project: From 4ec2139b29c31c3adbce14fb71dc400eb5b68f11 Mon Sep 17 00:00:00 2001 From: Sylvain Date: Fri, 2 Dec 2022 18:08:46 +0100 Subject: [PATCH 23/36] New translations app.shared.en.yml (Norwegian) --- config/locales/app.shared.no.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/locales/app.shared.no.yml b/config/locales/app.shared.no.yml index b658b6e81..24c220a12 100644 --- a/config/locales/app.shared.no.yml +++ b/config/locales/app.shared.no.yml @@ -110,7 +110,7 @@ password_input: new_password: "New password" confirm_password: "Confirm password" - password_too_short: "Password is too short (must be at least 8 characters)" + password_too_short: "Password is too short (must be at least 12 characters)" confirmation_mismatch: "Confirmation mismatch with password." #project edition form project: From d2600fdfd62435ec24cabbed2b44817f92ac3d2e Mon Sep 17 00:00:00 2001 From: Sylvain Date: Fri, 2 Dec 2022 18:08:47 +0100 Subject: [PATCH 24/36] New translations app.shared.en.yml (Portuguese) --- config/locales/app.shared.pt.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/locales/app.shared.pt.yml b/config/locales/app.shared.pt.yml index 6c414b3ef..1239a6b51 100644 --- a/config/locales/app.shared.pt.yml +++ b/config/locales/app.shared.pt.yml @@ -110,7 +110,7 @@ pt: password_input: new_password: "Nova senha" confirm_password: "Confirmar a senha" - password_too_short: "Senha muito curta (mínimo 8 caracteres)" + password_too_short: "Password is too short (must be at least 12 characters)" confirmation_mismatch: "Confirmação de senha é diferente da senha." #project edition form project: From 24c3faabe127b51662b66808e108ccb003dffd6a Mon Sep 17 00:00:00 2001 From: Sylvain Date: Fri, 2 Dec 2022 18:08:48 +0100 Subject: [PATCH 25/36] New translations app.shared.en.yml (Zulu) --- config/locales/app.shared.zu.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/locales/app.shared.zu.yml b/config/locales/app.shared.zu.yml index eaf1c0cc7..b5eea579a 100644 --- a/config/locales/app.shared.zu.yml +++ b/config/locales/app.shared.zu.yml @@ -110,7 +110,7 @@ zu: password_input: new_password: "crwdns28716:0crwdne28716:0" confirm_password: "crwdns28718:0crwdne28718:0" - password_too_short: "crwdns28720:0crwdne28720:0" + password_too_short: "crwdns31749:0crwdne31749:0" confirmation_mismatch: "crwdns28722:0crwdne28722:0" #project edition form project: From 7e4e8a950e5f6627f4d0e1d1028c264cc8399de0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 12 Dec 2022 08:57:09 +0000 Subject: [PATCH 26/36] Bump express from 4.17.1 to 4.18.2 Bumps [express](https://github.com/expressjs/express) from 4.17.1 to 4.18.2. - [Release notes](https://github.com/expressjs/express/releases) - [Changelog](https://github.com/expressjs/express/blob/master/History.md) - [Commits](https://github.com/expressjs/express/compare/4.17.1...4.18.2) --- updated-dependencies: - dependency-name: express dependency-type: indirect ... Signed-off-by: dependabot[bot] --- yarn.lock | 326 ++++++++++++++++++++++++++++-------------------------- 1 file changed, 172 insertions(+), 154 deletions(-) diff --git a/yarn.lock b/yarn.lock index b65b14898..36a210783 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2679,13 +2679,13 @@ abbrev@1: resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8" integrity sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q== -accepts@~1.3.4, accepts@~1.3.5, accepts@~1.3.7: - version "1.3.7" - resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.7.tgz#531bc726517a3b2b41f850021c6cc15eaab507cd" - integrity sha512-Il80Qs2WjYlJIBNzNkK6KYqlVMTbZLXgHx2oT0pU/fjRHyEp+PEfEPY0R3WCwAGVOtauxh1hOxNgIf5bv7dQpA== +accepts@~1.3.4, accepts@~1.3.5, accepts@~1.3.8: + version "1.3.8" + resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.8.tgz#0bf0be125b67014adcb0b0921e62db7bffe16b2e" + integrity sha512-PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw== dependencies: - mime-types "~2.1.24" - negotiator "0.6.2" + mime-types "~2.1.34" + negotiator "0.6.3" acorn-import-assertions@^1.7.6: version "1.8.0" @@ -2975,7 +2975,7 @@ argparse@^2.0.1: array-flatten@1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-1.1.1.tgz#9a5f699051b1e7073328f2a008968b64ea2955d2" - integrity sha1-ml9pkFGx5wczKPKgCJaLZOopVdI= + integrity sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg== array-flatten@^2.1.0: version "2.1.2" @@ -3140,21 +3140,23 @@ binary-extensions@^2.0.0: resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-2.2.0.tgz#75f502eeaf9ffde42fc98829645be4ea76bd9e2d" integrity sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA== -body-parser@1.19.0: - version "1.19.0" - resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.19.0.tgz#96b2709e57c9c4e09a6fd66a8fd979844f69f08a" - integrity sha512-dhEPs72UPbDnAQJ9ZKMNTP6ptJaionhP5cBb541nXPlW60Jepo9RV/a4fX4XWW9CuFNK22krhrj1+rgzifNCsw== +body-parser@1.20.1: + version "1.20.1" + resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.20.1.tgz#b1812a8912c195cd371a3ee5e66faa2338a5c668" + integrity sha512-jWi7abTbYwajOytWCQc37VulmWiRae5RyTpaCyDcS5/lMdtwSz5lOpDE67srw/HYe35f1z3fDQw+3txg7gNtWw== dependencies: - bytes "3.1.0" + bytes "3.1.2" content-type "~1.0.4" debug "2.6.9" - depd "~1.1.2" - http-errors "1.7.2" + depd "2.0.0" + destroy "1.2.0" + http-errors "2.0.0" iconv-lite "0.4.24" - on-finished "~2.3.0" - qs "6.7.0" - raw-body "2.4.0" - type-is "~1.6.17" + on-finished "2.4.1" + qs "6.11.0" + raw-body "2.5.1" + type-is "~1.6.18" + unpipe "1.0.0" bonjour@^3.5.0: version "3.5.0" @@ -3258,10 +3260,10 @@ bytes@3.0.0: resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.0.0.tgz#d32815404d689699f85a4ea4fa8755dd13a96048" integrity sha1-0ygVQE1olpn4Wk6k+odV3ROpYEg= -bytes@3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.1.0.tgz#f6cf7933a360e0588fa9fde85651cdc7f805d1f6" - integrity sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg== +bytes@3.1.2: + version "3.1.2" + resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.1.2.tgz#8b0beeb98605adf1b128fa4386403c009e0221a5" + integrity sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg== call-bind@^1.0.0, call-bind@^1.0.2: version "1.0.2" @@ -3479,12 +3481,12 @@ connect-history-api-fallback@^1.6.0: resolved "https://registry.yarnpkg.com/connect-history-api-fallback/-/connect-history-api-fallback-1.6.0.tgz#8b32089359308d111115d81cad3fceab888f97bc" integrity sha512-e54B99q/OUoH64zYYRf3HBP5z24G38h5D3qXu23JGRoigpX5Ss4r9ZnDk3g0Z8uQC2x2lPaJ+UlWBc1ZWBWdLg== -content-disposition@0.5.3: - version "0.5.3" - resolved "https://registry.yarnpkg.com/content-disposition/-/content-disposition-0.5.3.tgz#e130caf7e7279087c5616c2007d0485698984fbd" - integrity sha512-ExO0774ikEObIAEV9kDo50o+79VCUdEB6n6lzKgGwupcVeRlhrj3qGAfwq8G6uBJjkqLrhT0qEYFcWng8z1z0g== +content-disposition@0.5.4: + version "0.5.4" + resolved "https://registry.yarnpkg.com/content-disposition/-/content-disposition-0.5.4.tgz#8b82b4efac82512a02bb0b1dcec9d2c5e8eb5bfe" + integrity sha512-FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ== dependencies: - safe-buffer "5.1.2" + safe-buffer "5.2.1" content-type@~1.0.4: version "1.0.4" @@ -3501,12 +3503,12 @@ convert-source-map@^1.5.0, convert-source-map@^1.7.0: cookie-signature@1.0.6: version "1.0.6" resolved "https://registry.yarnpkg.com/cookie-signature/-/cookie-signature-1.0.6.tgz#e303a882b342cc3ee8ca513a79999734dab3ae2c" - integrity sha1-4wOogrNCzD7oylE6eZmXNNqzriw= + integrity sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ== -cookie@0.4.0: - version "0.4.0" - resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.4.0.tgz#beb437e7022b3b6d49019d088665303ebe9c14ba" - integrity sha512-+Hp8fLp57wnUSt0tY0tHEXh4voZRDnoIrZPqlo3DPiI4y9lwg/jqx+1Om94/W6ZaPDOUbnjOt/99w66zk+l1Xg== +cookie@0.5.0: + version "0.5.0" + resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.5.0.tgz#d1f5d71adec6558c58f389987c366aa47e994f8b" + integrity sha512-YZ3GUyn/o8gfKJlnlX7g7xq4gyO6OSuhGPKaaGssGB2qgDUS0gPgtTvoyZLTt9Ab6dC4hfc9dV5arkvc/OCmrw== core-js-compat@^3.20.2, core-js-compat@^3.21.0: version "3.21.1" @@ -3719,14 +3721,7 @@ debug@^3.1.1, debug@^3.2.7: dependencies: ms "^2.1.1" -debug@^4.1.0, debug@^4.1.1: - version "4.3.1" - resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.1.tgz#f0d229c505e0c6d8c49ac553d1b13dc183f6b2ee" - integrity sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ== - dependencies: - ms "2.1.2" - -debug@^4.3.2: +debug@^4.1.0, debug@^4.1.1, debug@^4.3.2: version "4.3.4" resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.4.tgz#1319f6579357f2338d3337d2cdd4914bb5dcc865" integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ== @@ -3788,15 +3783,20 @@ del@^6.0.0: rimraf "^3.0.2" slash "^3.0.0" +depd@2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/depd/-/depd-2.0.0.tgz#b696163cc757560d09cf22cc8fad1571b79e76df" + integrity sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw== + depd@~1.1.2: version "1.1.2" resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.2.tgz#9bcd52e14c097763e749b274c4346ed2e560b5a9" integrity sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak= -destroy@~1.0.4: - version "1.0.4" - resolved "https://registry.yarnpkg.com/destroy/-/destroy-1.0.4.tgz#978857442c44749e4206613e37946205826abd80" - integrity sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA= +destroy@1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/destroy/-/destroy-1.2.0.tgz#4803735509ad8be552934c67df614f94e66fa015" + integrity sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg== detect-node@^2.0.4: version "2.1.0" @@ -3900,7 +3900,7 @@ dot-case@^3.0.4: ee-first@1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d" - integrity sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0= + integrity sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow== elasticsearch-browser@3.1: version "3.1.4" @@ -3930,7 +3930,7 @@ emojis-list@^3.0.0: encodeurl@~1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59" - integrity sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k= + integrity sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w== enhanced-resolve@^5.9.2: version "5.9.2" @@ -4075,7 +4075,7 @@ escalade@^3.1.1: escape-html@~1.0.3: version "1.0.3" resolved "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988" - integrity sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg= + integrity sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow== escape-string-regexp@^1.0.5: version "1.0.5" @@ -4329,7 +4329,7 @@ esutils@^2.0.2: etag@~1.8.1: version "1.8.1" resolved "https://registry.yarnpkg.com/etag/-/etag-1.8.1.tgz#41ae2eeb65efa62268aebfea83ac7d79299b0887" - integrity sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc= + integrity sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg== eventemitter3@^4.0.0: version "4.0.7" @@ -4362,37 +4362,38 @@ exenv@^1.2.0: integrity sha1-KueOhdmJQVhnCwPUe+wfA72Ru50= express@^4.17.1: - version "4.17.1" - resolved "https://registry.yarnpkg.com/express/-/express-4.17.1.tgz#4491fc38605cf51f8629d39c2b5d026f98a4c134" - integrity sha512-mHJ9O79RqluphRrcw2X/GTh3k9tVv8YcoyY4Kkh4WDMUYKRZUq0h1o0w2rrrxBqM7VoeUVqgb27xlEMXTnYt4g== + version "4.18.2" + resolved "https://registry.yarnpkg.com/express/-/express-4.18.2.tgz#3fabe08296e930c796c19e3c516979386ba9fd59" + integrity sha512-5/PsL6iGPdfQ/lKM1UuielYgv3BUoJfz1aUwU9vHZ+J7gyvwdQXFEBIEIaxeGf0GIcreATNyBExtalisDbuMqQ== dependencies: - accepts "~1.3.7" + accepts "~1.3.8" array-flatten "1.1.1" - body-parser "1.19.0" - content-disposition "0.5.3" + body-parser "1.20.1" + content-disposition "0.5.4" content-type "~1.0.4" - cookie "0.4.0" + cookie "0.5.0" cookie-signature "1.0.6" debug "2.6.9" - depd "~1.1.2" + depd "2.0.0" encodeurl "~1.0.2" escape-html "~1.0.3" etag "~1.8.1" - finalhandler "~1.1.2" + finalhandler "1.2.0" fresh "0.5.2" + http-errors "2.0.0" merge-descriptors "1.0.1" methods "~1.1.2" - on-finished "~2.3.0" + on-finished "2.4.1" parseurl "~1.3.3" path-to-regexp "0.1.7" - proxy-addr "~2.0.5" - qs "6.7.0" + proxy-addr "~2.0.7" + qs "6.11.0" range-parser "~1.2.1" - safe-buffer "5.1.2" - send "0.17.1" - serve-static "1.14.1" - setprototypeof "1.1.1" - statuses "~1.5.0" + safe-buffer "5.2.1" + send "0.18.0" + serve-static "1.15.0" + setprototypeof "1.2.0" + statuses "2.0.1" type-is "~1.6.18" utils-merge "1.0.1" vary "~1.1.2" @@ -4456,17 +4457,17 @@ fill-range@^7.0.1: dependencies: to-regex-range "^5.0.1" -finalhandler@~1.1.2: - version "1.1.2" - resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.1.2.tgz#b7e7d000ffd11938d0fdb053506f6ebabe9f587d" - integrity sha512-aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA== +finalhandler@1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.2.0.tgz#7d23fe5731b207b4640e4fcd00aec1f9207a7b32" + integrity sha512-5uXcUVftlQMFnWC9qu/svkWv3GTd2PfUhK/3PLkYNAe7FbqJMt3515HaxE6eRL74GdsriiwujiawdaB1BpEISg== dependencies: debug "2.6.9" encodeurl "~1.0.2" escape-html "~1.0.3" - on-finished "~2.3.0" + on-finished "2.4.1" parseurl "~1.3.3" - statuses "~1.5.0" + statuses "2.0.1" unpipe "~1.0.0" find-cache-dir@^3.3.1: @@ -4537,7 +4538,7 @@ forwarded@0.2.0: fresh@0.5.2: version "0.5.2" resolved "https://registry.yarnpkg.com/fresh/-/fresh-0.5.2.tgz#3d8cadd90d976569fa835ab1f8e4b23a105605a7" - integrity sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac= + integrity sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q== fs-monkey@1.0.3: version "1.0.3" @@ -4574,7 +4575,16 @@ gensync@^1.0.0-beta.2: resolved "https://registry.yarnpkg.com/gensync/-/gensync-1.0.0-beta.2.tgz#32a6ee76c3d7f52d46b2b1ae5d93fea8580a25e0" integrity sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg== -get-intrinsic@^1.0.2, get-intrinsic@^1.1.0, get-intrinsic@^1.1.1: +get-intrinsic@^1.0.2: + version "1.1.3" + resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.1.3.tgz#063c84329ad93e83893c7f4f243ef63ffa351385" + integrity sha512-QJVz1Tj7MS099PevUG5jvnt9tSkXN8K14dxQlikJuPt4uD9hHAHjLyLBiLR5zELelBdD9QNRAXZzsJx0WaDL9A== + dependencies: + function-bind "^1.1.1" + has "^1.0.3" + has-symbols "^1.0.3" + +get-intrinsic@^1.1.0, get-intrinsic@^1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.1.1.tgz#15f59f376f855c446963948f0d24cd3637b4abc6" integrity sha512-kWZrnVM42QCiEA2Ig1bG8zjoIMOgxWwYCEeNdwY6Tv/cOSeGpcoX4pXHfKUxNKVoArnrEr2e9srnAxxGIraS9Q== @@ -4816,16 +4826,16 @@ http-deceiver@^1.2.7: resolved "https://registry.yarnpkg.com/http-deceiver/-/http-deceiver-1.2.7.tgz#fa7168944ab9a519d337cb0bec7284dc3e723d87" integrity sha1-+nFolEq5pRnTN8sL7HKE3D5yPYc= -http-errors@1.7.2: - version "1.7.2" - resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.7.2.tgz#4f5029cf13239f31036e5b2e55292bcfbcc85c8f" - integrity sha512-uUQBt3H/cSIVfch6i1EuPNy/YsRSOUBXTVfZ+yR7Zjez3qjBz6i9+i4zjNaoqcoFVI4lQJ5plg63TvGfRSDCRg== +http-errors@2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-2.0.0.tgz#b7774a1486ef73cf7667ac9ae0858c012c57b9d3" + integrity sha512-FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ== dependencies: - depd "~1.1.2" - inherits "2.0.3" - setprototypeof "1.1.1" - statuses ">= 1.5.0 < 2" - toidentifier "1.0.0" + depd "2.0.0" + inherits "2.0.4" + setprototypeof "1.2.0" + statuses "2.0.1" + toidentifier "1.0.1" http-errors@~1.6.2: version "1.6.3" @@ -4837,17 +4847,6 @@ http-errors@~1.6.2: setprototypeof "1.1.0" statuses ">= 1.4.0 < 2" -http-errors@~1.7.2: - version "1.7.3" - resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.7.3.tgz#6c619e4f9c60308c38519498c14fbb10aacebb06" - integrity sha512-ZTTX0MWrsQ2ZAhA1cejAwDLycFsd7I7nVtnkT3Ol0aqodaKW+0CTZDQ1uBv5whptCnc8e8HeRRJxRs0kmm/Qfw== - dependencies: - depd "~1.1.2" - inherits "2.0.4" - setprototypeof "1.1.1" - statuses ">= 1.5.0 < 2" - toidentifier "1.0.0" - http-parser-js@>=0.5.1: version "0.5.3" resolved "https://registry.yarnpkg.com/http-parser-js/-/http-parser-js-0.5.3.tgz#01d2709c79d41698bb01d4decc5e9da4e4a033d9" @@ -5507,7 +5506,7 @@ mdn-data@2.0.14: media-typer@0.3.0: version "0.3.0" resolved "https://registry.yarnpkg.com/media-typer/-/media-typer-0.3.0.tgz#8710d7af0aa626f8fffa1ce00168545263255748" - integrity sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g= + integrity sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ== medium-editor@^5.23.3: version "5.23.3" @@ -5529,7 +5528,7 @@ memoize-one@^5.0.0: merge-descriptors@1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/merge-descriptors/-/merge-descriptors-1.0.1.tgz#b00aaa556dd8b44568150ec9d1b953f3f90cbb61" - integrity sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E= + integrity sha512-cCi6g3/Zr1iqQi6ySbseM1Xvooa98N0w31jzUYrXPX2xqObmFGHJ0tQ5u74H3mVh7wLouTseZyYIq39g8cNp1w== merge-stream@^2.0.0: version "2.0.0" @@ -5560,7 +5559,7 @@ messageformat@~1.0.2: methods@~1.1.2: version "1.1.2" resolved "https://registry.yarnpkg.com/methods/-/methods-1.1.2.tgz#5529a4d67654134edcc5266656835b0f851afcee" - integrity sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4= + integrity sha512-iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w== micromatch@^4.0.2, micromatch@^4.0.4: version "4.0.4" @@ -5580,6 +5579,11 @@ mime-db@1.51.0: resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.51.0.tgz#d9ff62451859b18342d960850dc3cfb77e63fb0c" integrity sha512-5y8A56jg7XVQx2mbv1lu49NR4dokRnhZYTtL+KGfaa27uq4pSTXkwQkFJl4pkRMyNFz/EtYDSkiiEHx3F7UN6g== +mime-db@1.52.0: + version "1.52.0" + resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.52.0.tgz#bbabcdc02859f4987301c856e3387ce5ec43bf70" + integrity sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg== + mime-types@^2.1.27, mime-types@^2.1.31: version "2.1.34" resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.34.tgz#5a712f9ec1503511a945803640fafe09d3793c24" @@ -5587,13 +5591,20 @@ mime-types@^2.1.27, mime-types@^2.1.31: dependencies: mime-db "1.51.0" -mime-types@~2.1.17, mime-types@~2.1.24: +mime-types@~2.1.17: version "2.1.31" resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.31.tgz#a00d76b74317c61f9c2db2218b8e9f8e9c5c9e6b" integrity sha512-XGZnNzm3QvgKxa8dpzyhFTHmpP3l5YNusmne07VUOXxou9CqUqYa/HBy124RqtVh/O2pECas/MOcsDgpilPOPg== dependencies: mime-db "1.48.0" +mime-types@~2.1.24, mime-types@~2.1.34: + version "2.1.35" + resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.35.tgz#381a871b62a734450660ae3deee44813f70d959a" + integrity sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw== + dependencies: + mime-db "1.52.0" + mime@1.6.0: version "1.6.0" resolved "https://registry.yarnpkg.com/mime/-/mime-1.6.0.tgz#32cd9e5c64553bd58d19a568af452acff04981b1" @@ -5655,19 +5666,14 @@ moment@2.29, "moment@>= 2.9.0", "moment@>=2.8.0 <3.0.0": ms@2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8" - integrity sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g= - -ms@2.1.1: - version "2.1.1" - resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.1.tgz#30a5864eb3ebb0a66f2ebe6d727af06a09d86e0a" - integrity sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg== + integrity sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A== ms@2.1.2: version "2.1.2" resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009" integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w== -ms@^2.1.1: +ms@2.1.3, ms@^2.1.1: version "2.1.3" resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2" integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA== @@ -5695,10 +5701,10 @@ natural-compare@^1.4.0: resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7" integrity sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc= -negotiator@0.6.2: - version "0.6.2" - resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.2.tgz#feacf7ccf525a77ae9634436a64883ffeca346fb" - integrity sha512-hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw== +negotiator@0.6.3: + version "0.6.3" + resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.3.tgz#58e323a72fedc0d6f9cd4d31fe49f51479590ccd" + integrity sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg== neo-async@^2.6.2: version "2.6.2" @@ -5812,7 +5818,7 @@ object-assign@^4.1.1: resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863" integrity sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM= -object-inspect@^1.10.3, object-inspect@^1.9.0: +object-inspect@^1.10.3: version "1.10.3" resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.10.3.tgz#c2aa7d2d09f50c99375704f7a0adf24c5782d369" integrity sha512-e5mCJlSH7poANfC8z8S9s9S2IN5/4Zb3aZ33f5s8YqoazCFzNLloLU8r5VCG+G7WoqLvAAZoVMcy3tp/3X0Plw== @@ -5822,6 +5828,11 @@ object-inspect@^1.11.0, object-inspect@^1.12.0: resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.12.0.tgz#6e2c120e868fd1fd18cb4f18c31741d0d6e776f0" integrity sha512-Ho2z80bVIvJloH+YzRmpZVQe87+qASmBUKZDWgx9cu+KDrX2ZDH/3tMy+gXbZETVGs2M8YdxObOh7XAtim9Y0g== +object-inspect@^1.9.0: + version "1.12.2" + resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.12.2.tgz#c0641f26394532f28ab8d796ab954e43c009a8ea" + integrity sha512-z+cPxW0QGUp0mcqcsgQyLVRDoXFQbXOwBaqyF7VIgI4TWNQsDHrBpUQslRmIfAoYWdYzs6UlKJtB2XJpTaNSpQ== + object-is@^1.0.1: version "1.1.5" resolved "https://registry.yarnpkg.com/object-is/-/object-is-1.1.5.tgz#b9deeaa5fc7f1846a0faecdceec138e5778f53ac" @@ -5890,10 +5901,10 @@ obuf@^1.0.0, obuf@^1.1.2: resolved "https://registry.yarnpkg.com/obuf/-/obuf-1.1.2.tgz#09bea3343d41859ebd446292d11c9d4db619084e" integrity sha512-PX1wu0AmAdPqOL1mWhqmlOd8kOIZQwGZw6rh7uby9fTc5lhaOWFLX3I6R1hrF9k3zUY40e6igsLGkDXK92LJNg== -on-finished@~2.3.0: - version "2.3.0" - resolved "https://registry.yarnpkg.com/on-finished/-/on-finished-2.3.0.tgz#20f1336481b083cd75337992a16971aa2d906947" - integrity sha1-IPEzZIGwg811M3mSoWlxqi2QaUc= +on-finished@2.4.1: + version "2.4.1" + resolved "https://registry.yarnpkg.com/on-finished/-/on-finished-2.4.1.tgz#58c8c44116e54845ad57f14ab10b03533184ac3f" + integrity sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg== dependencies: ee-first "1.1.1" @@ -6080,7 +6091,7 @@ path-parse@^1.0.6, path-parse@^1.0.7: path-to-regexp@0.1.7: version "0.1.7" resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-0.1.7.tgz#df604178005f522f15eb4490e7247a1bfaa67f8c" - integrity sha1-32BBeABfUi8V60SQ5yR6G/qmf4w= + integrity sha512-5DFkuoqlv1uYQKxy8omFBeJPQcdoE07Kv2sferDCrAq1ohOU+MSDswDIbnx3YAM60qIOnYa53wBhXW0EbMonrQ== path-type@^4.0.0: version "4.0.0" @@ -6511,7 +6522,7 @@ prosemirror-view@^1.23.6: prosemirror-state "^1.0.0" prosemirror-transform "^1.1.0" -proxy-addr@~2.0.5: +proxy-addr@~2.0.7: version "2.0.7" resolved "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-2.0.7.tgz#f19fe69ceab311eeb94b42e70e8c2070f9ba1025" integrity sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg== @@ -6524,10 +6535,12 @@ punycode@^2.1.0: resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec" integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A== -qs@6.7.0: - version "6.7.0" - resolved "https://registry.yarnpkg.com/qs/-/qs-6.7.0.tgz#41dc1a015e3d581f1621776be31afb2876a9b1bc" - integrity sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ== +qs@6.11.0: + version "6.11.0" + resolved "https://registry.yarnpkg.com/qs/-/qs-6.11.0.tgz#fd0d963446f7a65e1367e01abd85429453f0c37a" + integrity sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q== + dependencies: + side-channel "^1.0.4" queue-microtask@^1.2.2: version "1.2.3" @@ -6554,13 +6567,13 @@ range-parser@^1.2.1, range-parser@~1.2.1: resolved "https://registry.yarnpkg.com/range-parser/-/range-parser-1.2.1.tgz#3cf37023d199e1c24d1a55b84800c2f3e6468031" integrity sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg== -raw-body@2.4.0: - version "2.4.0" - resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.4.0.tgz#a1ce6fb9c9bc356ca52e89256ab59059e13d0332" - integrity sha512-4Oz8DUIwdvoa5qMJelxipzi/iJIi40O5cGV1wNYp5hvZP8ZN0T+jiNkL0QepXs+EsQ9XJ8ipEDoiH70ySUJP3Q== +raw-body@2.5.1: + version "2.5.1" + resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.5.1.tgz#fe1b1628b181b700215e5fd42389f98b71392857" + integrity sha512-qqJBtEyVgS0ZmPGdCFPWJ3FreoqvG4MVQln/kCgF7Olq95IbOp0/BWyMwbdtn4VTvkM8Y7khCQ2Xgk/tcrCXig== dependencies: - bytes "3.1.0" - http-errors "1.7.2" + bytes "3.1.2" + http-errors "2.0.0" iconv-lite "0.4.24" unpipe "1.0.0" @@ -6938,7 +6951,7 @@ safe-buffer@5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1: resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d" integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g== -safe-buffer@>=5.1.0, safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.2, safe-buffer@~5.2.0: +safe-buffer@5.2.1, safe-buffer@>=5.1.0, safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.2, safe-buffer@~5.2.0: version "5.2.1" resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6" integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ== @@ -7030,24 +7043,24 @@ semver@^7.0.0, semver@^7.3.5: dependencies: lru-cache "^6.0.0" -send@0.17.1: - version "0.17.1" - resolved "https://registry.yarnpkg.com/send/-/send-0.17.1.tgz#c1d8b059f7900f7466dd4938bdc44e11ddb376c8" - integrity sha512-BsVKsiGcQMFwT8UxypobUKyv7irCNRHk1T0G680vk88yf6LBByGcZJOTJCrTP2xVN6yI+XjPJcNuE3V4fT9sAg== +send@0.18.0: + version "0.18.0" + resolved "https://registry.yarnpkg.com/send/-/send-0.18.0.tgz#670167cc654b05f5aa4a767f9113bb371bc706be" + integrity sha512-qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg== dependencies: debug "2.6.9" - depd "~1.1.2" - destroy "~1.0.4" + depd "2.0.0" + destroy "1.2.0" encodeurl "~1.0.2" escape-html "~1.0.3" etag "~1.8.1" fresh "0.5.2" - http-errors "~1.7.2" + http-errors "2.0.0" mime "1.6.0" - ms "2.1.1" - on-finished "~2.3.0" + ms "2.1.3" + on-finished "2.4.1" range-parser "~1.2.1" - statuses "~1.5.0" + statuses "2.0.1" serialize-javascript@^6.0.0: version "6.0.0" @@ -7069,25 +7082,25 @@ serve-index@^1.9.1: mime-types "~2.1.17" parseurl "~1.3.2" -serve-static@1.14.1: - version "1.14.1" - resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.14.1.tgz#666e636dc4f010f7ef29970a88a674320898b2f9" - integrity sha512-JMrvUwE54emCYWlTI+hGrGv5I8dEwmco/00EvkzIIsR7MqrHonbD9pO2MOfFnpFntl7ecpZs+3mW+XbQZu9QCg== +serve-static@1.15.0: + version "1.15.0" + resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.15.0.tgz#faaef08cffe0a1a62f60cad0c4e513cff0ac9540" + integrity sha512-XGuRDNjXUijsUL0vl6nSD7cwURuzEgglbOaFuZM9g3kwDXOWVTck0jLzjPzGD+TazWbboZYu52/9/XPdUgne9g== dependencies: encodeurl "~1.0.2" escape-html "~1.0.3" parseurl "~1.3.3" - send "0.17.1" + send "0.18.0" setprototypeof@1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.1.0.tgz#d0bd85536887b6fe7c0d818cb962d9d91c54e656" integrity sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ== -setprototypeof@1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.1.1.tgz#7e95acb24aa92f5885e0abef5ba131330d4ae683" - integrity sha512-JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw== +setprototypeof@1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.2.0.tgz#66c9a24a73f9fc28cbe66b09fed3d33dcaf1b424" + integrity sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw== shakapacker@6.2.0: version "6.2.0" @@ -7221,7 +7234,12 @@ stackframe@^1.1.1: resolved "https://registry.yarnpkg.com/stackframe/-/stackframe-1.2.1.tgz#1033a3473ee67f08e2f2fc8eba6aef4f845124e1" integrity sha512-h88QkzREN/hy8eRdyNhhsO7RSJ5oyTqxxmmn0dzBIMUclZsjpfmrsg81vp8mjjAs2vAZ72nyWxRUwSwmh0e4xg== -"statuses@>= 1.4.0 < 2", "statuses@>= 1.5.0 < 2", statuses@~1.5.0: +statuses@2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/statuses/-/statuses-2.0.1.tgz#55cb000ccf1d48728bd23c685a063998cf1a1b63" + integrity sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ== + +"statuses@>= 1.4.0 < 2": version "1.5.0" resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.5.0.tgz#161c7dac177659fd9811f43771fa99381478628c" integrity sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow= @@ -7457,10 +7475,10 @@ to-regex-range@^5.0.1: dependencies: is-number "^7.0.0" -toidentifier@1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/toidentifier/-/toidentifier-1.0.0.tgz#7e1be3470f1e77948bc43d94a3c8f4d7752ba553" - integrity sha512-yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw== +toidentifier@1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/toidentifier/-/toidentifier-1.0.1.tgz#3be34321a88a820ed1bd80dfaa33e479fbb8dd35" + integrity sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA== tr46@~0.0.3: version "0.0.3" @@ -7516,7 +7534,7 @@ type-fest@^0.20.2: resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.20.2.tgz#1bf207f4b28f91583666cb5fbd327887301cd5f4" integrity sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ== -type-is@~1.6.17, type-is@~1.6.18: +type-is@~1.6.18: version "1.6.18" resolved "https://registry.yarnpkg.com/type-is/-/type-is-1.6.18.tgz#4e552cd05df09467dcbc4ef739de89f2cf37c131" integrity sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g== @@ -7598,7 +7616,7 @@ unicode-property-aliases-ecmascript@^2.0.0: unpipe@1.0.0, unpipe@~1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/unpipe/-/unpipe-1.0.0.tgz#b2bf4ee8514aae6165b4817829d21b2ef49904ec" - integrity sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw= + integrity sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ== uri-js@^4.2.2: version "4.4.1" @@ -7632,7 +7650,7 @@ util@^0.12.0: utils-merge@1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.1.tgz#9f95710f50a267947b2ccc124741c1028427e713" - integrity sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM= + integrity sha512-pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA== uuid@^3.4.0: version "3.4.0" @@ -7647,7 +7665,7 @@ v8-compile-cache@^2.0.3: vary@~1.1.2: version "1.1.2" resolved "https://registry.yarnpkg.com/vary/-/vary-1.1.2.tgz#2299f02c6ded30d4a5961b0b9f74524a18f634fc" - integrity sha1-IpnwLG3tMNSllhsLn3RSShj2NPw= + integrity sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg== void-elements@3.1.0: version "3.1.0" From be55936518546f1f3c3f30233f2492d93a5c08d3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 12 Dec 2022 22:23:50 +0000 Subject: [PATCH 27/36] Bump @claviska/jquery-minicolors from 2.3.5 to 2.3.6 Bumps [@claviska/jquery-minicolors](https://github.com/claviska/jquery-minicolors) from 2.3.5 to 2.3.6. - [Release notes](https://github.com/claviska/jquery-minicolors/releases) - [Commits](https://github.com/claviska/jquery-minicolors/compare/2.3.5...2.3.6) --- updated-dependencies: - dependency-name: "@claviska/jquery-minicolors" dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 6f83acf6c..6128e4749 100644 --- a/package.json +++ b/package.json @@ -46,7 +46,7 @@ "@babel/preset-react": "^7.12.1", "@babel/preset-typescript": "^7.16.7", "@babel/runtime": "^7.17.2", - "@claviska/jquery-minicolors": "^2.3.5", + "@claviska/jquery-minicolors": "^2.3.6", "@dnd-kit/core": "^6.0.5", "@dnd-kit/modifiers": "^6.0.0", "@dnd-kit/sortable": "^7.0.1", diff --git a/yarn.lock b/yarn.lock index b65b14898..089a23c8d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1478,10 +1478,10 @@ "@babel/helper-validator-identifier" "^7.14.5" to-fast-properties "^2.0.0" -"@claviska/jquery-minicolors@^2.3.5": - version "2.3.5" - resolved "https://registry.yarnpkg.com/@claviska/jquery-minicolors/-/jquery-minicolors-2.3.5.tgz#b802fcf2a7b75f169e68a7321d8a8d03f9fcd17c" - integrity sha512-LpiN8hyqRPYB2tEzFD4lI54GxKHQXhzrJMnKnsumElYxjkjbdAPmiIm+1k/Mkfn92HepL7t9uaK5iQSFP/19aw== +"@claviska/jquery-minicolors@^2.3.6": + version "2.3.6" + resolved "https://registry.yarnpkg.com/@claviska/jquery-minicolors/-/jquery-minicolors-2.3.6.tgz#0f3dfe9baf11e93a3b1b1dcf2448177cf4c32e3e" + integrity sha512-8Ro6D4GCrmOl41+6w4NFhEOpx8vjxwVRI69bulXsFDt49uVRKhLU5TnzEV7AmOJrylkVq+ugnYNMiGHBieeKUQ== "@discoveryjs/json-ext@^0.5.0": version "0.5.6" From 468ed789cbdb86308aa216a3c3690a8c76c70309 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 13 Dec 2022 19:45:23 +0000 Subject: [PATCH 28/36] Bump loofah from 2.18.0 to 2.19.1 Bumps [loofah](https://github.com/flavorjones/loofah) from 2.18.0 to 2.19.1. - [Release notes](https://github.com/flavorjones/loofah/releases) - [Changelog](https://github.com/flavorjones/loofah/blob/main/CHANGELOG.md) - [Commits](https://github.com/flavorjones/loofah/compare/v2.18.0...v2.19.1) --- updated-dependencies: - dependency-name: loofah dependency-type: indirect ... Signed-off-by: dependabot[bot] --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 941a6a7ec..7ee3a63a4 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -207,7 +207,7 @@ GEM listen (3.0.8) rb-fsevent (~> 0.9, >= 0.9.4) rb-inotify (~> 0.9, >= 0.9.7) - loofah (2.18.0) + loofah (2.19.1) crass (~> 1.0.2) nokogiri (>= 1.5.9) mail (2.7.1) From fa18891bc6bfb294db4e7c3421963e1f05b8e571 Mon Sep 17 00:00:00 2001 From: Sylvain Date: Wed, 14 Dec 2022 11:30:06 +0100 Subject: [PATCH 29/36] (bug) invalid test assertion --- test/integration/exports/members_export_test.rb | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/test/integration/exports/members_export_test.rb b/test/integration/exports/members_export_test.rb index 51f359bb6..3a85b97b5 100644 --- a/test/integration/exports/members_export_test.rb +++ b/test/integration/exports/members_export_test.rb @@ -39,13 +39,12 @@ class Exports::MembersExportTest < ActionDispatch::IntegrationTest assert_not_nil workbook[I18n.t('export_members.members')] # test data - member = User.members.first wb = workbook[I18n.t('export_members.members')] - assert_equal member.id, wb.sheet_data[1][0].value + member = User.find(wb.sheet_data[1][0].value) assert_equal (member.is_allow_newsletter ? 1 : nil), wb.sheet_data[1][4].value # Clean XLSX file require 'fileutils' FileUtils.rm(e.file) end -end \ No newline at end of file +end From 4f03f7019982c6944e1aa216516522cb0c1183e1 Mon Sep 17 00:00:00 2001 From: Sylvain Date: Wed, 14 Dec 2022 13:33:26 +0100 Subject: [PATCH 30/36] (doc) updated changelog --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index ff42cb86a..742bc28db 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,7 @@ # Changelog Fab-manager +- Fix a bug: wrong reservations count for spaces in availabilities export (#415) + ## v5.5.7 2022 December 13 - Fix a bug: unable to update/delete a space From fd0dc57503cb1a90fa73d1d3da0c18a76dbaf7dd Mon Sep 17 00:00:00 2001 From: Sylvain Date: Wed, 14 Dec 2022 14:36:30 +0100 Subject: [PATCH 31/36] (quality) removed rails_12factor --- CHANGELOG.md | 2 ++ Gemfile | 4 ---- Gemfile.lock | 8 +------- doc/environment.md | 6 ++++++ env.example | 1 + 5 files changed, 10 insertions(+), 11 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e92076dc6..9b128a2d1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,8 @@ - Fix a security issue: updated express to 4.18.2 to fix [CVE-2022-24999](https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2022-24999) - Fix a security issue: updated @claviska/jquery-minicolors to 2.3.6 to fix [CVE-2021-4243](https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-4243) - Fix a security issue: updated loofah to 2.19.1 to fix [CVE-2022-23514](https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2022-23514), [CVE-2022-23515](https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2022-23515) and [CVE-2022-23516](https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2022-23516) +- Removed gem rails_12factor +- [TODO DEPLOY] add the `RAILS_LOG_TO_STDOUT=true` environment variable (see [doc/environment.md](doc/environment.md#RAILS_LOG_TO_STDOUT) for configuration details) ## v5.5.7 2022 December 13 diff --git a/Gemfile b/Gemfile index 70c41bdce..a90ff1d16 100644 --- a/Gemfile +++ b/Gemfile @@ -56,10 +56,6 @@ group :test do gem 'webmock' end -group :production, :staging do - gem 'rails_12factor' -end - gem 'seed_dump' gem 'pg' diff --git a/Gemfile.lock b/Gemfile.lock index 7ee3a63a4..d932957bd 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -338,11 +338,6 @@ GEM loofah (~> 2.3) rails-observers (0.1.5) activemodel (>= 4.0) - rails_12factor (0.0.3) - rails_serve_static_assets - rails_stdout_logging - rails_serve_static_assets (0.0.5) - rails_stdout_logging (0.0.5) railties (5.2.8.1) actionpack (= 5.2.8.1) activesupport (= 5.2.8.1) @@ -552,7 +547,6 @@ DEPENDENCIES railroady rails (~> 5.2.8) rails-observers - rails_12factor rb-readline recurrence redis-session-store @@ -580,4 +574,4 @@ DEPENDENCIES webmock BUNDLED WITH - 2.3.13 + 2.3.25 diff --git a/doc/environment.md b/doc/environment.md index 47b9dffcc..3e71ea414 100644 --- a/doc/environment.md +++ b/doc/environment.md @@ -99,6 +99,12 @@ These two variables are also used for SSO authentication. This parameter configures the logs verbosity. Available log levels can be found [here](http://guides.rubyonrails.org/debugging_rails_applications.html#log-levels). + + + RAILS_LOG_TO_STDOUT + +Enable redirecting logs (including errors) to stdout. +Set this variable to `true` in production environments. MAX_IMAGE_SIZE diff --git a/env.example b/env.example index ef65b0cdf..38b00ec3e 100644 --- a/env.example +++ b/env.example @@ -58,6 +58,7 @@ OPENLAB_SSL_VERIFY=true # System settings LOG_LEVEL=debug +RAILS_LOG_TO_STDOUT=true DISK_SPACE_MB_ALERT=100 ADMINSYS_EMAIL=admin@sleede.com From 3d1ac107f0de4deb8c2ac90f70ca9d87c778aadf Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 14 Dec 2022 14:38:23 +0000 Subject: [PATCH 32/36] Bump rails-html-sanitizer from 1.4.3 to 1.4.4 Bumps [rails-html-sanitizer](https://github.com/rails/rails-html-sanitizer) from 1.4.3 to 1.4.4. - [Release notes](https://github.com/rails/rails-html-sanitizer/releases) - [Changelog](https://github.com/rails/rails-html-sanitizer/blob/master/CHANGELOG.md) - [Commits](https://github.com/rails/rails-html-sanitizer/compare/v1.4.3...v1.4.4) --- updated-dependencies: - dependency-name: rails-html-sanitizer dependency-type: indirect ... Signed-off-by: dependabot[bot] --- Gemfile.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 941a6a7ec..bf4cb8e38 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -207,7 +207,7 @@ GEM listen (3.0.8) rb-fsevent (~> 0.9, >= 0.9.4) rb-inotify (~> 0.9, >= 0.9.7) - loofah (2.18.0) + loofah (2.19.1) crass (~> 1.0.2) nokogiri (>= 1.5.9) mail (2.7.1) @@ -334,8 +334,8 @@ GEM rails-dom-testing (2.0.3) activesupport (>= 4.2.0) nokogiri (>= 1.6) - rails-html-sanitizer (1.4.3) - loofah (~> 2.3) + rails-html-sanitizer (1.4.4) + loofah (~> 2.19, >= 2.19.1) rails-observers (0.1.5) activemodel (>= 4.0) rails_12factor (0.0.3) From cd37d40fdc641f61424b07411d23779ab1b5153c Mon Sep 17 00:00:00 2001 From: Sylvain Date: Fri, 16 Dec 2022 14:50:11 +0100 Subject: [PATCH 33/36] (dev) fix brakeman setup + improved overcommit checking --- .github/workflows/brakeman-analysis.yml | 4 ++-- .overcommit.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/brakeman-analysis.yml b/.github/workflows/brakeman-analysis.yml index 7ba7ae58f..70885eec5 100644 --- a/.github/workflows/brakeman-analysis.yml +++ b/.github/workflows/brakeman-analysis.yml @@ -17,11 +17,11 @@ jobs: steps: # Checkout the repository to the GitHub Actions runner - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v3 # Customize the ruby version depending on your needs - name: Setup Ruby - uses: actions/setup-ruby@v1 + uses: ruby/setup-ruby@v1 with: ruby-version: '2.6' diff --git a/.overcommit.yml b/.overcommit.yml index 2bc07d644..f5905b8c1 100644 --- a/.overcommit.yml +++ b/.overcommit.yml @@ -12,7 +12,7 @@ CommitMsg: MessageFormat: enabled: true - pattern: ^(\([a-z0-9]+\) [\w ]+(\n\n.+)?)|(Version (\d+\.?)+)|(Merge branch .*) - expected_pattern_message: (type) title\n\ndescription + pattern: ^(\((doc|bug|feat|security|dev|i18n|api|test|quality|ui|merge)\) [\w ]++(\n\n.+)?)|(Version (\d+\.?)+)|(Merge branch .*) + expected_pattern_message: (doc|bug|feat|security|dev|i18n|api|test|quality|ui|merge) title\n\ndescription sample_message: (bug) no validation on date\n\nThe birthdate was not validated... From 44089f9cf6884426fe34f51c090fb9ea5a527db7 Mon Sep 17 00:00:00 2001 From: Sylvain Date: Fri, 16 Dec 2022 14:53:15 +0100 Subject: [PATCH 34/36] (dev) upgrade to CodeQL Action v2 --- .github/workflows/brakeman-analysis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/brakeman-analysis.yml b/.github/workflows/brakeman-analysis.yml index 70885eec5..188c10bf3 100644 --- a/.github/workflows/brakeman-analysis.yml +++ b/.github/workflows/brakeman-analysis.yml @@ -39,6 +39,6 @@ jobs: # Upload the SARIF file generated in the previous step - name: Upload SARIF - uses: github/codeql-action/upload-sarif@v1 + uses: github/codeql-action/upload-sarif@v2 with: sarif_file: output.sarif.json From 66b1db6d0aa8ea583aa55f79444d6c19b13bed69 Mon Sep 17 00:00:00 2001 From: Sylvain Date: Fri, 16 Dec 2022 15:35:02 +0100 Subject: [PATCH 35/36] (bug) phone/adresse required not shown --- CHANGELOG.md | 1 + .../javascript/controllers/admin/members.js | 10 +- app/frontend/src/javascript/router.js | 3 +- .../templates/shared/_admin_form.html | 5 +- .../templates/shared/_manager_form.html | 10 +- yarn.lock | 260 ++++++++++++++++-- 6 files changed, 260 insertions(+), 29 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9b128a2d1..8d7cbe1e8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,7 @@ # Changelog Fab-manager - Fix a bug: wrong reservations count for spaces in availabilities export (#415) +- Fix a bug: phone or address required are not marked as it, in create manager/admin form - Fix a security issue: updated express to 4.18.2 to fix [CVE-2022-24999](https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2022-24999) - Fix a security issue: updated @claviska/jquery-minicolors to 2.3.6 to fix [CVE-2021-4243](https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-4243) - Fix a security issue: updated loofah to 2.19.1 to fix [CVE-2022-23514](https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2022-23514), [CVE-2022-23515](https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2022-23515) and [CVE-2022-23516](https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2022-23516) diff --git a/app/frontend/src/javascript/controllers/admin/members.js b/app/frontend/src/javascript/controllers/admin/members.js index 52c03bed6..bbe961bb8 100644 --- a/app/frontend/src/javascript/controllers/admin/members.js +++ b/app/frontend/src/javascript/controllers/admin/members.js @@ -1190,8 +1190,8 @@ Application.Controllers.controller('NewAdminController', ['$state', '$scope', 'A /** * Controller used in the manager's creation page (admin view) */ -Application.Controllers.controller('NewManagerController', ['$state', '$scope', 'User', 'groupsPromise', 'tagsPromise', 'growl', '_t', - function ($state, $scope, User, groupsPromise, tagsPromise, growl, _t) { +Application.Controllers.controller('NewManagerController', ['$state', '$scope', 'User', 'groupsPromise', 'tagsPromise', 'growl', '_t', 'settingsPromise', + function ($state, $scope, User, groupsPromise, tagsPromise, growl, _t, settingsPromise) { // default admin profile $scope.manager = { statistic_profile_attributes: { @@ -1210,6 +1210,12 @@ Application.Controllers.controller('NewManagerController', ['$state', '$scope', } }; + // is the phone number required in _admin_form? + $scope.phoneRequired = (settingsPromise.phone_required === 'true'); + + // is the address required in _admin_form? + $scope.addressRequired = (settingsPromise.address_required === 'true'); + // list of all groups $scope.groups = groupsPromise.filter(function (g) { return !g.disabled; }); diff --git a/app/frontend/src/javascript/router.js b/app/frontend/src/javascript/router.js index 2e8593899..be9bafc6b 100644 --- a/app/frontend/src/javascript/router.js +++ b/app/frontend/src/javascript/router.js @@ -1098,7 +1098,8 @@ angular.module('application.router', ['ui.router']) }, resolve: { groupsPromise: ['Group', function (Group) { return Group.query().$promise; }], - tagsPromise: ['Tag', function (Tag) { return Tag.query().$promise; }] + tagsPromise: ['Tag', function (Tag) { return Tag.query().$promise; }], + settingsPromise: ['Setting', function (Setting) { return Setting.query({ names: "['phone_required', 'address_required']" }).$promise; }] } }) diff --git a/app/frontend/templates/shared/_admin_form.html b/app/frontend/templates/shared/_admin_form.html index 808db2c5c..5f90dc4c6 100644 --- a/app/frontend/templates/shared/_admin_form.html +++ b/app/frontend/templates/shared/_admin_form.html @@ -95,7 +95,10 @@
- + + + + diff --git a/app/frontend/templates/shared/_manager_form.html b/app/frontend/templates/shared/_manager_form.html index b78763907..d72d69e0e 100644 --- a/app/frontend/templates/shared/_manager_form.html +++ b/app/frontend/templates/shared/_manager_form.html @@ -95,7 +95,10 @@
- + + + + @@ -110,7 +113,10 @@
- + + + + Date: Fri, 16 Dec 2022 18:50:20 +0100 Subject: [PATCH 36/36] Version 5.5.8 --- CHANGELOG.md | 2 ++ package.json | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 666f1f716..3a0adb913 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,7 @@ # Changelog Fab-manager +## v5.5.8 2022 December 16 + - Fix a bug: wrong reservations count for spaces in availabilities export (#415) - Fix a bug: phone or address required are not marked as it, in create manager/admin form - Fix a security issue: updated express to 4.18.2 to fix [CVE-2022-24999](https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2022-24999) diff --git a/package.json b/package.json index 99a81558b..32a3b3407 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "fab-manager", - "version": "5.5.7", + "version": "5.5.8", "description": "Fab-manager is the FabLab management solution. It provides a comprehensive, web-based, open-source tool to simplify your administrative tasks and your marker's projects.", "keywords": [ "fablab",