aboutsummaryrefslogtreecommitdiffhomepage
path: root/app
diff options
context:
space:
mode:
Diffstat (limited to 'app')
-rw-r--r--app/Resources/CraueConfigBundle/translations/CraueConfigBundle.en.yml2
-rw-r--r--app/config/parameters.yml.dist2
-rw-r--r--app/config/tests/parameters.yml.dist.mysql2
-rw-r--r--app/config/tests/parameters.yml.dist.pgsql2
-rw-r--r--app/config/tests/parameters.yml.dist.sqlite2
5 files changed, 9 insertions, 1 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/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:
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
44 # fosuser stuff
43 fosuser_confirmation: true 45 fosuser_confirmation: true
44 46
45 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 bc6c7844..1951f021 100644
--- a/app/config/tests/parameters.yml.dist.mysql
+++ b/app/config/tests/parameters.yml.dist.mysql
@@ -30,6 +30,8 @@ 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
34 # fosuser stuff
33 fosuser_confirmation: true 35 fosuser_confirmation: true
34 36
35 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 2520fec0..36ad6cde 100644
--- a/app/config/tests/parameters.yml.dist.pgsql
+++ b/app/config/tests/parameters.yml.dist.pgsql
@@ -30,6 +30,8 @@ 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
34 # fosuser stuff
33 fosuser_confirmation: true 35 fosuser_confirmation: true
34 36
35 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 253da5b7..6564014a 100644
--- a/app/config/tests/parameters.yml.dist.sqlite
+++ b/app/config/tests/parameters.yml.dist.sqlite
@@ -30,6 +30,8 @@ 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
34 # fosuser stuff
33 fosuser_confirmation: true 35 fosuser_confirmation: true
34 36
35 from_email: no-reply@wallabag.org 37 from_email: no-reply@wallabag.org