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/Resources/CraueConfigBundle/translations/CraueConfigBundle.fr.yml2
-rw-r--r--app/config/parameters.yml.dist4
-rw-r--r--app/config/tests/parameters.yml.dist.mysql4
-rw-r--r--app/config/tests/parameters.yml.dist.pgsql4
-rw-r--r--app/config/tests/parameters.yml.dist.sqlite4
6 files changed, 4 insertions, 16 deletions
diff --git a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.en.yml b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.en.yml
index 719e51ea..b627376e 100644
--- a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.en.yml
+++ b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.en.yml
@@ -25,3 +25,5 @@ modify_settings: "apply"
25piwik_host: Host of your website in Piwik 25piwik_host: Host of your website in Piwik
26piwik_site_id: ID of your website in Piwik 26piwik_site_id: ID of your website in Piwik
27piwik_enabled: Enable Piwik 27piwik_enabled: Enable Piwik
28demo_mode_enabled: "Enable demo mode ? (only used for the wallabag public demo)"
29demo_mode_username: "Demo user"
diff --git a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.fr.yml b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.fr.yml
index ab5dfc72..084eb6df 100644
--- a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.fr.yml
+++ b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.fr.yml
@@ -25,3 +25,5 @@ modify_settings: "appliquer"
25piwik_host: URL de votre site dans Piwik 25piwik_host: URL de votre site dans Piwik
26piwik_site_id: ID de votre site dans Piwik 26piwik_site_id: ID de votre site dans Piwik
27piwik_enabled: Activer Piwik 27piwik_enabled: Activer Piwik
28demo_mode_enabled: "Activer le mode démo ? (utiliser uniquement pour la démo publique de wallabag)"
29demo_mode_username: "Utilisateur de la démo"
diff --git a/app/config/parameters.yml.dist b/app/config/parameters.yml.dist
index 5f22b147..7c7413fb 100644
--- a/app/config/parameters.yml.dist
+++ b/app/config/parameters.yml.dist
@@ -45,7 +45,3 @@ parameters:
45 fosuser_confirmation: true 45 fosuser_confirmation: true
46 46
47 from_email: no-reply@wallabag.org 47 from_email: no-reply@wallabag.org
48
49 # this parameter is only used for the wallabag public demo, it means user won't be able to change the password of the demo_user account
50 demo: false
51 demo_username: wallabag
diff --git a/app/config/tests/parameters.yml.dist.mysql b/app/config/tests/parameters.yml.dist.mysql
index 126e11eb..1951f021 100644
--- a/app/config/tests/parameters.yml.dist.mysql
+++ b/app/config/tests/parameters.yml.dist.mysql
@@ -35,7 +35,3 @@ parameters:
35 fosuser_confirmation: true 35 fosuser_confirmation: true
36 36
37 from_email: no-reply@wallabag.org 37 from_email: no-reply@wallabag.org
38
39 # this parameter is only used for the wallabag public demo, it means user won't be able to change the password of the demo_user account
40 demo: false
41 demo_username: wallabag
diff --git a/app/config/tests/parameters.yml.dist.pgsql b/app/config/tests/parameters.yml.dist.pgsql
index 8fc33a94..36ad6cde 100644
--- a/app/config/tests/parameters.yml.dist.pgsql
+++ b/app/config/tests/parameters.yml.dist.pgsql
@@ -35,7 +35,3 @@ parameters:
35 fosuser_confirmation: true 35 fosuser_confirmation: true
36 36
37 from_email: no-reply@wallabag.org 37 from_email: no-reply@wallabag.org
38
39 # this parameter is only used for the wallabag public demo, it means user won't be able to change the password of the demo_user account
40 demo: false
41 demo_username: wallabag
diff --git a/app/config/tests/parameters.yml.dist.sqlite b/app/config/tests/parameters.yml.dist.sqlite
index 8e3d49b3..6564014a 100644
--- a/app/config/tests/parameters.yml.dist.sqlite
+++ b/app/config/tests/parameters.yml.dist.sqlite
@@ -35,7 +35,3 @@ parameters:
35 fosuser_confirmation: true 35 fosuser_confirmation: true
36 36
37 from_email: no-reply@wallabag.org 37 from_email: no-reply@wallabag.org
38
39 # this parameter is only used for the wallabag public demo, it means user won't be able to change the password of the demo_user account
40 demo: false
41 demo_username: wallabag