David Ormsbee 78acd083be Merge branch 'master' into ormsbee/verifyuser3 ...

Conflicts:
	common/djangoapps/course_modes/models.py
	lms/djangoapps/shoppingcart/models.py
	lms/djangoapps/shoppingcart/processors/CyberSource.py
	lms/djangoapps/shoppingcart/processors/tests/test_CyberSource.py
	lms/djangoapps/shoppingcart/tests/test_models.py
	lms/djangoapps/shoppingcart/tests/test_views.py
	lms/djangoapps/shoppingcart/urls.py
	lms/djangoapps/shoppingcart/views.py
	lms/envs/common.py
	lms/envs/dev.py
	lms/static/sass/base/_variables.scss

2013-09-04 10:58:30 -04:00

..

course_modes

Verification: moves common page elements/copy into central templates w/ supportive styling

2013-09-03 17:17:13 -04:00

jasmine

Abridge tests in light of learning how Segment.io works

2013-06-18 17:58:10 -04:00

courseware_vendor_js.html

gst integration into studio

2013-07-26 17:22:27 +03:00

hinter_display.html

Fixed terribly annoying issues with back button. Back button is now on

2013-08-26 09:40:05 -04:00

mathjax_include.html

Update MathJax to the latest stable version (2.2), to fix IE10 bug LMS-194

2013-07-16 09:20:35 -04: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