Chris Dodge 5df23d15f2 Merge branch 'master' of github.com:edx/edx-platform into feature/cdodge/autoprovision-forums-master ...

Conflicts:
	cms/djangoapps/contentstore/views/course.py

2013-05-14 10:57:11 -04:00

..

capa

Pylint fixes

2013-05-13 12:40:32 -04:00

xmodule

Merge branch 'master' of github.com:edx/edx-platform into feature/cdodge/autoprovision-forums-master

2013-05-14 10:57:11 -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

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