Greg Price f0322b9662 Merge branch 'release'

2015-03-11 11:14:48 -04:00

..

__init__.py

Get the cms up to the point of rendering a template

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

acceptance.py

Backport dummy SECRET_KEYs from django 1.5 upgrade

2015-02-26 11:54:37 -05:00

aws_migrate.py

s/pylint: disable=W0614/pylint: disable=unused-wildcard-import/

2014-12-01 11:22:11 -05:00

aws.py

SettingsService for accessing server-wide settings from XBlock

2015-03-05 18:24:47 +03:00

bok_choy.auth.json

Don't use 'test' db for mysql since it's reserved.

2014-11-13 14:41:50 -05:00

bok_choy.env.json

Enable course reruns by default.

2015-02-11 17:16:52 -05:00

bok_choy.py

Backport dummy SECRET_KEYs from django 1.5 upgrade

2015-02-26 11:54:37 -05:00

common.py

Merge pull request #7235 from open-craft/enable-content-libraries

2015-03-11 09:42:47 -05:00

debug_upload.py

s/pylint: disable=W0614/pylint: disable=unused-wildcard-import/

2014-12-01 11:22:11 -05:00

dev_dbperf.py

Upgrade django-debug-toolbar to 1.2.2

2015-02-26 15:57:03 -05:00

dev_with_worker.py

s/pylint: disable=W0614/pylint: disable=unused-wildcard-import/

2014-12-01 11:22:11 -05:00

dev.py

Upgrade django-debug-toolbar to 1.2.2

2015-02-26 15:57:03 -05:00

devstack.py

Merge pull request #6016 from cpennington/django-toolbar-upgrade

2015-02-27 10:39:32 -05:00

microsite_test.py

s/pylint: disable=W0614/pylint: disable=unused-wildcard-import/

2014-12-01 11:22:11 -05:00

test.py

Add an endpoint to exchange OAuth access tokens

2015-03-09 14:12:18 -04:00

yaml_config.py

optionally using environment variable for edx-platform hash

2014-12-16 15:13:08 -05:00