Permalink
Browse files

Preparing for merge with main branch - more clean-ups and documents u…

…pdate
  • Loading branch information...
krvss committed May 9, 2012
1 parent c08dde0 commit d4a970761bf93bc48c874e5d12be3cbaa20ebef9
Showing with 9 additions and 15 deletions.
  1. +6 −1 README.rst
  2. +1 −1 example/local_settings.py.template
  3. +1 −12 example/templates/done.html
  4. +1 −1 setup.py
View
@@ -747,6 +747,9 @@ http://127.0.0.1:8000 or http://localhost:8000 because it won't work when
testing. Instead I define http://myapp.com and setup a mapping on /etc/hosts
or use dnsmasq_.
+If you need to perform authentication from Facebook Canvas application, take a
+look to `Facebook Canvas Application Authentication`_.
+
Orkut
^^^^^
@@ -1140,6 +1143,7 @@ Mailing list
Join to `django-social-auth discussion list`_ and bring any questions or suggestions
that would improve this application. Convore_ discussion group is deprecated since
the service is going to be shut down on April 1st.
+
South users
^^^^^^^^^^^
South_ users should add this rule to enable migrations::
@@ -1348,4 +1352,5 @@ Base work is copyrighted by:
.. _hassek: https://github.com/hassek
.. _Mail.ru OAuth: http://api.mail.ru/docs/guides/oauth/
.. _Odnoklassniki OAuth: http://dev.odnoklassniki.ru/wiki/display/ok/The+OAuth+2.0+Protocol
-.. _authentication for VKontakte applications: http://www.ikrvss.ru/2011/11/08/django-social-auh-and-vkontakte-application/
+.. _authentication for VKontakte applications: http://www.ikrvss.ru/2011/11/08/django-social-auh-and-vkontakte-application/
+.. _Facebook Canvas Application Authentication: http://www.ikrvss.ru/2011/09/22/django-social-auth-and-facebook-canvas-applications/
@@ -54,4 +54,4 @@ SOCIAL_AUTH_PIPELINE = (
'social_auth.backends.pipeline.social.associate_user',
'social_auth.backends.pipeline.social.load_extra_data',
'social_auth.backends.pipeline.user.update_user_details',
-)
+)
@@ -65,18 +65,7 @@ <h3>Associate new <a href="http://openid.net/" title="OpenId">OpenId</a> credent
</form>
{% else %}
{% if name == "openid" %}
- <form action="{% url socialauth_associate_begin "yandex" %}" method="post">{% csrf_token %}
- <div>
- <label for="openid_ya_user">Yandex user
- {% if yandex %}(<span class="disconnect"><a href="{% url disconnect "yandex" %}">disconnect</a>)</span>{% endif %}
- </label>
- <input id="openid_ya_user" type="text" value="" name="openid_ya_user" />
- <input type="submit" value="Login"/>
- </div>
- </form>
- </li>
- <li>
- <form action="{% url socialauth_associate_begin "openid" %}" method="post">{% csrf_token %}
+ <form action="{% url socialauth_begin "openid" %}" method="post">{% csrf_token %}
<div>
<label for="openid_identifier">Other provider</label>
<input id="openid_identifier" type="text" value="" name="openid_identifier" />
View
@@ -42,7 +42,7 @@ def long_description():
install_requires=['django>=1.2.5',
'oauth2>=1.5.167',
'python_openid>=2.2'],
- classifiers=['Framework :: Django',
+ classifiers=['Framework :: Django',
'Development Status :: 4 - Beta',
'Topic :: Internet',
'License :: OSI Approved :: BSD License',

0 comments on commit d4a9707

Please sign in to comment.