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

..

certificates.feature

Mark tests for unimplemented features as skip so that the acceptance tests will all pass when we merge into master.

2013-09-03 16:42:03 -04:00

certificates.py

Mark tests for unimplemented features as skip so that the acceptance tests will all pass when we merge into master.

2013-09-03 16:42:03 -04:00

common.py

Disable pylint violation E0611 when importing assert_* methods from nose.tools

2013-08-27 16:21:33 -04:00

courseware_common.py

Potentially fixed all flakey tests

2013-05-31 15:16:45 -04:00

courseware.py

Disabled pylint warnings for lettuce steps:

2013-03-26 11:46:31 -04:00

help.feature

Added the full range of help modal options

2013-08-19 09:56:57 -04:00

help.py

Added the full range of help modal options

2013-08-19 09:56:57 -04:00

high-level-tabs.feature

Sped up tab lettuce test

2013-05-30 14:56:08 -04:00

high-level-tabs.py

Disable pylint violation E0611 when importing assert_* methods from nose.tools

2013-08-27 16:21:33 -04:00

homepage.feature

Sped up some Lettuce Tests

2013-05-30 14:23:49 -04:00

homepage.py

Disable pylint violation E0611 when importing assert_* methods from nose.tools

2013-08-27 16:21:33 -04:00

login.feature

Various stylistic and pylint fixes / changes

2013-08-21 16:05:52 -04:00

login.py

Disable pylint violation E0611 when importing assert_* methods from nose.tools

2013-08-27 16:21:33 -04:00

navigation.feature

Changed way feature flags are interpreted

2013-08-21 16:05:53 -04:00

navigation.py

Shift enroll/unenroll logic to CourseEnrollment model, add is_active and mode.

2013-08-14 13:23:06 -04:00

openended.feature

Pep8 fixes

2013-03-18 13:57:26 -04:00

openended.py

Disable pylint violation E0611 when importing assert_* methods from nose.tools

2013-08-27 16:21:33 -04:00

problems_setup.py

Acceptance tests for visual correctness reset feature

2013-08-30 17:24:33 -04:00

problems.feature

Acceptance tests for visual correctness reset feature

2013-08-30 17:24:33 -04:00

problems.py

Acceptance tests for visual correctness reset feature

2013-08-30 17:24:33 -04:00

registration.feature

Potentially fixed all flakey tests

2013-05-31 15:16:45 -04:00

registration.py

Scenario Dictionary now holds objects

2013-07-12 10:32:48 -04:00

signup.feature

Various stylistic and pylint fixes / changes

2013-08-21 16:05:52 -04:00

signup.py

Made a retry_on_exception world function that will retry the given function

2013-07-12 09:28:50 -04:00

video.feature

Various stylistic and pylint fixes / changes

2013-08-21 16:05:52 -04:00

video.py

Fix steps.

2013-08-19 10:39:52 +03:00

word_cloud.feature

add Word Cloud acceptance tests

2013-08-07 15:46:27 +03:00

word_cloud.py

add Word Cloud acceptance tests

2013-08-07 15:46:27 +03:00

xqueue_setup.py

Disabled pylint warnings for lettuce steps:

2013-03-26 11:46:31 -04:00