Merge branch 'dev' into monthly-payment

CHANGELOG.md

@@ -1,5 +1,7 @@
 # Changelog Fab-manager
 
+## v4.6.3 2020 October 28
+
 - Enabled Typescript
 - Enabled Hot module replacement
 - Enlarged privacy policy display and edition zones

config/locales/app.admin.zu.yml

@@ -1161,7 +1161,7 @@ zu:
         privacy:
           title: "crwdns20792:0crwdne20792:0"
           privacy_policy: "crwdns20794:0crwdne20794:0"
-          input_the_dpo: "crwdns8427:0crwdne8427:0"
+          input_the_dpo: "crwdns20910:0crwdne20910:0"
           current_policy: "crwdns8429:0crwdne8429:0"
           draft_from_USER_DATE: "crwdns8431:0{USER}crwdnd8431:0{DATE}crwdne8431:0"
           save_or_publish: "crwdns8433:0crwdne8433:0"

config/locales/app.public.es.yml

@@ -240,6 +240,7 @@ es:
         i_already_subscribed: "Ya me he suscrito"
         more_information: "Más información"
         your_subscription_expires_on_the_DATE: "Su suscripción termina {DATE}"
+        no_plans: "No plans are available for your group"
         my_group: "My grupo"
         his_group: "{GENDER, select, male{His} female{Her} other{Its}} group"
         he_wants_to_change_group: "{ROLE, select, member{Quiero} other{El usuario quiere}} cambiar el grupo"

config/locales/app.public.pt.yml

@@ -240,6 +240,7 @@ pt:
         i_already_subscribed: "Eu já estou inscrito"
         more_information: "Mais informação"
         your_subscription_expires_on_the_DATE: "Sua inscrição expira em {DATE}"
+        no_plans: "No plans are available for your group"
         my_group: "Meu grupo"
         his_group: "{GENDER, select, male{Ele} female{Ela} other{Esses}} grupo"
         he_wants_to_change_group: "{ROLE, select, member{Eu quero} other{O usuário quer}} trocar de grupo"

config/locales/app.public.zu.yml

@@ -240,6 +240,7 @@ zu:
         i_already_subscribed: "crwdns9175:0crwdne9175:0"
         more_information: "crwdns9177:0crwdne9177:0"
         your_subscription_expires_on_the_DATE: "crwdns9179:0{DATE}crwdne9179:0"
+        no_plans: "crwdns20912:0crwdne20912:0"
         my_group: "crwdns9181:0crwdne9181:0"
         his_group: "crwdns9183:0GENDER={GENDER}crwdne9183:0"
         he_wants_to_change_group: "crwdns20396:0ROLE={ROLE}crwdne20396:0"

package.json

@@ -1,6 +1,6 @@
 {
   "name": "fab-manager",
-  "version": "4.6.2",
+  "version": "4.6.3",
   "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",