Adam Palay cfeb76e67f Merge remote-tracking branch 'origin/release' into adam/resolve-merge-conflicts ...

Conflicts:
	common/lib/xmodule/xmodule/modulestore/tests/test_mixed_modulestore.py

2014-09-05 13:20:15 -04:00

..

calc

Upgrade pyparsing to 2.0.1

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

capa

Merge pull request #4612 from edx/dcs/matlab-api-tweak

2014-08-28 12:07:12 -04:00

chem

Upgrade pyparsing to 2.0.1

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

i18n/tests

Add i18n extraction test

2014-09-04 17:03: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 adam/resolve-merge-conflicts

2014-09-05 13:20:15 -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

updating handlers list to conditionally include syslogger-remote

2014-08-04 11:36:52 -04: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

…