Chris Dodge 08adf9c0d5 Merge branch 'master' into feature/cdodge/cms-master-merge3 ...

Conflicts:
	common/lib/xmodule/xmodule/course_module.py
	common/lib/xmodule/xmodule/modulestore/mongo.py
	common/lib/xmodule/xmodule/modulestore/search.py
	common/lib/xmodule/xmodule/modulestore/xml.py
	doc/development.md
	lms/envs/common.py

2013-01-11 14:04:46 -05:00

..

branding

Allow for branding subdomains that are longer than a single .

2012-10-11 13:18:27 -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

append some character, in this case a '_', if the course number is really a full-on number. The Wiki library interprets this incorrectly - to date we've always used non-numerical values.

2012-12-19 20:54:43 -05:00

courseware

Merge branch 'master' into feature/cdodge/cms-master-merge3

2013-01-11 14:04:46 -05: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 commented out line and add a new comment. also remove debugging trace output

2013-01-09 16:05:09 -05:00

instructor

Merge branch 'master' into feature/cdodge/cms-master-merge3

2013-01-11 14:04:46 -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

Better and clearer comments along with some fixes

2013-01-10 16:45:19 -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

Add BDD lettuce tests for studio overview toggle section feature.

2013-01-10 16:00:40 -05:00