Andy Armstrong 0ed3a95d3a Merge branch 'release' ...

Conflicts:
	AUTHORS
	common/static/js/vendor/ova/OpenSeaDragonAnnotation.js
	common/test/acceptance/pages/lms/dashboard.py

2014-09-25 16:25:45 -04:00

..

calc

Upgrade pyparsing to 2.0.1

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

capa

Merge pull request #5293 from edx/usman/tnl388-invalid-xml-in-code-response

2014-09-24 00:14:34 +05:00

chem

Upgrade pyparsing to 2.0.1

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

i18n/tests

Quality cleanup

2014-09-08 12:02:31 -04:00

safe_lxml

Moved imports to startup.py.

2014-09-11 20:14:37 +05:00

sandbox-packages

…

symmath

pep8/pylint cleanup on symmath/formula.py

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

xmodule

Merge branch 'release'

2014-09-25 16:25:45 -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

…