Adam Palay 76fc180cd9 Merge remote-tracking branch 'origin/release' into merge-release-into-master ...

Conflicts:
	common/lib/xmodule/xmodule/css/capa/display.scss

2015-09-01 16:01:04 -04:00

..

safe_exec

Add super() calls to setUp/tearDown that are missing them

2015-05-14 18:14:21 -04:00

templates

Merge remote-tracking branch 'origin/release' into merge-release-into-master

2015-09-01 16:01:04 -04:00

tests

Merge remote-tracking branch 'origin/release' into merge-release-into-master

2015-09-01 16:01:04 -04:00

__init__.py

Cleaning up pep8 violations

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

capa_problem.py

MA-977 Use "supports" decorator on XBlocks for multi-device support

2015-08-05 11:37:33 -04:00

checker.py

Change imports from path to use the stablest name.

2015-08-27 12:59:25 -04:00

correctmap.py

Revert "OSPR-535 Partial Credit"

2015-09-01 14:04:42 -04:00

customrender.py

Support for inline explanatory popups in problem XML

2015-02-05 16:56:02 -08:00

inputtypes.py

Revert "OSPR-535 Partial Credit"

2015-09-01 14:04:42 -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

registry.py

Fix PEP8: E126 continuation line over-indented

2014-11-24 20:46:44 -05:00

responsetypes.py

Merge remote-tracking branch 'origin/release' into merge-release-into-master

2015-09-01 16:01:04 -04:00

util.py

Adresses TNL-3096

2015-08-27 15:50:33 +00:00

xqueue_interface.py

Fix PEP8: E261 at least two spaces before inline comment

2014-11-10 19:31:09 -08:00