Victor Shnayder 84f05f9f61 Merge remote-tracking branch 'origin/master' into feature/alex/poll-merged ...

Conflicts:
	common/lib/xmodule/xmodule/capa_module.py
	common/lib/xmodule/xmodule/foldit_module.py
	common/lib/xmodule/xmodule/tests/__init__.py
	common/lib/xmodule/xmodule/tests/test_capa_module.py
	common/lib/xmodule/xmodule/tests/test_combined_open_ended.py
	common/lib/xmodule/xmodule/tests/test_conditional.py
	common/lib/xmodule/xmodule/tests/test_self_assessment.py

2013-03-08 00:40:18 -05: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-04 16:33:40 -05: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 heartbeat to cms

2012-10-11 12:32:23 -04: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

Merge remote-tracking branch 'origin/master' into feature/alex/poll-merged

2013-03-04 16:33:40 -05:00

terrain

Remove references to .definition and .metadata in modules

2013-03-06 18:07:56 -05: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

Merge remote-tracking branch 'origin/master' into feature/cale/xmodule-storage-model

2013-02-07 15:12:30 -05:00