Vik Paruchuri 687ab3ddae Merge remote-tracking branch 'origin/master' into feature/vik/oe-ui ...

Conflicts:
	common/lib/xmodule/xmodule/open_ended_grading_classes/peer_grading_service.py
	common/lib/xmodule/xmodule/peer_grading_module.py
	lms/templates/combinedopenended/combined_open_ended.html
	lms/templates/combinedopenended/combined_open_ended_status.html
	lms/templates/combinedopenended/openended/open_ended.html
	lms/templates/combinedopenended/openended/open_ended_rubric.html
	lms/templates/combinedopenended/selfassessment/self_assessment_prompt.html

2013-08-08 19:03:46 -04:00

..

combinedopenended

Merge remote-tracking branch 'origin/master' into feature/vik/oe-ui

2013-08-08 19:03:46 -04:00

course_groups

LMS i18n from Tsinghua

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

courseware

template fixes on instructor dash

2013-08-06 10:16:57 -04:00

debug

LMS i18n from Tsinghua

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

discussion

fix more rebase conflicts

2013-08-02 11:25:05 -04:00

emails

Email on enroll/un-enroll actions

2013-06-26 15:28:36 -07:00

instructor

Merge pull request #535 from edx/feature/cdodge/add-display-org-and-coursenum

2013-08-04 18:00:29 -07:00

licenses

LMS i18n from Tsinghua

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

open_ended_problems

fix more rebase conflicts

2013-08-02 11:25:05 -04:00

peer_grading

replace edx with variable substitution

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

registration

replace edx with variable substitution

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

static_templates

more template fixes for faq, press, and help

2013-08-05 11:24:25 -04:00

university_profile

update edge.html

2013-08-05 18:45:54 -04:00

widgets

Refactor Segment.io integration with sequentials and instructor dashboard pages

2013-07-02 13:49:33 -04:00

wiki

replace edx with variable substitution

2013-07-31 19:39:15 -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

XML based table of contents for books.

2012-08-08 14:13:20 -04:00

conditional_ajax.html

poll and conditional finished

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

conditional_module.html

Make display_name defaulting explicit

2013-03-08 14:58:09 -05:00

contact.html

i18n template fixes

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

course.html

add escaping

2013-08-02 09:51:41 -04:00

dashboard.html

fix rebase conflicts

2013-08-02 11:22:25 -04: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

LMS i18n from Tsinghua

2013-07-31 19:39:15 -04: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

replace edx with variable substitution

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

forgot_password_modal.html

LMS i18n from Tsinghua

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

google_analytics.html

Add google analytics to course info pages

2012-10-30 16:05:06 -04:00

graphical_slider_tool.html

Removed unnecessary XML section. Documenting.

2013-01-15 12:55:13 +02:00

help_modal.html

template errors

2013-08-02 12:54:46 -04:00

homework.html

…

identity.xml

OpenID provider implementation

2012-08-29 10:29:42 -04:00

index.html

replace edx with variable substitution

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

invalid_email_key.html

LMS i18n from Tsinghua

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

login_modal.html

LMS i18n from Tsinghua

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

login.html

replace edx with variable substitution

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

main_django.html

LMS i18n from Tsinghua

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

main.html

LMS i18n from Tsinghua

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

mktg_iframe.html

edx.org: abstracting new edx.org button extends and colors with other themes in mind

2013-07-29 10:21:54 -04:00

module-error.html

replace edx with variable substitution

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

name_changes.html

i18n template fixes

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

navigation.html

add escaping

2013-08-02 09:51:41 -04:00

notes.html

LMS i18n from Tsinghua

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

poll.html

poll and conditional finished

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

press.json

Press updates

2013-05-03 08:55:40 -04: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

LMS i18n from Tsinghua

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

register.html

replace edx with variable substitution

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

seq_module.html

LMS i18n from Tsinghua

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

show_circuit.html

…

signup_modal.html

replace edx with variable substitution

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

staff_problem_info.html

replace edx with variable substitution

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

static_htmlbook.html

fix rebase conflicts

2013-08-02 11:22:25 -04:00

static_pdfbook.html

fix rebase conflicts

2013-08-02 11:22:25 -04:00

staticbook.html

fix rebase conflicts

2013-08-02 11:22:25 -04:00

stripped-main.html

LMS i18n from Tsinghua

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

tab_module.html

…

test_center_register.html

touch-ups per review feedback

2013-08-02 21:37:27 -04:00

tracking_log.html

LMS i18n from Tsinghua

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

unsubscribe.html

Add endpoints to set user notification preference

2013-07-22 11:50:26 -04:00

using.html

LMS i18n from Tsinghua

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

vert_module.html

Make drag/drop save content immediately in seqs and verticals

2012-10-01 15:17:41 -04:00

video_modal.html

…

video.html

LMS i18n from Tsinghua

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

videoalpha.html

PR comment cleanup.

2013-08-06 13:23:33 -04:00

word_cloud.html

Hotfix world cloud functionality

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

xrds.xml

OpenID provider implementation

2012-08-29 10:29:42 -04:00