Douglas Hall 28a7b3e2d1 Merge remote-tracking branch 'origin/release' into merge-release-into-master

2016-01-12 15:12:06 -05:00

..

bookmarks

Fixed POST bookmarks bug when display_name is None.

2016-01-12 09:47:51 -05:00

calculator

Revert "Calculator layout and help popup fixes"

2016-01-11 12:47:05 -05:00

ccx

Made dates configuration for CCX schedule same as in studio (Course)

2015-12-10 18:45:00 +05:00

certificates

feedback changes

2015-10-19 11:10:21 +05:00

class_dashboard

…

commerce

Rewrote Credit API

2015-11-24 22:06:54 -05:00

components

Make tabbed view accessible

2015-09-14 14:34:05 -04:00

courseware

Enable MathJax in Course Pages

2016-01-12 13:49:30 +05:00

credit_notifications

Shrink images using trimage

2016-01-07 10:48:43 -05:00

dashboard

Deprecate escaping in display_name_with_default

2015-12-22 11:52:04 -05:00

debug

…

discovery

Merge pull request #9775 from edx/clrux/ac-147

2015-09-24 12:08:14 -04:00

discussion

Deprecate escaping in display_name_with_default

2015-12-22 11:52:04 -05:00

edxnotes

Optimize edxnotes files.

2015-07-21 10:54:02 -04:00

emails

Add mailing address to activation email form.

2015-12-30 13:30:43 -05:00

embargo

Update country access message end-points to be backwards compatible with embargo theme templates

2015-02-03 08:59:41 -05:00

enrollment

…

fields

Make HTML for non-editable views more logical.

2015-10-16 13:40:24 -04:00

financial-assistance

Validate country on FA form

2015-12-11 17:16:21 -05:00

instructor

Fix help targets in Instructor Dashboard

2016-01-04 15:20:40 -05:00

modal

Group imports together in Mako templates

2015-06-03 12:36:47 -04:00

peer_grading

Remove "instructor" label or change to "Admin"

2015-06-29 17:03:18 -04:00

registration

message updated for unsupported browsers

2015-10-01 11:21:15 +05:00

search

Dashboard search feature

2015-04-24 09:45:12 -04:00

shoppingcart

WL-242

2016-01-05 14:25:22 +05:00

static_templates

Update country access message end-points to be backwards compatible with embargo theme templates

2015-02-03 08:59:41 -05:00

student_account

Merge pull request #10885 from edx/release

2015-12-08 15:21:48 -05:00

student_profile

Add json escaping to Studio

2015-11-04 13:34:42 -05:00

support

SOL-1492

2015-12-18 18:19:17 +05:00

survey

add the ability to persist the course_key where the user answered the survey

2015-08-21 13:40:57 -04:00

ux/reference

Fixes invalid/improper microdata and attribute values in the header logo

2015-11-03 15:20:48 -05:00

verify_student

New AB Testing URL for checkout page.

2015-12-04 07:04:59 +00:00

widgets

Disable Optimizely in the courseware view.

2016-01-11 10:57:05 -05:00

wiki

Use new django-pipeline tags.

2015-11-16 20:57:13 +05:00

.gitignore

…

.hgignore

…

annotatable.html

…

book_toc.xml

…

bookmark_button.html

Add/Remove Bookmark button to each unit in LMS courseware.

2015-12-17 22:07:32 +05:00

conditional_ajax.html

…

conditional_module.html

Deprecate escaping in display_name_with_default

2015-12-22 11:52:04 -05:00

course.html

Deprecate escaping in display_name_with_default

2015-12-22 11:52:04 -05:00

dashboard.html

Remove duplicate import

2016-01-06 18:49:57 -05:00

edit_unit_link.html

…

email_change_failed.html

…

email_change_successful.html

Group imports together in Mako templates

2015-06-03 12:36:47 -04:00

email_exists.html

…

emails_change_successful.html

Group imports together in Mako templates

2015-06-03 12:36:47 -04:00

enroll_students.html

…

extauth_failure.html

…

feedback_email.txt

…

file-upload.underscore

…

footer-edx-v3.html

Upgrade segment.io to match documentation.

2015-10-30 09:24:20 -04:00

footer.html

Upgrade segment.io to match documentation.

2015-10-30 09:24:20 -04:00

forgot_password_modal.html

Group imports together in Mako templates

2015-06-03 12:36:47 -04:00

header.html

re-enable edx.org comprehensive theme

2015-12-03 17:18:55 -05:00

help_modal.html

use platform_name template tag

2015-09-29 17:01:55 +05:00

homework.html

…

identity.xml

…

imageannotation.html

…

index.html

adds an accessible label to the search input and the search button

2015-11-04 18:09:55 -05:00

invalid_email_key.html

Group imports together in Mako templates

2015-06-03 12:36:47 -04:00

library-block-author-preview-header.html

…

login-sidebar.html

…

login.html

Support LTI third-party-auth providers

2015-09-03 22:53:45 -07:00

lti_form.html

Group imports together in Mako templates

2015-06-03 12:36:47 -04:00

lti.html

Allow fullscreen within lti

2015-09-29 13:02:10 -04:00

main_django.html

Adding support for microsite template_paths on django templates

2016-01-12 10:34:00 -05:00

main.html

Rolling back template inheritance change that was causing child templates to break

2016-01-05 09:40:34 -05:00

manage_user_standing.html

Group imports together in Mako templates

2015-06-03 12:36:47 -04:00

module-error.html

…

navigation-edx.html

Deprecate escaping in display_name_with_default

2015-12-22 11:52:04 -05:00

navigation.html

Apply patch from hasnain-naveed/HOL-4-navigation-template-change in order to get a Jenkins build running

2015-12-27 19:18:07 -05:00

notes.html

Group imports together in Mako templates

2015-06-03 12:36:47 -04:00

pdf_viewer.html

Add metatag <path_prefix> for pdf_viewer.html

2015-03-12 17:19:38 +05:00

poll.html

…

problem_ajax.html

…

problem.html

add sr text for show/hide answer button

2015-12-29 17:03:32 -05:00

provider_login.html

…

register-form.html

Split register form out into a separately include template so that microsites can override it

2016-01-07 11:58:16 -05:00

register-shib.html

message updated for unsupported browsers

2015-10-01 11:21:15 +05:00

register-sidebar.html

…

register.html

Split register form out into a separately include template so that microsites can override it

2016-01-07 11:58:16 -05:00

resubscribe.html

Should never just link the word 'here'

2015-08-05 15:53:51 -04:00

seq_module.html

Fixed POST bookmarks bug when display_name is None.

2016-01-12 09:47:51 -05:00

signup_modal.html

Group imports together in Mako templates

2015-06-03 12:36:47 -04:00

split_test_author_view.html

…

split_test_staff_view.html

…

split_test_student_view.html

…

staff_problem_info.html

remove aria-hidden from staff lms controls

2015-12-30 11:11:36 -05:00

static_htmlbook.html

…

static_pdfbook.html

…

staticbook.html

LMS: course navigation menu refactor

2015-09-23 13:13:18 -04:00

studio_render_children_view.html

…

studio_render_paged_children_view.html

Create a common paginated list view

2015-06-15 13:51:09 -04:00

sysadmin_dashboard_gitlogs.html

Mako comments have to be double-hash, or they are included on the page.

2015-09-16 11:24:18 -04:00

sysadmin_dashboard.html

GitHub has a capital H

2015-11-23 15:06:33 -05:00

tab_module.html

…

textannotation.html

…

themable-footer.html

re-enable edx.org comprehensive theme

2015-12-03 17:18:55 -05:00

tracking_log.html

…

unsubscribe.html

Should never just link the word 'here'

2015-08-05 15:53:51 -04:00

using.html

…

vert_module.html

Add/Remove Bookmark button to each unit in LMS courseware.

2015-12-17 22:07:32 +05:00

video_modal.html

Added new Course List API.

2015-11-24 15:54:03 +00:00

video.html

Adding closed captions (not draggable)

2015-12-14 10:19:11 -05:00

videoannotation.html

…

word_cloud.html

…

xrds.xml

…