aboutsummaryrefslogtreecommitdiffhomepage
path: root/app
diff options
context:
space:
mode:
authorJeremy <jeremy.benoist@gmail.com>2015-03-07 23:25:36 +0100
committerJeremy <jeremy.benoist@gmail.com>2015-03-08 07:35:24 +0100
commit6894d48e03c397096bb64420373afa60c397fe97 (patch)
tree0deb201b05b6aea527abc82ba7989732c4afbdb9 /app
parentf37d1427a1b75f9d7a2e273b2e9fb0e895a769ab (diff)
downloadwallabag-6894d48e03c397096bb64420373afa60c397fe97.tar.gz
wallabag-6894d48e03c397096bb64420373afa60c397fe97.tar.zst
wallabag-6894d48e03c397096bb64420373afa60c397fe97.zip
Handle forgot password
Diffstat (limited to 'app')
-rw-r--r--app/config/config_dev.yml10
-rw-r--r--app/config/config_test.yml4
-rw-r--r--app/config/parameters.yml.dist1
-rw-r--r--app/config/security.yml1
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:
44assetic: 44assetic:
45 use_controller: true 45 use_controller: true
46 46
47#swiftmailer: 47swiftmailer:
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 a6ead1e8..00a6bc57 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
15swiftmailer: 15swiftmailer:
16 disable_delivery: true 16 # to be able to read emails sent
17 spool:
18 type: file
17 19
18doctrine: 20doctrine:
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 }