Skip to content
Permalink
Browse files

[MERGE] forward port branch saas-14 up to ca34ae4

  • Loading branch information...
KangOl committed Aug 29, 2019
2 parents ea821b9 + ca34ae4 commit 10d88083a0406522513340a85faffe7c4ad136ab
@@ -109,19 +109,10 @@ def web_login(self, *args, **kw):

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):
@@ -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 =====================================================================

@@ -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 =====================================================================

@@ -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;
}
}
}
@@ -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 =====================================================================

@@ -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 =====================================================================

@@ -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 =====================================================================

@@ -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 =================================================================
// Containers =================================================================
@@ -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;
}
}
}
}
@@ -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 =================================================================
// Containers =================================================================
@@ -79,7 +79,7 @@
// ===============================================

//== Fonts
@import url(https://fonts.googleapis.com/css?family=Work+Sans:300,400,500,600,700&subset=latin,latin-ext);
@import (css) url(https://fonts.googleapis.com/css?family=Work+Sans:300,400,500,600,700&subset=latin,latin-ext);

//== Font sizes/weigths
@font-size-base : 15px;
@@ -0,0 +1,11 @@
India, 2019-08-24

I hereby agree to the terms of the Odoo Individual Contributor License
Agreement v1.0.

I declare that I am authorized and able to make this agreement and sign this
declaration.

Signed,

Hariprasath bala.hariprasath@gmail.com https://github.com/hari4274

0 comments on commit 10d8808

Please sign in to comment.
You can’t perform that action at this time.