Julian Arni 7fc6057700 Merge branch 'master' into jkarni/fix/descriptorsystemruntime ...

Conflicts:
	cms/djangoapps/contentstore/views/preview.py

2013-08-12 15:04:49 -04:00

..

calc

Change calc module

2013-08-12 11:40:20 -04:00

capa

Create a new response type for Numerical/Formula

2013-08-12 11:48:45 -04:00

chem

Remove unused imports from common, as reported by pylint.

2013-06-19 16:56:34 -04:00

sandbox-packages

Move loncapa grading helpers into the sandbox-packages directory.

2013-05-31 12:01:33 -04:00

symmath

Pylint complains if you use string, even if you use it for what its still meant to be used for.

2013-06-21 16:35:47 -04:00

xmodule

Merge branch 'master' into jkarni/fix/descriptorsystemruntime

2013-08-12 15:04:49 -04:00

logsettings.py

Change console logging stream from stdout to stderr

2013-08-08 17:39:23 -04:00

rooted_paths.py

Sort the css and js assets by numerical index

2013-04-29 07:31:48 -04:00

sample-post.py

…

supertrace.py

…

tempdir.py

…