pierre/wallabag
1
0
Fork 0
forked from wallabag/wallabag
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Merge branch 'master' into 2.1

Browse Source
This commit is contained in:
Jeremy Benoist
2016-06-23 11:47:46 +02:00
parent 49e2854d5c fb5c17a9ab
commit f49d9ca383
54 changed files with 133 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/config/config.yml
View File

@ -156,7 +156,7 @@ liip_theme:
path_patterns:
bundle_resource:
- %%bundle_path%%/Resources/views/themes/%%current_theme%%/%%template%%
- "%%bundle_path%%/Resources/views/themes/%%current_theme%%/%%template%%"
fos_user:
db_driver: orm
@ -164,9 +164,9 @@ fos_user:
user_class: Wallabag\UserBundle\Entity\User
registration:
confirmation:
enabled: %fosuser_confirmation%
enabled: "%fosuser_confirmation%"
from_email:
address: %from_email%
address: "%from_email%"
sender_name: wallabag
fos_oauth_server:
db_driver: orm
@ -184,8 +184,8 @@ scheb_two_factor:
cookie_lifetime: 2592000
email:
enabled: %twofactor_auth%
sender_email: %twofactor_sender%
enabled: "%twofactor_auth%"
sender_email: "%twofactor_sender%"
digits: 6
template: WallabagUserBundle:Authentication:form.html.twig
mailer: wallabag_user.auth_code_mailer