Will Daly 96c2a50370 Merge branch 'master' into will/use-mixed-modulestore-in-tests ...

Conflicts:
	common/lib/xmodule/xmodule/modulestore/django.py
	lms/djangoapps/courseware/tests/test_views.py
	lms/djangoapps/courseware/tests/tests.py

2013-08-21 10:12:24 -04:00

..

calc

Move the silencing of numpy's warnings into test_calc.py

2013-08-15 08:54:43 -04:00

capa

Use calc's evaluator for staff answers in Numercial type

2013-08-19 13:40:32 -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 will/use-mixed-modulestore-in-tests

2013-08-21 10:12:24 -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

add warning message to sample-post.py

2013-02-06 18:57:25 -05:00

supertrace.py

Pep8 autofixes

2013-02-06 11:13:50 -05:00

tempdir.py

Make sure temp directories are properly cleaned up so running tests doesn't leave them behind.

2013-02-21 11:38:45 -05:00