David Ormsbee 0d07ebc921 Merge branch 'master' into move_settings ...

Conflicts:
	static/simplewiki

2012-04-09 16:47:45 -04:00

..

CodeMirror

Fixed codemirror arrowkey navigation bug.

2012-03-29 22:27:55 -07: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

Import from hg

2012-03-19 11:05:25 -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

html5shiv.js

Remove file in 3rdParty

2012-03-19 11:10:43 -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.treeview.css

Import from hg

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

jquery.treeview.js

Import from hg

2012-03-19 11:05:25 -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

video_player.js

Added some firefox fixes

2012-04-04 11:43:26 -04:00