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

..

djangoapps

Merge branch 'master' into ormsbee/verifyuser3

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

lib

Merge pull request #790 from edx/unanswered-on-input

2013-08-30 14:25:21 -07:00

static

Reset 'correctness' visual indicator of a problem on new input

2013-08-30 12:03:41 -04:00

templates

Merge branch 'master' into ormsbee/verifyuser3

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

test

add sample tabs to test_import_course

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

.gitignore

Gitignore jasmine_test_runner.html in the appropriate place.

2013-05-16 12:39:48 -04:00

xml_cleanup.py

Pep8 autofixes

2013-02-06 11:13:50 -05:00