aboutsummaryrefslogtreecommitdiffhomepage
path: root/app/config
diff options
context:
space:
mode:
authorNicolas LÅ“uillet <nicolas@loeuillet.org>2016-06-23 09:25:01 +0200
committerGitHub <noreply@github.com>2016-06-23 09:25:01 +0200
commit49e2854d5c15bbce3f24f91da34450e8f209295b (patch)
treef5aa95445549cc151e86f144b40464eecee28cf7 /app/config
parent4eaaa27bb5b9a5725b26471a39548d764fc9cd0a (diff)
parent496cfdc0172fd55cb555f74b64704c8f50c71b77 (diff)
downloadwallabag-49e2854d5c15bbce3f24f91da34450e8f209295b.tar.gz
wallabag-49e2854d5c15bbce3f24f91da34450e8f209295b.tar.zst
wallabag-49e2854d5c15bbce3f24f91da34450e8f209295b.zip
Merge pull request #2142 from wallabag/v2-use-npm
Manage assets through npm
Diffstat (limited to 'app/config')
-rw-r--r--app/config/config.yml13
-rw-r--r--app/config/config_dev.yml3
2 files changed, 0 insertions, 16 deletions
diff --git a/app/config/config.yml b/app/config/config.yml
index ea028d85..c371cf73 100644
--- a/app/config/config.yml
+++ b/app/config/config.yml
@@ -59,19 +59,6 @@ twig:
59 form_themes: 59 form_themes:
60 - "LexikFormFilterBundle:Form:form_div_layout.html.twig" 60 - "LexikFormFilterBundle:Form:form_div_layout.html.twig"
61 61
62# Assetic Configuration
63assetic:
64 debug: "%kernel.debug%"
65 use_controller: false
66 bundles: [ ]
67 #java: /usr/bin/java
68 filters:
69 cssrewrite: ~
70 #closure:
71 # jar: "%kernel.root_dir%/Resources/java/compiler.jar"
72 #yui_css:
73 # jar: "%kernel.root_dir%/Resources/java/yuicompressor-2.4.7.jar"
74
75# Doctrine Configuration 62# Doctrine Configuration
76doctrine: 63doctrine:
77 dbal: 64 dbal:
diff --git a/app/config/config_dev.yml b/app/config/config_dev.yml
index 2813e369..410d5a6c 100644
--- a/app/config/config_dev.yml
+++ b/app/config/config_dev.yml
@@ -34,9 +34,6 @@ monolog:
34 VERBOSITY_DEBUG: DEBUG 34 VERBOSITY_DEBUG: DEBUG
35 channels: [doctrine] 35 channels: [doctrine]
36 36
37assetic:
38 use_controller: true
39
40swiftmailer: 37swiftmailer:
41 # see http://mailcatcher.me/ 38 # see http://mailcatcher.me/
42 transport: smtp 39 transport: smtp