Calen Pennington 8575ed439d Merge branch 'master' into dogfood ...

Conflicts:
	djangoapps/courseware/capa/responsetypes.py
	djangoapps/courseware/module_render.py
	djangoapps/courseware/modules/html_module.py
	djangoapps/courseware/modules/seq_module.py
	djangoapps/courseware/modules/x_module.py
	djangoapps/courseware/views.py
	templates/main.html
	templates/problem.js
	templates/textbox.html

2012-06-05 14:38:49 -04:00

..

emails

changed welcome email

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

jasmine

Minor code style and assets fix

2012-05-31 13:24:25 -04:00

pipeline_mako

Split the pipeline_mako templates from the namespace used by actual django-pipeline django templates

2012-05-24 10:28:41 -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.html

gitupdate template files and mod to accordion.html

2012-05-28 11:26:35 -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-error.html

Display the appropriate type of error message depending on the type of the incoming request

2012-05-16 13:45:00 -04:00

courseware.html

Remove unused JavaScript on the page bottom

2012-05-31 13:24:24 -04:00

create_account.html

fixed typo

2012-04-28 19:09:47 -04:00

dogfood.html

workaround for codemirror bug on chrome - click "show answer" does codemirror.refresh()

2012-06-02 20:48:07 -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

gitupdate.html

typo - missing slash

2012-05-28 11:31:00 -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

Add enrollment link back to main page for development purposes, until we have the multicourse enrollment stuff worked out

2012-05-29 10:46:01 -04:00

info.html

Adds ARIA labels to page elements

2012-05-21 11:23:55 -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

Fix section convention and code highlight

2012-05-31 13:24:24 -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 dogfood

2012-06-05 14:38:49 -04:00

marketing.html

Merge branch 'master' into asset-pipeline

2012-05-21 14:53:16 -04:00

mathjax_include.html

Merge branch 'master' into dogfood

2012-06-05 14:38:49 -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

multicourse: display course in mitxhome only if active = True for course

2012-05-26 22:35:54 -04:00

module-error.html

Display specific error messages when parts of the courseware break, rather than returning a 500 indicating that the whole site is down

2012-05-16 11:46:09 -04:00

name_changes.html

Name changes work, but meta storage not tested

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

navigation.html

Adds ARIA labels to page elements

2012-05-21 11:23:55 -04:00

optioninput.html

fix multicourse; fix bug in I4xSystem - self.filestore not set when

2012-05-17 22:29:45 -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

Rewrite Problem module

2012-05-31 13:24:24 -04:00

problem.html

Rewrite Problem module

2012-05-31 13:24:24 -04:00

problem.js

problem.js: change "show answer" to put result in .html instead of .text (OK everyone?)

2012-06-02 23:03:58 -04:00

profile_graphs.js

merge with master

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

profile.html

Add path prefix to all AJAX requests

2012-05-31 13:24:24 -04:00

quickedit.html

dynamic math - changes to javascript, responsetypes, and inputtypes

2012-06-01 22:39:50 -04:00

schematicinput.html

Move to subdirectory in prepartion for merge

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

seq_module.html

Rewrite Sequence module to use unobtrusive JS

2012-05-31 13:24:23 -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

Merge branch 'master' into asset-pipeline

2012-05-21 14:53:16 -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_info.html

Make staff problem histogram work again

2012-05-31 13:24:25 -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

Adds ARIA labels to page elements

2012-05-21 11:23:55 -04:00

tab_module.html

Rewrite Tab module, refactor Sequence module

2012-05-31 13:24:24 -04:00

textbook.html

Move to subdirectory in prepartion for merge

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

textbox.html

Merge branch 'master' into dogfood

2012-06-05 14:38:49 -04:00

textinput_dynamath.html

dynamic math display - fix sequence of mathjax timing (mathml now

2012-06-02 17:08:53 -04:00

textinput.html

Merge branch 'master' into dogfood

2012-06-05 14:38:49 -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.html

Check for None with is rather than ==

2012-06-01 12:18:43 -04:00