From: deyk <deyk@crossway.org>
Date: Wed, 18 Jan 2012 19:44:49 +0000 (-0800)
Subject: Added support for handling user-merging workflows at authentication time.
X-Git-Tag: 22.4~60
X-Git-Url: https://git.mdrn.pl/django-cas-provider.git/commitdiff_plain/4a51c1aaa9c3eeac5368ff4e06870a94f18123aa?hp=4a51c1aaa9c3eeac5368ff4e06870a94f18123aa

Added support for handling user-merging workflows at authentication time.

 - views.login now has a merge mode flag, and a corresponding /cas/merge/ url.
 - forms.LoginForm now does its own validation, simplifying views.login
 - views.social_auth_login hasn't been adapted yet.
---