Calen Pennington b52ed48221 Merge remote-tracking branch 'origin/master' into feature/cale/cms-master ...

Conflicts:
	common/lib/capa/capa/responsetypes.py
	common/lib/xmodule/xmodule/js/src/html/display.coffee
	lms/envs/common.py

2012-10-23 13:38:11 -04:00

..

chem

Testing and small fixes

2012-10-12 15:32:36 -04:00

templates

Fix CR showanswer template

2012-10-15 22:09:19 +00:00

tests

Initial refactor of inputtypes into classes.

2012-10-11 11:26:49 -04: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

merge

2012-10-12 23:06:39 -04:00

checker.py

Cleaning up pep8 violations

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

correctmap.py

formatting cleanup in correctmap.py

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

eia.py

formatting

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

inputtypes.py

merge

2012-10-12 23:06:39 -04: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

responsetypes.py

Merge remote-tracking branch 'origin/master' into feature/cale/cms-master

2012-10-23 13:38:11 -04:00

util.py

typos

2012-10-18 20:25:52 -04:00

xqueue_interface.py

formatting in xqueue_interface.py

2012-10-08 10:58:38 -04:00