cahrens c95b44d851 Merge branch 'master' into feature/christina/metadata-ui ...

Conflicts:
	cms/envs/common.py
	cms/templates/base.html
	common/lib/xmodule/xmodule/combined_open_ended_module.py

2013-05-23 11:41:12 -04:00

..

calc

Sandbox-installed packages will be really installed instead of -e installed.

2013-05-21 19:21:39 -04:00

capa

Merge pull request #2101 from edx/ned/fix-code-import-for-check-functions

2013-05-22 12:32:43 -07:00

chem

Sandbox-installed packages will be really installed instead of -e installed.

2013-05-21 19:21:39 -04:00

sandbox-packages

Sandbox-installed packages will be really installed instead of -e installed.

2013-05-21 19:21:39 -04:00

xmodule

Merge branch 'master' into feature/christina/metadata-ui

2013-05-23 11:41:12 -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