diff options
author | Thomas Citharel <tcit@tcit.fr> | 2016-01-24 18:21:09 +0100 |
---|---|---|
committer | Thomas Citharel <tcit@tcit.fr> | 2016-01-24 18:21:09 +0100 |
commit | b89444ad8bb62ad996e84b3f02c7697e5f37ed19 (patch) | |
tree | b96b8943dcbae23436bc34ad6c95384ce7755aa7 /app | |
parent | 95780f5abe776bdeec3bc78eb3257f7682bb0bf6 (diff) | |
download | wallabag-b89444ad8bb62ad996e84b3f02c7697e5f37ed19.tar.gz wallabag-b89444ad8bb62ad996e84b3f02c7697e5f37ed19.tar.zst wallabag-b89444ad8bb62ad996e84b3f02c7697e5f37ed19.zip |
fix #1620 and introduce new parameters to export
Diffstat (limited to 'app')
-rw-r--r-- | app/config/config.yml | 4 | ||||
-rw-r--r-- | app/config/parameters.yml.dist | 4 | ||||
-rw-r--r-- | app/config/tests/parameters.yml.dist.mysql | 4 | ||||
-rw-r--r-- | app/config/tests/parameters.yml.dist.pgsql | 4 | ||||
-rw-r--r-- | app/config/tests/parameters.yml.dist.sqlite | 4 |
5 files changed, 20 insertions, 0 deletions
diff --git a/app/config/config.yml b/app/config/config.yml index 5d9c7c55..2ec44f99 100644 --- a/app/config/config.yml +++ b/app/config/config.yml | |||
@@ -56,6 +56,10 @@ twig: | |||
56 | export_epub: %export_epub% | 56 | export_epub: %export_epub% |
57 | export_mobi: %export_mobi% | 57 | export_mobi: %export_mobi% |
58 | export_pdf: %export_pdf% | 58 | export_pdf: %export_pdf% |
59 | export_csv: %export_csv% | ||
60 | export_json: %export_json% | ||
61 | export_txt: %export_txt% | ||
62 | export_xml: %export_xml% | ||
59 | version: %app.version% | 63 | version: %app.version% |
60 | twofactor_auth: %twofactor_auth% | 64 | twofactor_auth: %twofactor_auth% |
61 | warning_message: %warning_message% | 65 | warning_message: %warning_message% |
diff --git a/app/config/parameters.yml.dist b/app/config/parameters.yml.dist index 0c0cbff1..e4fcbd74 100644 --- a/app/config/parameters.yml.dist +++ b/app/config/parameters.yml.dist | |||
@@ -61,6 +61,10 @@ parameters: | |||
61 | export_epub: true | 61 | export_epub: true |
62 | export_mobi: true | 62 | export_mobi: true |
63 | export_pdf: true | 63 | export_pdf: true |
64 | export_csv: true | ||
65 | export_json: true | ||
66 | export_txt: true | ||
67 | export_xml: true | ||
64 | wallabag_url: http://v2.wallabag.org | 68 | wallabag_url: http://v2.wallabag.org |
65 | wallabag_support_url: 'https://www.wallabag.org/pages/support.html' | 69 | wallabag_support_url: 'https://www.wallabag.org/pages/support.html' |
66 | 70 | ||
diff --git a/app/config/tests/parameters.yml.dist.mysql b/app/config/tests/parameters.yml.dist.mysql index 88b1d2b4..f902f239 100644 --- a/app/config/tests/parameters.yml.dist.mysql +++ b/app/config/tests/parameters.yml.dist.mysql | |||
@@ -51,6 +51,10 @@ parameters: | |||
51 | export_epub: true | 51 | export_epub: true |
52 | export_mobi: true | 52 | export_mobi: true |
53 | export_pdf: true | 53 | export_pdf: true |
54 | export_csv: true | ||
55 | export_json: true | ||
56 | export_txt: true | ||
57 | export_xml: true | ||
54 | wallabag_url: http://v2.wallabag.org | 58 | wallabag_url: http://v2.wallabag.org |
55 | wallabag_support_url: 'https://www.wallabag.org/pages/support.html' | 59 | wallabag_support_url: 'https://www.wallabag.org/pages/support.html' |
56 | 60 | ||
diff --git a/app/config/tests/parameters.yml.dist.pgsql b/app/config/tests/parameters.yml.dist.pgsql index 3c61142d..76685b14 100644 --- a/app/config/tests/parameters.yml.dist.pgsql +++ b/app/config/tests/parameters.yml.dist.pgsql | |||
@@ -51,6 +51,10 @@ parameters: | |||
51 | export_epub: true | 51 | export_epub: true |
52 | export_mobi: true | 52 | export_mobi: true |
53 | export_pdf: true | 53 | export_pdf: true |
54 | export_csv: true | ||
55 | export_json: true | ||
56 | export_txt: true | ||
57 | export_xml: true | ||
54 | wallabag_url: http://v2.wallabag.org | 58 | wallabag_url: http://v2.wallabag.org |
55 | wallabag_support_url: 'https://www.wallabag.org/pages/support.html' | 59 | wallabag_support_url: 'https://www.wallabag.org/pages/support.html' |
56 | 60 | ||
diff --git a/app/config/tests/parameters.yml.dist.sqlite b/app/config/tests/parameters.yml.dist.sqlite index 2f7699b5..cdafb1b1 100644 --- a/app/config/tests/parameters.yml.dist.sqlite +++ b/app/config/tests/parameters.yml.dist.sqlite | |||
@@ -51,6 +51,10 @@ parameters: | |||
51 | export_epub: true | 51 | export_epub: true |
52 | export_mobi: true | 52 | export_mobi: true |
53 | export_pdf: true | 53 | export_pdf: true |
54 | export_csv: true | ||
55 | export_json: true | ||
56 | export_txt: true | ||
57 | export_xml: true | ||
54 | wallabag_url: http://v2.wallabag.org | 58 | wallabag_url: http://v2.wallabag.org |
55 | wallabag_support_url: 'https://www.wallabag.org/pages/support.html' | 59 | wallabag_support_url: 'https://www.wallabag.org/pages/support.html' |
56 | 60 | ||