[MERGE] forward port branch saas-15 up to 10d88083a04

10 files changed, 17 insertions, 26 deletions

diff --git a/addons/auth_oauth/controllers/main.py b/addons/auth_oauth/controllers/main.py
index 3b300070929..00eea3268b6 100644
--- a/addons/auth_oauth/controllers/main.py
+++ b/addons/auth_oauth/controllers/main.py
@@ -109,19 +109,10 @@ class OAuthLogin(Home):
 
         return response
 
-    @http.route()
-    def web_auth_signup(self, *args, **kw):
-        providers = self.list_providers()
-        response = super(OAuthLogin, self).web_auth_signup(*args, **kw)
-        response.qcontext.update(providers=providers)
-        return response
-
-    @http.route()
-    def web_auth_reset_password(self, *args, **kw):
-        providers = self.list_providers()
-        response = super(OAuthLogin, self).web_auth_reset_password(*args, **kw)
-        response.qcontext.update(providers=providers)
-        return response
+    def get_auth_signup_qcontext(self):
+        result = super(OAuthLogin, self).get_auth_signup_qcontext()
+        result["providers"] = self.list_providers()
+        return result
 
 
 class OAuthController(http.Controller):
diff --git a/addons/theme_bootswatch/static/src/less/amelia/bootswatch.less b/addons/theme_bootswatch/static/src/less/amelia/bootswatch.less
index d581785e9fd..740c7c138d3 100644
--- a/addons/theme_bootswatch/static/src/less/amelia/bootswatch.less
+++ b/addons/theme_bootswatch/static/src/less/amelia/bootswatch.less
@@ -2,7 +2,7 @@
 // Bootswatch
 // -----------------------------------------------------
 
-@import url("//fonts.googleapis.com/css?family=Lobster|Cabin:400,700");
+@import (css) url("//fonts.googleapis.com/css?family=Lobster|Cabin:400,700");
 
 // Navbar =====================================================================
 
diff --git a/addons/theme_bootswatch/static/src/less/cosmo/bootswatch.less b/addons/theme_bootswatch/static/src/less/cosmo/bootswatch.less
index 0be302254db..2da2fa2218a 100644
--- a/addons/theme_bootswatch/static/src/less/cosmo/bootswatch.less
+++ b/addons/theme_bootswatch/static/src/less/cosmo/bootswatch.less
@@ -2,7 +2,7 @@
 // Bootswatch
 // -----------------------------------------------------
 
-@import url("//fonts.googleapis.com/css?family=Source+Sans+Pro:300,400,700");
+@import (css) url("//fonts.googleapis.com/css?family=Source+Sans+Pro:300,400,700");
 
 // Navbar =====================================================================
 
diff --git a/addons/theme_bootswatch/static/src/less/cyborg/bootswatch.less b/addons/theme_bootswatch/static/src/less/cyborg/bootswatch.less
index eb5f6dff002..ee353fb753e 100644
--- a/addons/theme_bootswatch/static/src/less/cyborg/bootswatch.less
+++ b/addons/theme_bootswatch/static/src/less/cyborg/bootswatch.less
@@ -2,7 +2,7 @@
 // Bootswatch
 // -----------------------------------------------------
 
-@import url("//fonts.googleapis.com/css?family=Roboto:400,700");
+@import (css) url("//fonts.googleapis.com/css?family=Roboto:400,700");
 
 // Navbar =====================================================================
 
@@ -161,4 +161,4 @@ a.thumbnail.active {
   h1, h2, h3, h4, h5, h6 {
     color: #fff;
   }
-}
\ No newline at end of file
+}
diff --git a/addons/theme_bootswatch/static/src/less/flatly/bootswatch.less b/addons/theme_bootswatch/static/src/less/flatly/bootswatch.less
index a4d8f311836..2b53000bc5f 100644
--- a/addons/theme_bootswatch/static/src/less/flatly/bootswatch.less
+++ b/addons/theme_bootswatch/static/src/less/flatly/bootswatch.less
@@ -2,7 +2,7 @@
 // Bootswatch
 // -----------------------------------------------------
 
-@import url("//fonts.googleapis.com/css?family=Lato:400,700,400italic");
+@import (css) url("//fonts.googleapis.com/css?family=Lato:400,700,400italic");
 
 // Navbar =====================================================================
 
diff --git a/addons/theme_bootswatch/static/src/less/journal/bootswatch.less b/addons/theme_bootswatch/static/src/less/journal/bootswatch.less
index 151f5af7650..167c6863f2b 100644
--- a/addons/theme_bootswatch/static/src/less/journal/bootswatch.less
+++ b/addons/theme_bootswatch/static/src/less/journal/bootswatch.less
@@ -2,7 +2,7 @@
 // Bootswatch
 // -----------------------------------------------------
 
-@import url("//fonts.googleapis.com/css?family=News+Cycle:400,700");
+@import (css) url("//fonts.googleapis.com/css?family=News+Cycle:400,700");
 
 // Navbar =====================================================================
 
diff --git a/addons/theme_bootswatch/static/src/less/readable/bootswatch.less b/addons/theme_bootswatch/static/src/less/readable/bootswatch.less
index 621582acb3a..c7d7cd4cc66 100644
--- a/addons/theme_bootswatch/static/src/less/readable/bootswatch.less
+++ b/addons/theme_bootswatch/static/src/less/readable/bootswatch.less
@@ -2,7 +2,7 @@
 // Bootswatch
 // -----------------------------------------------------
 
-@import url("//fonts.googleapis.com/css?family=Raleway:400,700");
+@import (css) url("//fonts.googleapis.com/css?family=Raleway:400,700");
 
 // Navbar =====================================================================
 
diff --git a/addons/theme_bootswatch/static/src/less/simplex/bootswatch.less b/addons/theme_bootswatch/static/src/less/simplex/bootswatch.less
index 9587dd0ec88..137501ff46c 100644
--- a/addons/theme_bootswatch/static/src/less/simplex/bootswatch.less
+++ b/addons/theme_bootswatch/static/src/less/simplex/bootswatch.less
@@ -2,7 +2,7 @@
 // Bootswatch
 // -----------------------------------------------------
 
-@import url("//fonts.googleapis.com/css?family=Open+Sans:400,700");
+@import (css) url("//fonts.googleapis.com/css?family=Open+Sans:400,700");
 
 .btn-shadow(@color) {
   #gradient > .vertical-three-colors(lighten(@color, 3%), @color, 6%, darken(@color, 3%));
@@ -139,4 +139,4 @@ label {
 
 // Progress bars ==============================================================
 
-// Containers =================================================================
\ No newline at end of file
+// Containers =================================================================
diff --git a/addons/theme_bootswatch/static/src/less/spacelab/bootswatch.less b/addons/theme_bootswatch/static/src/less/spacelab/bootswatch.less
index 16a6678dc59..30f87c110ed 100644
--- a/addons/theme_bootswatch/static/src/less/spacelab/bootswatch.less
+++ b/addons/theme_bootswatch/static/src/less/spacelab/bootswatch.less
@@ -2,7 +2,7 @@
 // Bootswatch
 // -----------------------------------------------------
 
-@import url("//fonts.googleapis.com/css?family=Open+Sans:400italic,700italic,400,700");
+@import (css) url("//fonts.googleapis.com/css?family=Open+Sans:400italic,700italic,400,700");
 
 .btn-shadow(@color) {
   #gradient > .vertical-three-colors(lighten(@color, 15%), @color, 50%, darken(@color, 4%));
@@ -136,4 +136,4 @@
       color: #fff;
     }
   }
-}
\ No newline at end of file
+}
diff --git a/addons/theme_bootswatch/static/src/less/united/bootswatch.less b/addons/theme_bootswatch/static/src/less/united/bootswatch.less
index dbe7aba6dfe..0446b9a9b82 100644
--- a/addons/theme_bootswatch/static/src/less/united/bootswatch.less
+++ b/addons/theme_bootswatch/static/src/less/united/bootswatch.less
@@ -2,7 +2,7 @@
 // Bootswatch
 // -----------------------------------------------------
 
-@import url("//fonts.googleapis.com/css?family=Ubuntu");
+@import (css) url("//fonts.googleapis.com/css?family=Ubuntu");
 
 // Navbar =====================================================================
 
@@ -39,4 +39,4 @@
 
 // Progress bars ==============================================================
 
-// Containers =================================================================
\ No newline at end of file
+// Containers =================================================================