New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge of krvss fork #343

Merged
merged 121 commits into from May 9, 2012

Conversation

Projects
None yet
9 participants
@krvss
Copy link
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
Reverted signal processing in user details update; removed django dep…
…endency from setup - was not good for development version of django.
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.
Stas Kravets
Merge remote branch 'upstream/master'
Conflicts:
	social_auth/backends/contrib/livejournal.py
Stas Kravets
Merge remote branch 'upstream/master'
Conflicts:
	example/app/views.py
Stas Kravets
Merge remote branch 'upstream/master', updating to support latest cha…
…nges

Conflicts:
	example/templates/done.html
	example/templates/home.html
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.

krvss and others added some commits Feb 16, 2012

Account already in use exception
Moved exception class to exceptions.py module
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
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
Merge pull request #6 from oksana-slu/master
Заменила один ексепшин другим
Merge remote-tracking branch 'upstream/master'
Conflicts:
	social_auth/tests/base.py
Merge pull request #7 from latheiere/master
Corrected code in social_auth/backends/google.py, lines 98-99
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
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
@omab

This comment has been minimized.

Copy link
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