Clinton Blackburn 17f0193362 Merge pull request #10044 from edx/merge-release-into-master ...

Merging changes for hotfix/2015-10-05

2015-10-05 16:11:31 -04:00

..

cms

Ignore invalid-name errors for settings files

2015-01-16 11:37:28 -05:00

__init__.py

…

acceptance.py

Revert "Upgrade django-pipeline and staticfiles"

2015-10-05 14:40:28 -04:00

aws_migrate.py

…

aws.py

Revert "Upgrade django-pipeline and staticfiles"

2015-10-05 14:40:28 -04:00

bok_choy.auth.json

Use ConfigurationModels for third_party_auth, new metadata fetching - PR 8155

2015-06-26 13:23:59 -07:00

bok_choy.env.json

Merge pull request #9806 from edx/ziafazal/SOL-1185

2015-09-30 14:12:33 -04:00

bok_choy.py

Revert "Upgrade django-pipeline and staticfiles"

2015-10-05 14:40:28 -04:00

common.py

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

2015-10-05 16:11:31 -04:00

content.py

Upgrade django-debug-toolbar to 1.2.2

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

dev_with_worker.py

Fix Pylint: W0403(relative-import)

2015-03-13 20:20:04 -07:00

dev.py

Rename SEGMENT_KEY to have a unique key name for both CMS and LMS

2015-10-01 19:40:27 -04:00

devplus.py

Upgrade django-debug-toolbar to 1.2.2

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

devstack_optimized.py

Revert "Upgrade django-pipeline and staticfiles"

2015-10-05 14:40:28 -04:00

devstack.py

Revert "Upgrade django-pipeline and staticfiles"

2015-10-05 14:40:28 -04:00

discussionsettings.py

…

load_test.py

…

sauce.py

…

static.py

Move common/lib/*.py to openedx/core/lib

2015-03-23 12:40:24 -04:00

test_static_optimized.py

Revert "Upgrade django-pipeline and staticfiles"

2015-10-05 14:40:28 -04:00

test.py

Revert "Upgrade django-pipeline and staticfiles"

2015-10-05 14:40:28 -04:00

yaml_config.py

Replace SEGMENT_IO_LMS & SEGMENT_IO_LMS_KEY with single key SEGMENT_KEY

2015-09-24 11:49:03 -04:00