aboutsummaryrefslogtreecommitdiffhomepage
path: root/app
diff options
context:
space:
mode:
Diffstat (limited to 'app')
-rw-r--r--app/config/config.yml9
-rw-r--r--app/config/config_dev.yml3
-rw-r--r--app/config/parameters.yml.dist6
-rw-r--r--app/config/tests/parameters.yml.dist.mysql6
-rw-r--r--app/config/tests/parameters.yml.dist.pgsql6
-rw-r--r--app/config/tests/parameters.yml.dist.sqlite4
6 files changed, 27 insertions, 7 deletions
diff --git a/app/config/config.yml b/app/config/config.yml
index 23262469..a6cfc67d 100644
--- a/app/config/config.yml
+++ b/app/config/config.yml
@@ -32,6 +32,7 @@ wallabag_core:
32 en: 'English' 32 en: 'English'
33 fr: 'Français' 33 fr: 'Français'
34 de: 'Deutsch' 34 de: 'Deutsch'
35 tr: 'Türkçe'
35 36
36wallabag_import: 37wallabag_import:
37 allow_mimetypes: ['application/octet-stream', 'application/json', 'text/plain'] 38 allow_mimetypes: ['application/octet-stream', 'application/json', 'text/plain']
@@ -56,6 +57,10 @@ twig:
56 export_epub: %export_epub% 57 export_epub: %export_epub%
57 export_mobi: %export_mobi% 58 export_mobi: %export_mobi%
58 export_pdf: %export_pdf% 59 export_pdf: %export_pdf%
60 export_csv: %export_csv%
61 export_json: %export_json%
62 export_txt: %export_txt%
63 export_xml: %export_xml%
59 version: %app.version% 64 version: %app.version%
60 twofactor_auth: %twofactor_auth% 65 twofactor_auth: %twofactor_auth%
61 warning_message: %warning_message% 66 warning_message: %warning_message%
@@ -181,7 +186,9 @@ fos_user:
181 registration: 186 registration:
182 confirmation: 187 confirmation:
183 enabled: true 188 enabled: true
184 189 from_email:
190 address: %from_email%
191 sender_name: wallabag
185fos_oauth_server: 192fos_oauth_server:
186 db_driver: orm 193 db_driver: orm
187 client_class: Wallabag\ApiBundle\Entity\Client 194 client_class: Wallabag\ApiBundle\Entity\Client
diff --git a/app/config/config_dev.yml b/app/config/config_dev.yml
index 6b077fdb..2813e369 100644
--- a/app/config/config_dev.yml
+++ b/app/config/config_dev.yml
@@ -42,6 +42,3 @@ swiftmailer:
42 transport: smtp 42 transport: smtp
43 host: 'localhost' 43 host: 'localhost'
44 port: 1025 44 port: 1025
45 username: null
46 password: null
47
diff --git a/app/config/parameters.yml.dist b/app/config/parameters.yml.dist
index 0c0cbff1..ac4a4cc8 100644
--- a/app/config/parameters.yml.dist
+++ b/app/config/parameters.yml.dist
@@ -35,7 +35,7 @@ parameters:
35 locale: en 35 locale: en
36 36
37 # A secret key that's used to generate certain security-related tokens 37 # A secret key that's used to generate certain security-related tokens
38 secret: ThisTokenIsNotSoSecretChangeIt 38 secret: ovmpmAWXRCabNlMgzlzFXDYmCFfzGv
39 39
40 # wallabag misc 40 # wallabag misc
41 app.version: 2.0.0-alpha 41 app.version: 2.0.0-alpha
@@ -61,6 +61,10 @@ parameters:
61 export_epub: true 61 export_epub: true
62 export_mobi: true 62 export_mobi: true
63 export_pdf: true 63 export_pdf: true
64 export_csv: true
65 export_json: true
66 export_txt: true
67 export_xml: true
64 wallabag_url: http://v2.wallabag.org 68 wallabag_url: http://v2.wallabag.org
65 wallabag_support_url: 'https://www.wallabag.org/pages/support.html' 69 wallabag_support_url: 'https://www.wallabag.org/pages/support.html'
66 70
diff --git a/app/config/tests/parameters.yml.dist.mysql b/app/config/tests/parameters.yml.dist.mysql
index 88b1d2b4..3b9262bb 100644
--- a/app/config/tests/parameters.yml.dist.mysql
+++ b/app/config/tests/parameters.yml.dist.mysql
@@ -12,7 +12,7 @@ parameters:
12 test_database_driver: pdo_mysql 12 test_database_driver: pdo_mysql
13 test_database_host: localhost 13 test_database_host: localhost
14 test_database_port: 3306 14 test_database_port: 3306
15 test_database_name: wallabag 15 test_database_name: wallabag_test
16 test_database_user: root 16 test_database_user: root
17 test_database_password: ~ 17 test_database_password: ~
18 test_database_path: ~ 18 test_database_path: ~
@@ -51,6 +51,10 @@ parameters:
51 export_epub: true 51 export_epub: true
52 export_mobi: true 52 export_mobi: true
53 export_pdf: true 53 export_pdf: true
54 export_csv: true
55 export_json: true
56 export_txt: true
57 export_xml: true
54 wallabag_url: http://v2.wallabag.org 58 wallabag_url: http://v2.wallabag.org
55 wallabag_support_url: 'https://www.wallabag.org/pages/support.html' 59 wallabag_support_url: 'https://www.wallabag.org/pages/support.html'
56 60
diff --git a/app/config/tests/parameters.yml.dist.pgsql b/app/config/tests/parameters.yml.dist.pgsql
index 3c61142d..a5aef028 100644
--- a/app/config/tests/parameters.yml.dist.pgsql
+++ b/app/config/tests/parameters.yml.dist.pgsql
@@ -12,7 +12,7 @@ parameters:
12 test_database_driver: pdo_pgsql 12 test_database_driver: pdo_pgsql
13 test_database_host: localhost 13 test_database_host: localhost
14 test_database_port: 14 test_database_port:
15 test_database_name: wallabag 15 test_database_name: wallabag_test
16 test_database_user: travis 16 test_database_user: travis
17 test_database_password: ~ 17 test_database_password: ~
18 test_database_path: ~ 18 test_database_path: ~
@@ -51,6 +51,10 @@ parameters:
51 export_epub: true 51 export_epub: true
52 export_mobi: true 52 export_mobi: true
53 export_pdf: true 53 export_pdf: true
54 export_csv: true
55 export_json: true
56 export_txt: true
57 export_xml: true
54 wallabag_url: http://v2.wallabag.org 58 wallabag_url: http://v2.wallabag.org
55 wallabag_support_url: 'https://www.wallabag.org/pages/support.html' 59 wallabag_support_url: 'https://www.wallabag.org/pages/support.html'
56 60
diff --git a/app/config/tests/parameters.yml.dist.sqlite b/app/config/tests/parameters.yml.dist.sqlite
index 2f7699b5..cdafb1b1 100644
--- a/app/config/tests/parameters.yml.dist.sqlite
+++ b/app/config/tests/parameters.yml.dist.sqlite
@@ -51,6 +51,10 @@ parameters:
51 export_epub: true 51 export_epub: true
52 export_mobi: true 52 export_mobi: true
53 export_pdf: true 53 export_pdf: true
54 export_csv: true
55 export_json: true
56 export_txt: true
57 export_xml: true
54 wallabag_url: http://v2.wallabag.org 58 wallabag_url: http://v2.wallabag.org
55 wallabag_support_url: 'https://www.wallabag.org/pages/support.html' 59 wallabag_support_url: 'https://www.wallabag.org/pages/support.html'
56 60