Calen Pennington 29f7fe14fb Merge remote-tracking branch 'edx/master' into ok-merge-from-master

2014-05-23 10:05:56 -04:00

..

tests

Fix bad uses of course_id/location/locator in new code on master

2014-05-22 16:24:02 -04:00

__init__.py

Major refactor and rename of feature

2014-02-13 12:53:47 -05:00

access.py

Make course ids and usage ids opaque to LMS and Studio [partial commit]

2014-05-07 12:56:43 -04:00

assets.py

Make course ids and usage ids opaque to LMS and Studio [partial commit]

2014-05-07 12:56:43 -04:00

checklist.py

Merge remote-tracking branch 'edx/master' into ok-merge-from-master

2014-05-23 10:05:56 -04:00

component.py

Fix bad uses of course_id/location/locator in new code on master

2014-05-22 16:24:02 -04:00

course.py

Responses to comments on https://github.com/edx/edx-platform/pull/3539

2014-05-09 10:18:22 -04:00

dev.py

Add the ability to view templates in a browser in development mode

2014-02-07 14:56:35 -05:00

error.py

Fix pylint disable pragmas that were pep8 violations

2014-03-20 10:18:40 -04:00

export_git.py

Make course ids and usage ids opaque to LMS and Studio [partial commit]

2014-05-07 12:56:43 -04:00

helpers.py

Merge remote-tracking branch 'edx/master' into opaque-keys

2014-05-22 10:52:00 -04:00

import_export.py

Clean up logging in import_export.py

2014-05-21 14:25:21 -04:00

item.py

Fix merge conflicts

2014-05-22 16:24:02 -04:00

preview.py

Fix merge conflicts

2014-05-22 16:24:02 -04:00

public.py

Fix merge conflicts relative to master

2014-05-12 11:42:21 -04:00

session_kv_store.py

Add test of local_resource_url in AcidBlock

2014-02-25 14:01:37 -05:00

tabs.py

Make course ids and usage ids opaque to LMS and Studio [partial commit]

2014-05-07 12:56:43 -04:00

transcripts_ajax.py

Make course ids and usage ids opaque to LMS and Studio [partial commit]

2014-05-07 12:56:43 -04:00

user.py

Make course ids and usage ids opaque to LMS and Studio [partial commit]

2014-05-07 12:56:43 -04:00

xblock.py

Add test of local_resource_url in AcidBlock

2014-02-25 14:01:37 -05:00