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

__init__.py

Move terrain module from lms to common.

2013-02-20 09:52:32 -05:00

browser.py

Centralize startup code, and execute in all contexts

2013-08-27 12:12:20 -04:00

course_helpers.py

LMS acceptance tests use mixed modulestore

2013-08-21 16:23:48 -04:00

factories.py

Initial BDD spec for certificates workflow