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

..

CodeMirror

Fix section convention and code highlight

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

flot

Move to subdirectory in preparation for merge

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

images

Import from hg

2012-03-19 11:05:25 -04:00

mathjax-MathJax-c9db6ac

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

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

simplewiki

Moved simplewiki autosuggest js (it didn't get migrated). Fixed a minor typo in settings.py (it suggested the wrong override location for the static js files)

2012-03-25 20:08:03 -07:00

swfobject

Import from hg

2012-03-19 11:05:25 -04:00

askbot_jquery.min.js

Move to subdirectory in preparation for merge

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

cktsim.js

Fix up the symlinks to point to the right place

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

codemirror-compressed.js

Integrating some of Ike's courseware changes

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

html5shiv.js

Remove file in 3rdParty

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

imageinput.js

Integrating some of Ike's courseware changes

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

jasmine-jquery.js

Minor code style and assets fix

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

jquery-1.6.2.min.js

Import from hg

2012-03-19 11:05:25 -04:00

jquery-ui-1.8.16.custom.min.js

Import from hg

2012-03-19 11:05:25 -04:00

jquery.cookie.js

Move to subdirectory in preparation for merge

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

jquery.leanModal.js

Fixed leanModal bug that caused lots of overlays to be added.

2012-03-28 14:20:08 -07:00

jquery.leanModal.min.js

Moved bug fix to minified leanModal

2012-03-29 18:00:42 -07:00

jquery.qtip.min.js

Added tooltip for time on video

2012-04-04 10:26:13 -04:00

jquery.scrollTo-1.4.2-min.js

Rewritten video module

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

jquery.treeview.css

Moving sass compilation to django-pipeline

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

jquery.treeview.js

Import from hg

2012-03-19 11:05:25 -04:00

jquery.ui.touch-punch.min.js

Added more bug fixes

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

mathjax

update symlinks to keep references to static assets in wiki happy

2012-03-22 13:36:18 -04:00

schematic.js

Fix up the symlinks to point to the right place

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