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

..

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

Merge pull request #5361 from edx/cdodge/change-invoice-email-and-attachments

2014-09-24 10:56:41 -04:00

bok_choy.auth.json

Enable third party auth in LMS acceptance tests

2014-09-10 16:23:09 -04:00

bok_choy.env.json

Enable third party auth in LMS acceptance tests

2014-09-10 16:23:09 -04:00

bok_choy.py

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

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

common.py

Merge branch 'release'

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

Revert "Revert "add an additional tag so we can route zendesk tickets better for..."

2014-09-24 13:19:51 -04:00