Chris Dodge 3b5e17ef55 Merge branch 'master' into feature/cdodge/cms-master-merge2 ...

Conflicts:
	.gitmodules
	common/djangoapps/__init__.py
	common/djangoapps/track/migrations/__init__.py
	common/lib/capa/capa/inputtypes.py
	common/lib/capa/capa/responsetypes.py
	common/lib/capa/capa/templates/openendedinput.html
	common/lib/xmodule/xmodule/course_module.py
	common/lib/xmodule/xmodule/video_module.py
	common/static/sass/bourbon/css3/_box-sizing.scss
	doc/development.md
	lms/djangoapps/instructor/tests.py
	lms/envs/aws.py
	lms/envs/common.py
	lms/templates/video.html
	requirements.txt
	test-requirements.txt

2013-01-07 12:34:48 -05:00

..

CodeMirror

in order to support CodeMirror mode of 'text/html' we also have to include 'htmlmixed.js' as well as 'css.js' from the CodeMirror distro

2012-11-15 15:21:40 -05:00

flot

add jquery flot axislabels plugin

2012-09-08 23:21:13 -04: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

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

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

wrapped up section date setting; need help with already published sections

2012-10-22 16:43:44 -04:00

backbone-min.js

updated backbone & single thread retrieval now working

2012-08-20 22:03:46 -07: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

Fixed jquery ui image problem and added a base style sheet for lms to override fonts

2012-07-31 11:06:39 -04: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

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