aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--app/config/parameters.yml.dist2
-rw-r--r--app/config/tests/parameters.yml.dist.mysql2
-rw-r--r--app/config/tests/parameters.yml.dist.pgsql2
-rw-r--r--app/config/tests/parameters.yml.dist.sqlite2
-rw-r--r--composer.json2
-rw-r--r--src/Wallabag/UserBundle/Resources/config/services.yml5
6 files changed, 14 insertions, 1 deletions
diff --git a/app/config/parameters.yml.dist b/app/config/parameters.yml.dist
index 3eeedb78..57cae9a0 100644
--- a/app/config/parameters.yml.dist
+++ b/app/config/parameters.yml.dist
@@ -40,3 +40,5 @@ parameters:
40 # two factor stuff 40 # two factor stuff
41 twofactor_auth: true 41 twofactor_auth: true
42 twofactor_sender: no-reply@wallabag.org 42 twofactor_sender: no-reply@wallabag.org
43
44 from_email: no-reply@wallabag.org
diff --git a/app/config/tests/parameters.yml.dist.mysql b/app/config/tests/parameters.yml.dist.mysql
index 3244fd3a..2823a424 100644
--- a/app/config/tests/parameters.yml.dist.mysql
+++ b/app/config/tests/parameters.yml.dist.mysql
@@ -30,3 +30,5 @@ parameters:
30 # two factor stuff 30 # two factor stuff
31 twofactor_auth: true 31 twofactor_auth: true
32 twofactor_sender: no-reply@wallabag.org 32 twofactor_sender: no-reply@wallabag.org
33
34 from_email: no-reply@wallabag.org
diff --git a/app/config/tests/parameters.yml.dist.pgsql b/app/config/tests/parameters.yml.dist.pgsql
index cee34473..5b55cb64 100644
--- a/app/config/tests/parameters.yml.dist.pgsql
+++ b/app/config/tests/parameters.yml.dist.pgsql
@@ -30,3 +30,5 @@ parameters:
30 # two factor stuff 30 # two factor stuff
31 twofactor_auth: true 31 twofactor_auth: true
32 twofactor_sender: no-reply@wallabag.org 32 twofactor_sender: no-reply@wallabag.org
33
34 from_email: no-reply@wallabag.org
diff --git a/app/config/tests/parameters.yml.dist.sqlite b/app/config/tests/parameters.yml.dist.sqlite
index a1535bc9..01589d28 100644
--- a/app/config/tests/parameters.yml.dist.sqlite
+++ b/app/config/tests/parameters.yml.dist.sqlite
@@ -30,3 +30,5 @@ parameters:
30 # two factor stuff 30 # two factor stuff
31 twofactor_auth: true 31 twofactor_auth: true
32 twofactor_sender: no-reply@wallabag.org 32 twofactor_sender: no-reply@wallabag.org
33
34 from_email: no-reply@wallabag.org
diff --git a/composer.json b/composer.json
index 1c07c209..497b8012 100644
--- a/composer.json
+++ b/composer.json
@@ -54,7 +54,7 @@
54 "pagerfanta/pagerfanta": "~1.0.3", 54 "pagerfanta/pagerfanta": "~1.0.3",
55 "lexik/form-filter-bundle": "~5.0", 55 "lexik/form-filter-bundle": "~5.0",
56 "j0k3r/graby": "~1.0", 56 "j0k3r/graby": "~1.0",
57 "friendsofsymfony/user-bundle": "dev-master", 57 "friendsofsymfony/user-bundle": "~2.0@dev",
58 "friendsofsymfony/oauth-server-bundle": "^1.5", 58 "friendsofsymfony/oauth-server-bundle": "^1.5",
59 "stof/doctrine-extensions-bundle": "^1.2@dev", 59 "stof/doctrine-extensions-bundle": "^1.2@dev",
60 "scheb/two-factor-bundle": "~2.0", 60 "scheb/two-factor-bundle": "~2.0",
diff --git a/src/Wallabag/UserBundle/Resources/config/services.yml b/src/Wallabag/UserBundle/Resources/config/services.yml
index d79d8fa2..9a589332 100644
--- a/src/Wallabag/UserBundle/Resources/config/services.yml
+++ b/src/Wallabag/UserBundle/Resources/config/services.yml
@@ -1,4 +1,9 @@
1services: 1services:
2 # might be fixed in the symfony release
3 # https://github.com/FriendsOfSymfony/FOSUserBundle/issues/2048
4 fos_user.doctrine_registry:
5 alias: doctrine
6
2 wallabag_user.auth_code_mailer: 7 wallabag_user.auth_code_mailer:
3 class: Wallabag\UserBundle\Mailer\AuthCodeMailer 8 class: Wallabag\UserBundle\Mailer\AuthCodeMailer
4 arguments: 9 arguments: