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

3 files changed, 9 insertions, 4 deletions

diff --git a/app/Resources/static/themes/baggy/css/ratatouille.css b/app/Resources/static/themes/baggy/css/ratatouille.css
index bf89d881..b5aeb54e 100644
--- a/app/Resources/static/themes/baggy/css/ratatouille.css
+++ b/app/Resources/static/themes/baggy/css/ratatouille.css
@@ -63,8 +63,7 @@ pre {
   max-width: 61.25em; /* 980px */
 }
 
-table,
-img {
+table, img, figure {
   max-width: 100%;
   height: auto;
 }
diff --git a/app/Resources/static/themes/material/css/main.css b/app/Resources/static/themes/material/css/main.css
index 2ffe0b46..cade37f6 100755
--- a/app/Resources/static/themes/material/css/main.css
+++ b/app/Resources/static/themes/material/css/main.css
@@ -436,7 +436,8 @@ main ul.row {
   max-width: 40em;
 }
 
-#article img {
+#article img,
+#article figure {
   max-width: 100%;
   height: auto;
 }
diff --git a/app/config/config.yml b/app/config/config.yml
index a1517e97..80754393 100644
--- a/app/config/config.yml
+++ b/app/config/config.yml
@@ -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'
@@ -140,6 +140,11 @@ nelmio_cors:
         '^/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']
             max_age: 3600
         '^/':