Calen Pennington ebe67d2d7d Merge remote-tracking branch 'origin/release/1.0' ...

Conflicts:
	common/djangoapps/student/views.py

2012-07-23 13:55:20 -04:00

..

certificates

Forgot to add this file in the last commit.

2012-07-12 17:10:12 -04:00

circuit

Moving LMS code into subdirectory

2012-06-06 14:09:01 -04:00

courseware

Merge remote-tracking branch 'origin/release/1.0'

2012-07-23 13:55:20 -04:00

heartbeat

Moving LMS code into subdirectory

2012-06-06 14:09:01 -04:00

multicourse

Merge branch 'stable-edx4edx' of github.com:MITx/mitx

2012-07-08 16:52:36 -04:00

simplewiki

Removed duplicate index on simplewiki_namespace. Re-added migration that was exposing South 0.7.4 bug.

2012-07-19 11:12:10 -04:00

ssl_auth

Moving LMS code into subdirectory

2012-06-06 14:09:01 -04:00

static_template_view

Cleaned up the urls file a bit, to remove urls that don't work. Also removed some unused stuff from static_template_views.

2012-07-20 15:56:48 -04:00

staticbook

Changed check_course from a decorator to a regular function that throws exceptions. Much easier to understand now.

2012-07-17 11:12:42 -04:00