Calen Pennington 531eb80eb2 Merge remote-tracking branch 'origin/master' into feature/alex/poll-merged ...

Conflicts:
	cms/djangoapps/contentstore/tests/test_contentstore.py
	cms/djangoapps/contentstore/views.py
	common/lib/xmodule/xmodule/combined_open_ended_module.py
	common/lib/xmodule/xmodule/open_ended_grading_classes/combined_open_ended_modulev1.py
	common/lib/xmodule/xmodule/open_ended_grading_classes/open_ended_module.py
	common/lib/xmodule/xmodule/open_ended_grading_classes/openendedchild.py
	common/lib/xmodule/xmodule/peer_grading_module.py
	common/lib/xmodule/xmodule/tests/test_combined_open_ended.py
	common/lib/xmodule/xmodule/tests/test_self_assessment.py
	lms/djangoapps/open_ended_grading/tests.py

2013-03-13 12:18: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 remote-tracking branch 'origin/master' into feature/alex/poll-merged

2013-03-13 12:18:04 -04: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

We no longer need override_settings, Django has a better one.

2013-02-11 17:06:35 -05:00

student

Make display_name defaulting explicit

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

terrain

Update course factory to reflect XBlock changes

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

__init__.py

Another checkpoint before pull/merge

2012-11-20 11:37:14 -05:00

xmodule_modifiers.py

Make display_name defaulting explicit

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