cahrens 87d904cb35 Merge branch 'master' into feature/christina/metadata-ui ...

Conflicts:
	cms/templates/base.html

2013-05-24 16:10:34 -04:00

..

advanced-settings.feature

Added comments for skipped tests

2013-05-15 15:45:12 -04:00

advanced-settings.py

Fix lettuce tests

2013-05-23 12:50:19 -04:00

checklists.feature

Skip tests that break on Ubuntu due to alerts (which will be removed

2013-05-15 09:39:07 -04:00

checklists.py

Fix lettuce tests

2013-05-23 12:50:19 -04:00

common.py

Merge branch 'master' into bug/christina/studio

2013-03-28 11:17:47 -04:00

component_settings_editor_helpers.py

Selenium tests.

2013-05-23 11:34:02 -04:00

course-settings.feature

Skip tests that break on Ubuntu due to alerts (which will be removed

2013-05-15 09:39:07 -04:00

course-settings.py

Fix lettuce tests

2013-05-23 12:50:19 -04:00

courses.feature

pep8 fixes

2013-03-26 11:44:57 -04:00

courses.py

Fix lettuce tests

2013-05-23 12:50:19 -04:00

discussion-editor.feature

Selenium tests.

2013-05-23 11:34:02 -04:00

discussion-editor.py

Selenium tests.

2013-05-23 11:34:02 -04:00

html-editor.feature

Selenium tests.

2013-05-23 11:34:02 -04:00

html-editor.py

Selenium tests.

2013-05-23 11:34:02 -04:00

problem-editor.feature

Will not do unrelated test at this time.

2013-05-23 12:31:20 -04:00

problem-editor.py

Selenium tests.

2013-05-23 11:34:02 -04:00

section.feature

Added comments for skipped tests

2013-05-15 15:45:12 -04:00

section.py

Fix lettuce tests

2013-05-23 12:50:19 -04:00

signup.feature

Fix lettuce acceptance tests to reflect the new soft landing page changes.

2013-02-15 14:07:46 -05:00

signup.py

Fixed/skipped CMS tests in subsection and signup.

2013-05-15 10:14:37 -04:00

studio-overview-togglesection.feature

Added comments for skipped tests

2013-05-15 15:45:12 -04:00

studio-overview-togglesection.py

Disabled pylint warnings for lettuce steps:

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

subsection.feature

Added comments for skipped tests

2013-05-15 15:45:12 -04:00

subsection.py

Pep8 fixes

2013-05-16 11:33:50 -04:00

video-editor.feature

Selenium tests.

2013-05-23 11:34:02 -04:00

video-editor.py

Selenium tests.

2013-05-23 11:34:02 -04:00