Nimisha Asthagiri a03134b371 Merge remote-tracking branch 'origin/release' into rc/2014-07-16 ...

Conflicts:
	common/lib/xmodule/xmodule/modulestore/mixed.py
	common/lib/xmodule/xmodule/modulestore/mongo/base.py

2014-07-21 10:35:55 -04:00

..

calc

Upgrade pyparsing to 2.0.1

2014-04-02 16:09:53 -04:00

capa

Do not print exception message below stacktrace

2014-06-19 12:19:21 +03:00

chem

Upgrade pyparsing to 2.0.1

2014-04-02 16:09:53 -04:00

sandbox-packages

…

symmath

pep8/pylint cleanup on symmath/formula.py

2014-02-11 09:46:24 -05:00

xmodule

Merge remote-tracking branch 'origin/release' into rc/2014-07-16

2014-07-21 10:35:55 -04:00

django_startup.py

Very Minor tweaks to the LMS and CMS startup.

2014-01-02 14:27:52 -05:00

extract_tar.py

Fix pylint disable pragmas that were pep8 violations

2014-03-20 10:18:40 -04:00

html_to_text.py

Hide "Email Settings" from student dash if bulk email not enabled

2013-08-29 12:40:33 -04:00

logsettings.py

Remove lms/lib from sys.path in favore of using it as the module lms.lib

2013-11-08 11:08:48 -05:00

mail_utils.py

Wraps long lines in bulk email messages.

2014-04-25 18:25:20 +05:00

rooted_paths.py

…

supertrace.py

…

tempdir.py

…

test_generate.py

Moved test_generate from i18n-tools

2014-06-23 10:06:28 -04:00