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

Conflicts:
	common/lib/xmodule/xmodule/seq_module.py
	common/lib/xmodule/xmodule/template_module.py
	common/lib/xmodule/xmodule/x_module.py
	lms/djangoapps/courseware/tests/tests.py
	lms/djangoapps/courseware/views.py
	lms/static/sass/course.scss
	requirements.txt

2012-12-07 11:17:41 -05:00

..

chem

moved tests from miller to tests

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

templates

Slight change in caption for lattice select.

2012-11-22 16:52:59 +02: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

added miller indexes grading for crystallography problems

2012-11-19 18:18:08 +02: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

removed hidden parameter to template, style='hidden' is set by default for input

2012-11-22 12:53:21 +02: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 remote-tracking branch 'origin/master' into feature/cale/cms-master

2012-12-07 11:17:41 -05: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