cahrens 6629d5d3a3 Merge branch 'master' into talbs/studio-authorship ...

Conflicts:
	cms/djangoapps/contentstore/views/user.py
	cms/static/sass/elements/_controls.scss
	cms/templates/activation_active.html
	cms/templates/activation_complete.html
	cms/templates/activation_invalid.html

2013-07-22 12:15:42 -04:00

..

models

Studio i18n

2013-07-12 16:25:39 -04:00

views

Change delete asset prompt to Warning type for consistency.

2013-07-18 11:47:40 -04:00

base.js

Merge branch 'master' into talbs/studio-authorship

2013-07-22 12:15:42 -04:00

hesitate.js

whitespace changes

2013-05-08 09:29:20 -04:00

main.js

whitespace changes

2013-05-08 09:29:20 -04:00

template_loader.js

Saving checkbox state, client template for individual checklist.

2013-03-18 15:03:54 -04:00