Max Rothman c97314413b Merge branch 'release' into release-merge-test ...

Conflicts:
	lms/djangoapps/commerce/urls.py
	lms/djangoapps/commerce/views.py

2015-07-17 17:42:03 -04:00

..

cms

Ignore invalid-name errors for settings files

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

__init__.py

Moving LMS code into subdirectory

2012-06-06 14:09:01 -04:00

acceptance.py

Fix SEARCH_ENGINE set logic in settings files

2015-06-18 23:03:53 +02:00

aws_migrate.py

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

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

aws.py

Pulling JWT settings from envs tokens

2015-07-15 16:06:17 -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

Remove everything gated by ENABLE_INSTRUCTOR_ANALYTICS flag

2015-07-15 11:11:09 -04:00

bok_choy.py

Support running Studio with optimized assets

2015-07-01 18:22:31 -04:00

common.py

Merge branch 'release' into release-merge-test

2015-07-17 17:42:03 -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

Remove everything gated by ENABLE_INSTRUCTOR_ANALYTICS flag

2015-07-15 11:11:09 -04:00

devplus.py

Upgrade django-debug-toolbar to 1.2.2

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

devstack_optimized.py

Support running Studio with optimized assets

2015-07-01 18:22:31 -04:00

devstack.py

Update code of get_eligibility api.

2015-07-16 12:52:16 +05:00

discussionsettings.py

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

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

load_test.py

Fixing pep8 issues

2014-12-11 13:04:49 -05:00

sauce.py

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

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

static.py

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

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

test_static_optimized.py

Support running Studio with optimized assets

2015-07-01 18:22:31 -04:00

test.py

Revert "Add feature flag for Import/Export API in LMS"

2015-07-08 16:55:38 -04:00

yaml_config.py

MIT CCX: Use CCX Keys - responses to code review

2015-06-12 00:01:24 -07:00