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

..

cache_toolbox

Fix delete cache so it also deletes location with run = None.

2014-05-09 14:17:32 -04:00

config_models

Switch dark_lang to database backed configuration

2014-01-29 13:24:41 -05:00

contentserver

Change Location, CourseLocator, etc to reference opaque-keys library

2014-05-30 20:32:38 +00:00

course_groups

Move to OpaqueKey implementations from the external library

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

course_modes

Merge branch 'release'

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

dark_lang

Ensure system language is released in dark lang middleware

2014-05-05 15:42:48 -04:00

datadog

Remove dogstatsd-python in favor of dogapi

2013-09-11 19:28:58 -04:00

django_comment_common

Move to OpaqueKey implementations from the external library

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

django_future

Cleaning up pep8 violations

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

edxmako

Fix bad interaction between pluggable InputTypes and Microsites

2014-04-01 16:49:15 -04:00

embargo

Move to OpaqueKey implementations from the external library

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

external_auth

Merge branch 'release'

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

heartbeat

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

2014-05-07 12:54:49 -04:00

lang_pref

Update cms urls for language preferences

2014-02-14 22:35:14 +00:00

microsite_configuration

This PR addresses the open feedback on the Microsites feature

2014-02-28 16:27:12 -05:00

monitoring

Fixes #3409

2014-04-22 13:30:49 -04:00

pipeline_js

Move loading of YouTube API to video module.

2014-03-19 19:30:45 +02:00

pipeline_mako

proxy raw further along

2014-05-20 14:01:55 -04:00

request_cache

use a request-scoped cache to keep the metadata inheritence tree around for the whole request. This means we should only do one trip to Memcached/Mongo per course per request. This is expected to keep memory utilization down

2013-03-27 22:37:07 -04:00

reverification

Move to OpaqueKey implementations from the external library

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

service_status

Use assertIsInstance.

2013-10-07 18:17:40 -04:00

session_inactivity_timeout

add middleware to be able to expire inactive sessions after N seconds

2014-01-24 10:36:21 -05:00

static_replace

Move to OpaqueKey implementations from the external library

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

status

Remove unused imports from common, as reported by pylint.

2013-06-19 16:56:34 -04:00

student

Merge branch 'release'

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

terrain

Fix location.url [LMS-2786]

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

third_party_auth

Fix bug that prevented account association during registration

2014-04-29 17:42:08 -07:00

track

Merge pull request #3954 from edx/brian/fix_session_id

2014-06-09 14:01:29 -04:00

user_api

Move to OpaqueKey implementations from the external library

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

util

Move to OpaqueKey implementations from the external library

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

xmodule_django

Move to OpaqueKey implementations from the external library

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

xmodule_modifiers.py

Fixed staff debug info endpoints for staff member.

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