Update after previous merge

[github/wallabag/wallabag.git] / app / config / config.yml

diff --git a/app/config/config.yml b/app/config/config.yml
index a4d88b94fe3406252d6833db0829eeff0b6bd8d1..4d04d0027897d00693b582ade379ed79e0b7c97d 100644 (file)
--- a/app/config/config.yml
+++ b/app/config/config.yml
@@ -29,6 +29,10 @@ wallabag_core:
     languages:
         en: 'English'
         fr: 'Français'
+        de: 'Deutsch'
+
+wallabag_import:
+    allow_mimetypes: ['application/octet-stream', 'application/json', 'text/plain']
 
 # Twig Configuration
 twig:
@@ -87,9 +91,16 @@ doctrine:
         auto_generate_proxy_classes: "%kernel.debug%"
         entity_managers:
             default:
-                naming_strategy: wallabag_core.doctrine.prefixed_naming_strategy
                 auto_mapping: true
 
+stof_doctrine_extensions:
+    default_locale: "%locale%"
+    translation_fallback: true
+    orm:
+        default:
+            tree: true
+            sluggable: true
+
 # Swiftmailer Configuration
 swiftmailer:
     transport: "%mailer_transport%"
@@ -119,6 +130,7 @@ fos_rest:
 nelmio_api_doc:
     sandbox:
         enabled: false
+    name: wallabag API documentation
 
 nelmio_cors:
     defaults:
@@ -189,3 +201,8 @@ scheb_two_factor:
         sender_email: %twofactor_sender%
         digits: 6
         template: WallabagUserBundle:Authentication:form.html.twig
+        mailer: wallabag_user.auth_code_mailer
+
+kphoen_rulerz:
+    executors:
+        doctrine: true