aboutsummaryrefslogtreecommitdiffhomepage
path: root/app
diff options
context:
space:
mode:
Diffstat (limited to 'app')
-rw-r--r--app/AppKernel.php1
-rw-r--r--app/config/config.yml4
-rw-r--r--app/config/parameters.yml.dist3
-rw-r--r--app/config/routing.yml5
-rw-r--r--app/config/tests/parameters.yml.dist.mysql3
-rw-r--r--app/config/tests/parameters.yml.dist.pgsql3
-rw-r--r--app/config/tests/parameters.yml.dist.sqlite3
7 files changed, 22 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/config.yml b/app/config/config.yml
index 8403a458..e50f9b52 100644
--- a/app/config/config.yml
+++ b/app/config/config.yml
@@ -31,6 +31,10 @@ wallabag_core:
31 fr: 'Français' 31 fr: 'Français'
32 de: 'Deutsch' 32 de: 'Deutsch'
33 33
34wallabag_import:
35 allow_mimetypes: ['application/octet-stream', 'application/json', 'text/plain']
36 resource_dir: "%kernel.root_dir%/../web/uploads/import"
37
34# Twig Configuration 38# Twig Configuration
35twig: 39twig:
36 debug: "%kernel.debug%" 40 debug: "%kernel.debug%"
diff --git a/app/config/parameters.yml.dist b/app/config/parameters.yml.dist
index 149179c2..a769bc66 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: xxxxxxxx
diff --git a/app/config/routing.yml b/app/config/routing.yml
index 0f7b61fb..1ca2f677 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: /import
5
1wallabag_api: 6wallabag_api:
2 resource: "@WallabagApiBundle/Resources/config/routing.yml" 7 resource: "@WallabagApiBundle/Resources/config/routing.yml"
3 prefix: / 8 prefix: /
diff --git a/app/config/tests/parameters.yml.dist.mysql b/app/config/tests/parameters.yml.dist.mysql
index 096ad8c7..88b1d2b4 100644
--- a/app/config/tests/parameters.yml.dist.mysql
+++ b/app/config/tests/parameters.yml.dist.mysql
@@ -60,3 +60,6 @@ parameters:
60 language: en_US 60 language: en_US
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: xxxxxxxx
diff --git a/app/config/tests/parameters.yml.dist.pgsql b/app/config/tests/parameters.yml.dist.pgsql
index ca3f6ea2..3c61142d 100644
--- a/app/config/tests/parameters.yml.dist.pgsql
+++ b/app/config/tests/parameters.yml.dist.pgsql
@@ -60,3 +60,6 @@ parameters:
60 language: en_US 60 language: en_US
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: xxxxxxxx
diff --git a/app/config/tests/parameters.yml.dist.sqlite b/app/config/tests/parameters.yml.dist.sqlite
index 92460bcf..2f7699b5 100644
--- a/app/config/tests/parameters.yml.dist.sqlite
+++ b/app/config/tests/parameters.yml.dist.sqlite
@@ -60,3 +60,6 @@ parameters:
60 language: en_US 60 language: en_US
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: xxxxxxxx