Adam Palay d63a5abfbc Merge branch 'rc/2014-07-02' into testmergemaster ...

Conflicts:
	lms/djangoapps/instructor/views/instructor_dashboard.py

2014-07-07 13:54:03 -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

Enable Mixed Modulestore STUD-1540

2014-06-26 18:00:11 -04:00

course_groups

Move to OpaqueKey implementations from the external library

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

course_modes

Fix opaque_keys imports from hotfixes

2014-06-11 21:32:41 -04:00

dark_lang

Do not merge zh-hk into zh-tw in darklang

2014-06-12 01:19:49 +08:00

datadog

Remove dogstatsd-python in favor of dogapi

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

django_comment_common

forums: fix assign_default_role to use the correct constant.

2014-06-10 12:26:21 -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

Enable Mixed Modulestore STUD-1540

2014-06-26 18:00:11 -04:00

geoinfo

Do not look for country if no new ip.

2014-06-27 18:45:19 +03:00

heartbeat

Fix modulestore merge conflict with heartbeat.

2014-06-27 13:57:33 -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

Wait for scripts defined in common xmodule code to execute.

2014-06-18 13:11:37 -04: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

ModulestoreEnum class.

2014-06-27 14:37:35 -04:00

status

Remove unused imports from common, as reported by pylint.

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

student

Merge branch 'rc/2014-07-02' into testmergemaster

2014-07-07 13:54:03 -04:00

terrain

ModulestoreEnum class.

2014-06-27 14:37:35 -04:00

third_party_auth

Revert "Make LinkedIn auth provider request email by default."

2014-07-01 10:05:01 -04:00

track

skip failing test

2014-06-27 13:24:23 -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

ModulestoreEnum class.

2014-06-27 14:37:35 -04:00