David Ormsbee d0bff1ed3c Merge branch 'master' into jmpm-analytics ...

Conflicts:
	lms/djangoapps/instructor/views.py
	lms/envs/common.py
	lms/templates/courseware/instructor_dashboard.html

2013-03-06 17:09:09 -05:00

..

CodeMirror

CodeMirror.

2013-02-11 12:37:31 -05:00

flot

add jquery flot axislabels plugin

2012-09-08 23:21:13 -04:00

jquery-jvectormap-1.1.1

Added example of geographic student distribution over world map.

2013-01-11 17:14:29 -05:00

markitup

Move vendor javascript into common/static/js/vendor, so that they can be shared between the CMS and LMS, and create an html template that includes all of the vendor js needed for the courseware

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

mathjax-MathJax-c9db6ac

Pep8 autofixes

2013-02-06 11:13:50 -05:00

pdfjs

remove unneeded files (that break collectstatic)

2013-02-21 17:38:00 -05:00

swfobject

Move vendor javascript into common/static/js/vendor, so that they can be shared between the CMS and LMS, and create an html template that includes all of the vendor js needed for the courseware

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

timepicker

Update timepicker b/c it wasn't handling minutes from 01-09 and they'd

2013-01-10 11:05:14 -05:00

tiny_mce

studio html editor - added in visual assets needed for previous UI syncing

2013-01-16 16:56:22 -05:00

backbone-min.js

Fix for script tags w/in json objects being oddly evaluated on html page

2013-03-01 16:05:58 -05:00

codemirror-compressed.js

Move vendor javascript into common/static/js/vendor, so that they can be shared between the CMS and LMS, and create an html template that includes all of the vendor js needed for the courseware

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

date.js

replaced DateJS with latest version from their repository. There was a known bug about parsing times that are 12:xxPM - believe it or not.

2012-10-18 21:11:46 -04:00

jasmine-jquery.js

Move vendor javascript into common/static/js/vendor, so that they can be shared between the CMS and LMS, and create an html template that includes all of the vendor js needed for the courseware

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

jquery-ui.min.js

Update jquery ui. Overrode draggable w/ an in place fix for scroll

2013-01-25 12:44:58 -05:00

jquery.ba-bbq.min.js

Point Studio forgot password at corresponding lms forgot password. There is no place for a reset password link in Studio at the moment

2012-10-25 10:47:41 -04:00

jquery.cookie.js

Move vendor javascript into common/static/js/vendor, so that they can be shared between the CMS and LMS, and create an html template that includes all of the vendor js needed for the courseware

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

jquery.form.js

add new files

2012-10-12 20:55:16 -04:00

jquery.inlineedit.js

Move vendor javascript into common/static/js/vendor, so that they can be shared between the CMS and LMS, and create an html template that includes all of the vendor js needed for the courseware

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

jquery.leanModal.min.js

Move vendor javascript into common/static/js/vendor, so that they can be shared between the CMS and LMS, and create an html template that includes all of the vendor js needed for the courseware

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

jquery.min.js

Move vendor javascript into common/static/js/vendor, so that they can be shared between the CMS and LMS, and create an html template that includes all of the vendor js needed for the courseware

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

jquery.qtip.min.js

Move vendor javascript into common/static/js/vendor, so that they can be shared between the CMS and LMS, and create an html template that includes all of the vendor js needed for the courseware

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

jquery.scrollTo-1.4.2-min.js

Move vendor javascript into common/static/js/vendor, so that they can be shared between the CMS and LMS, and create an html template that includes all of the vendor js needed for the courseware

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

jquery.tablednd.js

Move vendor javascript into common/static/js/vendor, so that they can be shared between the CMS and LMS, and create an html template that includes all of the vendor js needed for the courseware

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

jquery.ui.draggable.js

Auto expand on hover of drag&drop unit

2013-01-29 13:10:23 -05:00

json2.js

Move vendor javascript into common/static/js/vendor, so that they can be shared between the CMS and LMS, and create an html template that includes all of the vendor js needed for the courseware

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

mersenne-twister-min.js

Moving a few static files out of lms into common

2012-08-07 13:39:59 -04:00

mustache.js

add mustache.js to common static repo

2012-10-17 13:47:07 -04:00

RequireJS.js

Added namespaced RequireJS.

2013-01-03 10:14:06 +02:00

underscore-min.js

Updated underscore (using _.invert())

2012-12-11 14:18:13 -05:00