David Ormsbee 43d8c7a712 Merge branch 'release' ...

Conflicts:
	lms/djangoapps/shoppingcart/processors/CyberSource2.py

2014-11-13 10:11:12 -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

Fix PEP8: E302 expected 2 blank lines, found 1

2014-11-10 11:00:11 -08:00

course_action_state

Include stack trace in Course Rerun errors; Log errors.

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

course_groups

Fix PEP8: E302 expected 2 blank lines, found 1

2014-11-10 11:00:11 -08:00

course_modes

Merge branch 'release'

2014-11-13 10:11:12 -05:00

dark_lang

Fix PEP8: E303 too many blank lines

2014-11-10 11:00:14 -08:00

datadog

Remove dogstatsd-python in favor of dogapi

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

django_comment_common

Fix PEP8: E302 expected 2 blank lines, found 1

2014-11-10 11:00:11 -08:00

django_future

Cleaning up pep8 violations

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

edxmako

Fix PEP8: E303 too many blank lines

2014-11-10 11:00:14 -08:00

embargo

Fix PEP8: E302 expected 2 blank lines, found 1

2014-11-10 11:00:11 -08:00

external_auth

Fix PEP8: E302 expected 2 blank lines, found 1

2014-11-10 11:00:11 -08:00

geoinfo

Support ipv6 in geoinfo and Embargo

2014-08-14 16:13:35 +08:00

heartbeat

Fix PEP8: E302 expected 2 blank lines, found 1

2014-11-10 11:00:11 -08:00

lang_pref

Use Backbone for student account and profile JS.

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

microsite_configuration

Fix PEP8: E231 missing whitespace after '[:,]'

2014-11-10 19:31:05 -08:00

monitoring

Fix PEP8: E302 expected 2 blank lines, found 1

2014-11-10 11:00:11 -08: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

Fix PEP8: E302 expected 2 blank lines, found 1

2014-11-10 11:00:11 -08: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

Fix PEP8: E303 too many blank lines

2014-11-10 11:00:14 -08:00

student

Merge branch 'release'

2014-11-13 10:11:12 -05:00

terrain

Fix PEP8: E231 missing whitespace after '[:,]'

2014-11-10 19:31:05 -08:00

third_party_auth

Add endpoint to log in with OAuth access token

2014-11-05 14:09:41 -05:00

track

Fix PEP8: W291 trailing whitespace

2014-11-10 19:31:09 -08:00

user_api

Fix PEP8: E302 expected 2 blank lines, found 1

2014-11-10 11:00:11 -08:00

util

Fix PEP8: W391 blank line at end of file

2014-11-10 11:00:18 -08: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