Calen Pennington d4280e8529 Fix merge conflicts

2014-05-16 14:10:50 -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

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

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

course_groups

Fix cohort.course_id naming

2014-05-09 09:23:51 -04:00

course_modes

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

2014-05-07 12:54:49 -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

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

2014-05-07 12:54:49 -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

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

2014-05-09 15:29:32 -04:00

external_auth

Fix ssl redirection test

2014-05-13 14:13:45 -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

settings.MITX_FEATURES => settings.FEATURES

2013-12-03 15:34:55 -05: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

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

2014-05-07 12:54:49 -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

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

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

status

Remove unused imports from common, as reported by pylint.

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

student

Fix merge conflicts

2014-05-16 14:10:50 -04:00

terrain

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

2014-05-09 15:29:32 -04:00

third_party_auth

Fix bug that prevented account association during registration

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

track

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

2014-05-09 15:29:32 -04:00

user_api

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

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

util

Compare stringified course_ids to regexes for courses allowed to execute unsafe code

2014-05-13 21:34:15 +00:00

xmodule_django

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

2014-05-07 12:52:24 -04:00

xmodule_modifiers.py

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

2014-05-09 15:29:32 -04:00