Rocky Duan 5009b78150 Merge branch 'ccp0101/moderation' of github.com:dementrock/mitx into merge ...

Conflicts:
	lms/djangoapps/django_comment_client/forum/views.py
	lms/djangoapps/django_comment_client/permissions.py
	lms/static/coffee/src/discussion/content.coffee
	lms/static/coffee/src/discussion/utils.coffee
	lms/templates/discussion/_recent_active_posts.html
	lms/templates/discussion/_search_bar.html
	lms/templates/discussion/_thread.html
	lms/templates/discussion/_trending_tags.html
	lms/urls.py

2012-08-14 17:32:30 -07: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

fixed bugs caused by merging

2012-08-14 13:43:04 -07: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 'ccp0101/moderation' of github.com:dementrock/mitx into merge

2012-08-14 17:32:30 -07:00

heartbeat

Upgrading to django 1.4.

2012-08-08 11:57:15 -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

Add DARK_LAUNCH functionality

2012-08-12 16:23:31 -04:00

static_template_view

Cleaning up pep8 violations

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

staticbook

Add DARK_LAUNCH functionality

2012-08-12 16:23:31 -04:00