Don Mitchell 3885e6cf78 Merge branch 'release' ...

Conflicts:
	lms/templates/help_modal.html
	lms/templates/index.html

2014-01-16 12:51:22 -05:00

..

cache_toolbox

Remove unused imports from common, as reported by pylint.

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

contentserver

Revert "Revert "Merge pull request #1240 from edx/dhm/config_separation""

2013-10-18 09:22:30 -04:00

course_groups

mitxmako => edxmako

2013-12-03 14:15:09 -05:00

course_modes

Response to CR 1-14

2014-01-15 00:27:14 +00:00

datadog

Remove dogstatsd-python in favor of dogapi

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

django_comment_common

i18n: externalize strings in discussion forums templates and python code.

2014-01-15 14:26:22 -05:00

django_future

Cleaning up pep8 violations

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

edxmako

Introduction of the Microsite feature which allows for limited multi-tenant branding on a subdomain basis, e.g. foo.edx.org and bar.edx.org

2014-01-14 14:36:01 -05:00

external_auth

Merge pull request #1941 from edx/diana/openid-fullname

2013-12-13 07:32:34 -08:00

heartbeat

convert all datetime.now() to datetime.now(UTC)

2013-07-22 17:39:11 -04:00

microsite_configuration

Introduction of the Microsite feature which allows for limited multi-tenant branding on a subdomain basis, e.g. foo.edx.org and bar.edx.org

2014-01-14 14:36:01 -05:00

monitoring

Move libraries that can only be imported in the context of django into common/djangoapps

2012-06-18 13:48:26 -04:00

pipeline_js

mitxmako => edxmako

2013-12-03 14:15:09 -05: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

service_status

Use assertIsInstance.

2013-10-07 18:17:40 -04:00

static_replace

Updating comments and docs for MITx -> edX transition

2013-12-10 13:21:18 -05:00

status

Remove unused imports from common, as reported by pylint.

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

student

Merge branch 'release'

2014-01-16 12:51:22 -05:00

terrain

Refactored bok-choy directory structure

2014-01-15 09:37:32 -05:00

track

Remove output of management command options and args from tracking logs.

2014-01-06 12:53:56 -05:00

util

Merge branch 'release'

2014-01-16 12:51:22 -05:00

xmodule_modifiers.py

Merge pull request #814 from edx/bugfix/ichuang/make-edit-link-use-static-asset-path

2013-12-10 13:58:13 -08:00