Will Daly 5085b71677 Merge remote-tracking branch 'origin/master' into will/combine-reg-login-form ...

Conflicts:
	common/djangoapps/third_party_auth/pipeline.py
	lms/djangoapps/verify_student/tests/test_views.py

2014-11-10 15:05:37 -05:00

..

cms

Remove more pep8 violations

2014-11-04 07:37:41 -05:00

devgroups

Remove more pep8 violations

2014-11-04 07:37:41 -05:00

__init__.py

Moving LMS code into subdirectory

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

acceptance.py

LMS-11297 BokChoy and Acceptance tests configure default_store with update_module_store_settings.

2014-09-11 10:48:08 -04:00

aws_migrate.py

fixing syntax

2014-02-04 09:26:25 -05:00

aws.py

Implement shim for mobile video events.

2014-11-03 14:12:07 -05:00

bok_choy.auth.json

When s3fs cannot be accessed replaced with osfs

2014-10-28 00:01:55 +08:00

bok_choy.env.json

Remove references to /tmp in tests

2014-10-17 10:00:12 -04:00

bok_choy.py

Remove references to /tmp in tests

2014-10-17 10:00:12 -04:00

common.py

Merge remote-tracking branch 'origin/master' into will/combine-reg-login-form

2014-11-10 15:05:37 -05:00

content.py

Remove more pep8 violations

2014-11-04 07:37:41 -05:00

dev_ike.py

Merge pull request #1907 from edx/db/whitespace-fixes

2013-12-13 11:40:54 -08:00

dev_int.py

Remove more pep8 violations

2014-11-04 07:37:41 -05:00

dev_with_worker.py

Add exceptions for unused imports in settings files

2013-05-21 13:07:04 -04:00

dev.py

Remove more pep8 violations

2014-11-04 07:37:41 -05:00

devplus.py

Remove more pep8 violations

2014-11-04 07:37:41 -05:00

devstack.py

Remove more pep8 violations

2014-11-04 07:37:41 -05:00

discussionsettings.py

Start linting envs files, add task to only pylint errors, and move pylintrc file to the correct location

2013-05-21 09:34:12 -04:00

edx4edx_aws.py

Remove more pep8 violations

2014-11-04 07:37:41 -05:00

load_test.py

Remove more pep8 violations

2014-11-04 07:37:41 -05:00

sauce.py

Remove more pep8 violations

2014-11-04 07:37:41 -05:00

static.py

Updating comments and docs for MITx -> edX transition

2013-12-10 13:21:18 -05:00

test.py

Merge remote-tracking branch 'origin/master' into will/combine-reg-login-form

2014-11-10 15:05:37 -05:00