Greg Price 372084e0b6 Merge branch 'drupal-new' ...

Conflicts:
	lms/envs/common.py

2013-05-17 16:17:35 -04:00

..

cache_toolbox

Pep8 autofixes

2013-02-06 11:13:50 -05:00

contentserver

actually.. return a 400 rather than a 404 because the request is malformed. Also add unit test.

2013-03-26 20:02:29 -04:00

course_groups

Merge pull request #1677 from MITx/victor/fix-auto-cohorting

2013-03-20 07:50:43 -07:00

django_future

Cleaning up pep8 violations

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

external_auth

Move the testcenter login to external_auth

2013-04-25 11:12:19 -04:00

heartbeat

Making linters happier

2013-05-03 15:08:28 -04:00

mitxmako

Fix test so that it works with both CMS and LMS settings

2013-05-17 13:18:10 -04: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_mako

Remove newline from javascript source tags

2012-10-31 16:26:11 -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

service_status

Add status app with simple view to check celery workers

2013-05-17 11:33:14 -04:00

static_replace

add comments

2013-03-07 16:12:21 -05:00

status

Make relative imports explicitly relative

2013-03-15 11:23:22 -04:00

student

Ensure CSRF cookie is present for login and registration pages

2013-05-17 14:23:28 -04:00

terrain

Look for the existence of the links, not for

2013-05-16 16:30:29 -04:00

track

Pep8 autofixes

2013-02-06 11:13:50 -05:00

util

Merge master to here.

2013-05-16 14:21:51 -04:00

xmodule_modifiers.py

Only render a histogram for modules that have scores associated with them

2013-04-22 08:04:16 -04:00