Calen Pennington b52ed48221 Merge remote-tracking branch 'origin/master' into feature/cale/cms-master ...

Conflicts:
	common/lib/capa/capa/responsetypes.py
	common/lib/xmodule/xmodule/js/src/html/display.coffee
	lms/envs/common.py

2012-10-23 13:38:11 -04:00

..

__init__.py

external_auth djangoapps files

2012-08-01 17:57:21 -04:00

admin.py

make external_auth table searchable in django admin; fix

2012-09-08 23:21:34 -04:00

djangostore.py

Fix error when creating empty associations

2012-10-05 13:46:49 -04:00

models.py

change model to have external_id and external_domain be unique_together

2012-08-02 09:56:33 -04:00

views.py

Merge remote-tracking branch 'origin/master' into feature/cale/cms-master

2012-10-23 13:38:11 -04:00