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

..

features

Delete test that is already covered by bok choy.

2015-10-21 13:26:54 -04:00

management

Rebase upgrade Django to v1.8.5

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

migrations

Rebase upgrade Django to v1.8.5

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

tests

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

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

__init__.py

…

access_response.py

Show vaguer error message if using default start date

2015-08-10 17:26:36 -04:00

access_utils.py

Refactor has_access for re-usability.

2015-10-26 16:26:41 -04:00

access.py

Refactor has_access for re-usability.

2015-10-26 16:26:41 -04:00

admin.py

Revert "Decorated instructor dashboard with sudo_required."

2015-07-17 12:11:38 -04:00

courses.py

Fix date summary blocks for courses without an end date.

2015-11-05 09:11:10 -05:00

courseware_access_exception.py

MA-851: Add access response information into view_course_access

2015-07-31 09:30:40 -04:00

date_summary.py

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

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

entrance_exams.py

use a generic function check if entrance_exam is enabled or not

2015-10-22 16:45:19 +05:00

field_overrides.py

Override due dates in the LMS for self-paced courses.

2015-10-28 14:33:11 -04:00

grades.py

Rebase upgrade Django to v1.8.5

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

masquerade.py

Make new masquerading code compatible to existing session data.

2015-08-11 10:47:25 +02:00

middleware.py

Fix Pylint: W0613(unused-argument)

2015-02-19 19:56:51 -08:00

model_data.py

Injecting call stack manager in CSM/CSMH,introducting @trackit,@wrapt, and refining implementation[PLAT-758]

2015-08-26 22:29:43 +00:00

models.py

Rebase upgrade Django to v1.8.5

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

module_render.py

Rebase upgrade Django to v1.8.5

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

self_paced_overrides.py

Disable setting course pacing during course run.

2015-10-28 16:44:36 -04:00

student_field_overrides.py

Only enable the OverrideFieldData when there are active overrides on a course.

2015-06-17 15:26:10 -04:00

tabs.py

added user’s pass status to problem_check response if problem is in

2015-10-14 15:38:18 +05:00

testutils.py

Disable setting course pacing during course run.

2015-10-28 16:44:36 -04:00

url_helpers.py

Addressed notes.

2015-07-21 14:39:18 +00:00

user_state_client.py

Add response times to get_many/set_many/delete_many.

2015-11-05 11:02:49 -05:00

views.py

Rebase upgrade Django to v1.8.5

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