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

..

__init__.py

Get the cms up to the point of rendering a template

2012-06-08 14:01:41 -04:00

acceptance.py

Moved stub servers to terrain

2013-12-19 09:12:41 -05:00

aws_migrate.py

adding migrate env for cms

2013-08-01 08:43:20 -04: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

Added configuration for running tests using the bok-choy framework

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

bok_choy.env.json

Add acceptance tests using the AcidBlock for LMS and Studio

2014-02-13 13:22:10 -05:00

bok_choy.py

Mixed no longer translates

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

common.py

Merge remote-tracking branch 'origin/master' into release, conflicts resolved

2014-03-06 16:56:16 -05:00

debug_upload.py

pylint fixes

2013-07-09 19:16:44 -04:00

dev_dbperf.py

Rollback Django Debug Toolbar from 1.0.1 to 0.9.4

2014-02-19 11:41:12 -05:00

dev_ike.py

Rename of feature AUTH_USE_MIT_CERTIFICATES to AUTH_USE_CERTIFICATES across platform.

2014-02-04 10:50:48 -05:00

dev_shared_preview.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

Rollback Django Debug Toolbar from 1.0.1 to 0.9.4

2014-02-19 11:41:12 -05:00

devstack.py

Rollback Django Debug Toolbar from 1.0.1 to 0.9.4

2014-02-19 11:41:12 -05:00

microsite_test.py

This PR addresses the open feedback on the Microsites feature

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

test.py

Merge pull request #2738 from edx/dbarch/mixed_ms_router

2014-03-05 17:17:07 -05:00