3 files changed, 9 insertions, 105 deletions
diff --git a/app/config/tests/parameters.yml.dist.mysql b/app/config/tests/parameters.yml.dist.mysql
index 3b9262bb..1951f021 100644
--- a/app/config/tests/parameters.yml.dist.mysql
+++ b/app/config/tests/parameters.yml.dist.mysql
@@ -27,43 +27,11 @@ parameters:
    # A secret key that's used to generate certain security-related tokens
    secret:            ThisTokenIsNotSoSecretChangeIt
-    # wallabag misc
+    # two factor stuff
-    app.version: 2.0.0-alpha
    twofactor_auth: true
    twofactor_sender: no-reply@wallabag.org
-    # message to display at the bottom of the page
+    # fosuser stuff
-    warning_message: >
+    fosuser_confirmation: true
-        You're trying wallabag v2, which is in alpha version. If you find a bug, please have a look to <a href="https://github.com/wallabag/wallabag/issues">our issues list</a> and <a href="https://github.com/wallabag/wallabag/issues/new">open a new if necessary</a>
-    download_pictures: false # if true, pictures will be stored into data/assets for each article
-    # Entry view
-    share_twitter: true
-    share_mail: true
-    share_shaarli: true
-    shaarli_url: http://myshaarli.com
-    share_diaspora: true
-    diaspora_url: http://diasporapod.com
-    flattr: true
-    carrot: true
-    show_printlink: true
-    export_epub: true
-    export_mobi: true
-    export_pdf: true
-    export_csv: true
-    export_json: true
-    export_txt: true
-    export_xml: true
-    wallabag_url: http://v2.wallabag.org
-    wallabag_support_url: 'https://www.wallabag.org/pages/support.html'
-    # default user config
-    items_on_page: 12
-    theme: material
-    language: en_US
    from_email: no-reply@wallabag.org
-    rss_limit: 50
-    # pocket import
-    pocket_consumer_key: xxxxxxxx
diff --git a/app/config/tests/parameters.yml.dist.pgsql b/app/config/tests/parameters.yml.dist.pgsql
index a5aef028..36ad6cde 100644
--- a/app/config/tests/parameters.yml.dist.pgsql
+++ b/app/config/tests/parameters.yml.dist.pgsql
@@ -27,43 +27,11 @@ parameters:
    # A secret key that's used to generate certain security-related tokens
    secret:            ThisTokenIsNotSoSecretChangeIt
-    # wallabag misc
+    # two factor stuff
-    app.version: 2.0.0-alpha
    twofactor_auth: true
    twofactor_sender: no-reply@wallabag.org
-    # message to display at the bottom of the page
+    # fosuser stuff
-    warning_message: >
+    fosuser_confirmation: true
-        You're trying wallabag v2, which is in alpha version. If you find a bug, please have a look to <a href="https://github.com/wallabag/wallabag/issues">our issues list</a> and <a href="https://github.com/wallabag/wallabag/issues/new">open a new if necessary</a>
-    download_pictures: false # if true, pictures will be stored into data/assets for each article
-    # Entry view
-    share_twitter: true
-    share_mail: true
-    share_shaarli: true
-    shaarli_url: http://myshaarli.com
-    share_diaspora: true
-    diaspora_url: http://diasporapod.com
-    flattr: true
-    carrot: true
-    show_printlink: true
-    export_epub: true
-    export_mobi: true
-    export_pdf: true
-    export_csv: true
-    export_json: true
-    export_txt: true
-    export_xml: true
-    wallabag_url: http://v2.wallabag.org
-    wallabag_support_url: 'https://www.wallabag.org/pages/support.html'
-    # default user config
-    items_on_page: 12
-    theme: material
-    language: en_US
    from_email: no-reply@wallabag.org
-    rss_limit: 50
-    # pocket import
-    pocket_consumer_key: xxxxxxxx
diff --git a/app/config/tests/parameters.yml.dist.sqlite b/app/config/tests/parameters.yml.dist.sqlite
index cdafb1b1..6564014a 100644
--- a/app/config/tests/parameters.yml.dist.sqlite
+++ b/app/config/tests/parameters.yml.dist.sqlite
@@ -27,43 +27,11 @@ parameters:
    # A secret key that's used to generate certain security-related tokens
    secret:            ThisTokenIsNotSoSecretChangeIt
-    # wallabag misc
+    # two factor stuff
-    app.version: 2.0.0-alpha
    twofactor_auth: true
    twofactor_sender: no-reply@wallabag.org
-    # message to display at the bottom of the page
+    # fosuser stuff
-    warning_message: >
+    fosuser_confirmation: true
-        You're trying wallabag v2, which is in alpha version. If you find a bug, please have a look to <a href="https://github.com/wallabag/wallabag/issues">our issues list</a> and <a href="https://github.com/wallabag/wallabag/issues/new">open a new if necessary</a>
-    download_pictures: false # if true, pictures will be stored into data/assets for each article
-    # Entry view
-    share_twitter: true
-    share_mail: true
-    share_shaarli: true
-    shaarli_url: http://myshaarli.com
-    share_diaspora: true
-    diaspora_url: http://diasporapod.com
-    flattr: true
-    carrot: true
-    show_printlink: true
-    export_epub: true
-    export_mobi: true
-    export_pdf: true
-    export_csv: true
-    export_json: true
-    export_txt: true
-    export_xml: true
-    wallabag_url: http://v2.wallabag.org
-    wallabag_support_url: 'https://www.wallabag.org/pages/support.html'
-    # default user config
-    items_on_page: 12
-    theme: material
-    language: en_US
    from_email: no-reply@wallabag.org
-    rss_limit: 50
-    # pocket import
-    pocket_consumer_key: xxxxxxxx

diff --git a/app/config/tests/parameters.yml.dist.mysql b/app/config/tests/parameters.yml.dist.mysql index 3b9262bb..1951f021 100644 --- a/app/config/tests/parameters.yml.dist.mysql +++ b/app/config/tests/parameters.yml.dist.mysql
@@ -27,43 +27,11 @@ parameters:
27	# A secret key that's used to generate certain security-related tokens	27	# A secret key that's used to generate certain security-related tokens
28	secret: ThisTokenIsNotSoSecretChangeIt	28	secret: ThisTokenIsNotSoSecretChangeIt
29		29
30	# wallabag misc	30	# two factor stuff
31	app.version: 2.0.0-alpha
32	twofactor_auth: true	31	twofactor_auth: true
33	twofactor_sender: no-reply@wallabag.org	32	twofactor_sender: no-reply@wallabag.org
34		33
35	# message to display at the bottom of the page	34	# fosuser stuff
36	warning_message: >	35	fosuser_confirmation: true
37	You're trying wallabag v2, which is in alpha version. If you find a bug, please have a look to <a href="https://github.com/wallabag/wallabag/issues">our issues list</a> and <a href="https://github.com/wallabag/wallabag/issues/new">open a new if necessary</a>
38		36
39	download_pictures: false # if true, pictures will be stored into data/assets for each article
40
41	# Entry view
42	share_twitter: true
43	share_mail: true
44	share_shaarli: true
45	shaarli_url: http://myshaarli.com
46	share_diaspora: true
47	diaspora_url: http://diasporapod.com
48	flattr: true
49	carrot: true
50	show_printlink: true
51	export_epub: true
52	export_mobi: true
53	export_pdf: true
54	export_csv: true
55	export_json: true
56	export_txt: true
57	export_xml: true
58	wallabag_url: http://v2.wallabag.org
59	wallabag_support_url: 'https://www.wallabag.org/pages/support.html'
60
61	# default user config
62	items_on_page: 12
63	theme: material
64	language: en_US
65	from_email: no-reply@wallabag.org	37	from_email: no-reply@wallabag.org
66	rss_limit: 50
67
68	# pocket import
69	pocket_consumer_key: xxxxxxxx


diff --git a/app/config/tests/parameters.yml.dist.pgsql b/app/config/tests/parameters.yml.dist.pgsql index a5aef028..36ad6cde 100644 --- a/app/config/tests/parameters.yml.dist.pgsql +++ b/app/config/tests/parameters.yml.dist.pgsql
@@ -27,43 +27,11 @@ parameters:
27	# A secret key that's used to generate certain security-related tokens	27	# A secret key that's used to generate certain security-related tokens
28	secret: ThisTokenIsNotSoSecretChangeIt	28	secret: ThisTokenIsNotSoSecretChangeIt
29		29
30	# wallabag misc	30	# two factor stuff
31	app.version: 2.0.0-alpha
32	twofactor_auth: true	31	twofactor_auth: true
33	twofactor_sender: no-reply@wallabag.org	32	twofactor_sender: no-reply@wallabag.org
34		33
35	# message to display at the bottom of the page	34	# fosuser stuff
36	warning_message: >	35	fosuser_confirmation: true
37	You're trying wallabag v2, which is in alpha version. If you find a bug, please have a look to <a href="https://github.com/wallabag/wallabag/issues">our issues list</a> and <a href="https://github.com/wallabag/wallabag/issues/new">open a new if necessary</a>
38		36
39	download_pictures: false # if true, pictures will be stored into data/assets for each article
40
41	# Entry view
42	share_twitter: true
43	share_mail: true
44	share_shaarli: true
45	shaarli_url: http://myshaarli.com
46	share_diaspora: true
47	diaspora_url: http://diasporapod.com
48	flattr: true
49	carrot: true
50	show_printlink: true
51	export_epub: true
52	export_mobi: true
53	export_pdf: true
54	export_csv: true
55	export_json: true
56	export_txt: true
57	export_xml: true
58	wallabag_url: http://v2.wallabag.org
59	wallabag_support_url: 'https://www.wallabag.org/pages/support.html'
60
61	# default user config
62	items_on_page: 12
63	theme: material
64	language: en_US
65	from_email: no-reply@wallabag.org	37	from_email: no-reply@wallabag.org
66	rss_limit: 50
67
68	# pocket import
69	pocket_consumer_key: xxxxxxxx


diff --git a/app/config/tests/parameters.yml.dist.sqlite b/app/config/tests/parameters.yml.dist.sqlite index cdafb1b1..6564014a 100644 --- a/app/config/tests/parameters.yml.dist.sqlite +++ b/app/config/tests/parameters.yml.dist.sqlite
@@ -27,43 +27,11 @@ parameters:
27	# A secret key that's used to generate certain security-related tokens	27	# A secret key that's used to generate certain security-related tokens
28	secret: ThisTokenIsNotSoSecretChangeIt	28	secret: ThisTokenIsNotSoSecretChangeIt
29		29
30	# wallabag misc	30	# two factor stuff
31	app.version: 2.0.0-alpha
32	twofactor_auth: true	31	twofactor_auth: true
33	twofactor_sender: no-reply@wallabag.org	32	twofactor_sender: no-reply@wallabag.org
34		33
35	# message to display at the bottom of the page	34	# fosuser stuff
36	warning_message: >	35	fosuser_confirmation: true
37	You're trying wallabag v2, which is in alpha version. If you find a bug, please have a look to <a href="https://github.com/wallabag/wallabag/issues">our issues list</a> and <a href="https://github.com/wallabag/wallabag/issues/new">open a new if necessary</a>
38		36
39	download_pictures: false # if true, pictures will be stored into data/assets for each article
40
41	# Entry view
42	share_twitter: true
43	share_mail: true
44	share_shaarli: true
45	shaarli_url: http://myshaarli.com
46	share_diaspora: true
47	diaspora_url: http://diasporapod.com
48	flattr: true
49	carrot: true
50	show_printlink: true
51	export_epub: true
52	export_mobi: true
53	export_pdf: true
54	export_csv: true
55	export_json: true
56	export_txt: true
57	export_xml: true
58	wallabag_url: http://v2.wallabag.org
59	wallabag_support_url: 'https://www.wallabag.org/pages/support.html'
60
61	# default user config
62	items_on_page: 12
63	theme: material
64	language: en_US
65	from_email: no-reply@wallabag.org	37	from_email: no-reply@wallabag.org
66	rss_limit: 50
67
68	# pocket import
69	pocket_consumer_key: xxxxxxxx