Jean Manuel Nater 1b94050ef6 Merge branch 'master' into jnater/courseware_tests ...

Conflicts:
	lms/djangoapps/open_ended_grading/tests.py

2013-06-21 16:38:31 -04:00

..

cache_toolbox

Remove unused imports from common, as reported by pylint.

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

contentserver

struct_time to datetime conversion.

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

course_groups

Remove unused imports from common, as reported by pylint.

2013-06-19 16:56:34 -04: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

Shib PR responses to @cpennington and @ormsbee comments

2013-06-20 18:12:20 -07:00

heartbeat

Making linters happier

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

mitxmako

Remove unused imports from common, as reported by pylint.

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

monitoring

…

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

Remove unused imports from common, as reported by pylint.

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

student

Merge branch 'master' into jnater/courseware_tests

2013-06-21 16:38:31 -04:00

terrain

Merge pull request #216 from edx/ned/remove-unused-imports

2013-06-20 14:15:31 -07:00

track

Remove unused imports from common, as reported by pylint.

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

util

Remove unused imports from common, as reported by pylint.

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

tests.py

Partial implementation of means to get xmodule from descriptor and

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

xmodule_modifiers.py

Incidental pep8 changes

2013-06-18 17:25:06 -04:00