Han Su Kim bdfd81d2f3 Merge remote-tracking branch 'origin/master' into release, conflicts resolved ...

Conflicts:
	cms/envs/common.py
	common/lib/xmodule/xmodule/seq_module.py
	lms/envs/common.py
	requirements/edx/edx-private.txt

2014-03-06 16:56:16 -05: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

Mixed no longer translates

2014-03-05 14:40:33 -05:00

aws_migrate.py

fixing syntax

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

aws.py

This PR addresses the open feedback on the Microsites feature

2014-02-28 16:27:12 -05:00

bok_choy.auth.json

MixedModulestore wraps most getters, update_item, delete_item

2014-02-05 09:34:30 -05: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

Point to prefer_xmodules new locn

2014-03-05 14:40:34 -05:00

common.py

Moved CLASS_DASHBOARD setting into the FEATURES dict.

2014-03-05 15:47:23 -08: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

New tab (Metrics) in instructor dashboard

2014-02-28 14:01:44 -08: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

Rollback Django Debug Toolbar from 1.0.1 to 0.9.4

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

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

Merge pull request #2553 from edx/cdodge/microsite-cleanup

2014-02-28 17:38:19 -05:00