Calen Pennington c917725ff0 Merge remote-tracking branch 'origin/master' into feature/cale/cms-master ...

Conflicts:
	common/lib/xmodule/xmodule/seq_module.py
	common/lib/xmodule/xmodule/template_module.py
	common/lib/xmodule/xmodule/x_module.py
	lms/djangoapps/courseware/tests/tests.py
	lms/djangoapps/courseware/views.py
	lms/static/sass/course.scss
	requirements.txt

2012-12-07 11:17:41 -05:00

..

jasmine

Make rake commands to run jasmine tests in browser and via phantomjs

2012-10-30 10:41:02 -04:00

courseware_vendor_js.html

Move vendor javascript into common/static/js/vendor, so that they can be shared between the CMS and LMS, and create an html template that includes all of the vendor js needed for the courseware

2012-07-24 16:14:03 -04:00

mathjax_include.html

Fix MathJax S3 URL to use the standard HTTPS location

2012-11-30 18:00:45 -05:00

xmodule_display.html

Allow for modular css from XModules, and split capa module css out as a test

2012-07-24 16:14:04 -04:00

xmodule_edit.html

Separate unit page from vertical implementation for editing

2012-10-01 15:19:35 -04:00