diff options
author | Nicolas LÅ“uillet <nicolas@loeuillet.org> | 2015-03-30 17:05:37 +0200 |
---|---|---|
committer | Nicolas LÅ“uillet <nicolas@loeuillet.org> | 2015-03-30 17:05:37 +0200 |
commit | f98a2a0fc3ae8a5955bb811f083c3d2535f96791 (patch) | |
tree | 386ecf0a54bdf904225182e0d2f63ced417b32c5 /app | |
parent | bdf2add2e80dc52a02113c50636b5f887639b31a (diff) | |
parent | d0c2243b1099303be961c9d4b33eaaa95e663bef (diff) | |
download | wallabag-f98a2a0fc3ae8a5955bb811f083c3d2535f96791.tar.gz wallabag-f98a2a0fc3ae8a5955bb811f083c3d2535f96791.tar.zst wallabag-f98a2a0fc3ae8a5955bb811f083c3d2535f96791.zip |
Merge pull request #1152 from wallabag/v2-forgot-password
Handle forgot password
Diffstat (limited to 'app')
-rw-r--r-- | app/config/config_dev.yml | 10 | ||||
-rw-r--r-- | app/config/config_test.yml | 4 | ||||
-rw-r--r-- | app/config/parameters.yml.dist | 1 | ||||
-rw-r--r-- | app/config/security.yml | 1 |
4 files changed, 13 insertions, 3 deletions
diff --git a/app/config/config_dev.yml b/app/config/config_dev.yml index efaf396e..205e0f66 100644 --- a/app/config/config_dev.yml +++ b/app/config/config_dev.yml | |||
@@ -44,5 +44,11 @@ monolog: | |||
44 | assetic: | 44 | assetic: |
45 | use_controller: true | 45 | use_controller: true |
46 | 46 | ||
47 | #swiftmailer: | 47 | swiftmailer: |
48 | # delivery_address: me@example.com | 48 | # see http://mailcatcher.me/ |
49 | transport: smtp | ||
50 | host: 'localhost' | ||
51 | port: 1025 | ||
52 | username: null | ||
53 | password: null | ||
54 | |||
diff --git a/app/config/config_test.yml b/app/config/config_test.yml index 32156963..4dca39d2 100644 --- a/app/config/config_test.yml +++ b/app/config/config_test.yml | |||
@@ -13,7 +13,9 @@ web_profiler: | |||
13 | intercept_redirects: false | 13 | intercept_redirects: false |
14 | 14 | ||
15 | swiftmailer: | 15 | swiftmailer: |
16 | disable_delivery: true | 16 | # to be able to read emails sent |
17 | spool: | ||
18 | type: file | ||
17 | 19 | ||
18 | doctrine: | 20 | doctrine: |
19 | dbal: | 21 | dbal: |
diff --git a/app/config/parameters.yml.dist b/app/config/parameters.yml.dist index 44969750..8f967011 100644 --- a/app/config/parameters.yml.dist +++ b/app/config/parameters.yml.dist | |||
@@ -41,3 +41,4 @@ parameters: | |||
41 | items_on_page: 12 | 41 | items_on_page: 12 |
42 | theme: baggy | 42 | theme: baggy |
43 | language: en_US | 43 | language: en_US |
44 | from_email: no-reply@wallabag.org | ||
diff --git a/app/config/security.yml b/app/config/security.yml index e06c8967..90903f31 100644 --- a/app/config/security.yml +++ b/app/config/security.yml | |||
@@ -59,4 +59,5 @@ security: | |||
59 | - { path: ^/api/salt, roles: IS_AUTHENTICATED_ANONYMOUSLY } | 59 | - { path: ^/api/salt, roles: IS_AUTHENTICATED_ANONYMOUSLY } |
60 | - { path: ^/api/doc, roles: IS_AUTHENTICATED_ANONYMOUSLY } | 60 | - { path: ^/api/doc, roles: IS_AUTHENTICATED_ANONYMOUSLY } |
61 | - { path: ^/login, roles: IS_AUTHENTICATED_ANONYMOUSLY } | 61 | - { path: ^/login, roles: IS_AUTHENTICATED_ANONYMOUSLY } |
62 | - { path: ^/forgot-password, roles: IS_AUTHENTICATED_ANONYMOUSLY } | ||
62 | - { path: ^/, roles: ROLE_USER } | 63 | - { path: ^/, roles: ROLE_USER } |