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

..

features

Fix location.url [LMS-2786]

2014-06-09 15:17:20 -04:00

management

Move to OpaqueKey implementations from the external library

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

migrations

Fix 0010 courseware migration

2013-11-20 20:39:40 -08:00

tests

Merge branch 'release'

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

__init__.py

Moving LMS code into subdirectory

2012-06-06 14:09:01 -04:00

access.py

Fixed staff debug info endpoints for staff member.

2014-06-02 12:26:27 +05:00

admin.py

Remove unused imports.

2014-02-10 14:07:50 -05:00

courses.py

Merge pull request #3934 from edx/flowerhack/handout-error-logs

2014-06-03 09:30:31 -04:00

grades.py

Revert StudentModule.module_state_key to field rather than computed property

2014-05-09 10:41:12 -04:00

masquerade.py

settings.MITX_FEATURES => settings.FEATURES

2013-12-03 15:34:55 -05:00

model_data.py

Move to OpaqueKey implementations from the external library

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

models.py

Opaque-keys: fix pylint violations

2014-05-24 19:36:09 -04:00

module_render.py

Merge pull request #3934 from edx/flowerhack/handout-error-logs

2014-06-03 09:30:31 -04:00

progress.py

Cleaning up pep8 violations

2012-07-23 14:44:40 -04:00

urls.py

Moving LMS code into subdirectory

2012-06-06 14:09:01 -04:00

views.py

Merge branch 'release'

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