From: Radek Czajka <radekczajka@nowoczesnapolska.org.pl>
Date: Wed, 19 Feb 2014 12:08:27 +0000 (+0100)
Subject: Upgrade django-allauth.
X-Git-Url: https://git.mdrn.pl/wolnelektury.git/commitdiff_plain/a6145bb10676f304d4a3de6789c383f1f9326055?ds=sidebyside

Upgrade django-allauth.
---

diff --git a/apps/wolnelektury_core/static/scss/main/auth.scss b/apps/wolnelektury_core/static/scss/main/auth.scss
index 03cf6150a..793afe4f4 100755
--- a/apps/wolnelektury_core/static/scss/main/auth.scss
+++ b/apps/wolnelektury_core/static/scss/main/auth.scss
@@ -29,6 +29,9 @@
     &.google {
         background-image: url(/static/img/auth/google.png);
     }
+    &.facebook {
+        background-image: url(/static/img/auth/facebook.png);
+    }
 }
 
 
diff --git a/apps/wolnelektury_core/templates/socialaccount/connections.html b/apps/wolnelektury_core/templates/socialaccount/connections.html
index 9896b0954..3df16a8c5 100644
--- a/apps/wolnelektury_core/templates/socialaccount/connections.html
+++ b/apps/wolnelektury_core/templates/socialaccount/connections.html
@@ -47,7 +47,7 @@
 <h2>{% trans 'Add a 3rd Party Account' %}</h2>
 
 <ul class="socialaccount_providers">
-{% include "socialaccount/snippets/provider_list.html" %}
+{% include "socialaccount/snippets/provider_list.html" with process="connect" %}
 </ul>
 
 {% include "socialaccount/snippets/login_extra.html" %}
diff --git a/apps/wolnelektury_core/templates/socialaccount/snippets/login_extra.html b/apps/wolnelektury_core/templates/socialaccount/snippets/login_extra.html
new file mode 100644
index 000000000..ae067926b
--- /dev/null
+++ b/apps/wolnelektury_core/templates/socialaccount/snippets/login_extra.html
@@ -0,0 +1 @@
+{# This file intentionally left empty to disable loading FB JS. #}
diff --git a/requirements.txt b/requirements.txt
index 4c96c9379..f630b15e9 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -12,9 +12,7 @@ django-piston>=0.2.2.1,<0.2.3
 jsonfield>=0.9.20
 django-picklefield
 django-modeltranslation
-
-#django-allauth<0.10 with migration fix
--e git+git://github.com/rczajka/django-allauth.git@4ecda71b81f9311dea4febe1d2d0105f23c642c7#egg=django-allauth
+django-allauth>=0.15,<0.16
 
 pytz