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

..

CodeMirror

Changed size of circuit schematic to be the same as old editor

2012-04-09 15:25:55 -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

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

application.js

merge with master

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

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

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

video_player.js

jsonify in postJSON from multiple choice did -- indeed -- break things. Removed.

2012-05-11 14:02:09 -04:00