Calen Pennington 240d91daeb Merge remote-tracking branch 'edx/master' into opaque-keys-merge-master ...

Conflicts:
	cms/djangoapps/contentstore/management/commands/tests/test_import.py
	cms/djangoapps/contentstore/tests/test_import.py
	common/lib/xmodule/xmodule/modulestore/tests/test_mongo.py
	common/lib/xmodule/xmodule/modulestore/xml_importer.py
	lms/djangoapps/bulk_email/tests/test_course_optout.py
	lms/djangoapps/bulk_email/tests/test_email.py
	lms/djangoapps/bulk_email/tests/test_err_handling.py
	lms/djangoapps/class_dashboard/tests/test_dashboard_data.py
	lms/djangoapps/courseware/courses.py
	lms/djangoapps/django_comment_client/base/views.py
	lms/djangoapps/instructor/tests/test_email.py
	lms/djangoapps/instructor/tests/test_legacy_anon_csv.py
	lms/djangoapps/instructor/tests/test_legacy_download_csv.py
	lms/djangoapps/instructor/tests/test_legacy_email.py
	lms/djangoapps/instructor/tests/test_legacy_enrollment.py
	lms/djangoapps/instructor/tests/test_legacy_forum_admin.py
	lms/djangoapps/instructor/tests/test_legacy_gradebook.py
	lms/djangoapps/instructor/tests/test_legacy_raw_download_csv.py
	lms/djangoapps/instructor/tests/test_legacy_reset.py
	lms/djangoapps/instructor/views/api.py
	lms/djangoapps/instructor/views/instructor_dashboard.py
	lms/djangoapps/instructor/views/legacy.py
	lms/templates/courseware/instructor_dashboard.html

2014-05-13 15:30:56 -04:00

..

spec

Merge remote-tracking branch 'edx/master' into opaque-keys-merge-master

2014-05-13 15:30:56 -04:00

vendor

Image capture support for non WebRTC compliant browsers, via Flash.

2013-09-02 22:16:51 -04:00

verify_student

Added comment to getUserMedia call in photocapture.js

2014-03-31 13:46:21 -04:00

wiki

mitx_markdown => edx_markdown

2013-12-04 10:23:47 -05:00

bootstrap-alert.js

added additional bootstrap js files

2012-08-17 14:14:07 -04:00

bootstrap-collapse.js

added additional bootstrap js files

2012-08-17 14:14:07 -04:00

bootstrap-modal.js

Added bootstrap-modal for the wiki preview modals.

2012-08-15 20:07:05 -04:00

bootstrap-transition.js

added additional bootstrap js files

2012-08-17 14:14:07 -04:00

bootstrap.min.js

added bootstrap js and other dependencies; tweaked settings template

2012-08-17 09:37:42 -04:00

course_info.js

cleans up course info/profile page

2012-07-02 14:11:25 -04:00

form.ext.js

IE7 compatibility: no trailing commas in arrays, including the third party json2.js lib because IE<8 has no JSON object.

2012-12-07 16:03:05 -05:00

help.js

Restore /faq page, and moved new content to /help

2013-01-17 10:47:50 -05:00

html5shiv.js

adding html5shiv.js to static/js

2012-07-11 15:26:18 -04:00

jquery.ajaxfileupload.js

Fixes image uploades in firefox

2012-09-17 15:54:24 -07:00

jquery.autocomplete.js

adjust new post button in forum view

2012-08-14 12:43:15 -07:00

jquery.gradebook.js

added simple table filtering to gradebook

2012-08-23 16:57:03 -04:00

jquery.treeview.js

added treeview

2012-07-30 17:39:44 -04:00

Markdown.Converter.js

moved some stuff & ajax link to page

2012-08-03 15:55:21 -04:00

Markdown.Editor.js

Unicode support for course names in reverification flow

2014-04-08 13:11:41 -04:00

Markdown.Sanitizer.js

moved some stuff & ajax link to page

2012-08-03 15:55:21 -04:00

mustache.js

moved some stuff & ajax link to page

2012-08-03 15:55:21 -04:00

my_courses_dropdown.js

User menu a11y changes to allow use of spacebar, escape key and arrow keys or tab and shift+tab to navigate

2013-11-01 14:34:02 -07:00

pdf-analytics.js

Added analytics event logging to PDF book viewer

2014-04-14 17:55:53 -04:00

pending_tasks.js

Refactor test_views from test_api. Pull out pending_tasks.js.

2013-06-18 11:19:25 -04:00

query-params.js

Fix login-if-?next behavior

2012-09-23 22:33:20 -04:00

RequireJS-namespace-undefine.js

Convert Studio JS to use require.js

2013-10-04 13:43:50 -04:00

simplewiki-AutoSuggest_c_2.0.js

Most of the wiki pages are now loading without errors.

2012-07-03 09:50:58 -07:00

split.js

moved some stuff & ajax link to page

2012-08-03 15:55:21 -04:00

staff_debug_actions.js

Merge remote-tracking branch 'edx/master' into opaque-keys-merge-master

2014-05-13 15:30:56 -04:00

sticky_filter.js

wip modal

2012-06-21 11:05:18 -04:00

sticky_footer.js

gets app completly uptodate with prototype

2012-06-20 14:37:37 -04:00

toggle_login_modal.js

Make remaining dialogs in wiki accessible.

2013-11-25 16:05:05 -05:00