aboutsummaryrefslogtreecommitdiffhomepage
path: root/app/config
diff options
context:
space:
mode:
authorNicolas LÅ“uillet <nicolas@loeuillet.org>2016-01-24 18:48:28 +0100
committerNicolas LÅ“uillet <nicolas@loeuillet.org>2016-01-24 18:48:28 +0100
commit143869525f0241e159e7d883c40129345f64c0d4 (patch)
tree34ab291a31c65ac71e66faecf755e16b9d027c40 /app/config
parent2532f72c5988e1316e842e50071c2366010f30a1 (diff)
parentb89444ad8bb62ad996e84b3f02c7697e5f37ed19 (diff)
downloadwallabag-143869525f0241e159e7d883c40129345f64c0d4.tar.gz
wallabag-143869525f0241e159e7d883c40129345f64c0d4.tar.zst
wallabag-143869525f0241e159e7d883c40129345f64c0d4.zip
Merge pull request #1629 from wallabag/fixexportformats
fix #1620 and introduce new parameters to export
Diffstat (limited to 'app/config')
-rw-r--r--app/config/config.yml4
-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, 20 insertions, 0 deletions
diff --git a/app/config/config.yml b/app/config/config.yml
index fe94560d..a6cfc67d 100644
--- a/app/config/config.yml
+++ b/app/config/config.yml
@@ -57,6 +57,10 @@ twig:
57 export_epub: %export_epub% 57 export_epub: %export_epub%
58 export_mobi: %export_mobi% 58 export_mobi: %export_mobi%
59 export_pdf: %export_pdf% 59 export_pdf: %export_pdf%
60 export_csv: %export_csv%
61 export_json: %export_json%
62 export_txt: %export_txt%
63 export_xml: %export_xml%
60 version: %app.version% 64 version: %app.version%
61 twofactor_auth: %twofactor_auth% 65 twofactor_auth: %twofactor_auth%
62 warning_message: %warning_message% 66 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