6 files changed, 27 insertions, 7 deletions

diff --git a/app/config/config.yml b/app/config/config.yml
index 23262469..a6cfc67d 100644
--- a/app/config/config.yml
+++ b/app/config/config.yml
@@ -32,6 +32,7 @@ wallabag_core:
         en: 'English'
         fr: 'Français'
         de: 'Deutsch'
+        tr: 'Türkçe'
 
 wallabag_import:
     allow_mimetypes: ['application/octet-stream', 'application/json', 'text/plain']
@@ -56,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%
@@ -181,7 +186,9 @@ fos_user:
     registration:
         confirmation:
             enabled: true
-
+    from_email:
+        address:        %from_email%
+        sender_name:    wallabag
 fos_oauth_server:
     db_driver:           orm
     client_class:        Wallabag\ApiBundle\Entity\Client
diff --git a/app/config/config_dev.yml b/app/config/config_dev.yml
index 6b077fdb..2813e369 100644
--- a/app/config/config_dev.yml
+++ b/app/config/config_dev.yml
@@ -42,6 +42,3 @@ swiftmailer:
     transport: smtp
     host: 'localhost'
     port: 1025
-    username: null
-    password: null
-
diff --git a/app/config/parameters.yml.dist b/app/config/parameters.yml.dist
index 0c0cbff1..ac4a4cc8 100644
--- a/app/config/parameters.yml.dist
+++ b/app/config/parameters.yml.dist
@@ -35,7 +35,7 @@ parameters:
     locale:            en
 
     # A secret key that's used to generate certain security-related tokens
-    secret:            ThisTokenIsNotSoSecretChangeIt
+    secret:            ovmpmAWXRCabNlMgzlzFXDYmCFfzGv
 
     # wallabag misc
     app.version: 2.0.0-alpha
@@ -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..3b9262bb 100644
--- a/app/config/tests/parameters.yml.dist.mysql
+++ b/app/config/tests/parameters.yml.dist.mysql
@@ -12,7 +12,7 @@ parameters:
     test_database_driver: pdo_mysql
     test_database_host: localhost
     test_database_port: 3306
-    test_database_name: wallabag
+    test_database_name: wallabag_test
     test_database_user: root
     test_database_password: ~
     test_database_path: ~
@@ -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..a5aef028 100644
--- a/app/config/tests/parameters.yml.dist.pgsql
+++ b/app/config/tests/parameters.yml.dist.pgsql
@@ -12,7 +12,7 @@ parameters:
     test_database_driver: pdo_pgsql
     test_database_host: localhost
     test_database_port:
-    test_database_name: wallabag
+    test_database_name: wallabag_test
     test_database_user: travis
     test_database_password: ~
     test_database_path: ~
@@ -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'