Bridger Maxwell 2f4cf23b73 Merge remote-tracking branch 'origin/master' into course_start ...

Conflicts:
	common/djangoapps/student/views.py

2012-07-17 12:53:27 -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/master' into course_start

2012-07-17 12:53:27 -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

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

ssl_auth

Moving LMS code into subdirectory

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

static_template_view

Merged with master. Moved a bunch of static template files to their own urls (without /t/template).

2012-07-16 15:32:22 -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