edx-platform

Files

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

base.txt

Merge branch 'master' into ormsbee/verifyuser3

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

github.txt

Integrate js-test-tool into testing infrastructure

2013-08-26 20:21:18 -04:00

local.txt

Fixes code_jail imports and draganddrop yaml

2013-07-19 12:05:17 +03:00

post.txt

scipy can go back into base. MySQL-python really does have to be installed after distribute has been updated by base.txt, I tested it.