Calen Pennington 029d8c8085 Merge remote-tracking branch 'origin/master' into feature/alex/poll-merged ...

Conflicts:
	common/lib/xmodule/xmodule/capa_module.py
	common/lib/xmodule/xmodule/tests/test_capa_module.py

2013-03-15 09:46:47 -04:00

..

capa

Coerce correctmap keys to strings, so that they are pickleable

2013-03-12 09:32:19 -04:00

xmodule

Merge remote-tracking branch 'origin/master' into feature/alex/poll-merged

2013-03-15 09:46:47 -04:00

.gitignore

Starting to generate jasmine tests for common/lib

2012-11-14 15:03:55 -05:00

logsettings.py

Revert logsettings

2013-02-11 19:21:22 -05:00

rooted_paths.py

…

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