From 3eb06f2891f4bd990751442d36f4e9cd6c025502 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Thu, 4 Feb 2016 14:21:33 +0100 Subject: Fix #1622: parameter for FosUser confirmation --- app/config/config.yml | 2 +- app/config/parameters.yml.dist | 1 + app/config/tests/parameters.yml.dist.mysql | 1 + app/config/tests/parameters.yml.dist.pgsql | 1 + app/config/tests/parameters.yml.dist.sqlite | 1 + 5 files changed, 5 insertions(+), 1 deletion(-) diff --git a/app/config/config.yml b/app/config/config.yml index dc6bccee..7dac4d3b 100644 --- a/app/config/config.yml +++ b/app/config/config.yml @@ -168,7 +168,7 @@ fos_user: user_class: Wallabag\UserBundle\Entity\User registration: confirmation: - enabled: true + enabled: %fosuser_confirmation% from_email: address: %from_email% sender_name: wallabag diff --git a/app/config/parameters.yml.dist b/app/config/parameters.yml.dist index 79654e9e..bf3fd5f5 100644 --- a/app/config/parameters.yml.dist +++ b/app/config/parameters.yml.dist @@ -40,5 +40,6 @@ parameters: # two factor stuff twofactor_auth: true twofactor_sender: no-reply@wallabag.org + fosuser_confirmation: true from_email: no-reply@wallabag.org diff --git a/app/config/tests/parameters.yml.dist.mysql b/app/config/tests/parameters.yml.dist.mysql index dceb5dea..bc6c7844 100644 --- a/app/config/tests/parameters.yml.dist.mysql +++ b/app/config/tests/parameters.yml.dist.mysql @@ -30,5 +30,6 @@ parameters: # two factor stuff twofactor_auth: true twofactor_sender: no-reply@wallabag.org + fosuser_confirmation: true from_email: no-reply@wallabag.org diff --git a/app/config/tests/parameters.yml.dist.pgsql b/app/config/tests/parameters.yml.dist.pgsql index e07db610..2520fec0 100644 --- a/app/config/tests/parameters.yml.dist.pgsql +++ b/app/config/tests/parameters.yml.dist.pgsql @@ -30,5 +30,6 @@ parameters: # two factor stuff twofactor_auth: true twofactor_sender: no-reply@wallabag.org + fosuser_confirmation: true from_email: no-reply@wallabag.org diff --git a/app/config/tests/parameters.yml.dist.sqlite b/app/config/tests/parameters.yml.dist.sqlite index 01589d28..253da5b7 100644 --- a/app/config/tests/parameters.yml.dist.sqlite +++ b/app/config/tests/parameters.yml.dist.sqlite @@ -30,5 +30,6 @@ parameters: # two factor stuff twofactor_auth: true twofactor_sender: no-reply@wallabag.org + fosuser_confirmation: true from_email: no-reply@wallabag.org -- cgit v1.2.3 From bc358c918005159afe3f7c350c0c0c29f4054e4c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Thu, 4 Feb 2016 16:06:05 +0100 Subject: CS --- app/Resources/CraueConfigBundle/translations/CraueConfigBundle.en.yml | 2 +- app/config/parameters.yml.dist | 2 ++ app/config/tests/parameters.yml.dist.mysql | 2 ++ app/config/tests/parameters.yml.dist.pgsql | 2 ++ app/config/tests/parameters.yml.dist.sqlite | 2 ++ src/Wallabag/CoreBundle/Tests/Controller/SettingsControllerTest.php | 2 +- src/Wallabag/UserBundle/Mailer/AuthCodeMailer.php | 2 +- 7 files changed, 11 insertions(+), 3 deletions(-) diff --git a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.en.yml b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.en.yml index b5385dc3..6d86eab6 100644 --- a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.en.yml +++ b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.en.yml @@ -9,7 +9,7 @@ export_json: Enable JSON export export_txt: Enable TXT export export_xml: Enable XML export pocket_consumer_key: Consumer key for Pocket to import contents (https://getpocket.com/developer/docs/authentication) -shaarli_url: URL de Shaarli, if the service is enabled +shaarli_url: Shaarli URL, if the service is enabled share_diaspora: Enable share to Diaspora share_mail: Enable share by email share_shaarli: Enable share to Shaarli diff --git a/app/config/parameters.yml.dist b/app/config/parameters.yml.dist index bf3fd5f5..7c7413fb 100644 --- a/app/config/parameters.yml.dist +++ b/app/config/parameters.yml.dist @@ -40,6 +40,8 @@ parameters: # two factor stuff twofactor_auth: true twofactor_sender: no-reply@wallabag.org + + # fosuser stuff fosuser_confirmation: true from_email: no-reply@wallabag.org diff --git a/app/config/tests/parameters.yml.dist.mysql b/app/config/tests/parameters.yml.dist.mysql index bc6c7844..1951f021 100644 --- a/app/config/tests/parameters.yml.dist.mysql +++ b/app/config/tests/parameters.yml.dist.mysql @@ -30,6 +30,8 @@ parameters: # two factor stuff twofactor_auth: true twofactor_sender: no-reply@wallabag.org + + # fosuser stuff fosuser_confirmation: true from_email: no-reply@wallabag.org diff --git a/app/config/tests/parameters.yml.dist.pgsql b/app/config/tests/parameters.yml.dist.pgsql index 2520fec0..36ad6cde 100644 --- a/app/config/tests/parameters.yml.dist.pgsql +++ b/app/config/tests/parameters.yml.dist.pgsql @@ -30,6 +30,8 @@ parameters: # two factor stuff twofactor_auth: true twofactor_sender: no-reply@wallabag.org + + # fosuser stuff fosuser_confirmation: true from_email: no-reply@wallabag.org diff --git a/app/config/tests/parameters.yml.dist.sqlite b/app/config/tests/parameters.yml.dist.sqlite index 253da5b7..6564014a 100644 --- a/app/config/tests/parameters.yml.dist.sqlite +++ b/app/config/tests/parameters.yml.dist.sqlite @@ -30,6 +30,8 @@ parameters: # two factor stuff twofactor_auth: true twofactor_sender: no-reply@wallabag.org + + # fosuser stuff fosuser_confirmation: true from_email: no-reply@wallabag.org diff --git a/src/Wallabag/CoreBundle/Tests/Controller/SettingsControllerTest.php b/src/Wallabag/CoreBundle/Tests/Controller/SettingsControllerTest.php index 354aedba..fd698b3e 100644 --- a/src/Wallabag/CoreBundle/Tests/Controller/SettingsControllerTest.php +++ b/src/Wallabag/CoreBundle/Tests/Controller/SettingsControllerTest.php @@ -6,7 +6,7 @@ use Wallabag\CoreBundle\Tests\WallabagCoreTestCase; /** * The controller `SettingsController` does not exist. - * This test cover security against the internal settings page managed by CraueConfigBundle + * This test cover security against the internal settings page managed by CraueConfigBundle. */ class SettingsControllerTest extends WallabagCoreTestCase { diff --git a/src/Wallabag/UserBundle/Mailer/AuthCodeMailer.php b/src/Wallabag/UserBundle/Mailer/AuthCodeMailer.php index 98017f43..d078bdf7 100644 --- a/src/Wallabag/UserBundle/Mailer/AuthCodeMailer.php +++ b/src/Wallabag/UserBundle/Mailer/AuthCodeMailer.php @@ -48,7 +48,7 @@ class AuthCodeMailer implements AuthCodeMailerInterface private $supportUrl; /** - * Url for the wallabag instance (only used for image in the HTML email template) + * Url for the wallabag instance (only used for image in the HTML email template). * * @var string */ -- cgit v1.2.3