Greg Price 0d37b4b254 Merge branch 'release' ...

Conflicts:
	cms/djangoapps/contentstore/tests/test_course_listing.py
	common/djangoapps/student/management/commands/create_random_users.py
	common/lib/xmodule/xmodule/modulestore/loc_mapper_store.py
	lms/djangoapps/bulk_email/forms.py
	lms/djangoapps/courseware/tests/test_video_handlers.py
	lms/djangoapps/courseware/views.py
	lms/djangoapps/instructor/management/commands/openended_post.py
	lms/djangoapps/instructor/management/commands/openended_stats.py
	lms/djangoapps/instructor/tests/test_spoc_gradebook.py

2014-06-02 15:29:40 -04:00

..

cms

Merge pull request #2738 from edx/dbarch/mixed_ms_router

2014-03-05 17:17:07 -05: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

Integrate event-tracking in to the LMS

2014-05-01 14:04:35 -04:00

aws_migrate.py

fixing syntax

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

aws.py

Merge pull request #3841 from edx/fix/large-email-queries-2

2014-05-29 16:37:25 -04:00

bok_choy.auth.json

Fix the pointer to the contentstore in the bok-choy settings

2014-04-04 12:30:09 -04:00

bok_choy.env.json

Added configuration for running tests using the bok-choy framework

2014-01-09 12:57:50 -05:00

bok_choy.py

Configure youtube stub for bok-choy

2014-04-25 20:01:09 +00:00

common.py

Merge branch 'release'

2014-06-02 15:29:40 -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

Only show banner on legacy dash for edx.org

2014-05-12 12:42:19 -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

Use path already created by ansible.

2014-05-16 16:37:39 -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

Moved hardcoded defaults into settings

2014-05-28 20:44:26 +00:00