aboutsummaryrefslogtreecommitdiffhomepage
path: root/app
diff options
context:
space:
mode:
authorNicolas LÅ“uillet <nicolas.loeuillet@smile.fr>2016-02-04 14:21:33 +0100
committerNicolas LÅ“uillet <nicolas.loeuillet@smile.fr>2016-02-04 16:00:45 +0100
commit3eb06f2891f4bd990751442d36f4e9cd6c025502 (patch)
tree82b05d54f8c46aaa60e31f3eac03c15f3c3fd035 /app
parente008c037f53324b931f027483f9f1053171109c5 (diff)
downloadwallabag-3eb06f2891f4bd990751442d36f4e9cd6c025502.tar.gz
wallabag-3eb06f2891f4bd990751442d36f4e9cd6c025502.tar.zst
wallabag-3eb06f2891f4bd990751442d36f4e9cd6c025502.zip
Fix #1622: parameter for FosUser confirmation
Diffstat (limited to 'app')
-rw-r--r--app/config/config.yml2
-rw-r--r--app/config/parameters.yml.dist1
-rw-r--r--app/config/tests/parameters.yml.dist.mysql1
-rw-r--r--app/config/tests/parameters.yml.dist.pgsql1
-rw-r--r--app/config/tests/parameters.yml.dist.sqlite1
5 files changed, 5 insertions, 1 deletions
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:
168 user_class: Wallabag\UserBundle\Entity\User 168 user_class: Wallabag\UserBundle\Entity\User
169 registration: 169 registration:
170 confirmation: 170 confirmation:
171 enabled: true 171 enabled: %fosuser_confirmation%
172 from_email: 172 from_email:
173 address: %from_email% 173 address: %from_email%
174 sender_name: wallabag 174 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:
40 # two factor stuff 40 # two factor stuff
41 twofactor_auth: true 41 twofactor_auth: true
42 twofactor_sender: no-reply@wallabag.org 42 twofactor_sender: no-reply@wallabag.org
43 fosuser_confirmation: true
43 44
44 from_email: no-reply@wallabag.org 45 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:
30 # two factor stuff 30 # two factor stuff
31 twofactor_auth: true 31 twofactor_auth: true
32 twofactor_sender: no-reply@wallabag.org 32 twofactor_sender: no-reply@wallabag.org
33 fosuser_confirmation: true
33 34
34 from_email: no-reply@wallabag.org 35 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:
30 # two factor stuff 30 # two factor stuff
31 twofactor_auth: true 31 twofactor_auth: true
32 twofactor_sender: no-reply@wallabag.org 32 twofactor_sender: no-reply@wallabag.org
33 fosuser_confirmation: true
33 34
34 from_email: no-reply@wallabag.org 35 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:
30 # two factor stuff 30 # two factor stuff
31 twofactor_auth: true 31 twofactor_auth: true
32 twofactor_sender: no-reply@wallabag.org 32 twofactor_sender: no-reply@wallabag.org
33 fosuser_confirmation: true
33 34
34 from_email: no-reply@wallabag.org 35 from_email: no-reply@wallabag.org