Don Mitchell 884019b14c Merge branch 'bug/dhm/date-parse' of github.com:MITx/mitx into bug/dhm/date-parse ...

Conflicts:
	cms/djangoapps/models/settings/course_metadata.py
	cms/urls.py

2013-03-22 16:56:31 -04:00

..

capa

pep8 fixes

2013-03-22 11:38:58 -04:00

xmodule

Merge branch 'bug/dhm/date-parse' of github.com:MITx/mitx into bug/dhm/date-parse

2013-03-22 16:56:31 -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

Make discussion js work for cms as well as lms so that inline discussion xmodules load

2012-10-01 15:16:54 -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