diff --git a/config/locales/app.public.en.yml b/config/locales/app.public.en.yml
index 22482bae2..b6fc12eab 100644
--- a/config/locales/app.public.en.yml
+++ b/config/locales/app.public.en.yml
@@ -165,6 +165,7 @@ en:
openlab_search_not_available_at_the_moment: "Search over the whole network is not available at the moment. You still can search over the projects of this platform."
project_search_result_is_empty: "Sorry, we found no results matching your search criteria."
reset_all_filters: "Reset all filters"
+ keywords: "Keywords"
search: "Search"
all_projects: "All projects"
my_projects: "My projects"
diff --git a/config/locales/mails.de.yml b/config/locales/mails.de.yml
index 9888ffc2f..b44103d8d 100644
--- a/config/locales/mails.de.yml
+++ b/config/locales/mails.de.yml
@@ -313,13 +313,13 @@ de:
body:
remember: "Gemäß dem Zahlungsplan von %{REFERENCE} wurde für %{DATE} eine Belastung der Karte in Höhe von %{AMOUNT} geplant."
error: "Leider konnte die Abbuchung über die Karte nicht erfolgreich abgeschlossen werden."
- action: "Bitte kontaktieren Sie das Mitglied so bald wie möglich und lösen Sie dann das Problem in der Verwaltung der Zahlungsfristen. Nach etwa 24 Stunden wird das Kartenabonnement storniert."
+ action: "Please contact the member as soon as possible, then go to the payment schedule management interface to resolve the problem. After a certain period of time, the card subscription could be cancelled."
notify_member_payment_schedule_failed:
subject: "[URGENT] Kartenbelastungsfehler"
body:
remember: "Gemäß Ihrem Zahlungsplan von %{REFERENCE} wurde für %{DATE} eine Belastung der Karte in Höhe von %{AMOUNT} geplant."
error: "Leider konnte die Abbuchung über die Karte nicht erfolgreich abgeschlossen werden."
- action_html: "Bitte überprüfen Sie %{DASHBOARD} oder kontaktieren Sie einen Manager innerhalb von 24 Stunden. Andernfalls kann Ihr Abonnement unterbrochen werden."
+ action_html: "Please check %{DASHBOARD} or contact a manager quickly, otherwise your subscription may be interrupted."
your_dashboard: "Ihr Dashboard"
notify_admin_payment_schedule_gateway_canceled:
subject: "[URGENT] Zahlungsplan vom Zahlungs-Gateway abgebrochen"
diff --git a/config/locales/mails.en.yml b/config/locales/mails.en.yml
index 149f681d5..92cf1b735 100644
--- a/config/locales/mails.en.yml
+++ b/config/locales/mails.en.yml
@@ -313,13 +313,13 @@ en:
body:
remember: "In accordance with the %{REFERENCE} payment schedule, a debit by card of %{AMOUNT} was scheduled on %{DATE}."
error: "Unfortunately, this card debit was unable to complete successfully."
- action: "Please contact the member as soon as possible, then go to the payment schedule management interface to resolve the problem. After about 24 hours, the card subscription will be cancelled."
+ action: "Please contact the member as soon as possible, then go to the payment schedule management interface to resolve the problem. After a certain period of time, the card subscription could be cancelled."
notify_member_payment_schedule_failed:
subject: "[URGENT] Card debit failure"
body:
remember: "In accordance with your %{REFERENCE} payment schedule, a debit by card of %{AMOUNT} was scheduled on %{DATE}."
error: "Unfortunately, this card debit was unable to complete successfully."
- action_html: "Please check %{DASHBOARD} or contact a manager before 24 hours, otherwise your subscription may be interrupted."
+ action_html: "Please check %{DASHBOARD} or contact a manager quickly, otherwise your subscription may be interrupted."
your_dashboard: "your dashboard"
notify_admin_payment_schedule_gateway_canceled:
subject: "[URGENT] Payment schedule canceled by the payment gateway"
diff --git a/config/locales/mails.es.yml b/config/locales/mails.es.yml
index f0d05d3f7..f82ec81ac 100644
--- a/config/locales/mails.es.yml
+++ b/config/locales/mails.es.yml
@@ -313,13 +313,13 @@ es:
body:
remember: "In accordance with the %{REFERENCE} payment schedule, a debit by card of %{AMOUNT} was scheduled on %{DATE}."
error: "Unfortunately, this card debit was unable to complete successfully."
- action: "Please contact the member as soon as possible, then go to the payment schedule management interface to resolve the problem. After about 24 hours, the card subscription will be cancelled."
+ action: "Please contact the member as soon as possible, then go to the payment schedule management interface to resolve the problem. After a certain period of time, the card subscription could be cancelled."
notify_member_payment_schedule_failed:
subject: "[URGENT] Card debit failure"
body:
remember: "In accordance with your %{REFERENCE} payment schedule, a debit by card of %{AMOUNT} was scheduled on %{DATE}."
error: "Unfortunately, this card debit was unable to complete successfully."
- action_html: "Please check %{DASHBOARD} or contact a manager before 24 hours, otherwise your subscription may be interrupted."
+ action_html: "Please check %{DASHBOARD} or contact a manager quickly, otherwise your subscription may be interrupted."
your_dashboard: "your dashboard"
notify_admin_payment_schedule_gateway_canceled:
subject: "[URGENT] Payment schedule canceled by the payment gateway"
diff --git a/config/locales/mails.fr.yml b/config/locales/mails.fr.yml
index 3de801a1d..3611b3d80 100644
--- a/config/locales/mails.fr.yml
+++ b/config/locales/mails.fr.yml
@@ -313,13 +313,13 @@ fr:
body:
remember: "Conformément à l'échéancier de paiement %{REFERENCE}, un prélèvement par carte de %{AMOUNT} était prévu le %{DATE}."
error: "Malheureusement, ce prélèvement n'a pas pu être effectué correctement."
- action: "Veuillez vous mettre en relation avec le membre au plus tôt, puis vous rendre dans l'interface de gestion des échéanciers afin de régler le problème. Au delà d'environ 24 heures, l'abonnement par carte bancaire sera annulé."
+ action: "Veuillez vous mettre en relation avec le membre au plus tôt, puis vous rendre dans l'interface de gestion des échéanciers afin de régler le problème. Au delà d'un certain délai, l'abonnement par carte bancaire pourrait être annulé."
notify_member_payment_schedule_failed:
subject: "[URGENT] Échec du prélèvement par carte"
body:
remember: "Conformément à votre échéancier de paiement %{REFERENCE}, un prélèvement par carte de %{AMOUNT} était prévu le %{DATE}."
error: "Malheureusement, ce prélèvement n'a pas pu être effectué correctement."
- action_html: "Veuillez vous rendre dans %{DASHBOARD} ou prendre contact avec un gestionnaire sous 24 heures, faute de quoi votre abonnement risque d'être interrompu."
+ action_html: "Veuillez vous rendre dans %{DASHBOARD} ou prendre contact avec un gestionnaire rapidement, faute de quoi votre abonnement risque d'être interrompu."
your_dashboard: "votre tableau de bord"
notify_admin_payment_schedule_gateway_canceled:
subject: "[URGENT] Échéancier de paiement annulé par la passerelle de paiement"
diff --git a/config/locales/mails.no.yml b/config/locales/mails.no.yml
index 3685f5538..b02fdc717 100644
--- a/config/locales/mails.no.yml
+++ b/config/locales/mails.no.yml
@@ -313,13 +313,13 @@
body:
remember: "In accordance with the %{REFERENCE} payment schedule, a debit by card of %{AMOUNT} was scheduled on %{DATE}."
error: "Unfortunately, this card debit was unable to complete successfully."
- action: "Please contact the member as soon as possible, then go to the payment schedule management interface to resolve the problem. After about 24 hours, the card subscription will be cancelled."
+ action: "Please contact the member as soon as possible, then go to the payment schedule management interface to resolve the problem. After a certain period of time, the card subscription could be cancelled."
notify_member_payment_schedule_failed:
subject: "[URGENT] Card debit failure"
body:
remember: "In accordance with your %{REFERENCE} payment schedule, a debit by card of %{AMOUNT} was scheduled on %{DATE}."
error: "Unfortunately, this card debit was unable to complete successfully."
- action_html: "Please check %{DASHBOARD} or contact a manager before 24 hours, otherwise your subscription may be interrupted."
+ action_html: "Please check %{DASHBOARD} or contact a manager quickly, otherwise your subscription may be interrupted."
your_dashboard: "your dashboard"
notify_admin_payment_schedule_gateway_canceled:
subject: "[URGENT] Payment schedule canceled by the payment gateway"
diff --git a/config/locales/mails.pt.yml b/config/locales/mails.pt.yml
index fcc81dda8..112b236f5 100755
--- a/config/locales/mails.pt.yml
+++ b/config/locales/mails.pt.yml
@@ -313,13 +313,13 @@ pt:
body:
remember: "De acordo com o calendário de pagamento de %{REFERENCE}, um débito por cartão de %{AMOUNT} foi agendado em %{DATE}."
error: "Infelizmente, não foi possível completar o débito no cartão com sucesso."
- action: "Por favor, entre em contato com o membro assim que possível, depois vá à interface de gestão de horários de pagamento para resolver o problema. Após cerca de 24 horas, a assinatura do cartão será cancelada."
+ action: "Please contact the member as soon as possible, then go to the payment schedule management interface to resolve the problem. After a certain period of time, the card subscription could be cancelled."
notify_member_payment_schedule_failed:
subject: "[URGENT] Falha no débito do cartão"
body:
remember: "De acordo com a sua agenda de pagamentos %{REFERENCE}, um débito por cartão de %{AMOUNT} foi agendado para %{DATE}."
error: "Infelizmente, não foi possível completar o débito no cartão com sucesso."
- action_html: "Por favor, verifique %{DASHBOARD} ou entre em contato com um gerente antes de 24 horas, caso contrário sua assinatura pode ser interrompida."
+ action_html: "Please check %{DASHBOARD} or contact a manager quickly, otherwise your subscription may be interrupted."
your_dashboard: "seu dashboard"
notify_admin_payment_schedule_gateway_canceled:
subject: "[URGENT] Payment schedule canceled by the payment gateway"
diff --git a/config/locales/mails.zu.yml b/config/locales/mails.zu.yml
index d01b5f847..aebe7a467 100644
--- a/config/locales/mails.zu.yml
+++ b/config/locales/mails.zu.yml
@@ -313,13 +313,13 @@ zu:
body:
remember: "crwdns21134:0%{REFERENCE}crwdnd21134:0%{AMOUNT}crwdnd21134:0%{DATE}crwdne21134:0"
error: "crwdns21136:0crwdne21136:0"
- action: "crwdns21138:0crwdne21138:0"
+ action: "crwdns22400:0crwdne22400:0"
notify_member_payment_schedule_failed:
subject: "crwdns21140:0[URGENT]crwdne21140:0"
body:
remember: "crwdns21142:0%{REFERENCE}crwdnd21142:0%{AMOUNT}crwdnd21142:0%{DATE}crwdne21142:0"
error: "crwdns21144:0crwdne21144:0"
- action_html: "crwdns21146:0%{DASHBOARD}crwdne21146:0"
+ action_html: "crwdns22402:0%{DASHBOARD}crwdne22402:0"
your_dashboard: "crwdns21148:0crwdne21148:0"
notify_admin_payment_schedule_gateway_canceled:
subject: "crwdns22389:0[URGENT]crwdne22389:0"
diff --git a/db/migrate/20220225143203_drop_table_open_api_calls_count_tracings.rb b/db/migrate/20220225143203_drop_table_open_api_calls_count_tracings.rb
index 444074bce..9c73380e6 100644
--- a/db/migrate/20220225143203_drop_table_open_api_calls_count_tracings.rb
+++ b/db/migrate/20220225143203_drop_table_open_api_calls_count_tracings.rb
@@ -1,3 +1,6 @@
+# frozen_string_literal: true
+
+# OpenApiCallsCountTracings was an unused table probably from a wrong copy/paste. We removed this dead code.
class DropTableOpenAPICallsCountTracings < ActiveRecord::Migration[5.2]
def up
drop_table :open_api_calls_count_tracings
diff --git a/doc/environment.md b/doc/environment.md
index 33bdf5030..d1dc87088 100644
--- a/doc/environment.md
+++ b/doc/environment.md
@@ -278,13 +278,16 @@ Set this variable to `https://openprojects.fab-manager.com` if you want to use t
Typically, `DEFAULT_PROTOCOL` will be `https` (`http` if you are in development, or if you set `ALLOW_INSECURE_HTTP`).
The variable `DEFAULT_HOST` should be your domain name (eg. fabmanager.example.com), and is also used for visits statistics (configuration of Google Analytics).
These two variables are also used for SSO authentication.
-
- OPENLAB_SSL_VERIFY, OPENLAB_SSL_VERIFY_PEER
+ OPENLAB_SSL_VERIFY
-Set this variable to `false` if you want to disable verify ssl certs.
+Set this variable to `false` if you do not want to verify the OpenLab's server's certificate against the CA certificate.
+
+ OPENLAB_SSL_VERIFY_PEER
+
+Set this variable to `false` if you want to turn off the OpenLab's server's verification but still send client certificate.
## Other settings
diff --git a/yarn.lock b/yarn.lock
index 047f00494..52a761b1f 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -8832,9 +8832,9 @@ urix@^0.1.0:
integrity sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI=
url-parse@^1.4.3, url-parse@^1.5.1:
- version "1.5.3"
- resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.5.3.tgz#71c1303d38fb6639ade183c2992c8cc0686df862"
- integrity sha512-IIORyIQD9rvj0A4CLWsHkBBJuNqWpFQe224b6j9t/ABmquIS0qDU2pY6kl6AuOrL5OkCXHMCFNe1jBcuAggjvQ==
+ version "1.5.10"
+ resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.5.10.tgz#9d3c2f736c1d75dd3bd2be507dcc111f1e2ea9c1"
+ integrity sha512-WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ==
dependencies:
querystringify "^2.1.1"
requires-port "^1.0.0"