aboutsummaryrefslogtreecommitdiffhomepage
path: root/app
diff options
context:
space:
mode:
Diffstat (limited to 'app')
-rw-r--r--app/AppKernel.php1
-rw-r--r--app/config/parameters.yml.dist3
-rw-r--r--app/config/routing.yml5
3 files changed, 9 insertions, 0 deletions
diff --git a/app/AppKernel.php b/app/AppKernel.php
index 85edc14a..93b0201a 100644
--- a/app/AppKernel.php
+++ b/app/AppKernel.php
@@ -31,6 +31,7 @@ class AppKernel extends Kernel
31 new Stof\DoctrineExtensionsBundle\StofDoctrineExtensionsBundle(), 31 new Stof\DoctrineExtensionsBundle\StofDoctrineExtensionsBundle(),
32 new Scheb\TwoFactorBundle\SchebTwoFactorBundle(), 32 new Scheb\TwoFactorBundle\SchebTwoFactorBundle(),
33 new KPhoen\RulerZBundle\KPhoenRulerZBundle(), 33 new KPhoen\RulerZBundle\KPhoenRulerZBundle(),
34 new Wallabag\ImportBundle\WallabagImportBundle(),
34 ); 35 );
35 36
36 if (in_array($this->getEnvironment(), array('dev', 'test'))) { 37 if (in_array($this->getEnvironment(), array('dev', 'test'))) {
diff --git a/app/config/parameters.yml.dist b/app/config/parameters.yml.dist
index 149179c2..c0d57aa1 100644
--- a/app/config/parameters.yml.dist
+++ b/app/config/parameters.yml.dist
@@ -60,3 +60,6 @@ parameters:
60 language: en 60 language: en
61 from_email: no-reply@wallabag.org 61 from_email: no-reply@wallabag.org
62 rss_limit: 50 62 rss_limit: 50
63
64 # pocket import
65 pocket_consumer_key: 47025-85ed5e6cfd72abbb49d12db1
diff --git a/app/config/routing.yml b/app/config/routing.yml
index 0f7b61fb..91a5705f 100644
--- a/app/config/routing.yml
+++ b/app/config/routing.yml
@@ -1,3 +1,8 @@
1wallabag_import:
2 resource: "@WallabagImportBundle/Controller/"
3 type: annotation
4 prefix: /
5
1wallabag_api: 6wallabag_api:
2 resource: "@WallabagApiBundle/Resources/config/routing.yml" 7 resource: "@WallabagApiBundle/Resources/config/routing.yml"
3 prefix: / 8 prefix: /