diff options
| author | Jeremy Benoist <j0k3r@users.noreply.github.com> | 2016-08-24 11:13:00 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-08-24 11:13:00 +0200 |
| commit | a1ab7d1d32cb69af563fcec4395fce5217f154f7 (patch) | |
| tree | ffc13a611a862cce7d74bf6d349bbb2468f33049 /app | |
| parent | 1bee9e0760c89756ebab0b67f9ab7efc5c6a709b (diff) | |
| parent | 8541b3c4fdf35788129483060499fef50818222c (diff) | |
| download | wallabag-a1ab7d1d32cb69af563fcec4395fce5217f154f7.tar.gz wallabag-a1ab7d1d32cb69af563fcec4395fce5217f154f7.tar.zst wallabag-a1ab7d1d32cb69af563fcec4395fce5217f154f7.zip | |
Merge pull request #2186 from wallabag/addRegistration
Add option to disable registration
Diffstat (limited to 'app')
| -rw-r--r-- | app/config/config.yml | 3 | ||||
| -rw-r--r-- | app/config/parameters.yml.dist | 1 |
2 files changed, 4 insertions, 0 deletions
diff --git a/app/config/config.yml b/app/config/config.yml index 80754393..30fd6063 100644 --- a/app/config/config.yml +++ b/app/config/config.yml | |||
| @@ -50,6 +50,9 @@ wallabag_core: | |||
| 50 | rss_limit: 50 | 50 | rss_limit: 50 |
| 51 | reading_speed: 1 | 51 | reading_speed: 1 |
| 52 | 52 | ||
| 53 | wallabag_user: | ||
| 54 | registration_enabled: "%fosuser_registration%" | ||
| 55 | |||
| 53 | wallabag_import: | 56 | wallabag_import: |
| 54 | allow_mimetypes: ['application/octet-stream', 'application/json', 'text/plain'] | 57 | allow_mimetypes: ['application/octet-stream', 'application/json', 'text/plain'] |
| 55 | resource_dir: "%kernel.root_dir%/../web/uploads/import" | 58 | resource_dir: "%kernel.root_dir%/../web/uploads/import" |
diff --git a/app/config/parameters.yml.dist b/app/config/parameters.yml.dist index d45839f4..d092e139 100644 --- a/app/config/parameters.yml.dist +++ b/app/config/parameters.yml.dist | |||
| @@ -34,6 +34,7 @@ parameters: | |||
| 34 | twofactor_sender: no-reply@wallabag.org | 34 | twofactor_sender: no-reply@wallabag.org |
| 35 | 35 | ||
| 36 | # fosuser stuff | 36 | # fosuser stuff |
| 37 | fosuser_registration: true | ||
| 37 | fosuser_confirmation: true | 38 | fosuser_confirmation: true |
| 38 | 39 | ||
| 39 | from_email: no-reply@wallabag.org | 40 | from_email: no-reply@wallabag.org |