Adam Palay 4bb4efe9d9 Merge remote-tracking branch 'origin/release' into rc/2015-06-29 ...

Conflicts:
	requirements/edx/github.txt

2015-06-29 16:55:57 -04:00

..

features

Fixes tests, adds internationalized strings for new state tooltips, corrected tooltip javascript, etc.

2015-06-23 10:27:22 -04:00

management

Merge pull request #8391 from edx/alawibaba/plat5892

2015-06-12 12:39:38 -04:00

migrations

MIT: CCX. Code Quality Fixes

2015-04-10 23:30:27 -04:00

tests

Merge remote-tracking branch 'origin/release' into rc/2015-06-29

2015-06-29 16:55:57 -04:00

__init__.py

Moving LMS code into subdirectory

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

access.py

MA-776 change UserCourseEnrollmentsList endpoint to use course_overviews

2015-06-22 18:33:12 -04:00

admin.py

Remove unused imports.

2014-02-10 14:07:50 -05:00

courses.py

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

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

entrance_exams.py

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

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

field_overrides.py

Disable lineage traversal when no providers are specified in OverrideFieldData

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

grades.py

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

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

masquerade.py

Extend preview to support cohorted courseware

2015-01-15 10:33:44 -05:00

middleware.py

Fix Pylint: W0613(unused-argument)

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

model_data.py

Merge pull request #8391 from edx/alawibaba/plat5892

2015-06-12 12:39:38 -04:00

models.py

Adding call stack manager

2015-06-19 20:43:26 +00:00

module_render.py

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

2015-06-17 15:26:10 -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

Switch tabs to use ugettext_noop for titles.

2015-06-23 11:08:41 -04:00

testutils.py

This change cleans up the work in progress request at #8176

2015-06-12 10:21:48 -04:00

url_helpers.py

ECOM-1290: added the redirection back to courseware after re-verification

2015-04-10 19:44:35 +05:00

user_state_client.py

Adding dependency for edx-user-state-client

2015-06-25 03:10:50 +00:00

views.py

Merge branch 'release'

2015-06-25 13:11:41 -04:00