David Ormsbee d0bff1ed3c Merge branch 'master' into jmpm-analytics ...

Conflicts:
	lms/djangoapps/instructor/views.py
	lms/envs/common.py
	lms/templates/courseware/instructor_dashboard.html

2013-03-06 17:09:09 -05:00

..

capa

Fix a bug in extracting HTML

2013-03-06 10:34:57 -05:00

xmodule

Remove unnecessary import.

2013-03-06 09:21:37 -05:00

.gitignore

Starting to generate jasmine tests for common/lib

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

logsettings.py

Merge branch 'master' into jmpm-analytics

2013-03-06 17:09:09 -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