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

..

class_dashboard

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

2014-05-16 14:01:20 -04:00

combinedopenended

i18n open_ended_rubric (ORA-314)

2014-02-19 15:41:16 -05:00

course_groups

Added more descriptive page titles.

2014-01-30 17:32:03 -05:00

courseware

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

2014-05-16 14:01:20 -04:00

dashboard

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

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

debug

LMS i18n from Tsinghua

2013-07-31 19:39:15 -04:00

discussion

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

2014-05-07 12:49:55 -04:00

emails

Wording for batch beta email add with autoenroll (LMS-2551)

2014-04-18 10:13:19 -04:00

instructor

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

2014-05-16 14:01:20 -04:00

licenses

LMS i18n from Tsinghua

2013-07-31 19:39:15 -04:00

linkedin

put google analytics in quotation marks in linkedin email template

2014-05-05 12:08:36 -04:00

modal

Answer checks should offer feedback to assistive tech. This commit adds

2014-03-20 09:53:44 -04:00

open_ended_problems

Fix URLs for static resources

2014-02-26 15:06:56 +01:00

peer_grading

Fix student progress @sarina bug

2014-05-20 18:08:33 -04:00

registration

Merge pull request #2781 from edx/cdodge/password-history-enforcements

2014-04-04 16:14:43 -04:00

shoppingcart

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

2014-05-07 12:49:55 -04:00

static_templates

fixes templating error (LMS-2560)

2014-04-24 14:17:43 -04:00

verify_student

Revert "Handle the indexerror exception on create_order"

2014-05-20 18:33:54 +05:00

widgets

Add support for raw HTML editor.

2014-04-24 14:18:12 -04:00

wiki

Refactored course_nav middleware to isolate the django-wiki hack,

2014-04-08 15:24:48 -04:00

.gitignore

…

.hgignore

…

admin_dashboard.html

replace edx with variable substitution

2013-07-31 19:39:15 -04:00

annotatable.html

LMS i18n from Tsinghua

2013-07-31 19:39:15 -04:00

book_toc.xml

…

conditional_ajax.html

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

2014-05-07 12:49:55 -04:00

conditional_module.html

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

2014-05-07 12:49:55 -04:00

contact.html

Unicode support for course names in reverification flow

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

course.html

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

2014-05-07 12:49:55 -04:00

dashboard.html

Add third-party auth implementation and tests

2014-04-25 12:11:20 -07:00

edit_circuit.html

…

edit_unit_link.html

Added "Edit in CMS" links throughout courseware

2014-04-04 10:23:51 -07:00

email_change_failed.html

LMS i18n from Tsinghua

2013-07-31 19:39:15 -04:00

email_change_successful.html

LMS i18n from Tsinghua

2013-07-31 19:39:15 -04:00

email_exists.html

LMS i18n from Tsinghua

2013-07-31 19:39:15 -04:00

emails_change_successful.html

LMS i18n from Tsinghua

2013-07-31 19:39:15 -04:00

enroll_students.html

Unicode support for course names in reverification flow

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

extauth_failure.html

Set the html language to the browser's specified language

2014-01-28 16:43:29 -05:00

feedback_email.txt

…

foldit.html

Allow progress without leaderboard and vice-versa

2013-02-25 17:28:22 -05:00

folditbasic.html

Move date_utils to common/djangoapps/util

2014-02-18 17:35:56 -05:00

folditchallenge.html

LMS i18n from Tsinghua

2013-07-31 19:39:15 -04:00

footer.html

Added an alt tag to the footer logo; added charset meta tag; moved

2014-02-06 11:25:16 -05:00

forgot_password_modal.html

replace unicode 'X' with font-awesome 'remove'

2014-03-11 12:48:58 -07:00

google_analytics.html

Add ability to deactivate GA snippet

2014-05-05 17:31:07 -04:00

graphical_slider_tool.html

…

help_modal.html

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

2014-05-07 12:49:55 -04:00

homework.html

…

identity.xml

…

index.html

This PR addresses the open feedback on the Microsites feature

2014-02-28 16:27:12 -05:00

invalid_email_key.html

LMS i18n from Tsinghua

2013-07-31 19:39:15 -04:00

login-sidebar.html

Introduction of the Microsite feature which allows for limited multi-tenant branding on a subdomain basis, e.g. foo.edx.org and bar.edx.org

2014-01-14 14:36:01 -05:00

login.html

Add third-party auth implementation and tests

2014-04-25 12:11:20 -07:00

lti_form.html

BLD-753: Add i18n for LTI.

2014-04-09 12:12:52 +03:00

lti.html

lti 2.0 result service rest endpoint

2014-04-29 12:01:12 -07:00

main_django.html

Added an alt tag to the footer logo; added charset meta tag; moved

2014-02-06 11:25:16 -05:00

main.html

unicode fixes

2014-04-02 16:18:56 +03:00

manage_user_standing.html

Removing JS gettext() in favor of server-side substitution.

2014-01-09 10:24:09 -05:00

mathjax_accessible.html

For a11y, modal dialogs and script templates should be hidden from

2014-02-07 11:12:41 -05:00

mktg_iframe.html

Remove google analytics tracking from iframes used in Drupal course about pages

2014-04-30 14:34:45 -04:00

module-error.html

Unicode support for course names in reverification flow

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

name_changes.html

i18n template fixes

2013-08-01 14:13:41 -04:00

navigation.html

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

2014-05-07 12:49:55 -04:00

notes.html

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

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

pdf_viewer.html

Added analytics event logging to PDF book viewer

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

poll.html

Removed inappropriate section tags. Because screen readers announce each section, they should not be used unless they are actually defining meaningful sections.

2014-02-05 11:32:08 -05:00

problem_ajax.html

Removed inappropriate section tags. Because screen readers announce each section, they should not be used unless they are actually defining meaningful sections.

2014-02-05 11:32:08 -05:00

problem.html

Temporarily disable CAPA problem "Check" button.

2014-04-07 13:17:43 -04:00

provider_login.html

Update OpenID dialog text

2014-04-08 16:43:38 -04:00

register-shib.html

Stop using JavaScript to set the body CSS class

2014-02-05 17:34:35 +01:00

register-sidebar.html

Introduction of the Microsite feature which allows for limited multi-tenant branding on a subdomain basis, e.g. foo.edx.org and bar.edx.org

2014-01-14 14:36:01 -05:00

register.html

Add third-party auth implementation and tests

2014-04-25 12:11:20 -07:00

resubscribe.html

add undo (resub) to landing page of forum unsub link

2014-01-17 18:07:33 -08:00

seq_module.html

Answer checks should offer feedback to assistive tech. This commit adds

2014-03-20 09:53:44 -04:00

show_circuit.html

…

signup_modal.html

Unicode support for course names in reverification flow

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

split_test_staff_view.html

Add tests and clean up A/B testing

2014-03-05 13:46:03 -05:00

split_test_student_view.html

Track renders of split_test children

2014-03-05 13:45:08 -05:00

staff_problem_info.html

Fix merge conflicts

2014-05-16 14:10:50 -04:00

static_htmlbook.html

Merge pull request #2343 from edx/dstgermain/a11y-page-titles

2014-01-30 14:33:48 -08:00

static_pdfbook.html

Set the page in the correct place.

2014-04-28 17:01:03 -04:00

staticbook.html

Added more descriptive page titles.

2014-01-30 17:32:03 -05:00

studio_render_children_view.html

Allow creation of components on container page

2014-05-21 15:40:31 -04:00

sysadmin_dashboard_gitlogs.html

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

2014-05-09 15:29:32 -04:00

sysadmin_dashboard.html

Clarify strings for i18n

2014-05-09 10:23:46 -04:00

tab_module.html

…

textannotation.html

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

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

tracking_log.html

LMS i18n from Tsinghua

2013-07-31 19:39:15 -04:00

unsubscribe.html

add undo (resub) to landing page of forum unsub link

2014-01-17 18:07:33 -08:00

using.html

LMS i18n from Tsinghua

2013-07-31 19:39:15 -04:00

vert_module.html

Restore the ability to drag at any level inside a vertical and clean up templates.

2014-05-02 15:09:24 -04:00

video_modal.html

…

video.html

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

videoannotation.html

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

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

word_cloud.html

i18n word cloud LMS-2197

2014-02-07 16:42:14 -05:00

xrds.xml

…