Jean Manuel Nater 78128e7672 Merge branch 'master' into jnater/playground ...

Conflicts:
	common/lib/xmodule/xmodule/modulestore/tests/factories.py
	lms/djangoapps/courseware/tests/tests.py

2013-06-18 13:36:24 -04:00

..

cache_toolbox

Pep8 autofixes

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

contentserver

struct_time to datetime conversion.

2013-06-10 17:16:34 -04:00

course_groups

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

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

django_comment_common

add a migrations to the new django_comment_common to keep things a bit more consistent with our normal useage.

2013-05-22 13:32:32 -04: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 tests that vary urls.py

2013-06-10 10:56:50 -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

Move underscore templates into separate files, included in Mako templates

2013-05-22 15:55:50 -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

Merge branch 'master' into jnater/playground

2013-06-18 13:36:24 -04:00

terrain

Added docstring specifying when this method must be called

2013-06-06 14:52:35 -04:00

track

Move tz_aware into connection config rather than settings.

2013-06-10 17:16:35 -04:00

util

Merge pull request #92 from edx/fix/cale/url-tests

2013-06-12 10:47:13 -07:00

tests.py

Partial implementation of means to get xmodule from descriptor and

2013-06-10 17:16:35 -04:00

xmodule_modifiers.py

struct_time to datetime conversion.

2013-06-10 17:16:34 -04:00