Adam Palay 8243d934e4 Merge remote-tracking branch 'origin/release' into merge-release-to-master ...

Conflicts:
	common/test/acceptance/tests/video/test_video_times.py

2015-05-08 10:23:04 -04:00

..

tests

Merge pull request #7621 from edx/shr/bug/TNL-1858-Unable-to-delete-studio-page

2015-05-08 15:06:03 +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

Implements SOL-20. Filtering for assets table by asset type

2015-01-16 12:53:24 -05:00

checklist.py

Ignore pylint error 7610 (translation-of-non-string) on where it is intended to do

2015-04-03 11:59:53 +08:00

component.py

Merge pull request #7563 from louyihua/translation_fix

2015-04-03 08:47:36 -04:00

course.py

MA-611, MA-613 Mobile Push Notification Studio Backend; Integration with Parse

2015-04-18 15:30:19 -04:00

dev.py

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

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

entrance_exam.py

Fix for SOL-475 (double exam grader bug)

2015-04-28 12:49:03 -04:00

error.py

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

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

export_git.py

Change has_course_access definition and doc string

2014-12-02 22:08:58 -05:00

helpers.py

Fix for SOL-475 (double exam grader bug)

2015-04-28 12:49:03 -04:00

import_export.py

Move common/lib/*.py to openedx/core/lib

2015-03-23 12:40:24 -04:00

item.py

i18n fix in studio

2015-04-13 19:00:52 +08:00

library.py

Unified Course Team and Library Users page. Converted both to Backbone.

2015-03-24 12:09:19 +03:00

preview.py

prevent overly nesting _field_data (TNL-2050)

2015-05-07 14:05:27 -04:00

public.py

Quality check and test fixes.

2015-01-12 13:41:03 +03:00

session_kv_store.py

Use strings instead of tuples as keys in SessionKeyValueStore

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

tabs.py

Change has_course_access definition and doc string

2014-12-02 22:08:58 -05:00

transcripts_ajax.py

Fixed transcript skip first line if it contains BOM(Byte Order Mark).

2015-01-16 12:21:43 +05:00

user.py

Unified Course Team and Library Users page. Converted both to Backbone.

2015-03-24 12:09:19 +03: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