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

Conflicts:
	cms/djangoapps/contentstore/views/course.py
	lms/djangoapps/django_comment_client/base/views.py
	lms/djangoapps/django_comment_client/management/commands/show_permissions.py
	lms/djangoapps/django_comment_client/models.py
	lms/djangoapps/django_comment_client/tests/test_utils.py
	lms/envs/common.py

2013-05-20 10:22:36 -04:00

..

calc

Move packages around so we can install packages into the sandbox.

2013-05-06 10:55:05 -04:00

capa

More info in the capa/safe_exec/README

2013-05-16 17:02:45 -04:00

chem

Move packages around so we can install packages into the sandbox.

2013-05-06 10:55:05 -04:00

sandbox-packages

Move symmath into capa so that it's available where needed

2013-05-06 11:39:17 -04:00

xmodule

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

2013-05-20 10:22:36 -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