Adam Palay b5c4b6388c Merge remote-tracking branch 'origin/release' into adam/merge-release-to-master ...

Conflicts:
	common/djangoapps/cors_csrf/helpers.py
	common/djangoapps/enrollment/views.py
	lms/djangoapps/commerce/constants.py
	lms/djangoapps/commerce/tests.py
	lms/djangoapps/commerce/views.py

2015-03-19 16:30:46 -04:00

..

calc

s/pylint: disable=W0104/pylint: disable=pointless-statement/

2014-12-01 11:22:12 -05:00

capa

Remove unused imports

2015-03-17 07:10:31 -04:00

chem

Fix Pylint: W0110: (deprecated-lambda)

2014-11-24 20:48:05 -05:00

dogstats

Consistently ensure dog_stats_api tags are formatted correctly

2014-10-09 12:35:26 -07: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

Adds testability to the EIA file

2015-01-13 11:01:41 -05:00

symmath

Always call super(..).setUp() from setUp

2015-02-04 09:09:14 -05:00

xmodule

Merge remote-tracking branch 'origin/release' into adam/merge-release-to-master

2015-03-19 16:30:46 -04:00

django_startup.py

Fix PEP8: E302 expected 2 blank lines, found 1

2014-11-10 11:00:11 -08:00

extract_tar.py

Remove more pep8 violations

2014-11-04 07:37:41 -05: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

…

tempdir.py

Fix PEP8: E302 expected 2 blank lines, found 1

2014-11-10 11:00:11 -08:00