diff options
Diffstat (limited to 'app')
-rw-r--r-- | app/config/config.yml | 4 | ||||
-rw-r--r-- | app/config/parameters.yml.dist | 7 | ||||
-rw-r--r-- | app/config/tests/parameters.yml.dist.mysql | 7 | ||||
-rw-r--r-- | app/config/tests/parameters.yml.dist.pgsql | 7 | ||||
-rw-r--r-- | app/config/tests/parameters.yml.dist.sqlite | 7 |
5 files changed, 4 insertions, 28 deletions
diff --git a/app/config/config.yml b/app/config/config.yml index a6cfc67d..943365e8 100644 --- a/app/config/config.yml +++ b/app/config/config.yml | |||
@@ -33,6 +33,10 @@ wallabag_core: | |||
33 | fr: 'Français' | 33 | fr: 'Français' |
34 | de: 'Deutsch' | 34 | de: 'Deutsch' |
35 | tr: 'Türkçe' | 35 | tr: 'Türkçe' |
36 | items_on_page: 12 | ||
37 | theme: material | ||
38 | language: en | ||
39 | rss_limit: 50 | ||
36 | 40 | ||
37 | wallabag_import: | 41 | wallabag_import: |
38 | allow_mimetypes: ['application/octet-stream', 'application/json', 'text/plain'] | 42 | allow_mimetypes: ['application/octet-stream', 'application/json', 'text/plain'] |
diff --git a/app/config/parameters.yml.dist b/app/config/parameters.yml.dist index e4fcbd74..f9555676 100644 --- a/app/config/parameters.yml.dist +++ b/app/config/parameters.yml.dist | |||
@@ -68,12 +68,5 @@ parameters: | |||
68 | wallabag_url: http://v2.wallabag.org | 68 | wallabag_url: http://v2.wallabag.org |
69 | wallabag_support_url: 'https://www.wallabag.org/pages/support.html' | 69 | wallabag_support_url: 'https://www.wallabag.org/pages/support.html' |
70 | 70 | ||
71 | # default user config | ||
72 | items_on_page: 12 | ||
73 | theme: material | ||
74 | language: en | ||
75 | from_email: no-reply@wallabag.org | ||
76 | rss_limit: 50 | ||
77 | |||
78 | # pocket import | 71 | # pocket import |
79 | pocket_consumer_key: xxxxxxxx | 72 | pocket_consumer_key: xxxxxxxx |
diff --git a/app/config/tests/parameters.yml.dist.mysql b/app/config/tests/parameters.yml.dist.mysql index f902f239..e0e92760 100644 --- a/app/config/tests/parameters.yml.dist.mysql +++ b/app/config/tests/parameters.yml.dist.mysql | |||
@@ -58,12 +58,5 @@ parameters: | |||
58 | wallabag_url: http://v2.wallabag.org | 58 | wallabag_url: http://v2.wallabag.org |
59 | wallabag_support_url: 'https://www.wallabag.org/pages/support.html' | 59 | wallabag_support_url: 'https://www.wallabag.org/pages/support.html' |
60 | 60 | ||
61 | # default user config | ||
62 | items_on_page: 12 | ||
63 | theme: material | ||
64 | language: en_US | ||
65 | from_email: no-reply@wallabag.org | ||
66 | rss_limit: 50 | ||
67 | |||
68 | # pocket import | 61 | # pocket import |
69 | pocket_consumer_key: xxxxxxxx | 62 | pocket_consumer_key: xxxxxxxx |
diff --git a/app/config/tests/parameters.yml.dist.pgsql b/app/config/tests/parameters.yml.dist.pgsql index 76685b14..e6e7636c 100644 --- a/app/config/tests/parameters.yml.dist.pgsql +++ b/app/config/tests/parameters.yml.dist.pgsql | |||
@@ -58,12 +58,5 @@ parameters: | |||
58 | wallabag_url: http://v2.wallabag.org | 58 | wallabag_url: http://v2.wallabag.org |
59 | wallabag_support_url: 'https://www.wallabag.org/pages/support.html' | 59 | wallabag_support_url: 'https://www.wallabag.org/pages/support.html' |
60 | 60 | ||
61 | # default user config | ||
62 | items_on_page: 12 | ||
63 | theme: material | ||
64 | language: en_US | ||
65 | from_email: no-reply@wallabag.org | ||
66 | rss_limit: 50 | ||
67 | |||
68 | # pocket import | 61 | # pocket import |
69 | pocket_consumer_key: xxxxxxxx | 62 | pocket_consumer_key: xxxxxxxx |
diff --git a/app/config/tests/parameters.yml.dist.sqlite b/app/config/tests/parameters.yml.dist.sqlite index cdafb1b1..c47392a3 100644 --- a/app/config/tests/parameters.yml.dist.sqlite +++ b/app/config/tests/parameters.yml.dist.sqlite | |||
@@ -58,12 +58,5 @@ parameters: | |||
58 | wallabag_url: http://v2.wallabag.org | 58 | wallabag_url: http://v2.wallabag.org |
59 | wallabag_support_url: 'https://www.wallabag.org/pages/support.html' | 59 | wallabag_support_url: 'https://www.wallabag.org/pages/support.html' |
60 | 60 | ||
61 | # default user config | ||
62 | items_on_page: 12 | ||
63 | theme: material | ||
64 | language: en_US | ||
65 | from_email: no-reply@wallabag.org | ||
66 | rss_limit: 50 | ||
67 | |||
68 | # pocket import | 61 | # pocket import |
69 | pocket_consumer_key: xxxxxxxx | 62 | pocket_consumer_key: xxxxxxxx |