Merge pull request #1629 from wallabag/fixexportformats

fix #1620 and introduce new parameters to export

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:
         export_epub: %export_epub%
         export_mobi: %export_mobi%
         export_pdf: %export_pdf%
+        export_csv: %export_csv%
+        export_json: %export_json%
+        export_txt: %export_txt%
+        export_xml: %export_xml%
         version: %app.version%
         twofactor_auth: %twofactor_auth%
         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:
     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'
 
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:
     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'
 
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:
     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'
 
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:
     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'