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

Conflicts:
	requirements/edx/github.txt

2015-07-22 08:10:26 -04:00

..

tests

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

2015-07-22 08:10:26 -04:00

__init__.py

New feature contribution: Entrance Exams

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

access.py

Refactor auth.has_access to auth.user_has_role

2015-07-19 20:42:29 -04:00

assets.py

Use Django 1.4 @ensure_csrf_cookie method PLAT-664

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

certificates.py

only ddx PM can activate/deactivate or delete certificate configuration

2015-07-15 17:09:01 +05:00

checklist.py

Use Django 1.4 @ensure_csrf_cookie method PLAT-664

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

component.py

Revert "Decorated instructor dashboard with sudo_required."

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

course.py

Refactor auth.has_access to auth.user_has_role

2015-07-19 20:42:29 -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

Revert "edX Course/Library Import/Export API"

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

item.py

Remove superfluous-parens pylint violations

2015-07-13 17:33:28 -04:00

library.py

Revert "Decorated instructor dashboard with sudo_required."

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

preview.py

Eliminate instances of unused-import Pylint violation

2015-07-13 17:33:25 -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

Eliminate instances of unused-import Pylint violation

2015-07-13 17:33:25 -04:00

transcripts_ajax.py

add name param check_transcripts

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

user.py

Revert "Decorated instructor dashboard with sudo_required."

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

videos.py

MA-844 Video Upload: remove dependency on AssetMetaDataStore.

2015-06-18 18:28:48 -04:00

xblock.py

Fix XBlock class loading in local resource view

2015-06-30 19:10:45 +02:00