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

..

cms

Ignore invalid-name errors for settings files

2015-01-16 11:37:28 -05:00

__init__.py

Moving LMS code into subdirectory

2012-06-06 14:09:01 -04:00

acceptance.py

Remove unused imports

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

aws_migrate.py

s/pylint: disable=W0614/pylint: disable=unused-wildcard-import/

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

aws.py

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

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

bok_choy.auth.json

Bok Choy tests for the split payment and verification flow

2015-01-15 17:25:25 -05:00

bok_choy.env.json

Added Certficates Web/HTML View

2015-03-13 12:16:13 -04:00

bok_choy.py

Backport dummy SECRET_KEYs from django 1.5 upgrade

2015-02-26 11:54:37 -05:00

common.py

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

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

content.py

Upgrade django-debug-toolbar to 1.2.2

2015-02-26 15:57:03 -05:00

dev_with_worker.py

Fix Pylint: W0403(relative-import)

2015-03-13 20:20:04 -07:00

dev.py

Upgrade django-debug-toolbar to 1.2.2

2015-02-26 15:57:03 -05:00

devplus.py

Upgrade django-debug-toolbar to 1.2.2

2015-02-26 15:57:03 -05:00

devstack.py

Added Certficates Web/HTML View

2015-03-13 12:16:13 -04:00

discussionsettings.py

s/pylint: disable=W0614/pylint: disable=unused-wildcard-import/

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

load_test.py

Fixing pep8 issues

2014-12-11 13:04:49 -05:00

sauce.py

s/pylint: disable=W0614/pylint: disable=unused-wildcard-import/

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

static.py

s/pylint: disable=W0614/pylint: disable=unused-wildcard-import/

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

test.py

Added Certficates Web/HTML View

2015-03-13 12:16:13 -04:00

yaml_config.py

Adding yaml_config, a new settings module

2014-12-10 16:46:12 -05:00