Diana Huang dd20226ec3 Merge branch 'master' into feature/diana/rubric-input ...

Fix some merge issues involving rubric rendering

Conflicts:
	common/lib/xmodule/xmodule/combined_open_ended_rubric.py
	common/lib/xmodule/xmodule/open_ended_module.py
	common/lib/xmodule/xmodule/self_assessment_module.py

2013-01-18 16:36:22 -05:00

..

branding

[34078525] pep8 renaming of some extern_auth functions

2012-08-29 18:46:35 -04:00

certificates

Adding management command to grade students who were not previously

2012-11-20 15:18:25 -05:00

circuit

Cleaning up pep8 violations

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

course_wiki

Refactored wiki cheatsheet code.

2012-08-27 18:30:38 -04:00

courseware

Merge pull request #1316 from MITx/bugfix/victor/beta_testers

2013-01-18 12:43:11 -08:00

dashboard

added additional query to show number of users with any given number of registrations (power users)

2012-08-27 19:22:19 -04:00

django_comment_client

Remove circular dependencies that connect student.models and django_comment_client

2013-01-10 23:32:48 -05:00

heartbeat

Put course location urls in heartbeat page, rather than lists

2012-08-23 09:19:26 -04:00

instructor

fix bug in instructor dashboard groups code

2013-01-18 14:04:01 -05:00

licenses

Add fix for users with multiple licenses

2012-10-22 10:27:17 -04:00

lms_migration

add tracking log entries for modulestore reload

2012-09-09 21:08:31 -04:00

multicourse

Cleaning up pep8 violations

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

open_ended_grading

Merge branch 'master' into feature/diana/rubric-input

2013-01-18 16:36:22 -05:00

portal

Improve some comments and names in the acceptance test framework

2013-01-02 10:44:21 -05:00

psychometrics

center histogram bars; pep8

2012-09-10 22:28:37 -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

return proper error codes for 404 and 500 errors

2012-09-10 10:38:17 -04:00

staticbook

Dynamically find the start and end pages of a textbook instead of hardcoding to 6.002 values

2012-09-19 17:12:08 -04:00

terrain

Improve some comments and names in the acceptance test framework

2013-01-02 10:44:21 -05:00