muhammad-ammar 8d5f153201 Merge remote-tracking branch 'origin/release' into dj18-release-merge ...

Conflicts:
	common/djangoapps/util/testing.py
	lms/djangoapps/instructor/views/api.py
	lms/djangoapps/teams/tests/test_views.py
	openedx/core/djangoapps/programs/models.py
	openedx/core/djangoapps/user_api/accounts/tests/test_views.py
	requirements/edx/github.txt

2015-11-18 17:53:44 +05: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

Rebase upgrade Django to v1.8.5

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

aws_migrate.py

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

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

aws.py

Merge remote-tracking branch 'origin/release' into dj18-release-merge

2015-11-18 17:53:44 +05: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

Add Timed Exams as a feature to edx-platform

2015-10-30 08:44:33 -04:00

bok_choy.py

Merge pull request #9744 from edx/cdodge/timed-exams

2015-10-30 11:03:59 -04:00

common.py

Merge remote-tracking branch 'origin/release' into dj18-release-merge

2015-11-18 17:53:44 +05:00

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

Rebase upgrade Django to v1.8.5

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

devplus.py

Rebase upgrade Django to v1.8.5

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

devstack_optimized.py

Use django.contrib.staticfiles instead of django-staticfiles.

2015-10-06 19:52:38 +05:00

devstack.py

Rebase upgrade Django to v1.8.5

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

discussionsettings.py

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

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

load_test.py

Rebase upgrade Django to v1.8.5

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

sauce.py

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

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

static.py

Rebase upgrade Django to v1.8.5

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

test_static_optimized.py

Rebase upgrade Django to v1.8.5

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

test_with_mysql.py

Rebase upgrade Django to v1.8.5

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

test.py

Rebase upgrade Django to v1.8.5

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

yaml_config.py

Rebase upgrade Django to v1.8.5

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