Andy Armstrong fe6668a550 Merge branch 'release' ...

Conflicts:
	common/lib/xmodule/xmodule/video_module/video_module.py
	requirements/edx/github.txt

2014-09-23 15:53:10 -04:00

..

cache_toolbox

LMS-11168 Support for removing versions and branch in Split, Mixed, and SQL.

2014-08-07 18:07:41 -04:00

config_models

Switch dark_lang to database backed configuration

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

contentserver

Refactored ContentServer tests to use ddt.

2014-09-23 21:36:46 +05:00

course_action_state

Include stack trace in Course Rerun errors; Log errors.

2014-09-04 14:31:07 -04:00

course_groups

Create auto cohorts when list_cohorts is called and return number of users per cohort.

2014-09-11 13:51:34 -04:00

course_modes

Prepare track selection page for new audit track

2014-09-12 13:58:13 -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

For microsites, since we don't have a footer override yet for django templates, remove the footer all together

2014-09-17 10:52:04 -04:00

embargo

update number of queries in embargo test

2014-09-19 10:19:23 -04:00

external_auth

Fixed InvalidKeyError in course handler in studio.

2014-09-12 15:16:36 +05:00

geoinfo

Support ipv6 in geoinfo and Embargo

2014-08-14 16:13:35 +08: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

Merge pull request #3495 from eduNEXT/feature/fmo/theme-microsite-support

2014-08-19 12:39:21 -04:00

monitoring

Fixes #3409

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

monkey_patch

Monkey patch 'django.utils.translation'

2014-08-27 15:27:34 -07: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

Asset urls must start w/ slash

2014-08-21 12:11:27 -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-09-23 15:53:10 -04:00

terrain

show video controls for all youtube videos

2014-09-11 17:02:27 +05:00

third_party_auth

Login analytics

2014-09-11 13:53:29 +00:00

track

Add event tracking endpoint to be called by segment.io

2014-09-09 07:25:54 -04:00

user_api

Basic Mobile API (v0.5) and Video Abstraction Layer integration.

2014-09-23 12:31:46 -04:00

util

Importable python_lib.zip assets

2014-09-18 17:59:12 -04:00

xmodule_django

LMS-11168 Support for removing versions and branch in Split, Mixed, and SQL.

2014-08-07 18:07:41 -04:00

xmodule_modifiers.py

XBlock argument passing support

2014-09-07 12:01:25 -04:00