Kyle Fiedler 162fa59441 Merge branch 'master' into pmitros/name-change ...

Conflicts:
	static/css/application.css
	static/css/marketing.css

2012-03-29 11:08:41 -04:00

..

emails

Moved site, is_secure, etc. into render_to_string shortcut, and fixed bugs in the shortcut. We should test this pretty well, since this touches a lot of templates

2012-03-28 19:44:22 -04:00

registration

Move to subdirectory in prepartion for merge

2012-03-19 11:10:44 -04:00

sass

Merge branch 'master' into pmitros/name-change

2012-03-29 11:08:41 -04:00

.gitignore

Move to subdirectory in prepartion for merge

2012-03-19 11:10:44 -04:00

.hgignore

Move to subdirectory in prepartion for merge

2012-03-19 11:10:44 -04:00

404.html

Move to subdirectory in prepartion for merge

2012-03-19 11:10:44 -04:00

6002x-faq.html

Move to subdirectory in prepartion for merge

2012-03-19 11:10:44 -04:00

6002x-press-release.html

Move to subdirectory in prepartion for merge

2012-03-19 11:10:44 -04:00

accordion_bak.html

Move to subdirectory in prepartion for merge

2012-03-19 11:10:44 -04:00

accordion_init.js

Move to subdirectory in prepartion for merge

2012-03-19 11:10:44 -04:00

accordion.html

Move to subdirectory in prepartion for merge

2012-03-19 11:10:44 -04:00

activation_active.html

Move to subdirectory in prepartion for merge

2012-03-19 11:10:44 -04:00

activation_complete.html

Move to subdirectory in prepartion for merge

2012-03-19 11:10:44 -04:00

activation_invalid.html

Move to subdirectory in prepartion for merge

2012-03-19 11:10:44 -04:00

book_toc.html

Move to subdirectory in prepartion for merge

2012-03-19 11:10:44 -04:00

copyright.html

Move to subdirectory in prepartion for merge

2012-03-19 11:10:44 -04:00

courseware.html

Move to subdirectory in prepartion for merge

2012-03-19 11:10:44 -04:00

create_account.html

Move to subdirectory in prepartion for merge

2012-03-19 11:10:44 -04:00

edit_circuit.html

Move to subdirectory in prepartion for merge

2012-03-19 11:10:44 -04:00

email_change_successful.html

Name and e-mail change functionality appears to work -- needs graphic design

2012-03-21 09:39:32 -04:00

email_exists.html

Name and e-mail change functionality appears to work -- needs graphic design

2012-03-21 09:39:32 -04:00

emails_change_successful.html

Name and e-mail change functionality appears to work -- needs graphic design

2012-03-21 09:39:32 -04:00

feedback_email.txt

Move to subdirectory in prepartion for merge

2012-03-19 11:10:44 -04:00

gradebook_profilegraphs.html

Changed gradebook to be a table.

2012-03-24 15:32:11 -04:00

gradebook.html

Merged in master branch

2012-03-25 15:05:37 -04:00

help.html

Move to subdirectory in prepartion for merge

2012-03-19 11:10:44 -04:00

homework.html

Move to subdirectory in prepartion for merge

2012-03-19 11:10:44 -04:00

honor.html

Move to subdirectory in prepartion for merge

2012-03-19 11:10:44 -04:00

index.html

Move to subdirectory in prepartion for merge

2012-03-19 11:10:44 -04:00

info.html

Move to subdirectory in prepartion for merge

2012-03-19 11:10:44 -04:00

invalid_email_key.html

Name and e-mail change functionality appears to work -- needs graphic design

2012-03-21 09:39:32 -04:00

Kirchhoff.html

Move to subdirectory in prepartion for merge

2012-03-19 11:10:44 -04:00

login.html

Move to subdirectory in prepartion for merge

2012-03-19 11:10:44 -04:00

main.html

Added return false on clicks for calculator

2012-03-22 16:37:36 -04:00

marketing.html

Move to subdirectory in prepartion for merge

2012-03-19 11:10:44 -04:00

mitx_global.html

Move to subdirectory in prepartion for merge

2012-03-19 11:10:44 -04:00

mitx_help.html

Move to subdirectory in prepartion for merge

2012-03-19 11:10:44 -04:00

mitx-overview.html

Move to subdirectory in prepartion for merge

2012-03-19 11:10:44 -04:00

name_changes.html

Name changes work, but meta storage not tested

2012-03-20 22:27:30 -04:00

navigation.html

Move to subdirectory in prepartion for merge

2012-03-19 11:10:44 -04:00

password_reset_form.html

Move to subdirectory in prepartion for merge

2012-03-19 11:10:44 -04:00

privacy.html

Move to subdirectory in prepartion for merge

2012-03-19 11:10:44 -04:00

problem_ajax.html

Move to subdirectory in prepartion for merge

2012-03-19 11:10:44 -04:00

problem.html

Move to subdirectory in prepartion for merge

2012-03-19 11:10:44 -04:00

problem.js

Move to subdirectory in prepartion for merge

2012-03-19 11:10:44 -04:00

profile_graphs.js

Move to subdirectory in prepartion for merge

2012-03-19 11:10:44 -04:00

profile.html

Merge branch 'master' into pmitros/name-change

2012-03-29 11:08:41 -04:00

schematicinput.html

Move to subdirectory in prepartion for merge

2012-03-19 11:10:44 -04:00

seq_module.html

Move to subdirectory in prepartion for merge

2012-03-19 11:10:44 -04:00

seq_module.js

Move to subdirectory in prepartion for merge

2012-03-19 11:10:44 -04:00

server-down.html

Move to subdirectory in prepartion for merge

2012-03-19 11:10:44 -04:00

server-error.html

Move to subdirectory in prepartion for merge

2012-03-19 11:10:44 -04:00

server-overloaded.html

Move to subdirectory in prepartion for merge

2012-03-19 11:10:44 -04:00

show_circuit.html

Move to subdirectory in prepartion for merge

2012-03-19 11:10:44 -04:00

simplewiki_base.html

Move to subdirectory in prepartion for merge

2012-03-19 11:10:44 -04:00

simplewiki_create.html

Move to subdirectory in prepartion for merge

2012-03-19 11:10:44 -04:00

simplewiki_edit.html

Move to subdirectory in prepartion for merge

2012-03-19 11:10:44 -04:00

simplewiki_error.html

Move to subdirectory in prepartion for merge

2012-03-19 11:10:44 -04:00

simplewiki_history.html

Move to subdirectory in prepartion for merge

2012-03-19 11:10:44 -04:00

simplewiki_instructions.html

Move to subdirectory in prepartion for merge

2012-03-19 11:10:44 -04:00

simplewiki_revision_feed.html

Move to subdirectory in prepartion for merge

2012-03-19 11:10:44 -04:00

simplewiki_searchresults.html

Move to subdirectory in prepartion for merge

2012-03-19 11:10:44 -04:00

simplewiki_updateprogressbar.html

Move to subdirectory in prepartion for merge

2012-03-19 11:10:44 -04:00

simplewiki_view.html

Move to subdirectory in prepartion for merge

2012-03-19 11:10:44 -04:00

staff_problem_info.html

Move to subdirectory in prepartion for merge

2012-03-19 11:10:44 -04:00

staticbook.html

Move to subdirectory in prepartion for merge

2012-03-19 11:10:44 -04:00

tab_module.html

Move to subdirectory in prepartion for merge

2012-03-19 11:10:44 -04:00

tab_module.js

Move to subdirectory in prepartion for merge

2012-03-19 11:10:44 -04:00

textbook.html

Move to subdirectory in prepartion for merge

2012-03-19 11:10:44 -04:00

textinput.html

failed to actually test and find the missing colon

2012-03-27 09:51:27 -04:00

tos.html

Move to subdirectory in prepartion for merge

2012-03-19 11:10:44 -04:00

using.html

Move to subdirectory in prepartion for merge

2012-03-19 11:10:44 -04:00

vert_module.html

Move to subdirectory in prepartion for merge

2012-03-19 11:10:44 -04:00

video_init.js

Move to subdirectory in prepartion for merge

2012-03-19 11:10:44 -04:00

video.html

Move to subdirectory in prepartion for merge

2012-03-19 11:10:44 -04:00