aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--app/Resources/CraueConfigBundle/translations/CraueConfigBundle.en.yml2
-rw-r--r--app/config/config.yml2
-rw-r--r--app/config/parameters.yml.dist3
-rw-r--r--app/config/tests/parameters.yml.dist.mysql3
-rw-r--r--app/config/tests/parameters.yml.dist.pgsql3
-rw-r--r--app/config/tests/parameters.yml.dist.sqlite3
6 files changed, 14 insertions, 2 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
9export_txt: Enable TXT export 9export_txt: Enable TXT export
10export_xml: Enable XML export 10export_xml: Enable XML export
11pocket_consumer_key: Consumer key for Pocket to import contents (https://getpocket.com/developer/docs/authentication) 11pocket_consumer_key: Consumer key for Pocket to import contents (https://getpocket.com/developer/docs/authentication)
12shaarli_url: URL de Shaarli, if the service is enabled 12shaarli_url: Shaarli URL, if the service is enabled
13share_diaspora: Enable share to Diaspora 13share_diaspora: Enable share to Diaspora
14share_mail: Enable share by email 14share_mail: Enable share by email
15share_shaarli: Enable share to Shaarli 15share_shaarli: Enable share to Shaarli
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..7c7413fb 100644
--- a/app/config/parameters.yml.dist
+++ b/app/config/parameters.yml.dist
@@ -41,4 +41,7 @@ parameters:
41 twofactor_auth: true 41 twofactor_auth: true
42 twofactor_sender: no-reply@wallabag.org 42 twofactor_sender: no-reply@wallabag.org
43 43
44 # fosuser stuff
45 fosuser_confirmation: true
46
44 from_email: no-reply@wallabag.org 47 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..1951f021 100644
--- a/app/config/tests/parameters.yml.dist.mysql
+++ b/app/config/tests/parameters.yml.dist.mysql
@@ -31,4 +31,7 @@ parameters:
31 twofactor_auth: true 31 twofactor_auth: true
32 twofactor_sender: no-reply@wallabag.org 32 twofactor_sender: no-reply@wallabag.org
33 33
34 # fosuser stuff
35 fosuser_confirmation: true
36
34 from_email: no-reply@wallabag.org 37 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..36ad6cde 100644
--- a/app/config/tests/parameters.yml.dist.pgsql
+++ b/app/config/tests/parameters.yml.dist.pgsql
@@ -31,4 +31,7 @@ parameters:
31 twofactor_auth: true 31 twofactor_auth: true
32 twofactor_sender: no-reply@wallabag.org 32 twofactor_sender: no-reply@wallabag.org
33 33
34 # fosuser stuff
35 fosuser_confirmation: true
36
34 from_email: no-reply@wallabag.org 37 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..6564014a 100644
--- a/app/config/tests/parameters.yml.dist.sqlite
+++ b/app/config/tests/parameters.yml.dist.sqlite
@@ -31,4 +31,7 @@ parameters:
31 twofactor_auth: true 31 twofactor_auth: true
32 twofactor_sender: no-reply@wallabag.org 32 twofactor_sender: no-reply@wallabag.org
33 33
34 # fosuser stuff
35 fosuser_confirmation: true
36
34 from_email: no-reply@wallabag.org 37 from_email: no-reply@wallabag.org