Calen Pennington cd862b3253 Merge remote-tracking branch 'edx/master' into opaque-keys ...

Conflicts:
	cms/djangoapps/contentstore/tests/test_contentstore.py
	cms/djangoapps/contentstore/views/component.py
	cms/djangoapps/contentstore/views/item.py
	cms/djangoapps/contentstore/views/preview.py
	cms/djangoapps/contentstore/views/tests/test_container.py
	cms/static/js/spec/views/unit_spec.js
	cms/static/js/utils/module.js
	cms/templates/container.html
	cms/templates/studio_vertical_wrapper.html
	cms/templates/studio_xblock_wrapper.html
	common/djangoapps/student/views.py
	lms/templates/notes.html
	lms/templates/textannotation.html
	lms/templates/videoannotation.html

2014-05-22 10:52:00 -04:00

..

__init__.py

Add AutoAuthPage to lms pages for bok-choy tests

2014-04-24 17:42:36 -04:00

auto_auth.py

made is_browser_on_page actually check for the right page in AutoAuthPage

2014-05-16 14:06:47 -04:00

course_about.py

Update edx-platform page objects and tests to be compatible with new bok-choy version

2014-03-21 17:10:15 -04:00

course_info.py

Update edx-platform page objects and tests to be compatible with new bok-choy version

2014-03-21 17:10:15 -04:00

course_nav.py

Bok-Choy video tests batch4

2014-05-08 10:53:08 +00:00

course_page.py

Rename URL_PATH to url_path in acceptance code

2014-02-06 12:02:48 -05:00

courseware.py

Make course ids and usage ids opaque to LMS and Studio [partial commit]

2014-05-06 12:03:42 -04:00

dashboard.py

added check for modal to disappear in _change_lang_promise

2014-05-19 12:45:45 -04:00

discussion.py

add acceptance tests for user profile pagination.

2014-04-24 13:47:03 -04:00

find_courses.py

Update edx-platform page objects and tests to be compatible with new bok-choy version

2014-03-21 17:10:15 -04:00

login.py

Update bok-choy page definitions

2014-04-18 09:35:10 -04:00

open_response.py

Update edx-platform page objects and tests to be compatible with new bok-choy version

2014-03-21 17:10:15 -04:00

peer_calibrate.py

Update edx-platform page objects and tests to be compatible with new bok-choy version

2014-03-21 17:10:15 -04:00

peer_confirm.py

Update edx-platform page objects and tests to be compatible with new bok-choy version

2014-03-21 17:10:15 -04:00

peer_grade.py

Update edx-platform page objects and tests to be compatible with new bok-choy version

2014-03-21 17:10:15 -04:00

progress.py

Update bok-choy page definitions

2014-04-18 09:35:10 -04:00

register.py

Update edx-platform page objects and tests to be compatible with new bok-choy version

2014-03-21 17:10:15 -04:00

rubric.py

Update edx-platform page objects and tests to be compatible with new bok-choy version

2014-03-21 17:10:15 -04:00

staff_view.py

Switching to new dashboard API and adding rescore to actions list

2014-05-08 19:03:14 -04:00

tab_nav.py

Update edx-platform page objects and tests to be compatible with new bok-choy version

2014-03-21 17:10:15 -04:00

video.py

Added new error message that displays when HTML5 video is not supported altogether. Make sure spinner gets hidden when error message is shown. [BLD-638]

2014-05-20 19:17:57 +02:00