Renzo Lucioni 5bb0e90878 Merge pull request #12156 from edx/renzo/merge-release-into-master ...

Manually merge release into master

2016-04-15 00:47:54 -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

Create a new CSMHExtended table to hold our new data

2016-02-29 13:58:39 -05:00

aws_migrate.py

Don't hardcode student_module_history

2016-03-01 11:56:11 -05:00

aws.py

Revert "saleem-latif/WL-328: Multi-Site Comprehensive Theming"

2016-04-12 08:22:14 -04:00

bok_choy.auth.json

Update reset-test-db.sh for bok-choy

2016-02-29 13:59:29 -05:00

bok_choy.env.json

remove unused CERTIFICATES_ENABLED feature flag

2016-04-06 17:53:40 -04:00

bok_choy.py

Revert "saleem-latif/WL-328: Multi-Site Comprehensive Theming"

2016-04-12 08:22:14 -04:00

common.py

Merge pull request #12156 from edx/renzo/merge-release-into-master

2016-04-15 00:47:54 -04: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

Rebase upgrade Django to v1.8.5

2015-11-10 15:00:19 -05:00

dev.py

Remove ruby reference in pipeline arguments.

2016-02-08 18:18:37 -05:00

devstack_optimized.py

Revert "saleem-latif/WL-328: Multi-Site Comprehensive Theming"

2016-04-12 08:22:14 -04:00

devstack.py

Revert "Remove ThemingAware storage mixins and ComprehensiveThemeFinder."

2016-04-12 16:22:34 -04:00

microsite_test.py

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

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

test_static_optimized.py

Rebase upgrade Django to v1.8.5

2015-11-10 15:00:19 -05:00

test.py

Revert "saleem-latif/WL-328: Multi-Site Comprehensive Theming"

2016-04-12 08:22:14 -04:00

yaml_config.py

Use yaml.safe_load, since we have no need for the greater power of .load

2016-02-24 15:36:04 -05:00