cahrens
|
60d60de2c4
|
Use format for strings instead of %.
|
2013-07-25 12:21:17 -04: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 |
|
Don Mitchell
|
cfa13922f5
|
Change url for login from login to signin.
|
2013-02-15 17:30:24 -05:00 |
|
Victor Shnayder
|
5609ca6e2b
|
remove empty marketing template
|
2012-07-16 13:34:05 -04:00 |
|
Victor Shnayder
|
c176a7fe92
|
Add account creation and login to CMS
* connect up views from student app
* Add initial @login_required decorators on the protected views
* Add tests for some of the basic functionality
|
2012-07-16 13:34:04 -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 |
|