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

..

__init__.py

Pep8 autofixes

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

factories.py

Pep8 autofixes

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

test_access.py

Remove references to .definition and .metadata in modules

2013-03-06 18:07:56 -05:00

test_model_data.py

Fix tests except for conditional module and open ended grading

2013-03-05 15:04:59 -05:00

test_module_render.py

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

2013-03-06 12:15:07 -05:00

test_progress.py

Pep8 fixes for tests

2013-03-05 11:53:00 -05:00

test_tabs.py

Cleaned up courseware test_tabs unittests

2013-03-06 10:16:43 -05:00

test_views.py

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

2013-03-06 12:15:07 -05:00

tests.py

Remove references to .definition and .metadata in modules

2013-03-06 18:07:56 -05:00