diff --git a/l10n/de.js b/l10n/de.js index 2c564a7494433f2063874429452f30e092f07bb5..d12d723b8d76694d5e3f1e57367299e6e08eebea 100644 --- a/l10n/de.js +++ b/l10n/de.js @@ -46,7 +46,7 @@ OC.L10N.register( "Create My Account": "Mein Konto erstellen", "Verify": "Überprüfen Sie", "Later": "Später", - "Set my recovery email address": "Meine Wiederherstellungs-E-Mail-Adresse festlegen", + "Set My Recovery Email Now": "Meine Wiederherstellungs-E-Mail jetzt einstellen", "Display name": "Name anzeigen", "Username": "Benutzername", "Enter Password": "Passwort eingeben", @@ -74,6 +74,10 @@ OC.L10N.register( "Success!": "Erfolgreich!", "Your __username__@__domain__ account was successfully created.": "Ihr __username__@__domain__-Konto wurde erfolgreich erstellt.", "If you want to use your murena.io email in a mail app like Thunderbird, Outlook or another, please visit this page.": "Wenn Sie Ihre murena.io-E-Mail in einer Mail-Anwendung wie Thunderbird, Outlook oder einer anderen nutzen möchten, besuchen Sie bitte diese Seite.", - "Incorrect password length: Required length is 8 to 32": "Falsche Passwortlänge: Erforderliche Länge ist 8 bis 32" + "Incorrect password length: Required length is 8 to 32": "Falsche Passwortlänge: Erforderliche Länge ist 8 bis 32", + "Use an alternative email": "Verwenden Sie eine alternative E-Mail", + "Important:": "Das ist wichtig:", + "For security reasons, a recovery email is required. If you decide to set it later, your account will be partially restricted.": "Aus Sicherheitsgründen ist eine Wiederherstellungs-E-Mail erforderlich. Wenn Sie sich entscheiden, diese später einzustellen, wird Ihr Konto teilweise eingeschränkt.", + "Set a recovery email address": "Festlegen einer Wiederherstellungs-E-Mail-Adresse" }, "nplurals=2; plural=(n != 1);"); diff --git a/l10n/de.json b/l10n/de.json index fdc003d311e1ff1dcba0d4939ffcc91d5b1ff290..1acdb33c9a0be547b6248363147c9406ac00d12f 100644 --- a/l10n/de.json +++ b/l10n/de.json @@ -45,7 +45,7 @@ "Create My Account": "Mein Konto erstellen", "Verify": "Überprüfen Sie", "Later": "Später", - "Set my recovery email address": "Meine Wiederherstellungs-E-Mail-Adresse festlegen", + "Set My Recovery Email Now": "Meine Wiederherstellungs-E-Mail jetzt einstellen", "Display name": "Name anzeigen", "Username": "Benutzername", "Enter Password": "Passwort eingeben", @@ -72,7 +72,11 @@ "Success!": "Erfolgreich!", "Your __username__@__domain__ account was successfully created.": "Ihr __username__@__domain__-Konto wurde erfolgreich erstellt.", "If you want to use your murena.io email in a mail app like Thunderbird, Outlook or another, please visit this page.": "Wenn Sie Ihre murena.io-E-Mail in einer Mail-Anwendung wie Thunderbird, Outlook oder einer anderen nutzen möchten, besuchen Sie bitte diese Seite.", - "Incorrect password length: Required length is 8 to 32": "Falsche Passwortlänge: Erforderliche Länge ist 8 bis 32" + "Incorrect password length: Required length is 8 to 32": "Falsche Passwortlänge: Erforderliche Länge ist 8 bis 32", + "Use an alternative email": "Verwenden Sie eine alternative E-Mail", + "Important:": "Das ist wichtig:", + "For security reasons, a recovery email is required. If you decide to set it later, your account will be partially restricted.": "Aus Sicherheitsgründen ist eine Wiederherstellungs-E-Mail erforderlich. Wenn Sie sich entscheiden, diese später einzustellen, wird Ihr Konto teilweise eingeschränkt.", + "Set a recovery email address": "Festlegen einer Wiederherstellungs-E-Mail-Adresse" }, "pluralForm": "nplurals=2; plural=(n != 1);" } diff --git a/l10n/en.js b/l10n/en.js index 9cb3afc8c5e2a3c581d8306e0b9ba978d1b29007..cf71a7458e1eac5d98fea512edb104109e3bedba 100644 --- a/l10n/en.js +++ b/l10n/en.js @@ -49,7 +49,7 @@ OC.L10N.register( "Create My Account": "Create My Account", "Verify": "Verify", "Later": "Later", - "Set my recovery email address": "Set my recovery email address", + "Set My Recovery Email Now": "Set My Recovery Email Now", "Display name": "Display name", "Username": "Username", "Enter Password": "Enter Password", @@ -78,6 +78,10 @@ OC.L10N.register( "Your __username__@__domain__ account was successfully created.": "Your __username__@__domain__ account was successfully created.", "If you want to use your murena.io email in a mail app like Thunderbird, Outlook or another, please visit this page.": "If you want to use your murena.io email in a mail app like Thunderbird, Outlook or another, please visit this page.", "Recovery email address is already taken.": "Recovery email address is already taken.", - "Incorrect password length: Required length is 8 to 32": "Incorrect password length: Required length is 8 to 32" + "Incorrect password length: Required length is 8 to 32": "Incorrect password length: Required length is 8 to 32", + "Use an alternative email": "Use an alternative email", + "Important:": "Important:", + "For security reasons, a recovery email is required. If you decide to set it later, your account will be partially restricted.": "For security reasons, a recovery email is required. If you decide to set it later, your account will be partially restricted.", + "Set a recovery email address": "Set a recovery email address" }, "nplurals=2; plural=(n != 1);"); diff --git a/l10n/en.json b/l10n/en.json index eb5fac3a7e05d9a8517145a0934c04b989563a5f..51a28a357c029aa709bf8f7984e95dbafb9fcdd4 100644 --- a/l10n/en.json +++ b/l10n/en.json @@ -46,7 +46,7 @@ "Create My Account": "Create My Account", "Verify": "Verify", "Later": "Later", - "Set my recovery email address": "Set my recovery email address", + "Set My Recovery Email Now": "Set My Recovery Email Now", "Display name": "Display name", "Username": "Username", "Enter Password": "Enter Password", @@ -74,7 +74,11 @@ "Success!": "Success!", "Your __username__@__domain__ account was successfully created.": "Your __username__@__domain__ account was successfully created.", "If you want to use your murena.io email in a mail app like Thunderbird, Outlook or another, please visit this page.": "If you want to use your murena.io email in a mail app like Thunderbird, Outlook or another, please visit this page.", - "Incorrect password length: Required length is 8 to 32": "Incorrect password length: Required length is 8 to 32" + "Incorrect password length: Required length is 8 to 32": "Incorrect password length: Required length is 8 to 32", + "Use an alternative email": "Use an alternative email", + "Important:": "Important:", + "For security reasons, a recovery email is required. If you decide to set it later, your account will be partially restricted.": "For security reasons, a recovery email is required. If you decide to set it later, your account will be partially restricted.", + "Set a recovery email address": "Set a recovery email address" }, "pluralForm": "nplurals=2; plural=(n != 1);" } diff --git a/l10n/es.js b/l10n/es.js index f4f64e8ecaf936cecc2686fffcdd8a0163c86b8d..a6cf885bf61c19fe380d20ffdf60a1c557ad80c5 100644 --- a/l10n/es.js +++ b/l10n/es.js @@ -48,7 +48,7 @@ OC.L10N.register( "Create My Account": "Crear mi cuenta", "Verify": "Verifique", "Later": "Más tarde", - "Set my recovery email address": "Establecer mi dirección de correo electrónico de recuperación", + "Set My Recovery Email Now": "Establecer mi correo electrónico de recuperación ahora", "Display name": "Mostrar nombre", "Username": "Nombre de usuario", "Enter Password": "Introducir contraseña", @@ -76,6 +76,10 @@ OC.L10N.register( "Success!": "¡Éxito!", "Your __username__@__domain__ account was successfully created.": "Su cuenta __username__@__domain__ se ha creado correctamente.", "If you want to use your murena.io email in a mail app like Thunderbird, Outlook or another, please visit this page.": "Si desea utilizar su correo electrónico de murena.io en una aplicación de correo como Thunderbird, Outlook u otra, visite esta página.", - "Incorrect password length: Required length is 8 to 32": "Longitud de contraseña incorrecta: La longitud requerida es de 8 a 32" + "Incorrect password length: Required length is 8 to 32": "Longitud de contraseña incorrecta: La longitud requerida es de 8 a 32", + "Use an alternative email": "Utilizar un correo electrónico alternativo", + "Important:": "Importante:", + "For security reasons, a recovery email is required. If you decide to set it later, your account will be partially restricted.": "Por razones de seguridad, se requiere un correo electrónico de recuperación. Si decides configurarlo más tarde, tu cuenta quedará parcialmente restringida.", + "Set a recovery email address": "Establecer una dirección de correo electrónico de recuperación" }, "nplurals=2; plural=(n != 1);"); diff --git a/l10n/es.json b/l10n/es.json index eee55840d777d09d68d347aff185241ec71716ae..45441c31e73d149836c2402d8def50007d8e6ecd 100644 --- a/l10n/es.json +++ b/l10n/es.json @@ -47,7 +47,7 @@ "Create My Account": "Crear mi cuenta", "Verify": "Verifique", "Later": "Más tarde", - "Set my recovery email address": "Establecer mi dirección de correo electrónico de recuperación", + "Set My Recovery Email Now": "Establecer mi correo electrónico de recuperación ahora", "Display name": "Mostrar nombre", "Username": "Nombre de usuario", "Enter Password": "Introducir contraseña", @@ -75,7 +75,11 @@ "Success!": "¡Éxito!", "Your __username__@__domain__ account was successfully created.": "Su cuenta __username__@__domain__ se ha creado correctamente.", "If you want to use your murena.io email in a mail app like Thunderbird, Outlook or another, please visit this page.": "Si desea utilizar su correo electrónico de murena.io en una aplicación de correo como Thunderbird, Outlook u otra, visite esta página.", - "Incorrect password length: Required length is 8 to 32": "Longitud de contraseña incorrecta: La longitud requerida es de 8 a 32" + "Incorrect password length: Required length is 8 to 32": "Longitud de contraseña incorrecta: La longitud requerida es de 8 a 32", + "Use an alternative email": "Utilizar un correo electrónico alternativo", + "Important:": "Importante:", + "For security reasons, a recovery email is required. If you decide to set it later, your account will be partially restricted.": "Por razones de seguridad, se requiere un correo electrónico de recuperación. Si decides configurarlo más tarde, tu cuenta quedará parcialmente restringida.", + "Set a recovery email address": "Establecer una dirección de correo electrónico de recuperación" }, "pluralForm": "nplurals=2; plural=(n != 1);" } diff --git a/l10n/fr.js b/l10n/fr.js index dea43d8d118fc09a6dfc2b292bf25ac129c06ec4..02a080b25d4c197bb5fea8c13ce5693e17732564 100644 --- a/l10n/fr.js +++ b/l10n/fr.js @@ -47,7 +47,7 @@ OC.L10N.register( "Create My Account": "Créer mon compte", "Verify": "Vérifier", "Later": "Plus tard", - "Set my recovery email address": "Définir mon adresse e-mail de récupération", + "Set My Recovery Email Now": "Définir mon e-mail de récupération maintenant", "Display name": "Nom d'affichage", "Username": "Nom d'utilisateur", "Enter Password": "Saisir le mot de passe", @@ -75,6 +75,10 @@ OC.L10N.register( "Success!": "Succès !", "Your __username__@__domain__ account was successfully created.": "Votre compte __username__@__domain__ a été créé avec succès.", "If you want to use your murena.io email in a mail app like Thunderbird, Outlook or another, please visit this page.": "Si vous souhaitez utiliser votre email murena.io dans une application de messagerie comme Thunderbird, Outlook ou autre, veuillez visiter cette page.", - "Incorrect password length: Required length is 8 to 32":"ngueur de mot de passe incorrecte : La longueur requise est comprise entre 8 et 32" + "Incorrect password length: Required length is 8 to 32":"ngueur de mot de passe incorrecte : La longueur requise est comprise entre 8 et 32", + "Use an alternative email": "Utiliser un autre courriel", + "Important:": "Important :", + "For security reasons, a recovery email is required. If you decide to set it later, your account will be partially restricted.": "Pour des raisons de sécurité, un courriel de récupération est nécessaire. Si vous décidez de le désactiver ultérieurement, votre compte sera partiellement restreint.", + "Set a recovery email address": "Définir une adresse électronique de récupération" }, "nplurals=2; plural=(n != 1);"); diff --git a/l10n/fr.json b/l10n/fr.json index e733fab18b8cc2a7a9c17fc8f8620d89650fd3d8..83a3ff78a140e44d356fd1ab68ef993f2a9ac580 100644 --- a/l10n/fr.json +++ b/l10n/fr.json @@ -46,7 +46,7 @@ "Create My Account": "Créer mon compte", "Verify": "Vérifier", "Later": "Plus tard", - "Set my recovery email address": "Définir mon adresse e-mail de récupération", + "Set My Recovery Email Now": "Définir mon e-mail de récupération maintenant", "Display name": "Nom d'affichage", "Username": "Nom d'utilisateur", "Enter Password": "Saisir le mot de passe", @@ -74,7 +74,11 @@ "Success!": "Succès !", "Your __username__@__domain__ account was successfully created.": "Votre compte __username__@__domain__ a été créé avec succès.", "If you want to use your murena.io email in a mail app like Thunderbird, Outlook or another, please visit this page.": "Si vous souhaitez utiliser votre email murena.io dans une application de messagerie comme Thunderbird, Outlook ou autre, veuillez visiter cette page.", - "Incorrect password length: Required length is 8 to 32":"ngueur de mot de passe incorrecte : La longueur requise est comprise entre 8 et 32" + "Incorrect password length: Required length is 8 to 32":"ngueur de mot de passe incorrecte : La longueur requise est comprise entre 8 et 32", + "Use an alternative email": "Utiliser un autre courriel", + "Important:": "Important :", + "For security reasons, a recovery email is required. If you decide to set it later, your account will be partially restricted.": "Pour des raisons de sécurité, un courriel de récupération est nécessaire. Si vous décidez de le désactiver ultérieurement, votre compte sera partiellement restreint.", + "Set a recovery email address": "Définir une adresse électronique de récupération" }, "pluralForm": "nplurals=2; plural=(n != 1);" } diff --git a/l10n/it.js b/l10n/it.js index c0a1df6429bd6c77690a40c39a32b7fa77e01b1e..356b12841160c573d07d78ac91ba9f4590104d1b 100644 --- a/l10n/it.js +++ b/l10n/it.js @@ -47,7 +47,7 @@ OC.L10N.register( "Create My Account": "Crea il mio account", "Verify": "Verifica", "Later": "Più tardi", - "Set my recovery email address": "Impostare l'indirizzo e-mail di recupero", + "Set My Recovery Email Now": "Imposta ora la mia e-mail di recupero", "Display name": "Nome visualizzato", "Username": "Nome utente", "Enter Password": "Inserire la password", @@ -75,6 +75,10 @@ OC.L10N.register( "Success!": "Successo!", "Your __username__@__domain__ account was successfully created.": "L'account __username__@__domain__ è stato creato con successo.", "If you want to use your murena.io email in a mail app like Thunderbird, Outlook or another, please visit this page.": "Se si desidera utilizzare l'e-mail di murena.io in un'applicazione di posta elettronica come Thunderbird, Outlook o altre, visitare questa pagina.", - "Incorrect password length: Required length is 8 to 32":"Lunghezza della password errata: La lunghezza richiesta è da 8 a 32" + "Incorrect password length: Required length is 8 to 32":"Lunghezza della password errata: La lunghezza richiesta è da 8 a 32", + "Use an alternative email": "Utilizzare un'e-mail alternativa", + "Important:": "Importante:", + "For security reasons, a recovery email is required. If you decide to set it later, your account will be partially restricted.": "Per motivi di sicurezza, è necessaria un'e-mail di recupero. Se si decide di impostarla in un secondo momento, l'account verrà parzialmente limitato.", + "Set a recovery email address": "Impostare un indirizzo e-mail di recupero" }, "nplurals=2; plural=(n != 1);"); diff --git a/l10n/it.json b/l10n/it.json index 82634b233a01e154c7ac8feda50f6ceb1b55da8f..7c62999bce53f83274048fdfc24daf28c4b5ba3e 100644 --- a/l10n/it.json +++ b/l10n/it.json @@ -46,7 +46,7 @@ "Create My Account": "Crea il mio account", "Verify": "Verifica", "Later": "Più tardi", - "Set my recovery email address": "Impostare l'indirizzo e-mail di recupero", + "Set My Recovery Email Now": "Imposta ora la mia e-mail di recupero", "Display name": "Nome visualizzato", "Username": "Nome utente", "Enter Password": "Inserire la password", @@ -70,7 +70,11 @@ "Recovery Email is required.": "L'e-mail di recupero è necessaria.", "You must read and accept the Terms of Service to create your account.": "Per creare il proprio account è necessario leggere e accettare i Termini di servizio.", "If you want to use your murena.io email in a mail app like Thunderbird, Outlook or another, please visit this page.": "Se si desidera utilizzare l'e-mail di murena.io in un'applicazione di posta elettronica come Thunderbird, Outlook o altre, visitare questa pagina.", - "Incorrect password length: Required length is 8 to 32":"Lunghezza della password errata: La lunghezza richiesta è da 8 a 32" + "Incorrect password length: Required length is 8 to 32":"Lunghezza della password errata: La lunghezza richiesta è da 8 a 32", + "Use an alternative email": "Utilizzare un'e-mail alternativa", + "Important:": "Importante:", + "For security reasons, a recovery email is required. If you decide to set it later, your account will be partially restricted.": "Per motivi di sicurezza, è necessaria un'e-mail di recupero. Se si decide di impostarla in un secondo momento, l'account verrà parzialmente limitato.", + "Set a recovery email address": "Impostare un indirizzo e-mail di recupero" }, "pluralForm": "nplurals=2; plural=(n != 1);" } diff --git a/lib/Controller/AccountController.php b/lib/Controller/AccountController.php index 88cb74b6f460960df4d6dcce5d07df10db7c6fb7..e33cd9818d3cb9bb4154331b7cb2734b571ef6d4 100644 --- a/lib/Controller/AccountController.php +++ b/lib/Controller/AccountController.php @@ -142,7 +142,7 @@ class AccountController extends Controller { $this->userService->setTOS($username, true); $this->userService->setUserLanguage($username, $language); $this->newsletterService->setNewsletterSignup($newsletterEos, $newsletterProduct, $userEmail, $language); - + $this->userService->setRecoveryEmail($username, ''); if($recoveryEmail !== '') { $this->userService->setUnverifiedRecoveryEmail($username, $recoveryEmail); } diff --git a/package.json b/package.json index 74dc503cdd9b43742dab1ccd8b6da31a74f6dcb2..30435c15ee6f0ee927d8856961c466e7f18c41ad 100644 --- a/package.json +++ b/package.json @@ -8,7 +8,8 @@ }, "private": true, "scripts": { - "build": "NODE_ENV=production webpack --progress", + "build-scss": "sass scss:css --style compressed --no-source-map", + "build": "npm run build-scss && NODE_ENV=production webpack --progress", "dev": "NODE_ENV=development webpack --progress", "watch": "NODE_ENV=development webpack --progress --watch", "lint": "eslint --ext .js,.vue src", diff --git a/css/ecloud-accounts-userregistration.css b/scss/ecloud-accounts-userregistration.scss similarity index 89% rename from css/ecloud-accounts-userregistration.css rename to scss/ecloud-accounts-userregistration.scss index 895b680cfd099b06ed8d82e311bbe6d386669cba..991c2c1186626ae69713918313911455411133a1 100644 --- a/css/ecloud-accounts-userregistration.css +++ b/scss/ecloud-accounts-userregistration.scss @@ -29,6 +29,7 @@ html { .password-group #password { height: 58px !important; + margin-left: 0; } @media only screen and (max-width: 768px) { @@ -37,7 +38,8 @@ html { } #body-login .v-align { - padding: 5vh 0vh !important; + padding: 2vh 0vh !important; + max-height: fit-content !important; } } diff --git a/src/signup/CaptchaForm.vue b/src/signup/CaptchaForm.vue index e12a1e3c39b701e34699ba7e0dd1db464b1eebcb..342aeeaac66b6d1259c7a34bab26ea8b61ff997d 100644 --- a/src/signup/CaptchaForm.vue +++ b/src/signup/CaptchaForm.vue @@ -109,6 +109,11 @@ export default { } diff --git a/src/signup/RegistrationForm.vue b/src/signup/RegistrationForm.vue index 5ce865c9c4b6c04e386f527f31b6338cd5237f52..e9178c1ac15ab3bbdd76be0cab73bdf78480c823 100644 --- a/src/signup/RegistrationForm.vue +++ b/src/signup/RegistrationForm.vue @@ -307,7 +307,10 @@ export default {