Julian Arni 7fc6057700 Merge branch 'master' into jkarni/fix/descriptorsystemruntime ...

Conflicts:
	cms/djangoapps/contentstore/views/preview.py

2013-08-12 15:04:49 -04:00

..

auth

course admin team: handle is_staff users

2013-07-29 13:12:05 -04:00

contentstore

Merge branch 'master' into jkarni/fix/descriptorsystemruntime

2013-08-12 15:04:49 -04:00

course_creators

Send notification to admin when a user enters 'pending' state.

2013-08-06 16:26:33 -04:00

models

changing http:// to // on intro video urls to prevent browsers from blocking video embeds

2013-08-09 14:13:41 -07:00