Merge pull request #1612 from wallabag/v2-settings-page

Settings page
2016-02-04 15:59:57 +01:00
parent 74f39b0952 79b9e49d94
commit e008c037f5
40 changed files with 510 additions and 245 deletions
--- a/src/Wallabag/ImportBundle/Resources/config/services.yml
+++ b/src/Wallabag/ImportBundle/Resources/config/services.yml
@ -17,7 +17,7 @@ services:
            - "@security.token_storage"
            - "@doctrine.orm.entity_manager"
            - "@wallabag_core.content_proxy"
-            - %pocket_consumer_key%
+            - "@craue_config"
        calls:
            - [ setClient, [ "@wallabag_import.pocket.client" ] ]
            - [ setLogger, [ "@logger" ]]