aboutsummaryrefslogtreecommitdiffhomepage
path: root/app/config
diff options
context:
space:
mode:
authorJeremy Benoist <jeremy.benoist@gmail.com>2016-01-20 20:00:12 +0100
committerJeremy Benoist <jeremy.benoist@gmail.com>2016-01-31 14:37:19 +0100
commit26975877d76a99f6a3153d3d3b4fc6c9f32687bc (patch)
tree591044fe0abb5cd1213ea53cc89ee4b7ef892c93 /app/config
parentbc78968764c741019a6b866ad434678cdbecbba4 (diff)
downloadwallabag-26975877d76a99f6a3153d3d3b4fc6c9f32687bc.tar.gz
wallabag-26975877d76a99f6a3153d3d3b4fc6c9f32687bc.tar.zst
wallabag-26975877d76a99f6a3153d3d3b4fc6c9f32687bc.zip
Always include warning message
We'll remove it later, on the stable release
Diffstat (limited to 'app/config')
-rw-r--r--app/config/config.yml1
-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
5 files changed, 0 insertions, 17 deletions
diff --git a/app/config/config.yml b/app/config/config.yml
index 943365e8..58e1dd66 100644
--- a/app/config/config.yml
+++ b/app/config/config.yml
@@ -67,7 +67,6 @@ twig:
67 export_xml: %export_xml% 67 export_xml: %export_xml%
68 version: %app.version% 68 version: %app.version%
69 twofactor_auth: %twofactor_auth% 69 twofactor_auth: %twofactor_auth%
70 warning_message: %warning_message%
71 paypal_url: "https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=9UBA65LG3FX9Y&lc=gb" 70 paypal_url: "https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=9UBA65LG3FX9Y&lc=gb"
72 form_themes: 71 form_themes:
73 - "LexikFormFilterBundle:Form:form_div_layout.html.twig" 72 - "LexikFormFilterBundle:Form:form_div_layout.html.twig"
diff --git a/app/config/parameters.yml.dist b/app/config/parameters.yml.dist
index f9555676..52d26cb4 100644
--- a/app/config/parameters.yml.dist
+++ b/app/config/parameters.yml.dist
@@ -42,10 +42,6 @@ parameters:
42 twofactor_auth: true 42 twofactor_auth: true
43 twofactor_sender: no-reply@wallabag.org 43 twofactor_sender: no-reply@wallabag.org
44 44
45 # message to display at the bottom of the page
46 warning_message: >
47 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>
48
49 download_pictures: false # if true, pictures will be stored into data/assets for each article 45 download_pictures: false # if true, pictures will be stored into data/assets for each article
50 46
51 # Entry view 47 # Entry view
diff --git a/app/config/tests/parameters.yml.dist.mysql b/app/config/tests/parameters.yml.dist.mysql
index e0e92760..073f6c27 100644
--- a/app/config/tests/parameters.yml.dist.mysql
+++ b/app/config/tests/parameters.yml.dist.mysql
@@ -32,10 +32,6 @@ parameters:
32 twofactor_auth: true 32 twofactor_auth: true
33 twofactor_sender: no-reply@wallabag.org 33 twofactor_sender: no-reply@wallabag.org
34 34
35 # message to display at the bottom of the page
36 warning_message: >
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
39 download_pictures: false # if true, pictures will be stored into data/assets for each article 35 download_pictures: false # if true, pictures will be stored into data/assets for each article
40 36
41 # Entry view 37 # Entry view
diff --git a/app/config/tests/parameters.yml.dist.pgsql b/app/config/tests/parameters.yml.dist.pgsql
index e6e7636c..24a1818a 100644
--- a/app/config/tests/parameters.yml.dist.pgsql
+++ b/app/config/tests/parameters.yml.dist.pgsql
@@ -32,10 +32,6 @@ parameters:
32 twofactor_auth: true 32 twofactor_auth: true
33 twofactor_sender: no-reply@wallabag.org 33 twofactor_sender: no-reply@wallabag.org
34 34
35 # message to display at the bottom of the page
36 warning_message: >
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
39 download_pictures: false # if true, pictures will be stored into data/assets for each article 35 download_pictures: false # if true, pictures will be stored into data/assets for each article
40 36
41 # Entry view 37 # Entry view
diff --git a/app/config/tests/parameters.yml.dist.sqlite b/app/config/tests/parameters.yml.dist.sqlite
index c47392a3..c739f89b 100644
--- a/app/config/tests/parameters.yml.dist.sqlite
+++ b/app/config/tests/parameters.yml.dist.sqlite
@@ -32,10 +32,6 @@ parameters:
32 twofactor_auth: true 32 twofactor_auth: true
33 twofactor_sender: no-reply@wallabag.org 33 twofactor_sender: no-reply@wallabag.org
34 34
35 # message to display at the bottom of the page
36 warning_message: >
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
39 download_pictures: false # if true, pictures will be stored into data/assets for each article 35 download_pictures: false # if true, pictures will be stored into data/assets for each article
40 36
41 # Entry view 37 # Entry view