Adam Palay b199a72c62 Merge remote-tracking branch 'origin/release' into merge-release-into-master ...

Conflicts:
	cms/djangoapps/contentstore/views/course.py

2015-06-12 16:22:06 -04:00

..

tests

Merge pull request #8496 from edx/waheed/plat674-improve-test-with-ddt

2015-06-12 19:14:41 +05:00

__init__.py

New feature contribution: Entrance Exams

2015-01-15 20:35:24 -05:00

access.py

Moved has_course_access from CMS to student.auth (common)

2014-12-02 19:36:38 -05:00

assets.py

Use Django 1.4 @ensure_csrf_cookie method PLAT-664

2015-06-06 08:48:36 -04:00

certificates.py

Use Django 1.4 @ensure_csrf_cookie method PLAT-664

2015-06-06 08:48:36 -04:00

checklist.py

Use Django 1.4 @ensure_csrf_cookie method PLAT-664

2015-06-06 08:48:36 -04:00

component.py

Added a simple XBlockMixin for courseware licenses

2015-05-18 14:34:28 -04:00

course.py

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

2015-06-12 16:22:06 -04:00

dev.py

s/pylint: disable=W0613/pylint: disable=unused-argument/

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

entrance_exam.py

Use Django 1.4 @ensure_csrf_cookie method PLAT-664

2015-06-06 08:48:36 -04:00

error.py

s/pylint: disable=W0613/pylint: disable=unused-argument/

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

exception.py

New Feature: Certificates Web View

2015-06-01 19:48:04 -04:00

export_git.py

Use Django 1.4 @ensure_csrf_cookie method PLAT-664

2015-06-06 08:48:36 -04:00

helpers.py

Refactor and merge CourseViewType and CourseTab.

2015-06-08 15:18:39 -04:00

import_export.py

Use Django 1.4 @ensure_csrf_cookie method PLAT-664

2015-06-06 08:48:36 -04:00

item.py

Specified number of mongo and split calls in xblock outline handler test with ddt.

2015-06-12 17:17:59 +05:00

library.py

Use Django 1.4 @ensure_csrf_cookie method PLAT-664

2015-06-06 08:48:36 -04:00

preview.py

Make courseware licenses show up in Studio XBlock previews

2015-05-18 14:35:40 -04:00

public.py

Use Django 1.4 @ensure_csrf_cookie method PLAT-664

2015-06-06 08:48:36 -04:00

session_kv_store.py

Use strings instead of tuples as keys in SessionKeyValueStore

2014-09-24 15:17:46 -04:00

tabs.py

Merge pull request #8367 from edx/diana/merge-course-view-and-tab

2015-06-08 16:08:27 -04:00

transcripts_ajax.py

add name param check_transcripts

2015-06-12 16:34:45 +05:00

user.py

Use Django 1.4 @ensure_csrf_cookie method PLAT-664

2015-06-06 08:48:36 -04:00

videos.py

Merge pull request #7561 from edx/mobile/PLAT-520

2015-04-03 12:46:21 -04:00

xblock.py

Fix Pylint: I0022(deprecated-pragma)

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