From: Slava Bacherikov <slava@bacher09.org>
Date: Tue, 17 Apr 2012 16:50:16 +0000 (+0300)
Subject: Merge with current omab master
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=efd00fa8f50d18fd05c085116260aa966098c93f;p=django-social-auth.git

Merge with current omab master
---

efd00fa8f50d18fd05c085116260aa966098c93f
diff --cc README.rst
index cdf5388,06d9dd8..5fe7f11
--- a/README.rst
+++ b/README.rst
@@@ -119,8 -118,8 +119,9 @@@ Configuratio
          'social_auth.backends.contrib.dropbox.DropboxBackend',
          'social_auth.backends.contrib.flickr.FlickrBackend',
          'social_auth.backends.contrib.instagram.InstagramBackend',
 +        'social_auth.backends.contrib.vkontakte.VkontakteBackend',
          'social_auth.backends.OpenIDBackend',
+         'social_auth.backends.contrib.bitbucket.BitbucketBackend',
          'django.contrib.auth.backends.ModelBackend',
      )
  
@@@ -154,8 -153,8 +155,10 @@@
      FLICKR_API_SECRET            = ''
      INSTAGRAM_CLIENT_ID          = ''
      INSTAGRAM_CLIENT_SECRET      = ''
 +    VK_APP_ID                    = ''
 +    VK_API_SECRET                = ''
+     BITBUCKET_CONSUMER_KEY       = ''
+     BITBUCKET_CONSUMER_SECRET    = ''
  
  - Setup login URLs::
  
@@@ -987,11 -990,26 +1012,26 @@@ Join to `django-social-auth discussion 
  that would improve this application. Convore_ discussion group is deprecated since
  the service is going to be shut down on April 1st.
  
- If defining a custom user model, do not import social_auth from any models.py
- that would finally import from the models.py that defines your User class or it
- will make your project fail with a recursive import because social_auth uses
- get_model() to retrieve your User.
- 
 -Sout users
 -^^^^^^^^^^
++South users
++^^^^^^^^^^^
+ South_ users should add this rule to enable migrations::
+ 
+     try:
+         import south
+         from south.modelsinspector import add_introspection_rules
+         add_introspection_rules([], ["^social_auth\.fields\.JSONField"])
+     except:
+         pass
+ 
+ Custom User model
+ ^^^^^^^^^^^^^^^^^
+ If defining a custom user model, do not import ``social_auth`` from any
+ ``models.py`` that would finally import from the ``models.py`` that defines
+ your ``User`` class or it will make your project fail with a recursive import
+ because ``social_auth`` uses ``get_model()`` to retrieve your User.
+ 
+ Third party backends
+ ^^^^^^^^^^^^^^^^^^^^
  There's an ongoing movement to create a list of third party backends on
  djangopackages.com_, so, if somebody doesn't want it's backend in the
  ``contrib`` directory but still wants to share, just split it in a separated
@@@ -1137,6 -1162,5 +1184,8 @@@ Base work is copyrighted by
  .. _Instagram API: http://instagr.am/developer/
  .. _django-social-auth discussion list: https://groups.google.com/group/django-social-auth
  .. _Twitter OAuth keys: https://dev.twitter.com/docs/auth/authorizing-request
 +.. _Vkontakte OAuth: http://vk.com/developers.php?oid=-1&p=%D0%90%D0%B2%D1%82%D0%BE%D1%80%D0%B8%D0%B7%D0%B0%D1%86%D0%B8%D1%8F_%D1%81%D0%B0%D0%B9%D1%82%D0%BE%D0%B2
 +.. _names of the privileges VKontakte: http://vk.com/developers.php?oid=-1&p=%D0%9F%D1%80%D0%B0%D0%B2%D0%B0_%D0%B4%D0%BE%D1%81%D1%82%D1%83%D0%BF%D0%B0_%D0%BF%D1%80%D0%B8%D0%BB%D0%BE%D0%B6%D0%B5%D0%BD%D0%B8%D0%B9
 +.. _Vkontakte API: http://vk.com/developers.php
+ .. _StackOverflow: http://stackoverflow.com/questions/9835506/urllib-urlopen-works-on-sslv3-urls-with-python-2-6-6-on-1-machine-but-not-wit
+ .. _#315: https://github.com/omab/django-social-auth/issues/315
diff --cc doc/backends/index.rst
index c000264,6f00501..62ef933
--- a/doc/backends/index.rst
+++ b/doc/backends/index.rst
@@@ -8,11 -8,13 +8,14 @@@ Contents
  
     openid
     oauth
-    google
     twitter
     facebook
+    google
     linkedin
     github
+    bitbucket
+    dropbox
+    flickr
     browserid
     instagram
 +   vkontakte