Diana Huang a971e71792 Merge branch 'will/logistration-third-party-auth-fixes' into will/combine-reg-login-form ...

Conflicts:
	common/djangoapps/course_modes/views.py

2014-11-04 10:50:09 -05:00

..

cms

ModulestoreEnum class.

2014-06-27 14:37:35 -04:00

devgroups

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

__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

Clean up after track selection experiment

2014-10-14 13:56:49 -04:00

bok_choy.auth.json

Remove unused credentials from mongo init

2014-10-09 11:55:14 -04: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 branch 'will/logistration-third-party-auth-fixes' into will/combine-reg-login-form

2014-11-04 10:50:09 -05:00

content.py

Rollback Django Debug Toolbar from 1.0.1 to 0.9.4

2014-02-19 15:39:39 -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

settings.MITX_FEATURES => settings.FEATURES

2013-12-03 15:34:55 -05:00

dev_with_worker.py

Add exceptions for unused imports in settings files

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

dev.py

Basic Mobile API (v0.5) and Video Abstraction Layer integration.

2014-09-23 12:31:46 -04:00

devplus.py

Rollback Django Debug Toolbar from 1.0.1 to 0.9.4

2014-02-19 15:39:39 -05:00

devstack.py

Basic Mobile API (v0.5) and Video Abstraction Layer integration.

2014-09-23 12:31:46 -04: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

Add trailing commas to multiline lists, to prevent string concatenation bugs

2014-02-13 13:12:42 -05:00

load_test.py

Added pylint exceptions to load test settings.

2013-08-01 09:42:31 -04:00

sauce.py

Add ability to run against generic selenium grid

2013-09-18 13:49:34 -04:00

static.py

Updating comments and docs for MITx -> edX transition

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

test.py

Redirect users to the track selection page or ?next page when using third party auth

2014-10-28 10:28:30 -04:00