aboutsummaryrefslogtreecommitdiffhomepage
path: root/app/config
diff options
context:
space:
mode:
authorJeremy Benoist <jeremy.benoist@gmail.com>2019-04-01 13:16:15 +0200
committerJeremy Benoist <jeremy.benoist@gmail.com>2019-04-01 13:16:15 +0200
commit3620dae1e6b3fab5a4ba4001b4581ce7ed795996 (patch)
tree775d2fe5b2942d9231888ed01d0a0081a1b2347e /app/config
parentb886ee923d7e627da2ae0221271bedbcb495025a (diff)
parentbfd69c74e5b4f2ebfcb304b1983bf771c2bb11f7 (diff)
downloadwallabag-3620dae1e6b3fab5a4ba4001b4581ce7ed795996.tar.gz
wallabag-3620dae1e6b3fab5a4ba4001b4581ce7ed795996.tar.zst
wallabag-3620dae1e6b3fab5a4ba4001b4581ce7ed795996.zip
Merge remote-tracking branch 'origin/master' into 2.4
Diffstat (limited to 'app/config')
-rw-r--r--app/config/config.yml8
-rw-r--r--app/config/wallabag.yml2
2 files changed, 5 insertions, 5 deletions
diff --git a/app/config/config.yml b/app/config/config.yml
index 2d8f9bf0..078f277a 100644
--- a/app/config/config.yml
+++ b/app/config/config.yml
@@ -148,18 +148,18 @@ nelmio_cors:
148 paths: 148 paths:
149 '^/api/': 149 '^/api/':
150 allow_origin: ['*'] 150 allow_origin: ['*']
151 allow_headers: ['X-Custom-Auth'] 151 allow_headers: ['Authorization','content-type']
152 allow_methods: ['POST', 'PUT', 'PATCH','GET', 'DELETE'] 152 allow_methods: ['POST', 'PUT', 'PATCH','GET', 'DELETE']
153 max_age: 3600 153 max_age: 3600
154 '^/oauth/': 154 '^/oauth/':
155 allow_origin: ['*'] 155 allow_origin: ['*']
156 allow_headers: ['X-Custom-Auth'] 156 allow_headers: ['Authorization','content-type']
157 allow_methods: ['POST', 'PUT', 'GET', 'DELETE'] 157 allow_methods: ['POST', 'PUT', 'GET', 'DELETE']
158 max_age: 3600 158 max_age: 3600
159 '^/': 159 '^/':
160 #origin_regex: true 160 #origin_regex: true
161 allow_origin: ['^http://localhost:[0-9]+'] 161 allow_origin: ['*']
162 allow_headers: ['X-Custom-Auth'] 162 allow_headers: ['Authorization','content-type']
163 allow_methods: ['POST', 'PUT', 'GET', 'DELETE'] 163 allow_methods: ['POST', 'PUT', 'GET', 'DELETE']
164 max_age: 3600 164 max_age: 3600
165 hosts: ['^api\.'] 165 hosts: ['^api\.']
diff --git a/app/config/wallabag.yml b/app/config/wallabag.yml
index 09b2f3a2..96dfacf9 100644
--- a/app/config/wallabag.yml
+++ b/app/config/wallabag.yml
@@ -1,5 +1,5 @@
1wallabag_core: 1wallabag_core:
2 version: 2.3.7-dev 2 version: 2.3.8-dev
3 paypal_url: "https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=9UBA65LG3FX9Y&lc=gb" 3 paypal_url: "https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=9UBA65LG3FX9Y&lc=gb"
4 languages: 4 languages:
5 en: 'English' 5 en: 'English'