Chris Dodge 22695d80c7 Merge branch 'master' into feature/cdodge/cms-master-merge4 ...

Conflicts:
	common/djangoapps/student/models.py
	common/lib/capa/capa/responsetypes.py
	common/lib/xmodule/setup.py
	common/lib/xmodule/xmodule/course_module.py
	common/lib/xmodule/xmodule/xml_module.py
	jenkins/test.sh
	lms/djangoapps/courseware/access.py
	lms/djangoapps/courseware/tests/tests.py
	lms/djangoapps/django_comment_client/models.py
	requirements.txt

2013-01-17 09:15:37 -05:00

..

chem

moved tests from miller to tests

2012-11-28 16:57:30 +02:00

templates

Fix feedback response for peer grading so that students can respond to multiple feedback items

2013-01-10 19:00:04 -05:00

tests

Merge pull request #1010 from MITx/feature/alex/regions

2012-11-28 07:09:14 -08:00

__init__.py

Cleaning up pep8 violations

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

calc.py

formatting cleanup in calc.py

2012-10-08 10:51:37 -04:00

capa_problem.py

Clean up capa by removing message post actions that aren't needed

2013-01-14 13:12:38 -05:00

checker.py

Cleaning up pep8 violations

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

correctmap.py

minor whitespace + comment fixes

2012-10-29 23:44:38 -04:00

customrender.py

Cleanups:

2012-10-27 19:52:16 -04:00

eia.py

formatting

2012-10-08 10:55:45 -04:00

inputtypes.py

Remove open ended grading stuff, fix JS variable

2013-01-10 19:00:03 -05:00

javascript_problem_generator.js

Provide a reasonable seeding mechanism for jsresponses

2012-09-11 15:09:49 -07:00

javascript_problem_grader.js

Fixing dependency system for javascriptresponses. In particular, adding a location for node-only packages (that are never sent to the client) in lms/lib/node_modules and adding lms/static/js, lms/static/coffee/* to the NODE_PATH, along with the course's data directory.

2012-08-07 03:28:35 -04:00

registry.py

Add a registry that keeps track of tag->renderer/input mappings

2012-10-27 19:51:05 -04:00

responsetypes.py

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

2013-01-17 09:15:37 -05:00

util.py

perform a new merge from master, resolve conflicts

2013-01-03 10:43:03 -05:00

xqueue_interface.py

perform a new merge from master, resolve conflicts

2013-01-03 10:43:03 -05:00