diff options
author | Jérémy Benoist <j0k3r@users.noreply.github.com> | 2017-06-06 15:25:05 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-06-06 15:25:05 +0200 |
commit | 6ed2627bb35561e32d702fbe67247349dd67453e (patch) | |
tree | 75d8c130d26f0591fe858cd9eacf6b97aed4af7e /app/config/config.yml | |
parent | 9fe87bc2e20fa95573287a61ef9798cc15648187 (diff) | |
parent | 438329be467d77595f549da48a6b49f38ece9b55 (diff) | |
download | wallabag-6ed2627bb35561e32d702fbe67247349dd67453e.tar.gz wallabag-6ed2627bb35561e32d702fbe67247349dd67453e.tar.zst wallabag-6ed2627bb35561e32d702fbe67247349dd67453e.zip |
Merge pull request #3177 from wallabag/api-create-user-update
API user creation behing a toggle
Diffstat (limited to 'app/config/config.yml')
-rw-r--r-- | app/config/config.yml | 37 |
1 files changed, 1 insertions, 36 deletions
diff --git a/app/config/config.yml b/app/config/config.yml index 04f8547d..2bc5e3b3 100644 --- a/app/config/config.yml +++ b/app/config/config.yml | |||
@@ -2,6 +2,7 @@ imports: | |||
2 | - { resource: parameters.yml } | 2 | - { resource: parameters.yml } |
3 | - { resource: security.yml } | 3 | - { resource: security.yml } |
4 | - { resource: services.yml } | 4 | - { resource: services.yml } |
5 | - { resource: wallabag.yml } | ||
5 | 6 | ||
6 | parameters: | 7 | parameters: |
7 | # Allows to use the live reload feature for changes in assets | 8 | # Allows to use the live reload feature for changes in assets |
@@ -34,42 +35,6 @@ framework: | |||
34 | http_method_override: true | 35 | http_method_override: true |
35 | assets: ~ | 36 | assets: ~ |
36 | 37 | ||
37 | wallabag_core: | ||
38 | version: 2.2.3 | ||
39 | paypal_url: "https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=9UBA65LG3FX9Y&lc=gb" | ||
40 | languages: | ||
41 | en: 'English' | ||
42 | fr: 'Français' | ||
43 | de: 'Deutsch' | ||
44 | tr: 'Türkçe' | ||
45 | fa: 'فارسی' | ||
46 | ro: 'Română' | ||
47 | pl: 'Polish' | ||
48 | da: 'Dansk' | ||
49 | es: 'Español' | ||
50 | oc: 'Occitan' | ||
51 | it: 'Italiano' | ||
52 | pt: 'Português' | ||
53 | items_on_page: 12 | ||
54 | theme: material | ||
55 | language: '%locale%' | ||
56 | rss_limit: 50 | ||
57 | reading_speed: 1 | ||
58 | cache_lifetime: 10 | ||
59 | action_mark_as_read: 1 | ||
60 | list_mode: 0 | ||
61 | fetching_error_message_title: 'No title found' | ||
62 | fetching_error_message: | | ||
63 | wallabag can't retrieve contents for this article. Please <a href="http://doc.wallabag.org/en/user/errors_during_fetching.html#how-can-i-help-to-fix-that">troubleshoot this issue</a>. | ||
64 | api_limit_mass_actions: 10 | ||
65 | |||
66 | wallabag_user: | ||
67 | registration_enabled: "%fosuser_registration%" | ||
68 | |||
69 | wallabag_import: | ||
70 | allow_mimetypes: ['application/octet-stream', 'application/json', 'text/plain', 'text/csv'] | ||
71 | resource_dir: "%kernel.root_dir%/../web/uploads/import" | ||
72 | |||
73 | # Twig Configuration | 38 | # Twig Configuration |
74 | twig: | 39 | twig: |
75 | debug: "%kernel.debug%" | 40 | debug: "%kernel.debug%" |