Merge remote-tracking branch 'origin/master' into 2.1

This commit is contained in:
Jeremy Benoist
2016-08-22 23:03:16 +02:00
45 changed files with 494 additions and 153 deletions

View File

@ -30,7 +30,7 @@ framework:
assets: ~
wallabag_core:
version: 2.0.5
version: 2.0.7
paypal_url: "https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=9UBA65LG3FX9Y&lc=gb"
languages:
en: 'English'
@ -138,6 +138,11 @@ nelmio_cors:
#origin_regex: false
paths:
'^/api/':
allow_origin: ['*']
allow_headers: ['X-Custom-Auth']
allow_methods: ['POST', 'PUT', 'PATCH','GET', 'DELETE']
max_age: 3600
'^/oauth/':
allow_origin: ['*']
allow_headers: ['X-Custom-Auth']
allow_methods: ['POST', 'PUT', 'GET', 'DELETE']