Will Daly 6728f16ae4 Merge branch 'feature/zoldak/refactor-factories' into feature/will/speed_up_lettuce_tests ...

Conflicts:
	lms/djangoapps/courseware/features/problems.py

2013-03-21 10:49:04 -04:00

..

cache_toolbox

Pep8 autofixes

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

contentserver

Pep8 autofixes

2013-02-06 11:13:50 -05: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

Pep8 autofixes

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

heartbeat

Add datadog metrics capture around heartbeat timing

2013-03-08 10:36:59 -05:00

mitxmako

Make sure temp directories are properly cleaned up so running tests doesn't leave them behind.

2013-02-21 11:38:45 -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_mako

Remove newline from javascript source tags

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

Move course and item factories to xmodule.modulestore.tests

2013-03-20 12:10:18 -04:00

terrain

Merge branch 'feature/zoldak/refactor-factories' into feature/will/speed_up_lettuce_tests

2013-03-21 10:49:04 -04:00

track

Pep8 autofixes

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

util

When checking types to convert data, don't forget about longs. 32-bit Pythons make longs from values that are ints on 64-bit Pythons.

2013-02-12 11:25:14 -05:00

xmodule_modifiers.py

Make display_name defaulting explicit

2013-03-08 14:58:09 -05:00