Sarina Canelake 2aea261d48 Merge branch 'release' ...

Conflicts:
	common/djangoapps/course_modes/views.py
	common/djangoapps/student/tests/test_roles.py
	common/djangoapps/student/views.py
	common/lib/opaque_keys/opaque_keys/__init__.py
	common/lib/opaque_keys/opaque_keys/tests/test_opaque_keys.py
	common/lib/xmodule/xmodule/contentstore/mongo.py
	lms/djangoapps/certificates/management/commands/gen_cert_report.py
	lms/djangoapps/notes/views.py

2014-06-10 16:59:23 -04:00

..

tests

Implement a custom editor for the split_module.

2014-06-05 12:16:16 -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

Move to OpaqueKey implementations from the external library

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

checklist.py

Move to OpaqueKey implementations from the external library

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

component.py

Implement a custom editor for the split_module.

2014-06-05 12:16:16 -04:00

course.py

Merge branch 'release'

2014-06-10 16:59:23 -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

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

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

import_export.py

Move to OpaqueKey implementations from the external library

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

item.py

Implement a custom editor for the split_module.

2014-06-05 12:16:16 -04:00

preview.py

Move to OpaqueKey implementations from the external library

2014-05-29 17:03:35 -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

Move to OpaqueKey implementations from the external library

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

transcripts_ajax.py

Move to OpaqueKey implementations from the external library

2014-05-29 17:03:35 -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