Jean Manuel Nater 3c67e2754a Merge branch 'master' into jnater/courseware_tests ...

Conflicts:
	lms/djangoapps/courseware/tests/tests.py
	lms/djangoapps/instructor/tests/test_enrollment.py

2013-06-27 13:53:47 -04:00

..

calc

Convert many byte strings to unicode; change string formatting

2013-06-20 11:46:04 -04:00

capa

Merge pull request #272 from edx/fix/LMS-500

2013-06-26 07:49:54 -07:00

chem

Remove unused imports from common, as reported by pylint.

2013-06-19 16:56:34 -04:00

sandbox-packages

Move loncapa grading helpers into the sandbox-packages directory.

2013-05-31 12:01:33 -04:00

symmath

Pylint complains if you use string, even if you use it for what its still meant to be used for.

2013-06-21 16:35:47 -04:00

xmodule

Merge branch 'master' into jnater/courseware_tests

2013-06-27 13:53:47 -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