Merge pull request #1417 from wallabag/v2-display-picture

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

diff --git a/app/config/config.yml b/app/config/config.yml
index b751c0bb294eda1e8c34537486dfa1d238bfcadb..f623ab237ca9de664b9045648a4c1b7627226264 100644 (file)
--- a/app/config/config.yml
+++ b/app/config/config.yml
@@ -45,8 +45,12 @@ twig:
         export_mobi: %export_mobi%
         export_pdf: %export_pdf%
         version: %app.version%
+        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
 
 # Assetic Configuration
 assetic:
@@ -75,7 +79,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,14 +140,20 @@ liip_theme:
     load_controllers: false
     themes:
         - baggy
+        - material
     autodetect_theme: wallabag_core.helper.detect_active_theme
 
     path_patterns:
-        app_resource:
-            - %%app_path%%/views/themes/%%current_theme%%/%%template%%
-            - %%app_path%%/views/%%template%%
+        # 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%%
+        # bundle_resource_dir:
+        #     - %%dir%%/views/themes/%%current_theme%%/%%bundle_name%%/%%template%%
+        #     - %%dir%%/views/%%bundle_name%%/%%override_path%%
+
+fos_user:
+    db_driver: orm
+    firewall_name: main
+    user_class: Wallabag\CoreBundle\Entity\User