oss/wallabag
oss/wallabag
1
0
Fork 0
mirror of https://github.com/wallabag/wallabag.git synced 2025-09-15 18:57:05 +00:00
Code Wiki Activity

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

Browse source
This commit is contained in:
Jeremy Benoist 2016-08-22 23:03:16 +02:00
commit 79efca1e6f
No known key found for this signature in database
GPG key ID: BCA73962457ACC3C
45 changed files with 494 additions and 153 deletions
Download patch file Download diff file Expand all files Collapse all files

3
app/Resources/static/themes/baggy/css/ratatouille.css
View file

@ -63,8 +63,7 @@ pre {
max-width: 61.25em; /* 980px */
}
table,
img {
table, img, figure {
max-width: 100%;
height: auto;
}

3
app/Resources/static/themes/material/css/main.css
View file

@ -436,7 +436,8 @@ main ul.row {
max-width: 40em;
}
#article img {
#article img,
#article figure {
max-width: 100%;
height: auto;
}

7
app/config/config.yml
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']