lapentab b9ca9a84d7 Merge branch 'master' into blapenta/fix-test-coverage ...

Conflicts:
	AUTHORS
	common/lib/xmodule/xmodule/tests/test_annotatable_module.py
	common/lib/xmodule/xmodule/tests/test_capa_module.py
	common/lib/xmodule/xmodule/tests/test_combined_open_ended.py
	common/lib/xmodule/xmodule/tests/test_conditional.py
	common/lib/xmodule/xmodule/tests/test_html_module.py
	common/lib/xmodule/xmodule/tests/test_progress.py
	common/lib/xmodule/xmodule/tests/test_xml_module.py
	lms/djangoapps/courseware/tests/__init__.py

2013-06-18 13:41:53 -04:00

..

calc

Quick fixes in calc.py

2013-06-13 16:38:43 -04:00

capa

Merge branch 'master' into pbaratta/calc-add-trig

2013-06-13 16:43:27 -04:00

chem

Sandbox-installed packages will be really installed instead of -e installed.

2013-05-21 19:21:39 -04:00

sandbox-packages

Move loncapa grading helpers into the sandbox-packages directory.

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

symmath

Move symmath to be its own directory, and install it into the sandbox.

2013-05-31 15:22:16 -04:00

xmodule

Merge branch 'master' into blapenta/fix-test-coverage

2013-06-18 13:41:53 -04:00

logsettings.py

Revert logsettings

2013-02-11 19:21:22 -05: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