Andy Armstrong 7b26e85478 Merge branch 'release' into andya/merge-hotfix-2014-08-29 ...

Conflicts:
	cms/djangoapps/contentstore/tests/test_import.py
	common/lib/xmodule/xmodule/modulestore/__init__.py
	common/lib/xmodule/xmodule/modulestore/tests/test_mixed_modulestore.py
	lms/djangoapps/courseware/tests/test_module_render.py

2014-08-29 16:50:10 -04:00

..

tests

Add memoization for has_changes

2014-08-29 14:09:41 -04:00

__init__.py

Major refactor and rename of feature

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

access.py

Add fallback for org based roles

2014-06-09 15:10:49 -04:00

assets.py

Asset urls must start w/ slash

2014-08-21 12:11:27 -04:00

checklist.py

Translate string iff non-empty

2014-08-01 11:03:47 -07:00

component.py

Merge branch 'release' into andya/merge-hotfix-2014-08-29

2014-08-29 16:50:10 -04:00

course.py

Push bulk_write_operations up into ModuleStoreRead, and rename to remove reference to writes

2014-08-27 16:29:48 -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

Move to OpaqueKey implementations from the external library

2014-05-29 17:03:35 -04:00

helpers.py

Pass parent_xblock to xblock_studio_url to avoid unnecessary calls to get_parent_xblock.

2014-08-07 12:27:26 -04:00

import_export.py

Refactor xml_importer.py for easier reading.

2014-08-08 14:41:57 -04:00

item.py

Merge branch 'release' into andya/merge-hotfix-2014-08-29

2014-08-29 16:50:10 -04:00

preview.py

Add a request-token to identify which xblock html was rendered as part of the current request

2014-08-15 11:04:52 -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

LMS-2947 remove get_error_courses in Split.

2014-07-09 21:10:12 -04:00

transcripts_ajax.py

Fix merge conflict

2014-07-11 15:40:09 -04:00

user.py

Move to OpaqueKey implementations from the external library

2014-05-29 17:03:35 -04:00

xblock.py

Add test of local_resource_url in AcidBlock

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