Matt Drayer d35667384a Merge branch 'release' ...

Conflicts:
	requirements/edx/base.txt

2014-01-29 16:19:30 -05:00

..

combinedopenended

more i18n work

2013-12-05 14:03:02 -05:00

course_groups

Set the html language to the browser's specified language

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

courseware

Merge branch 'release'

2014-01-16 12:51:22 -05:00

dashboard

LMS: resolves missing certificate download button styling

2014-01-13 16:26:36 -05:00

debug

LMS i18n from Tsinghua

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

discussion

add "Add A Response" button to thread views in discussion tab / inline

2014-01-28 17:13:16 -05:00

emails

Port of invitation/enroll/unenroll email functionality

2013-11-15 10:10:04 -08:00

instructor

Add individual due dates feature.

2014-01-14 10:19:02 -05:00

licenses

LMS i18n from Tsinghua

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

linkedin

Fix a typo in the LinkedIn e-mail.

2014-01-27 14:06:27 -05:00

open_ended_problems

re-remove ora message as part of merge conflict resolution

2013-12-16 17:13:11 -05:00

peer_grading

removes unsure button (ORA-254)

2014-01-17 14:41:54 -05:00

registration

Set the html language to the browser's specified language

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

shoppingcart

Final iteration

2014-01-15 13:06:50 +00:00

static_templates

Edit template for unused edx.org pages

2014-01-09 13:32:28 -05:00

university_profile

edge.html inherits from main.html

2014-01-10 17:29:24 +05:00

verify_student

Fixed all instances of "occured" typo

2014-01-24 16:13:26 -08:00

widgets

whitespace-only changes

2013-12-10 11:45:49 -05:00

wiki

Set the html language to the browser's specified language

2014-01-28 16:43:29 -05: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

poll and conditional finished

2013-02-15 18:48:39 +02:00

conditional_module.html

Provide access to the course_id directly on XModules/Descriptors

2013-10-30 11:23:11 -04:00

contact.html

i18n template fixes

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

course.html

Use <span> for course preview’s university

2014-01-06 21:09:15 +01:00

dashboard.html

Merge pull request #1744 from edx/flowerhack/feature/verified-cert-events

2013-12-10 11:47:47 -08:00

edit_circuit.html

…

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

LMS i18n from Tsinghua

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

extauth_failure.html

Set the html language to the browser's specified language

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

feed.rss

Press updates

2013-05-03 08:55:40 -04:00

feedback_email.txt

…

foldit.html

Allow progress without leaderboard and vice-versa

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

folditbasic.html

LMS i18n from Tsinghua

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

folditchallenge.html

LMS i18n from Tsinghua

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

footer.html

Studio/LMS: Updates copyright notices to 2014

2014-01-13 19:59:24 -05:00

forgot_password_modal.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

google_analytics.html

…

graphical_slider_tool.html

…

help_modal.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

homework.html

…

identity.xml

…

index.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

invalid_email_key.html

LMS i18n from Tsinghua

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

login_modal.html

MITX_ROOT_URL => EDX_ROOT_URL

2013-12-04 12:59:35 -05: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

Merge pull request #2308 from edx/giulio/fix-error-msg-typo

2014-01-27 10:46:13 -08:00

lti_form.html

Fix comment.

2013-12-11 16:52:46 +02:00

lti.html

Address comments.

2013-12-11 13:28:34 +02:00

main_django.html

Set the html language to the browser's specified language

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

main.html

Set the html language to the browser's specified language

2014-01-28 16:43:29 -05: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

make it so that mathplayer message only appears when mathjax is on the page

2013-09-20 15:05:47 -04:00

mktg_iframe.html

Set the html language to the browser's specified language

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

module-error.html

fix enroll multiple button, fix module_error report

2013-08-09 13:45:27 -04:00

name_changes.html

i18n template fixes

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

navigation.html

catch additional FEATURE['ENABLE_MKTG_SITE'] checks and make sure MicrositeConfigurations will override the global setting

2014-01-16 17:04:17 -05:00

notes.html

annotation tools

2014-01-29 08:52:44 -05:00

poll.html

poll and conditional finished

2013-02-15 18:48:39 +02:00

press.json

whitespace-only changes

2013-12-10 11:45:49 -05:00

problem_ajax.html

Add feature showing current score next to problem title

2013-07-19 16:14:24 -04:00

problem.html

LMS i18n from Tsinghua

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

provider_login.html

Return the full name of the student as part of the OpenId response.

2013-12-12 17:33:33 -05:00

register-shib.html

Fixed all instances of "occured" typo

2014-01-24 16:13:26 -08: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

Selectively require/hide registration fields & add country/city fields

2014-01-29 09:01:28 -05:00

resubscribe.html

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

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

seq_module.html

Make sequence module use ajax_url properly

2013-10-29 10:36:22 -04:00

show_circuit.html

…

signup_modal.html

Selectively require/hide registration fields & add country/city fields

2014-01-29 09:01:28 -05:00

staff_problem_info.html

settings.MITX_FEATURES => settings.FEATURES

2013-12-03 15:34:55 -05:00

static_htmlbook.html

annotation tools

2014-01-29 08:52:44 -05:00

static_pdfbook.html

LMS: revises CSS reference/pipeline architecture to handle IE9 selector limits

2013-10-16 12:29:49 -04:00

staticbook.html

LMS: revises CSS reference/pipeline architecture to handle IE9 selector limits

2013-10-16 12:29:49 -04:00

sysadmin_dashboard_gitlogs.html

Add sysadmin dashboard

2013-12-15 19:06:05 -05:00

sysadmin_dashboard.html

Add sysadmin dashboard

2013-12-15 19:06:05 -05:00

tab_module.html

…

textannotation.html

annotation tools

2014-01-29 08:52:44 -05: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

…

video_modal.html

…

video.html

BLD-699: Fix i18n.

2014-01-27 07:49:22 +02:00

videoannotation.html

annotation tools

2014-01-29 08:52:44 -05:00

word_cloud.html

Hotfix world cloud functionality

2013-08-05 17:14:11 +03:00

xrds.xml

…