Will Daly 5085b71677 Merge remote-tracking branch 'origin/master' into will/combine-reg-login-form ...

Conflicts:
	common/djangoapps/third_party_auth/pipeline.py
	lms/djangoapps/verify_student/tests/test_views.py

2014-11-10 15:05:37 -05: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

Add donation end-point

2014-10-07 14:22:55 -04:00

contentserver

Unit Test Improvements

2014-10-31 11:55:13 +00:00

course_action_state

Include stack trace in Course Rerun errors; Log errors.

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

course_groups

Fix i18n and quality errors in course_groups/views.py

2014-10-30 11:10:57 -04:00

course_modes

Merge branch 'will/logistration-third-party-auth-fixes' into will/combine-reg-login-form

2014-11-04 10:50:09 -05: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

…

edxmako

Remove more pep8 violations

2014-11-04 07:37:41 -05:00

embargo

update number of queries in embargo test

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

enrollment

Allow inactive users to modify their own enrollments

2014-11-10 08:10:47 -05:00

external_auth

Handle OpenID errors for POST requests.

2014-10-15 16:33:31 -04: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

Use Backbone for student account and profile JS.

2014-10-08 15:50:13 -04:00

microsite_configuration

allow for a customized region on the receipt page that is microsite brand specific

2014-10-30 22:17:02 -04:00

monitoring

Consistently ensure dog_stats_api tags are formatted correctly

2014-10-09 12:35:26 -07:00

monkey_patch

Monkey patch 'django.utils.translation'

2014-08-27 15:27:34 -07:00

pipeline_js

TNL-272: Fix double loading of cms-modules.js.

2014-09-26 21:28:54 +03:00

pipeline_mako

Elegant rtl/ltr css switch, LMS RTL fixes, language aware @cache_if_anonymous

2014-10-17 13:51:42 -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

Use split to test views

2014-09-29 11:25:55 -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 remote-tracking branch 'origin/master' into will/combine-reg-login-form

2014-11-10 15:05:37 -05:00

terrain

Fixed youtube stub server and removed unused variable.

2014-11-10 11:43:58 +05:00

third_party_auth

Merge remote-tracking branch 'origin/master' into will/combine-reg-login-form

2014-11-10 15:05:37 -05:00

track

Implement shim for mobile video events.

2014-11-03 14:12:07 -05:00

user_api

Merge pull request #5899 from edx/alasdair/logistration-select-validation

2014-11-10 11:54:20 -05:00

util

Merge remote-tracking branch 'origin/master' into will/combine-reg-login-form

2014-10-20 10:57:05 -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

Escape xblock wrapper data attributes and css classes for safe html

2014-10-16 09:09:22 -04:00