Calen Pennington bc823d3bfe Merge branch 'master' into asset-pipeline ...

Conflicts:
	djangoapps/multicourse/__init__.py
	requirements.txt
	sass/_info.scss
	sass/_textbook.scss
	sass/courseware/_sequence-nav.scss
	sass/courseware/_video.scss
	sass/index/_base.scss
	sass/index/_extends.scss
	sass/index/_footer.scss
	sass/index/_header.scss
	sass/index/_index.scss
	sass/index/_variables.scss
	sass/layout/_calculator.scss
	sass/print.scss
	static/css
	static/css/application.css
	static/css/marketing.css
	templates/main.html
	templates/marketing.html
	templates/sass/index/_base.scss
	templates/sass/index/_extends.scss
	templates/sass/index/_footer.scss
	templates/sass/index/_header.scss
	templates/sass/index/_index.scss
	templates/sass/index/_variables.scss
	templates/sass/marketing/_base.scss
	templates/sass/marketing/_extends.scss
	templates/sass/marketing/_footer.scss
	templates/sass/marketing/_header.scss
	templates/sass/marketing/_index.scss
	templates/sass/marketing/_variables.scss

2012-05-17 16:32:39 -04:00

..

coffee

merge with master

2012-05-10 12:25:33 -04:00

emails

changed welcome email

2012-04-28 03:40:33 -04:00

pipeline

Moving sass compilation to django-pipeline

2012-04-20 14:20:09 -04:00

registration

Moving sass compilation to django-pipeline

2012-04-20 14:20:09 -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

merge with master

2012-05-10 12:25:33 -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.html

Made links in sidebar all in p>

2012-05-14 16:39: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

choicegroup.html

checkboxes

2012-05-07 21:04:10 -04:00

copyright.html

Move to subdirectory in prepartion for merge

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

courseware.html

makes the sequence nav more semantic and replaces js hover with css

2012-05-15 16:00:27 -04:00

create_account.html

fixed typo

2012-04-28 19:09:47 -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

Moving sass compilation to django-pipeline

2012-04-20 14:20:09 -04:00

gradebook.html

Merge branch 'master' into asset-pipeline

2012-05-17 16:32:39 -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

imageinput.html

Moving in Ike's new files, touches of multicourse

2012-05-13 20:33:29 -04:00

index.html

Merge branch 'master' into asset-pipeline

2012-05-17 16:32:39 -04:00

info.html

Add a guest_handouts.html for anonymous users

2012-05-07 15:36:02 -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

jstextline.html

Moving in Ike's new files, touches of multicourse

2012-05-13 20:33:29 -04:00

login.html

Move to subdirectory in prepartion for merge

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

main.html

Merge branch 'master' into asset-pipeline

2012-05-17 16:32:39 -04:00

marketing.html

Merge branch 'master' into asset-pipeline

2012-05-17 16:32:39 -04:00

mathstring.html

Moving in Ike's new files, touches of multicourse

2012-05-13 20:33:29 -04:00

mitx_global.html

Merge branch 'master' into asset-pipeline

2012-05-17 16:32:39 -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

mitxhome.html

Moving in Ike's new files, touches of multicourse

2012-05-13 20:33:29 -04:00

name_changes.html

Name changes work, but meta storage not tested

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

navigation.html

Moving in Ike's new files, touches of multicourse

2012-05-13 20:33:29 -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

Replace links to static in problems with links to fingerprinted data

2012-04-23 11:42:42 -04:00

problem.js

Moving in Ike's new files, touches of multicourse

2012-05-13 20:33:29 -04:00

profile_graphs.js

merge with master

2012-05-10 12:25:33 -04:00

profile.html

Merge branch 'master' into asset-pipeline

2012-05-17 16:32:39 -04:00

quickedit.html

Ike's changes to enable multicourse, new response types, etc.

2012-05-16 21:18:47 -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

makes the sequence nav more semantic and replaces js hover with css

2012-05-15 16:00:27 -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

Moving sass compilation to django-pipeline

2012-04-20 14:20:09 -04:00

simplewiki_edit.html

Moved styling to sass. Editor now looks like textarea used to.

2012-03-31 15:43:09 -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

Changed instructions for circuit-schematic:

2012-03-29 16:41:44 -07: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

solutionspan.html

Integrating some of Ike's courseware changes

2012-05-13 19:36:01 -04:00

staff_problem_histogram.js

Removed python code in templates to be javascript.

2012-05-08 14:13:27 -04:00

staff_problem_info.html

Made sure that histogram graph doesn't show up for modules without scores. Modified look of histogram graph.

2012-05-08 14:13:27 -04:00

static_content.html

Replace links to static in problems with links to fingerprinted data

2012-04-23 11:42:42 -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

textbox.html

Integrating some of Ike's courseware changes

2012-05-13 19:36:01 -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

More minor tweeks

2012-04-24 11:09:33 -04:00

video.html

Videos now support annotations w/o verticals

2012-05-08 14:13:28 -04:00