mirrors/wallabag
1
0
Fork 0
mirror of https://github.com/wallabag/wallabag.git synced 2025-01-09 16:35:27 +00:00
Code Issues Projects Releases Wiki Activity

Fix from_email & fos_user

Browse source
This commit is contained in:
Jeremy Benoist 2016-01-31 15:12:18 +01:00
parent a74a6ca2b1
commit 48e3007b7f
6 changed files with 14 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/config/parameters.yml.dist
View file

@ -40,3 +40,5 @@ parameters:
# two factor stuff # two factor stuff
twofactor_auth: true twofactor_auth: true
twofactor_sender: no-reply@wallabag.org twofactor_sender: no-reply@wallabag.org
from_email: no-reply@wallabag.org

2
app/config/tests/parameters.yml.dist.mysql
View file

@ -30,3 +30,5 @@ parameters:
# two factor stuff # two factor stuff
twofactor_auth: true twofactor_auth: true
twofactor_sender: no-reply@wallabag.org twofactor_sender: no-reply@wallabag.org
from_email: no-reply@wallabag.org

2
app/config/tests/parameters.yml.dist.pgsql
View file

@ -30,3 +30,5 @@ parameters:
# two factor stuff # two factor stuff
twofactor_auth: true twofactor_auth: true
twofactor_sender: no-reply@wallabag.org twofactor_sender: no-reply@wallabag.org
from_email: no-reply@wallabag.org

2
app/config/tests/parameters.yml.dist.sqlite
View file

@ -30,3 +30,5 @@ parameters:
# two factor stuff # two factor stuff
twofactor_auth: true twofactor_auth: true
twofactor_sender: no-reply@wallabag.org twofactor_sender: no-reply@wallabag.org
from_email: no-reply@wallabag.org

2
composer.json
View file

@ -54,7 +54,7 @@
"pagerfanta/pagerfanta": "~1.0.3", "pagerfanta/pagerfanta": "~1.0.3",
"lexik/form-filter-bundle": "~5.0", "lexik/form-filter-bundle": "~5.0",
"j0k3r/graby": "~1.0", "j0k3r/graby": "~1.0",
"friendsofsymfony/user-bundle": "dev-master", "friendsofsymfony/user-bundle": "~2.0@dev",
"friendsofsymfony/oauth-server-bundle": "^1.5", "friendsofsymfony/oauth-server-bundle": "^1.5",
"stof/doctrine-extensions-bundle": "^1.2@dev", "stof/doctrine-extensions-bundle": "^1.2@dev",
"scheb/two-factor-bundle": "~2.0", "scheb/two-factor-bundle": "~2.0",

5
src/Wallabag/UserBundle/Resources/config/services.yml
View file

@ -1,4 +1,9 @@
services: services:
# might be fixed in the symfony release
# https://github.com/FriendsOfSymfony/FOSUserBundle/issues/2048
fos_user.doctrine_registry:
alias: doctrine
wallabag_user.auth_code_mailer: wallabag_user.auth_code_mailer:
class: Wallabag\UserBundle\Mailer\AuthCodeMailer class: Wallabag\UserBundle\Mailer\AuthCodeMailer
arguments: arguments: