edx-platform

Files

ichuang 9b90068e03 Merge branch 'stable-edx4edx' of github.com:MITx/mitx

Conflicts:
	common/lib/xmodule/seq_module.py
	common/lib/xmodule/xmodule/capa_module.py
	lms/djangoapps/courseware/module_render.py
	lms/djangoapps/courseware/views.py
	lms/djangoapps/multicourse/multicourse_settings.py

2012-07-08 16:52:36 -04:00

emails

updating URL for activation email to edx4edx

2012-06-29 09:37:14 -04:00

jasmine

Moving LMS code into subdirectory

2012-06-06 14:09:01 -04:00

registration

Moving LMS code into subdirectory

2012-06-06 14:09:01 -04:00

.gitignore

Moving LMS code into subdirectory

2012-06-06 14:09:01 -04:00

.hgignore

Moving LMS code into subdirectory

2012-06-06 14:09:01 -04:00

404.html

Moving LMS code into subdirectory

2012-06-06 14:09:01 -04:00

6002x-faq.html

Moving LMS code into subdirectory

2012-06-06 14:09:01 -04:00

6002x-press-release.html

Moving LMS code into subdirectory

2012-06-06 14:09:01 -04:00

accordion.html

remove quickedit link from accordion (no need for manual gitreload anymore)

2012-06-15 21:44:19 -04:00

activation_active.html

Moving LMS code into subdirectory

2012-06-06 14:09:01 -04:00

activation_complete.html

Moving LMS code into subdirectory

2012-06-06 14:09:01 -04:00

activation_invalid.html

Moving LMS code into subdirectory

2012-06-06 14:09:01 -04:00

book_toc.html

Moving LMS code into subdirectory

2012-06-06 14:09:01 -04:00

Moving LMS code into subdirectory

2012-06-06 14:09:01 -04:00

courseware-error.html

change MITx -> edX in many lms templates

2012-06-28 10:26:59 -04:00

courseware.html

Moving LMS code into subdirectory

2012-06-06 14:09:01 -04:00

create_account.html

change MITx -> edX in many lms templates

2012-06-28 10:26:59 -04:00

dogfood.html

Fix other references to jquery after update to latest version

2012-06-20 15:06:49 -04:00

edit_circuit.html

Moving LMS code into subdirectory

2012-06-06 14:09:01 -04:00

email_change_successful.html

Moving LMS code into subdirectory

2012-06-06 14:09:01 -04:00

email_exists.html

Moving LMS code into subdirectory

2012-06-06 14:09:01 -04:00

emails_change_successful.html

Moving LMS code into subdirectory

2012-06-06 14:09:01 -04:00

feedback_email.txt

Moving LMS code into subdirectory

2012-06-06 14:09:01 -04:00

gitupdate.html

Moving LMS code into subdirectory

2012-06-06 14:09:01 -04:00

gradebook_profilegraphs.html

Moving LMS code into subdirectory

2012-06-06 14:09:01 -04:00

gradebook.html

Moving LMS code into subdirectory

2012-06-06 14:09:01 -04:00

help.html

Moving LMS code into subdirectory

2012-06-06 14:09:01 -04:00

homework.html

Moving LMS code into subdirectory

2012-06-06 14:09:01 -04:00

honor.html

change MITx -> edX in many lms templates

2012-06-28 10:26:59 -04:00

index.html

edx4edx configuration running on content server. Notes:

2012-06-26 14:04:56 +00:00

info.html

edx4edx configuration running on content server. Notes:

2012-06-26 14:04:56 +00:00

invalid_email_key.html

Moving LMS code into subdirectory

2012-06-06 14:09:01 -04:00

change MITx -> edX in many lms templates

2012-06-28 10:26:59 -04:00

main.html

change MITx -> edX in many lms templates

2012-06-28 10:26:59 -04:00

marketing.html

Fix other references to jquery after update to latest version

2012-06-20 15:06:49 -04:00

mathjax_include.html

Replace dynamite code with tested version

2012-06-08 11:16:03 -04:00

mitx_global.html

Moving LMS code into subdirectory

2012-06-06 14:09:01 -04:00

mitx_help.html

Moving LMS code into subdirectory

2012-06-06 14:09:01 -04:00

mitx-overview.html

Moving LMS code into subdirectory

2012-06-06 14:09:01 -04:00

mitxhome.html

Moving LMS code into subdirectory

2012-06-06 14:09:01 -04:00

module-error.html

Moving LMS code into subdirectory

2012-06-06 14:09:01 -04:00

name_changes.html

Moving LMS code into subdirectory

2012-06-06 14:09:01 -04:00

navigation.html

change MITx -> edX in many lms templates

2012-06-28 10:26:59 -04:00

optioninput.html

Moving LMS code into subdirectory

2012-06-06 14:09:01 -04:00

password_reset_form.html

Moving LMS code into subdirectory

2012-06-06 14:09:01 -04:00

privacy.html

Moving LMS code into subdirectory

2012-06-06 14:09:01 -04:00

problem_ajax.html

Update code according to changes in 829e502

2012-07-03 14:33:24 -04:00

problem.html

Fix up problem display to use the new metadata that's available

2012-07-03 14:20:11 -04:00

profile_graphs.js

Moving LMS code into subdirectory

2012-06-06 14:09:01 -04:00

profile.html

Merge branch 'stable-edx4edx' of github.com:MITx/mitx

2012-07-08 16:52:36 -04:00

quickedit.html

fix quickedit.html for latest css

2012-06-23 16:19:41 -04:00

seq_module.html

Update code according to changes in 829e502

2012-07-03 14:33:24 -04:00

server-down.html

change MITx -> edX in many lms templates

2012-06-28 10:26:59 -04:00

server-error.html

change MITx -> edX in many lms templates

2012-06-28 10:26:59 -04:00

server-overloaded.html

Moving LMS code into subdirectory

2012-06-06 14:09:01 -04:00

show_circuit.html

Moving LMS code into subdirectory

2012-06-06 14:09:01 -04:00

simplewiki_base.html

Moving LMS code into subdirectory

2012-06-06 14:09:01 -04:00

simplewiki_edit.html

Moving LMS code into subdirectory

2012-06-06 14:09:01 -04:00

simplewiki_error.html

Moving LMS code into subdirectory

2012-06-06 14:09:01 -04:00

simplewiki_history.html

Moving LMS code into subdirectory

2012-06-06 14:09:01 -04:00

simplewiki_instructions.html

Moving LMS code into subdirectory

2012-06-06 14:09:01 -04:00

simplewiki_revision_feed.html

Moving LMS code into subdirectory

2012-06-06 14:09:01 -04:00

simplewiki_searchresults.html

Moving LMS code into subdirectory

2012-06-06 14:09:01 -04:00

simplewiki_updateprogressbar.html

Moving LMS code into subdirectory

2012-06-06 14:09:01 -04:00

simplewiki_view.html

Moving LMS code into subdirectory

2012-06-06 14:09:01 -04:00

staff_problem_info.html

Merge branch 'stable-edx4edx' of github.com:MITx/mitx

2012-07-08 16:52:36 -04:00

staticbook.html

Moving LMS code into subdirectory

2012-06-06 14:09:01 -04:00

tab_module.html

Moving LMS code into subdirectory

2012-06-06 14:09:01 -04:00

textbook.html

Moving LMS code into subdirectory

2012-06-06 14:09:01 -04:00

tos.html

Moving LMS code into subdirectory

2012-06-06 14:09:01 -04:00

using.html

Moving LMS code into subdirectory

2012-06-06 14:09:01 -04:00

vert_module.html

Begin using a Keystore for XML parsing. Still broken: sequence icons, custom tags, problems, video js

2012-06-29 12:40:50 -04:00

video.html

Make user profiles work again after the switch to an XMLModuleStore. Staff user histograms are still broken

2012-06-29 12:45:17 -04:00