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

..

capa

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

2013-03-08 00:40:18 -05:00

course_groups

Prevent scroll-to-top on clicks in cohorts views

2013-02-24 19:44:41 -05:00

vendor

Fix for script tags w/in json objects being oddly evaluated on html page

2013-03-01 16:05:58 -05:00

pdfviewer.js

fix loading of specific pages.

2013-02-26 01:03:01 -05:00