Calen Pennington d8f8d8c656 Merge branch 'release/1.0' ...

Conflicts:
	common/djangoapps/student/views.py
	lms/djangoapps/courseware/courses.py

2012-07-24 08:52:50 -04:00

..

djangoapps

Cleaning up pep8 violations

2012-07-23 14:44:40 -04:00

envs

Convert @mitx.mit.edu emails to @edx.org emails

2012-07-23 23:43:34 -04:00

static

Make end-to-end tests work again

2012-07-13 11:51:33 -04:00

templates

Fix failing tests

2012-07-23 13:49:11 -04:00

__init__.py

Get the cms up to the point of rendering a template

2012-06-21 10:59:36 -04:00

manage.py

Fix string layout for readability

2012-06-21 10:59:45 -04:00

urls.py

Add account creation and login to CMS

2012-07-16 13:34:04 -04:00