Bridger Maxwell 14382702bc Merge remote-tracking branch 'origin/master' into feature/bridger/new_wiki ...

Conflicts:
	lms/templates/wiki/settings.html

2012-08-22 13:09:42 -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

course_wiki

Changed title of default root wiki page to just be Wiki.

2012-08-22 12:42:03 -04:00

courseware

Catch errors in module load

2012-08-22 12:58:46 -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' of github.com:MITx/mitx into feature/rocky/discussion_api_key

2012-08-21 15:45:24 -07:00

heartbeat

Upgrading to django 1.4.

2012-08-08 11:57:15 -04:00

lms_migration

github IPs in lms.envs.common; made create_user, create_groups,

2012-08-20 18:38:05 -04:00

multicourse

Cleaning up pep8 violations

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

simplewiki

Got simplewiki just cleaned up enough to work again, so I could view a page for reference.

2012-08-19 19:57:19 -04:00

static_template_view

Cleaning up pep8 violations

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

staticbook

Textbook TOC from S3

2012-08-20 13:32:13 -04:00