diff options
author | Jeremy Benoist <jeremy.benoist@gmail.com> | 2015-12-29 09:59:46 +0100 |
---|---|---|
committer | Jeremy Benoist <jeremy.benoist@gmail.com> | 2015-12-29 11:17:06 +0100 |
commit | 23ff8d36199c0cddb5bae4a5010cb71f861eeef8 (patch) | |
tree | 0da3a5941c85f80408e49db63ecd3b3ba5347a40 /app | |
parent | c997cfcc9c161241a6398b0942a1a869688d807a (diff) | |
download | wallabag-23ff8d36199c0cddb5bae4a5010cb71f861eeef8.tar.gz wallabag-23ff8d36199c0cddb5bae4a5010cb71f861eeef8.tar.zst wallabag-23ff8d36199c0cddb5bae4a5010cb71f861eeef8.zip |
Add custom email for 2FA
Related #1490
Diffstat (limited to 'app')
-rw-r--r-- | app/config/config.yml | 1 | ||||
-rw-r--r-- | app/config/parameters.yml.dist | 3 | ||||
-rw-r--r-- | app/config/tests/parameters.yml.dist.mysql | 1 | ||||
-rw-r--r-- | app/config/tests/parameters.yml.dist.pgsql | 1 | ||||
-rw-r--r-- | app/config/tests/parameters.yml.dist.sqlite | 1 |
5 files changed, 6 insertions, 1 deletions
diff --git a/app/config/config.yml b/app/config/config.yml index f2538c90..8403a458 100644 --- a/app/config/config.yml +++ b/app/config/config.yml | |||
@@ -198,6 +198,7 @@ scheb_two_factor: | |||
198 | sender_email: %twofactor_sender% | 198 | sender_email: %twofactor_sender% |
199 | digits: 6 | 199 | digits: 6 |
200 | template: WallabagUserBundle:Authentication:form.html.twig | 200 | template: WallabagUserBundle:Authentication:form.html.twig |
201 | mailer: wallabag_user.auth_code_mailer | ||
201 | 202 | ||
202 | kphoen_rulerz: | 203 | kphoen_rulerz: |
203 | executors: | 204 | executors: |
diff --git a/app/config/parameters.yml.dist b/app/config/parameters.yml.dist index b475d637..149179c2 100644 --- a/app/config/parameters.yml.dist +++ b/app/config/parameters.yml.dist | |||
@@ -52,10 +52,11 @@ parameters: | |||
52 | export_mobi: true | 52 | export_mobi: true |
53 | export_pdf: true | 53 | export_pdf: true |
54 | wallabag_url: http://v2.wallabag.org | 54 | wallabag_url: http://v2.wallabag.org |
55 | wallabag_support_url: 'https://www.wallabag.org/pages/support.html' | ||
55 | 56 | ||
56 | # default user config | 57 | # default user config |
57 | items_on_page: 12 | 58 | items_on_page: 12 |
58 | theme: material | 59 | theme: material |
59 | language: en_US | 60 | language: en |
60 | from_email: no-reply@wallabag.org | 61 | from_email: no-reply@wallabag.org |
61 | rss_limit: 50 | 62 | rss_limit: 50 |
diff --git a/app/config/tests/parameters.yml.dist.mysql b/app/config/tests/parameters.yml.dist.mysql index 5b29690c..096ad8c7 100644 --- a/app/config/tests/parameters.yml.dist.mysql +++ b/app/config/tests/parameters.yml.dist.mysql | |||
@@ -52,6 +52,7 @@ parameters: | |||
52 | export_mobi: true | 52 | export_mobi: true |
53 | export_pdf: true | 53 | export_pdf: true |
54 | wallabag_url: http://v2.wallabag.org | 54 | wallabag_url: http://v2.wallabag.org |
55 | wallabag_support_url: 'https://www.wallabag.org/pages/support.html' | ||
55 | 56 | ||
56 | # default user config | 57 | # default user config |
57 | items_on_page: 12 | 58 | items_on_page: 12 |
diff --git a/app/config/tests/parameters.yml.dist.pgsql b/app/config/tests/parameters.yml.dist.pgsql index efdac961..ca3f6ea2 100644 --- a/app/config/tests/parameters.yml.dist.pgsql +++ b/app/config/tests/parameters.yml.dist.pgsql | |||
@@ -52,6 +52,7 @@ parameters: | |||
52 | export_mobi: true | 52 | export_mobi: true |
53 | export_pdf: true | 53 | export_pdf: true |
54 | wallabag_url: http://v2.wallabag.org | 54 | wallabag_url: http://v2.wallabag.org |
55 | wallabag_support_url: 'https://www.wallabag.org/pages/support.html' | ||
55 | 56 | ||
56 | # default user config | 57 | # default user config |
57 | items_on_page: 12 | 58 | items_on_page: 12 |
diff --git a/app/config/tests/parameters.yml.dist.sqlite b/app/config/tests/parameters.yml.dist.sqlite index 276d1147..92460bcf 100644 --- a/app/config/tests/parameters.yml.dist.sqlite +++ b/app/config/tests/parameters.yml.dist.sqlite | |||
@@ -52,6 +52,7 @@ parameters: | |||
52 | export_mobi: true | 52 | export_mobi: true |
53 | export_pdf: true | 53 | export_pdf: true |
54 | wallabag_url: http://v2.wallabag.org | 54 | wallabag_url: http://v2.wallabag.org |
55 | wallabag_support_url: 'https://www.wallabag.org/pages/support.html' | ||
55 | 56 | ||
56 | # default user config | 57 | # default user config |
57 | items_on_page: 12 | 58 | items_on_page: 12 |