X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=app%2Fconfig%2Fconfig.yml;h=a6cfc67d63e118ac363290b5789120a619c36f16;hb=0796532460b90cb3ef7ecbf86db6d0adc07c88b4;hp=88b1a59fc910b9c30e4addc40bc17b21f77895b3;hpb=dda57bb9443817e3a080d5d25343f5a7e15dd14f;p=github%2Fwallabag%2Fwallabag.git

diff --git a/app/config/config.yml b/app/config/config.yml
index 88b1a59f..a6cfc67d 100644
--- a/app/config/config.yml
+++ b/app/config/config.yml
@@ -21,25 +21,22 @@ framework:
     trusted_proxies: ~
     session:
         # handler_id set to null will use default session handler from php.ini
-        handler_id:  ~
+        handler_id:  session.handler.native_file
+        save_path:   "%kernel.root_dir%/../var/sessions/%kernel.environment%"
     fragments:       ~
     http_method_override: true
+    assets: ~
 
 wallabag_core:
     languages:
         en: 'English'
         fr: 'Français'
         de: 'Deutsch'
-    import:
-        allow_mimetypes: ['application/octet-stream', 'application/json', 'text/plain']
+        tr: 'Türkçe'
 
 wallabag_import:
-    importers:
-        pocket_urls:
-            oauth_request: https://getpocket.com/v3/oauth/request
-            auth_authorize: https://getpocket.com/auth/authorize
-            oauth_authorize: https://getpocket.com/v3/oauth/authorize
-            get: https://getpocket.com/v3/get
+    allow_mimetypes: ['application/octet-stream', 'application/json', 'text/plain']
+    resource_dir: "%kernel.root_dir%/../web/uploads/import"
 
 # Twig Configuration
 twig:
@@ -60,14 +57,16 @@ 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%
         paypal_url: "https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=9UBA65LG3FX9Y&lc=gb"
-        flattr_url: "https://flattr.com/thing/1265480"
-    form:
-        resources:
-            - LexikFormFilterBundle:Form:form_div_layout.html.twig
+    form_themes:
+        - "LexikFormFilterBundle:Form:form_div_layout.html.twig"
 
 # Assetic Configuration
 assetic:
@@ -108,6 +107,12 @@ stof_doctrine_extensions:
             tree: true
             sluggable: true
 
+doctrine_migrations:
+    dir_name: "%kernel.root_dir%/DoctrineMigrations"
+    namespace: Application\Migrations
+    table_name: migration_versions
+    name: Application Migrations
+
 # Swiftmailer Configuration
 swiftmailer:
     transport: "%mailer_transport%"
@@ -171,14 +176,8 @@ liip_theme:
     autodetect_theme: wallabag_core.helper.detect_active_theme
 
     path_patterns:
-        # app_resource:
-        #     - %%app_path%%/views/themes/%%current_theme%%/%%template%%
-        #     - %%app_path%%/views/%%template%%
         bundle_resource:
             - %%bundle_path%%/Resources/views/themes/%%current_theme%%/%%template%%
-        # bundle_resource_dir:
-        #     - %%dir%%/views/themes/%%current_theme%%/%%bundle_name%%/%%template%%
-        #     - %%dir%%/views/%%bundle_name%%/%%override_path%%
 
 fos_user:
     db_driver: orm
@@ -187,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