Rocky Duan 2fb02f1a73 Merge branch 'master' of github.com:MITx/mitx into merge ...

Conflicts:
	lms/urls.py

2012-08-07 16:58:14 -04:00

..

certificates

Put back dynamic grade cutoffs and final grade rounding (from stable-end-of-course)

2012-08-06 18:51:11 -04:00

circuit

Cleaning up pep8 violations

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

courseware

Merge branch 'master' of github.com:MITx/mitx into merge

2012-08-07 16:58:14 -04:00

dashboard

Pass the cursor, rather than the output of cursor.execute, to dictfetchall

2012-08-01 16:19:29 -04:00

django_comment_client

Merge branch 'master' into merge

2012-08-07 16:49:54 -04:00

heartbeat

Cleaning up pep8 violations

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

lms_migration

minor - have migrate also show user when debugging

2012-08-04 10:28:05 -04:00

multicourse

Cleaning up pep8 violations

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

simplewiki

Cleaning up pep8 violations

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

static_template_view

Cleaning up pep8 violations

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

staticbook

Cleaning up pep8 violations

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