Commit Graph

8 Commits

Author SHA1 Message Date
David Baumgold
e8d62ff6a8 Replace — with literal emdash 2014-12-12 11:09:26 -05:00
David Baumgold
1fe72d89bf Double quotes for i18n string 2014-12-12 09:44:21 -05:00
David Baumgold
71a74c41c7 Don't break up i18n string 2014-12-12 09:43:27 -05:00
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
David Baumgold
a6f349dab9 Studio i18n 2013-07-12 16:25:39 -04:00
Brian Talbot
b4457371a8 Studio: revises and syncs up activation message UI with dashboard UI 2013-07-11 14:53:22 -04:00
Victor Shnayder
5609ca6e2b remove empty marketing template 2012-07-16 13:34:05 -04:00
Victor Shnayder
ff59c9bfa9 Initial connection of student module with cms.
* Enable account creation
* Some code cleanups
* Fix access to nonexistent fields in the account creation view
* Formatting fixes
2012-07-13 11:51:32 -04:00