aboutsummaryrefslogtreecommitdiffhomepage
path: root/app/config
diff options
context:
space:
mode:
authorNicolas LÅ“uillet <nicolas@loeuillet.org>2015-03-02 21:23:19 +0100
committerNicolas LÅ“uillet <nicolas@loeuillet.org>2015-03-02 21:23:19 +0100
commitba7b9d48d407f87690a3fdc199b37714d2a52897 (patch)
treea15611f10d09749e82011e0d51532af3de8cfabd /app/config
parentfca3c757233940cbe4c431e3e05fe74893225fe0 (diff)
parent3e30422cdae3cc45f44c3039c2d38b99121dd9e9 (diff)
downloadwallabag-ba7b9d48d407f87690a3fdc199b37714d2a52897.tar.gz
wallabag-ba7b9d48d407f87690a3fdc199b37714d2a52897.tar.zst
wallabag-ba7b9d48d407f87690a3fdc199b37714d2a52897.zip
Merge pull request #1132 from wallabag/v2-theme
V2 theme
Diffstat (limited to 'app/config')
-rw-r--r--app/config/config.yml16
-rw-r--r--app/config/config_test.yml4
-rw-r--r--app/config/routing.yml6
3 files changed, 22 insertions, 4 deletions
diff --git a/app/config/config.yml b/app/config/config.yml
index 8e7258ea..367aa276 100644
--- a/app/config/config.yml
+++ b/app/config/config.yml
@@ -128,3 +128,19 @@ nelmio_cors:
128 allow_methods: ['POST', 'PUT', 'GET', 'DELETE'] 128 allow_methods: ['POST', 'PUT', 'GET', 'DELETE']
129 max_age: 3600 129 max_age: 3600
130 hosts: ['^api\.'] 130 hosts: ['^api\.']
131
132liip_theme:
133 load_controllers: false
134 themes:
135 - baggy
136 autodetect_theme: wallabag_core.helper.detect_active_theme
137
138 path_patterns:
139 # app_resource:
140 # - %%app_path%%/views/themes/%%current_theme%%/%%template%%
141 # - %%app_path%%/views/%%template%%
142 bundle_resource:
143 - %%bundle_path%%/Resources/views/themes/%%current_theme%%/%%template%%
144 # bundle_resource_dir:
145 # - %%dir%%/views/themes/%%current_theme%%/%%bundle_name%%/%%template%%
146 # - %%dir%%/views/%%bundle_name%%/%%override_path%%
diff --git a/app/config/config_test.yml b/app/config/config_test.yml
index 83e2922a..a6ead1e8 100644
--- a/app/config/config_test.yml
+++ b/app/config/config_test.yml
@@ -17,4 +17,6 @@ swiftmailer:
17 17
18doctrine: 18doctrine:
19 dbal: 19 dbal:
20 path: %kernel.root_dir%/../data/db/poche_test.sqlite 20 driver: pdo_sqlite
21 path: %kernel.root_dir%/../data/db/wallabag_test.sqlite
22 host: localhost
diff --git a/app/config/routing.yml b/app/config/routing.yml
index 20f6979a..d681b39b 100644
--- a/app/config/routing.yml
+++ b/app/config/routing.yml
@@ -19,6 +19,6 @@ logout:
19 path: /logout 19 path: /logout
20 20
21rest : 21rest :
22 type : rest 22 type : rest
23 resource : "routing_rest.yml" 23 resource : "routing_rest.yml"
24 prefix : /api \ No newline at end of file 24 prefix : /api