Will Daly 48bc4776be Merge branch 'will/third-party-auth-fixes' into will/combine-reg-login-form ...

Conflicts:
	common/djangoapps/third_party_auth/__init__.py
	common/djangoapps/third_party_auth/pipeline.py

2014-10-28 15:16:27 -04:00

..

djangoapps

Merge branch 'will/third-party-auth-fixes' into will/combine-reg-login-form

2014-10-28 15:16:27 -04:00

lib

Moved assetstore tests to own file and ddt'd across stores

2014-10-27 10:04:10 -04:00

static

Merge branch 'will/third-party-auth-fixes' into will/combine-reg-login-form

2014-10-28 15:16:27 -04:00

templates

Redirect users to the track selection page or ?next page when using third party auth

2014-10-28 10:28:30 -04:00

test

Fix test page definition for course group configurations page

2014-10-24 14:30:31 -04:00

.gitignore

…

xml_cleanup.py

…