From db186d9e9a534ad873b2a56b1881279563bccd93 Mon Sep 17 00:00:00 2001 From: "Fabio C. Barrionuevo da Luz" Date: Mon, 31 Aug 2015 00:09:28 -0300 Subject: [PATCH 1/2] fix issue #296 --- CHANGELOG.md | 6 ++++++ .../{{cookiecutter.repo_name}}/templates/account/login.html | 5 +++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 04f64969..80f0ca11 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -22,6 +22,11 @@ This project adheres to [Semantic Versioning](http://semver.org/). ### Removed - Dokku in favor of docker-compose and other modern Django tools (@pydanny) +## [2015-08-30] +### Changed +- Fix issue #296 - change login.html to use [get_providers](https://github.com/pennersr/django-allauth/blob/master/allauth/socialaccount/templatetags/socialaccount.py#L84-L93) templatetag because ``allauth.socialaccount`` context processor now is [deprecated](http://django-allauth.readthedocs.org/en/latest/changelog.html#from-0-21-0) (@luzfcb) + + ## [2015-08-30] ### Changed - Moved from Bootstrap 3 to Bootstrap 4 (@audreyr) @@ -32,6 +37,7 @@ This project adheres to [Semantic Versioning](http://semver.org/). - Update AngularJS version to 1.4.4 (@luzfcb) - Update the usage example on README (@luzfcb) + ## [2015-08-28] ### Changed - Switched to django-mailgun-redux so mail doesn't blow up on Python 3 (@pydanny) diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/account/login.html b/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/account/login.html index 19b7a897..51e75a10 100644 --- a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/account/login.html +++ b/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/account/login.html @@ -2,6 +2,7 @@ {% load i18n %} {% load account %} +{% load socialaccount %} {% load url from future %} {% load crispy_forms_tags %} @@ -12,8 +13,8 @@

{% trans "Sign In" %}

- - {% if socialaccount.providers %} + {% get_providers as socialaccount_providers %} + {% if socialaccount_providers %}

{% blocktrans with site.name as site_name %}Please sign in with one of your existing third party accounts. Or, sign up for a {{ site_name }} account and sign in below:{% endblocktrans %}

From baaa94926e2c45b3ce6d20021731da1dadea784a Mon Sep 17 00:00:00 2001 From: "Fabio C. Barrionuevo da Luz" Date: Sun, 13 Sep 2015 13:04:57 -0300 Subject: [PATCH 2/2] update CHANGELOG.md --- CHANGELOG.md | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 80f0ca11..2ef8d2b7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,10 @@ All enhancements and patches to cookiecutter-django will be documented in this file. This project adheres to [Semantic Versioning](http://semver.org/). +## [2015-09-13] +### Changed +- Fix issue #296 - change login.html to use [get_providers](https://github.com/pennersr/django-allauth/blob/master/allauth/socialaccount/templatetags/socialaccount.py#L84-L93) templatetag because ``allauth.socialaccount`` context processor now is [deprecated](http://django-allauth.readthedocs.org/en/latest/changelog.html#from-0-21-0) (@luzfcb) + ## [2015-09-09] ### Added - post_gen_hook to generate a secret key for use in locals.py. You should define your own for production (@pydanny) @@ -22,11 +26,6 @@ This project adheres to [Semantic Versioning](http://semver.org/). ### Removed - Dokku in favor of docker-compose and other modern Django tools (@pydanny) -## [2015-08-30] -### Changed -- Fix issue #296 - change login.html to use [get_providers](https://github.com/pennersr/django-allauth/blob/master/allauth/socialaccount/templatetags/socialaccount.py#L84-L93) templatetag because ``allauth.socialaccount`` context processor now is [deprecated](http://django-allauth.readthedocs.org/en/latest/changelog.html#from-0-21-0) (@luzfcb) - - ## [2015-08-30] ### Changed - Moved from Bootstrap 3 to Bootstrap 4 (@audreyr) @@ -37,7 +36,6 @@ This project adheres to [Semantic Versioning](http://semver.org/). - Update AngularJS version to 1.4.4 (@luzfcb) - Update the usage example on README (@luzfcb) - ## [2015-08-28] ### Changed - Switched to django-mailgun-redux so mail doesn't blow up on Python 3 (@pydanny)