cahrens 8ace7fe57c Merge branch 'master' into bug/christina/studio ...

Conflicts:
	cms/djangoapps/contentstore/views.py
	common/lib/xmodule/xmodule/capa_module.py
	common/lib/xmodule/xmodule/combined_open_ended_module.py
	common/lib/xmodule/xmodule/peer_grading_module.py

2013-04-01 12:30:07 -04: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

Make relative imports explicitly relative

2013-03-15 11:23:22 -04:00

test_login.py

Login URL resolves differently in LMS and CMS, which breaks login_test

2013-03-27 13:01:10 -04: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

Convert due date to a Date (vs. a string with no year).

2013-04-01 11:37:05 -04: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

Make relative imports explicitly relative

2013-03-15 11:23:22 -04:00

tests.py

a few more pep8 fixes

2013-03-29 13:15:33 -04:00