Merge of krvss fork #343

Merged
merged 121 commits into from May 9, 2012

Projects

None yet

9 participants

@krvss
Contributor
krvss commented May 9, 2012

After numerious requests from users I'd like to merge my fork with main branch.

Functionality in this fork:

Comments/suggestions are very welcome!

Stas Kravets and others added some commits Jan 14, 2011
Stas Kravets LiveJournal association display added to template. 4fe9b87
Stas Kravets Merge remote branch 'upstream/master' 9023d7c
Stas Kravets Reverted signal processing in user details update; removed django dep…
…endency from setup - was not good for development version of django.
9c39ba2
Stas Kravets VKontakte support - initial version. 0614f67
Stas Kravets Merge remote branch 'upstream/master' 0c4b22f
Stas Kravets Fixed openid issue, switch to hashlib from md5 library. 51a4a57
Stas Kravets Added expiration time check for VKontakte. aef5b15
Stas Kravets Yandex.ru support added; small change in default e-mail value in Open…
…IDBackend.get_user_details in order to make sure it is not None.
3ba9463
Stas Kravets Merge remote branch 'upstream/master' 1dc833d
Stas Kravets Merging 'upstream/master'. 35151b7
Stas Kravets Merge remote branch 'upstream/master' af82214
Stas Kravets Merging 'upstream/master'. 5c28055
Stas Kravets Merge remote branch 'upstream/master' 7d77363
Stas Kravets Updated LJ and Yandex backends to work with self.data, not self.POST. c55b822
Stas Kravets Update for Yandex to make sure all data passed into OpenID backend. 96f1f8e
Stas Kravets Merge remote branch 'upstream/master'
Conflicts:
	social_auth/backends/contrib/livejournal.py
024761a
Stas Kravets Merge remote branch 'upstream/master'
Conflicts:
	example/app/views.py
0577db6
Stas Kravets Merge remote branch 'upstream/master', updating to support latest cha…
…nges

Conflicts:
	example/templates/done.html
	example/templates/home.html
cfdcab1
Stas Kravets Merge remote branch 'upstream/master' 374d26b
Stas Kravets Merging of latest changes. 3055c4c
Stas Kravets Merge remote branch 'upstream/master' c040ba8
Stas Kravets Merge remote branch 'upstream/master'
Conflicts:
	setup.py
b76add6
Stas Kravets Merge remote branch 'upstream/master' d0c9462
Stas Kravets Merge remote branch 'upstream/master'
Conflicts:
	setup.py
f7f286c
Stas Kravets Merge remote branch 'upstream/master' d31eafd
Stas Kravets Merging with latest head; Yandex OpenID 2.0 support added - no need t…
…o specify Yandex username anymore, but it still works if you do.
63ffc7d
Stas Kravets Merge remote branch 'upstream/master' c28571b
Stas Kravets Odnoklassniki OAuth 2.0 authentication support added. d70ce9a
Stas Kravets Merge remote branch 'upstream/master' 4e15505
Stas Kravets Minor updates of settings and html. fdd379c
Stas Kravets Merge remote branch 'upstream/master' a2d788b
Stas Kravets Django dependency removed to allow development version usage. b6a3a92
Stas Kravets VKontakte OAuth2 authentication support added. d03ccd9
Stas Kravets Mail.ru OAuth 2.0 support added. aabb618
Stas Kravets Merge remote branch 'upstream/master' 23bc1e2
Stas Kravets Merge remote branch 'upstream/master' 5b96a5f
Stas Kravets Merge remote branch 'upstream/master'
Conflicts:
	example/templates/home.html
10e6297
Stas Kravets Merge remote branch 'upstream/master' 61436a2
Stas Kravets Authentication using signed_request for Facebook. Useful when applica…
…tion is canvas-type.
24e482a
Stas Kravets Merge remote branch 'upstream/master' d53d4a7
Stas Kravets VKontakte: experimental authentication for applications added. 30aad15
Stas Kravets JS API Application authentication added ("session" authentication). ea39a17
Stas Kravets Merge remote branch 'upstream/master'
Conflicts:
	example/templates/done.html
	example/templates/home.html
a7dbeae
Stas Kravets Updating templates for latest syntax. 1da4cad
Stas Kravets Added safe conversion of UID in init in order to avoid possible conge…
…stions.
97b4fd3
Stas Kravets VKontakte error checking. f20cfdd
Stas Kravets Merge remote branch 'upstream/master' a3ab46b
Stas Kravets Mail.ru cancel authentication handled properly. 4d4abc1
@sidmitra @ryr sidmitra Adding exception handling for Value Error: Account already in use, in…
… view.associate_complete
e4e5f7f
@omab @ryr Refactor repeated code. Refs gh-102 d97dae1
@omab @ryr v0.4.2 207d0fd
@omab @ryr Use details username only if it's non-blank. Closes gh-104 bb6a1b5
@omab @ryr Avoid csrf check on complete views in case provider uses POST and doe…
…sn't send CSRF token. Refs gh-67
e125408
Stas Kravets Merge remote branch 'upstream/master' 742c8cc
Stas Kravets VKontakte application authentication improvements. 1f5823c
@ryr Stas Kravets VKontakte application authentication improvements. c4efe99
root cosmetics db146a3
@ryr ryr Merge branch 'master' of https://github.com/ryr/django-social-auth c4790a2
@ryr ryr Merge branch 'master' of https://github.com/ryr/django-social-auth b81a22d
Stas Kravets VKontakte app auth improvements. 0d26e9d
@ryr ryr VKontakte app auth improvements. 650be8d
@ryr ryr Merge branch 'master' of https://github.com/omab/django-social-auth 567fb30
@bashmish bashmish Fixed bug in OpenIDBackend.extra_data() 0ffab23
@krvss krvss Merge remote-tracking branch 'upstream/master'. 1082920
@ryr ryr Merge remote-tracking branch 'upstream/master'
Conflicts:
	social_auth/__init__.py
	social_auth/backends/contrib/vkontakte.py
	social_auth/views.py
69f1ccb
@ryr ryr Merge branch 'master' of https://github.com/ryr/django-social-auth
Conflicts:
	social_auth/backends/contrib/vkontakte.py
391d329
@ryr ryr fix missed line 14eed6e
@ryr ryr revert to original file fb01102
@krvss krvss Merge pull request #1 from bashmish/master
Fixed bug in OpenIDBackend.extra_data()
b0996f9
@krvss krvss Merge pull request #2 from ryr/pull-request
some cosmetics
f223bcd
@krvss krvss Merge remote-tracking branch 'upstream/master'; Fixing VKontakte bad …
…exception declaration

Conflicts:
	social_auth/backends/facebook.py
6236268
@krvss krvss Merge branch 'master' of github.com:krvss/django-social-auth 2def980
@krvss krvss Merge remote-tracking branch 'upstream/master'
Conflicts:
	example/local_settings.py.template
2b52132
@krvss krvss Fixing redirect url as found in pull request from Quard. 07b8b89
@krvss krvss Merge remote-tracking branch 'upstream/master' e5767cb
@krvss krvss VKontakte OpenAPI fix: avoiding auto-close of popup window 1b849e2
@krvss krvss Merge remote-tracking branch 'upstream/master' 1698f9c
@krvss krvss Adding logging to OAuth backends: log the api call errors 808eff1
@krvss krvss Adding support of OAuth app login. d1514c6
@krvss krvss Merge remote-tracking branch 'upstream/master'
Conflicts:
	social_auth/backends/facebook.py
6feae45
@krvss krvss Merging with latest head; removal outdated FB authentication (sessions) 15aba05
@krvss krvss Merge remote-tracking branch 'upstream/master'
Conflicts:
	social_auth/backends/__init__.py
2c6fbec
@krvss krvss Added link for Russian users. 2667211
@krvss krvss Merge remote-tracking branch 'upstream/master' 9517e1f
@krvss krvss Merge remote-tracking branch 'upstream/master' dad8c88
@krvss krvss Merge remote-tracking branch 'upstream/master' feb5ea0
@krvss krvss Merge remote-tracking branch 'upstream/master' e7ac5f0
@krvss krvss Merge remote-tracking branch 'upstream/master' 84fe3b8
@krvss krvss Yandex OAuth2 support for Ya.ru and Moi Krug added e16f211
@krvss krvss Yandex OAuth2: Token moved to Authorization header 1ec6fd0
@krvss krvss Merge remote-tracking branch 'upstream/master' aa8e9d0
@krvss krvss Yandex OAuth2: Userpic update 2e54187
@krvss krvss Merge remote-tracking branch 'upstream/master' c0d2222
@krvss krvss Merging latest changes from omab 6465b04
@krvss krvss Facebook app auth update for the latest changes. 85c568c
@gugu gugu User-friendly errors, russian translation 595e76b
@gugu gugu Account already in use exception
Moved exception class to exceptions.py module
e13c36a
@gugu gugu removed debug 48d0a96
@gugu gugu changed "authentication" to "authorization" 2550cb5
@gugu gugu changed "authentication" to "authorization" e177efd
@elmit elmit fix bug in facebook backend with partial pipeline 96bf35a
@krvss krvss Merge pull request #4 from Eksmo/master
User-friendly errors
abb41ed
@gugu gugu fixed twitter tests 0bf1167
@krvss krvss Merge pull request #5 from Eksmo/master
fixed twitter tests
46c9a57
@krvss krvss Merge remote-tracking branch 'upstream/master'
Conflicts:
	README.rst
	doc/backends/google.rst
	doc/configuration.rst
	doc/miscellaneous.rst
	example/app/pipeline.py
	example/app/views.py
	example/local_settings.py.template
	example/settings.py
	example/templates/home.html
	social_auth/__init__.py
	social_auth/backends/__init__.py
	social_auth/backends/browserid.py
	social_auth/backends/contrib/github.py
	social_auth/backends/contrib/instagram.py
	social_auth/backends/facebook.py
	social_auth/backends/google.py
	social_auth/backends/pipeline/misc.py
	social_auth/backends/twitter.py
	social_auth/tests/google.py
	social_auth/utils.py
	social_auth/views.py
c4b7e71
@krvss krvss Merge remote-tracking branch 'origin/master'
Conflicts:
	social_auth/backends/__init__.py
	social_auth/backends/exceptions.py
	social_auth/backends/facebook.py
	social_auth/backends/pipeline/social.py
	social_auth/views.py
3e95b2a
@krvss krvss Merge remote-tracking branch 'upstream/master' 041354b
@oksana-slu oksana-slu replaced by except AuthFailed to except AuthException cef9a80
@krvss krvss Merge pull request #6 from oksana-slu/master
Заменила один ексепшин другим
c462d08
@latheiere latheiere Update social_auth/backends/google.py 13adcf3
@krvss krvss Merge remote-tracking branch 'upstream/master'
Conflicts:
	social_auth/tests/base.py
7729032
@krvss krvss Merge branch 'master' of github.com:krvss/django-social-auth d3e225f
@krvss krvss Merge pull request #7 from latheiere/master
Corrected code in social_auth/backends/google.py, lines 98-99
f878011
@krvss krvss Merge remote-tracking branch 'upstream/master'
Conflicts:
	README.rst
	example/local_settings.py.template
	example/templates/done.html
	social_auth/backends/contrib/vkontakte.py
	social_auth/backends/contrib/yandex.py
	social_auth/backends/facebook.py
	social_auth/views.py
29e1436
@krvss krvss Merge branch 'master' of github.com:krvss/django-social-auth e9d66c0
@krvss krvss Minor optimization and fixes a43f8a4
@krvss krvss Merging of vkontakte and yandex backends with bacher09 versions. Prep…
…arations for merge with omab master.
a8a1539
@krvss krvss Merge remote-tracking branch 'upstream/master'
Conflicts:
	example/settings.py
	social_auth/backends/__init__.py
	social_auth/backends/contrib/vkontakte.py
	social_auth/backends/contrib/yandex.py
bb86450
@krvss krvss Preparing for merge with main branch - cleaning up old merge differences c08dde0
@krvss krvss Preparing for merge with main branch - more clean-ups and documents u…
…pdate
d4a9707
@krvss krvss Logging update to use log function from utils, Facebook documentation…
… update for merge
00bc3c4
@omab
Owner
omab commented May 9, 2012

Wow, this is big, I'll review it and merge or suggest some changes, thanks!

@omab omab merged commit 00bc3c4 into omab:master May 9, 2012
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment