Merge pull request #1297 from wallabag/v2-estimated-time

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

diff --git a/app/config/config.yml b/app/config/config.yml
index 367aa2763537dff1868576d823b42cbc014c06d3..1f5f744104617c669411600d16a2cb43ea0d8ae5 100644 (file)
--- a/app/config/config.yml
+++ b/app/config/config.yml
@@ -47,7 +47,9 @@ twig:
         version: %app.version%
         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
 # Assetic Configuration
 assetic:
     debug:          "%kernel.debug%"
@@ -75,7 +77,10 @@ doctrine:
 
     orm:
         auto_generate_proxy_classes: "%kernel.debug%"
-        auto_mapping: true
+        entity_managers:
+            default:
+                naming_strategy: wallabag_core.doctrine.prefixed_naming_strategy
+                auto_mapping: true
 
 # Swiftmailer Configuration
 swiftmailer:
@@ -133,6 +138,7 @@ liip_theme:
     load_controllers: false
     themes:
         - baggy
+        - material
     autodetect_theme: wallabag_core.helper.detect_active_theme
 
     path_patterns: