From 6c9f50a6622cdc5c9f975cfb14994db1d9b3ab1b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Wed, 17 Feb 2016 17:02:12 +0100 Subject: Demonstration mode to prevent password changes --- app/config/parameters.yml.dist | 3 +++ app/config/tests/parameters.yml.dist.mysql | 3 +++ app/config/tests/parameters.yml.dist.pgsql | 3 +++ app/config/tests/parameters.yml.dist.sqlite | 3 +++ 4 files changed, 12 insertions(+) (limited to 'app') diff --git a/app/config/parameters.yml.dist b/app/config/parameters.yml.dist index 7c7413fb..dd9ec60a 100644 --- a/app/config/parameters.yml.dist +++ b/app/config/parameters.yml.dist @@ -45,3 +45,6 @@ parameters: fosuser_confirmation: true from_email: no-reply@wallabag.org + + # set to true to prevent changing password + demo: false diff --git a/app/config/tests/parameters.yml.dist.mysql b/app/config/tests/parameters.yml.dist.mysql index 1951f021..3d5df619 100644 --- a/app/config/tests/parameters.yml.dist.mysql +++ b/app/config/tests/parameters.yml.dist.mysql @@ -35,3 +35,6 @@ parameters: fosuser_confirmation: true from_email: no-reply@wallabag.org + + # set to true to prevent changing password + demo: false diff --git a/app/config/tests/parameters.yml.dist.pgsql b/app/config/tests/parameters.yml.dist.pgsql index 36ad6cde..dd29b737 100644 --- a/app/config/tests/parameters.yml.dist.pgsql +++ b/app/config/tests/parameters.yml.dist.pgsql @@ -35,3 +35,6 @@ parameters: fosuser_confirmation: true from_email: no-reply@wallabag.org + + # set to true to prevent changing password + demo: false diff --git a/app/config/tests/parameters.yml.dist.sqlite b/app/config/tests/parameters.yml.dist.sqlite index 6564014a..0e3256e6 100644 --- a/app/config/tests/parameters.yml.dist.sqlite +++ b/app/config/tests/parameters.yml.dist.sqlite @@ -35,3 +35,6 @@ parameters: fosuser_confirmation: true from_email: no-reply@wallabag.org + + # set to true to prevent changing password + demo: false -- cgit v1.2.3 From c3b43c8a3ee5bc65296110a8c57c037461089745 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Wed, 17 Feb 2016 17:24:00 +0100 Subject: change comment about demo parameter --- 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 +- 4 files changed, 4 insertions(+), 4 deletions(-) (limited to 'app') diff --git a/app/config/parameters.yml.dist b/app/config/parameters.yml.dist index dd9ec60a..b71e5393 100644 --- a/app/config/parameters.yml.dist +++ b/app/config/parameters.yml.dist @@ -46,5 +46,5 @@ parameters: from_email: no-reply@wallabag.org - # set to true to prevent changing password + # this parameter is only used for the wallabag public demo, it means user won't be able to change the password of the default account demo: false diff --git a/app/config/tests/parameters.yml.dist.mysql b/app/config/tests/parameters.yml.dist.mysql index 3d5df619..1e21e26a 100644 --- a/app/config/tests/parameters.yml.dist.mysql +++ b/app/config/tests/parameters.yml.dist.mysql @@ -36,5 +36,5 @@ parameters: from_email: no-reply@wallabag.org - # set to true to prevent changing password + # this parameter is only used for the wallabag public demo, it means user won't be able to change the password of the default account demo: false diff --git a/app/config/tests/parameters.yml.dist.pgsql b/app/config/tests/parameters.yml.dist.pgsql index dd29b737..3e1b0b81 100644 --- a/app/config/tests/parameters.yml.dist.pgsql +++ b/app/config/tests/parameters.yml.dist.pgsql @@ -36,5 +36,5 @@ parameters: from_email: no-reply@wallabag.org - # set to true to prevent changing password + # this parameter is only used for the wallabag public demo, it means user won't be able to change the password of the default account demo: false diff --git a/app/config/tests/parameters.yml.dist.sqlite b/app/config/tests/parameters.yml.dist.sqlite index 0e3256e6..eedb8469 100644 --- a/app/config/tests/parameters.yml.dist.sqlite +++ b/app/config/tests/parameters.yml.dist.sqlite @@ -36,5 +36,5 @@ parameters: from_email: no-reply@wallabag.org - # set to true to prevent changing password + # this parameter is only used for the wallabag public demo, it means user won't be able to change the password of the default account demo: false -- cgit v1.2.3 From d8d56448c993bdf4811a193f96e5ff44ed026417 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Thu, 18 Feb 2016 13:31:22 +0100 Subject: add a username for demonstration mode --- app/config/parameters.yml.dist | 3 ++- app/config/tests/parameters.yml.dist.mysql | 3 ++- app/config/tests/parameters.yml.dist.pgsql | 3 ++- app/config/tests/parameters.yml.dist.sqlite | 3 ++- 4 files changed, 8 insertions(+), 4 deletions(-) (limited to 'app') diff --git a/app/config/parameters.yml.dist b/app/config/parameters.yml.dist index b71e5393..5f22b147 100644 --- a/app/config/parameters.yml.dist +++ b/app/config/parameters.yml.dist @@ -46,5 +46,6 @@ parameters: from_email: no-reply@wallabag.org - # this parameter is only used for the wallabag public demo, it means user won't be able to change the password of the default account + # 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 demo: false + demo_username: wallabag diff --git a/app/config/tests/parameters.yml.dist.mysql b/app/config/tests/parameters.yml.dist.mysql index 1e21e26a..126e11eb 100644 --- a/app/config/tests/parameters.yml.dist.mysql +++ b/app/config/tests/parameters.yml.dist.mysql @@ -36,5 +36,6 @@ parameters: from_email: no-reply@wallabag.org - # this parameter is only used for the wallabag public demo, it means user won't be able to change the password of the default account + # 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 demo: false + demo_username: wallabag diff --git a/app/config/tests/parameters.yml.dist.pgsql b/app/config/tests/parameters.yml.dist.pgsql index 3e1b0b81..8fc33a94 100644 --- a/app/config/tests/parameters.yml.dist.pgsql +++ b/app/config/tests/parameters.yml.dist.pgsql @@ -36,5 +36,6 @@ parameters: from_email: no-reply@wallabag.org - # this parameter is only used for the wallabag public demo, it means user won't be able to change the password of the default account + # 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 demo: false + demo_username: wallabag diff --git a/app/config/tests/parameters.yml.dist.sqlite b/app/config/tests/parameters.yml.dist.sqlite index eedb8469..8e3d49b3 100644 --- a/app/config/tests/parameters.yml.dist.sqlite +++ b/app/config/tests/parameters.yml.dist.sqlite @@ -36,5 +36,6 @@ parameters: from_email: no-reply@wallabag.org - # this parameter is only used for the wallabag public demo, it means user won't be able to change the password of the default account + # 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 demo: false + demo_username: wallabag -- cgit v1.2.3 From a4f42c59f0d8a408cf9f5d7971146866530012d3 Mon Sep 17 00:00:00 2001 From: Jeremy Benoist Date: Mon, 22 Feb 2016 11:38:25 +0100 Subject: Use internal config instead for demo --- app/Resources/CraueConfigBundle/translations/CraueConfigBundle.en.yml | 2 ++ app/Resources/CraueConfigBundle/translations/CraueConfigBundle.fr.yml | 2 ++ app/config/parameters.yml.dist | 4 ---- app/config/tests/parameters.yml.dist.mysql | 4 ---- app/config/tests/parameters.yml.dist.pgsql | 4 ---- app/config/tests/parameters.yml.dist.sqlite | 4 ---- 6 files changed, 4 insertions(+), 16 deletions(-) (limited to 'app') 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" piwik_host: Host of your website in Piwik piwik_site_id: ID of your website in Piwik piwik_enabled: Enable Piwik +demo_mode_enabled: "Enable demo mode ? (only used for the wallabag public demo)" +demo_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" piwik_host: URL de votre site dans Piwik piwik_site_id: ID de votre site dans Piwik piwik_enabled: Activer Piwik +demo_mode_enabled: "Activer le mode démo ? (utiliser uniquement pour la démo publique de wallabag)" +demo_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: fosuser_confirmation: true from_email: no-reply@wallabag.org - - # 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 - demo: false - 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: fosuser_confirmation: true from_email: no-reply@wallabag.org - - # 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 - demo: false - 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: fosuser_confirmation: true from_email: no-reply@wallabag.org - - # 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 - demo: false - 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: fosuser_confirmation: true from_email: no-reply@wallabag.org - - # 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 - demo: false - demo_username: wallabag -- cgit v1.2.3