aboutsummaryrefslogtreecommitdiffhomepage
path: root/app/config/config.yml
diff options
context:
space:
mode:
authorNicolas LÅ“uillet <nicolas@loeuillet.org>2016-01-15 15:38:31 +0100
committerNicolas LÅ“uillet <nicolas@loeuillet.org>2016-01-15 15:38:31 +0100
commit1930c19d8214c05ceefac5ac011a6b6e7e4a983d (patch)
tree8f07ffa139c7c2e883a560ef7dbb35a76adfb8dd /app/config/config.yml
parent790573d45899504bdecd2573c8f64018e23b139e (diff)
parent131eaa3e94ace8d75d6218e5c7c3aa58d5bb5009 (diff)
downloadwallabag-1930c19d8214c05ceefac5ac011a6b6e7e4a983d.tar.gz
wallabag-1930c19d8214c05ceefac5ac011a6b6e7e4a983d.tar.zst
wallabag-1930c19d8214c05ceefac5ac011a6b6e7e4a983d.zip
Merge pull request #1524 from wallabag/sf2.8
Upgrade to Symfony 3.0
Diffstat (limited to 'app/config/config.yml')
-rw-r--r--app/config/config.yml15
1 files changed, 5 insertions, 10 deletions
diff --git a/app/config/config.yml b/app/config/config.yml
index 8e9369c2..19e7155d 100644
--- a/app/config/config.yml
+++ b/app/config/config.yml
@@ -21,9 +21,11 @@ framework:
21 trusted_proxies: ~ 21 trusted_proxies: ~
22 session: 22 session:
23 # handler_id set to null will use default session handler from php.ini 23 # handler_id set to null will use default session handler from php.ini
24 handler_id: ~ 24 handler_id: session.handler.native_file
25 save_path: "%kernel.root_dir%/../var/sessions/%kernel.environment%"
25 fragments: ~ 26 fragments: ~
26 http_method_override: true 27 http_method_override: true
28 assets: ~
27 29
28wallabag_core: 30wallabag_core:
29 languages: 31 languages:
@@ -59,9 +61,8 @@ twig:
59 warning_message: %warning_message% 61 warning_message: %warning_message%
60 paypal_url: "https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=9UBA65LG3FX9Y&lc=gb" 62 paypal_url: "https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=9UBA65LG3FX9Y&lc=gb"
61 flattr_url: "https://flattr.com/thing/1265480" 63 flattr_url: "https://flattr.com/thing/1265480"
62 form: 64 form_themes:
63 resources: 65 - "LexikFormFilterBundle:Form:form_div_layout.html.twig"
64 - LexikFormFilterBundle:Form:form_div_layout.html.twig
65 66
66# Assetic Configuration 67# Assetic Configuration
67assetic: 68assetic:
@@ -171,14 +172,8 @@ liip_theme:
171 autodetect_theme: wallabag_core.helper.detect_active_theme 172 autodetect_theme: wallabag_core.helper.detect_active_theme
172 173
173 path_patterns: 174 path_patterns:
174 # app_resource:
175 # - %%app_path%%/views/themes/%%current_theme%%/%%template%%
176 # - %%app_path%%/views/%%template%%
177 bundle_resource: 175 bundle_resource:
178 - %%bundle_path%%/Resources/views/themes/%%current_theme%%/%%template%% 176 - %%bundle_path%%/Resources/views/themes/%%current_theme%%/%%template%%
179 # bundle_resource_dir:
180 # - %%dir%%/views/themes/%%current_theme%%/%%bundle_name%%/%%template%%
181 # - %%dir%%/views/%%bundle_name%%/%%override_path%%
182 177
183fos_user: 178fos_user:
184 db_driver: orm 179 db_driver: orm