Jillian Vogel b7f0836be8 Merge remote-tracking branch 'upstream/master' ...

Conflicts:
	AUTHORS

2015-12-04 11:26:55 +10:30

..

cms/js

Fix optimizing of draggabilly and json2

2015-11-06 09:40:20 -05:00

coffee

Fix optimizing of draggabilly and json2

2015-11-06 09:40:20 -05:00

fonts

removing extra bold font-weight (800) from style rules/typeface files

2015-06-25 22:49:54 -04:00

images

re-enable edx.org comprehensive theme

2015-12-03 17:18:55 -05:00

js

MA-240 Added window beforeunload handler to the ActiveVideoUploadList view,

2015-12-04 07:38:22 +10:30

sass

Add Programs tab to Studio

2015-11-25 14:56:50 -05:00

common

Create a common paginated list view

2015-06-15 13:51:09 -04:00

js_test_squire.yml

Update sinon to version 1.17.0

2015-09-24 10:55:48 -04:00

js_test.yml

Fix optimizing of draggabilly and json2

2015-11-06 09:40:20 -05:00

templates

Create a common paginated list view

2015-06-15 13:51:09 -04:00

xmodule_js

Integrate js-test-tool into testing infrastructure

2013-08-26 20:21:18 -04:00