diff options
author | Jeremy Benoist <j0k3r@users.noreply.github.com> | 2015-08-19 21:27:49 +0200 |
---|---|---|
committer | Jeremy Benoist <j0k3r@users.noreply.github.com> | 2015-08-19 21:27:49 +0200 |
commit | 34437f408c5b7b590aded6795d7ce01bfbfc7711 (patch) | |
tree | 1fbcff3f6f74c4aef331b8bbd00476850d179329 /app | |
parent | ab4aeb8bd83d0dff91f42543adec5245db6809a8 (diff) | |
parent | fdab81e910f65babd1945e67c74b8bb541bcbfb3 (diff) | |
download | wallabag-34437f408c5b7b590aded6795d7ce01bfbfc7711.tar.gz wallabag-34437f408c5b7b590aded6795d7ce01bfbfc7711.tar.zst wallabag-34437f408c5b7b590aded6795d7ce01bfbfc7711.zip |
Merge pull request #1369 from wallabag/v2-bottombar
fix #1332: bottom bar to display message
Diffstat (limited to 'app')
-rw-r--r-- | app/config/config.yml | 1 | ||||
-rw-r--r-- | app/config/parameters.yml.dist | 4 |
2 files changed, 5 insertions, 0 deletions
diff --git a/app/config/config.yml b/app/config/config.yml index 1f5f7441..5b26b06f 100644 --- a/app/config/config.yml +++ b/app/config/config.yml | |||
@@ -45,6 +45,7 @@ twig: | |||
45 | export_mobi: %export_mobi% | 45 | export_mobi: %export_mobi% |
46 | export_pdf: %export_pdf% | 46 | export_pdf: %export_pdf% |
47 | version: %app.version% | 47 | version: %app.version% |
48 | warning_message: %warning_message% | ||
48 | paypal_url: "https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=9UBA65LG3FX9Y&lc=gb" | 49 | paypal_url: "https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=9UBA65LG3FX9Y&lc=gb" |
49 | flattr_url: "https://flattr.com/thing/1265480" | 50 | flattr_url: "https://flattr.com/thing/1265480" |
50 | form: | 51 | form: |
diff --git a/app/config/parameters.yml.dist b/app/config/parameters.yml.dist index 97933ec3..b3947207 100644 --- a/app/config/parameters.yml.dist +++ b/app/config/parameters.yml.dist | |||
@@ -22,6 +22,10 @@ parameters: | |||
22 | # wallabag misc | 22 | # wallabag misc |
23 | app.version: 2.0.0-alpha | 23 | app.version: 2.0.0-alpha |
24 | 24 | ||
25 | # message to display at the bottom of the page | ||
26 | warning_message: > | ||
27 | 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> | ||
28 | |||
25 | download_pictures: false # if true, pictures will be stored into data/assets for each article | 29 | download_pictures: false # if true, pictures will be stored into data/assets for each article |
26 | 30 | ||
27 | # Entry view | 31 | # Entry view |