aboutsummaryrefslogtreecommitdiffhomepage
path: root/app
diff options
context:
space:
mode:
authorJeremy Benoist <j0k3r@users.noreply.github.com>2015-12-28 13:12:30 +0100
committerJeremy Benoist <j0k3r@users.noreply.github.com>2015-12-28 13:12:30 +0100
commit82899c040258896bff540080602e93aa49a71ae8 (patch)
tree4687785a472b4f5001dc73374247eeca2206da6a /app
parent22c1d29b898f0e33c23a571a8fa6820f76145b69 (diff)
parent3c65dfb735c7ccdee3d8ea420fe295439d53bb13 (diff)
downloadwallabag-82899c040258896bff540080602e93aa49a71ae8.tar.gz
wallabag-82899c040258896bff540080602e93aa49a71ae8.tar.zst
wallabag-82899c040258896bff540080602e93aa49a71ae8.zip
Merge pull request #1488 from wallabag/v2-slug-tags
Slug for tags
Diffstat (limited to 'app')
-rw-r--r--app/AppKernel.php1
-rw-r--r--app/config/config.yml9
2 files changed, 10 insertions, 0 deletions
diff --git a/app/AppKernel.php b/app/AppKernel.php
index 1eacb348..85edc14a 100644
--- a/app/AppKernel.php
+++ b/app/AppKernel.php
@@ -28,6 +28,7 @@ class AppKernel extends Kernel
28 new Lexik\Bundle\FormFilterBundle\LexikFormFilterBundle(), 28 new Lexik\Bundle\FormFilterBundle\LexikFormFilterBundle(),
29 new FOS\OAuthServerBundle\FOSOAuthServerBundle(), 29 new FOS\OAuthServerBundle\FOSOAuthServerBundle(),
30 new Wallabag\UserBundle\WallabagUserBundle(), 30 new Wallabag\UserBundle\WallabagUserBundle(),
31 new Stof\DoctrineExtensionsBundle\StofDoctrineExtensionsBundle(),
31 new Scheb\TwoFactorBundle\SchebTwoFactorBundle(), 32 new Scheb\TwoFactorBundle\SchebTwoFactorBundle(),
32 new KPhoen\RulerZBundle\KPhoenRulerZBundle(), 33 new KPhoen\RulerZBundle\KPhoenRulerZBundle(),
33 ); 34 );
diff --git a/app/config/config.yml b/app/config/config.yml
index 82c5e7c9..f2538c90 100644
--- a/app/config/config.yml
+++ b/app/config/config.yml
@@ -90,6 +90,14 @@ doctrine:
90 default: 90 default:
91 auto_mapping: true 91 auto_mapping: true
92 92
93stof_doctrine_extensions:
94 default_locale: "%locale%"
95 translation_fallback: true
96 orm:
97 default:
98 tree: true
99 sluggable: true
100
93# Swiftmailer Configuration 101# Swiftmailer Configuration
94swiftmailer: 102swiftmailer:
95 transport: "%mailer_transport%" 103 transport: "%mailer_transport%"
@@ -119,6 +127,7 @@ fos_rest:
119nelmio_api_doc: 127nelmio_api_doc:
120 sandbox: 128 sandbox:
121 enabled: false 129 enabled: false
130 name: wallabag API documentation
122 131
123nelmio_cors: 132nelmio_cors:
124 defaults: 133 defaults: