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

Settings page
This commit is contained in:
Nicolas Lœuillet
2016-02-04 15:59:57 +01:00
40 changed files with 510 additions and 245 deletions

View File

@ -3,7 +3,7 @@ services:
class: Wallabag\CoreBundle\Helper\DetectActiveTheme
arguments:
- "@security.token_storage"
- %theme% # default theme from parameters.yml
- %wallabag_core.theme%
# custom form type
wallabag_core.form.type.config:
@ -76,17 +76,17 @@ services:
class: Wallabag\CoreBundle\EventListener\RegistrationConfirmedListener
arguments:
- "@doctrine.orm.entity_manager"
- %theme%
- %items_on_page%
- %rss_limit%
- %language%
- %wallabag_core.theme%
- %wallabag_core.items_on_page%
- %wallabag_core.rss_limit%
- %wallabag_core.language%
tags:
- { name: kernel.event_subscriber }
wallabag_core.helper.entries_export:
class: Wallabag\CoreBundle\Helper\EntriesExport
arguments:
- %wallabag_url%
- "@craue_config"
- src/Wallabag/CoreBundle/Resources/public/themes/_global/img/appicon/apple-touch-icon-152.png
wallabag.operator.array.matches: