David Ormsbee 78acd083be Merge branch 'master' into ormsbee/verifyuser3 ...

Conflicts:
	common/djangoapps/course_modes/models.py
	lms/djangoapps/shoppingcart/models.py
	lms/djangoapps/shoppingcart/processors/CyberSource.py
	lms/djangoapps/shoppingcart/processors/tests/test_CyberSource.py
	lms/djangoapps/shoppingcart/tests/test_models.py
	lms/djangoapps/shoppingcart/tests/test_views.py
	lms/djangoapps/shoppingcart/urls.py
	lms/djangoapps/shoppingcart/views.py
	lms/envs/common.py
	lms/envs/dev.py
	lms/static/sass/base/_variables.scss

2013-09-04 10:58:30 -04:00

..

combinedopenended

Rename reset to try again, hide and disable submit buttons

2013-08-16 14:43:37 -04:00

course_groups

LMS i18n from Tsinghua

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

courseware

Merge branch 'master' into ormsbee/verifyuser3

2013-09-04 10:58:30 -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

Slightly change email registration template

2013-08-29 15:27:30 -07:00

instructor

Fixed tests for removing hash access to hints. Fixed instructor view for same.

2013-08-26 09:40:04 -04: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

Fix prompt hiding issue in peer grading

2013-08-16 15:24:38 -04:00

registration

remove unused registration templates

2013-08-26 10:01:03 -04:00

shoppingcart

Implemented fake payment page.

2013-09-03 10:46:33 -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

verify_student

Fix up some links to point to the right place.

2013-09-03 18:03:02 -04:00

widgets

Add HTML editor for authoring bulk email message (adopted from CMS)

2013-08-29 12:40:32 -04:00

wiki

replace html strings wtih tokens in templates

2013-08-13 11:19:58 -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

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

Merge branch 'master' into ormsbee/verifyuser3

2013-09-04 10:58:30 -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

cleanup on the photo page for vcerts

2013-08-27 10:55:09 -04:00

forgot_password_modal.html

LMS i18n from Tsinghua

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

google_analytics.html

…

graphical_slider_tool.html

Removed unnecessary XML section. Documenting.

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

help_modal.html

set first FAQ link to mktg webiste too

2013-08-19 16:34:17 -04:00

homework.html

…

identity.xml

…

index.html

changing http:// to // on intro video urls to prevent browsers from blocking video embeds

2013-08-09 14:13:41 -07: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

Allow users who are not logged in to register.

2013-08-26 15:29:12 -04:00

main_django.html

LMS i18n from Tsinghua

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

main.html

Move verify-specific JS out of site level

2013-08-29 10:13:28 -04:00

mktg_iframe.html

mktg - revised sass/css for iframed button to match styles/consistency

2013-08-19 10:25:29 -04: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

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

Allow users who are not logged in to register.

2013-08-26 15:29:12 -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

switch from log_event to Logger.log

2013-08-20 16:52:18 -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

…

video_modal.html

…

video.html

Removed unnecessary tabindex = 0 from <a /> - they get it by default.

2013-08-14 11:51:15 +03:00

word_cloud.html

Hotfix world cloud functionality

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

xrds.xml

…