David Ormsbee 5202bdf85a Merge branch 'ormsbee/verify2' into ormsbee/verifyuser3 ...

Conflicts:
	common/templates/course_modes/choose.html
	lms/templates/verify_student/photo_verification.html

2013-08-29 14:34:52 -04:00

..

combinedopenended

…

course_groups

…

courseware

Remove mock verify enrollment link

2013-08-26 16:02:56 -04:00

debug

…

discussion

…

emails

…

instructor

fix i18n

2013-08-12 13:21:46 -04:00

licenses

…

open_ended_problems

…

peer_grading

…

registration

replace html strings wtih tokens in templates

2013-08-13 11:19:58 -04:00

shoppingcart

move currency formatting into template

2013-08-21 10:31:26 -07: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

Merge branch 'ormsbee/verify2' into ormsbee/verifyuser3

2013-08-29 14:34:52 -04:00

widgets

…

wiki

replace html strings wtih tokens in templates

2013-08-13 11:19:58 -04:00

.gitignore

…

.hgignore

…

admin_dashboard.html

…

annotatable.html

…

book_toc.xml

…

conditional_ajax.html

…

conditional_module.html

…

contact.html

…

course.html

…

dashboard.html

Add in a new HTML class that represents the enrollment mode.

2013-08-27 09:42:25 -04:00

edit_circuit.html

…

email_change_failed.html

…

email_change_successful.html

…

email_exists.html

…

emails_change_successful.html

…

enroll_students.html

…

extauth_failure.html

…

feed.rss

…

feedback_email.txt

…

foldit.html

…

folditbasic.html

…

folditchallenge.html

…

footer.html

cleanup on the photo page for vcerts

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

forgot_password_modal.html

…

google_analytics.html

…

graphical_slider_tool.html

…

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

…

login_modal.html

…

login.html

Allow users who are not logged in to register.

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

main_django.html

…

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

…

navigation.html

…

notes.html

…

poll.html

…

press.json

…

problem_ajax.html

…

problem.html

…

provider_login.html

…

register.html

Allow users who are not logged in to register.

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

seq_module.html

…

show_circuit.html

…

signup_modal.html

…

staff_problem_info.html

…

static_htmlbook.html

…

static_pdfbook.html

…

staticbook.html

switch from log_event to Logger.log

2013-08-20 16:52:18 -04:00

stripped-main.html

…

tab_module.html

…

test_center_register.html

touch-ups per review feedback

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

tracking_log.html

…

unsubscribe.html

…

using.html

…

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

…