Gabe Mulley c9b0568acc Merge branch 'release' ...

Conflicts:
	cms/djangoapps/contentstore/views/item.py

2013-11-12 08:41:42 -05:00

..

coffee

Merge pull request #1580 from edx/christina/item

2013-11-06 10:50:56 -08:00

img

ui changes from design team feedback on studio assets page

2013-09-25 17:29:27 -04:00

js

Merge branch 'release'

2013-11-12 08:41:42 -05:00

js_spec

Revert "BLD-408: Don't allow users to enter video url's in http."

2013-11-08 20:32:22 +02:00

sass

Studio: revises the styling for the export view to sync with the import view's UI

2013-11-01 16:01:11 -04:00

js_test_squire.yml

Add an XBlock javascript runtime, and use it to run XModules

2013-10-18 16:31:32 -04:00

js_test.yml

Add js unit tests.

2013-10-23 13:03:35 +03:00

xmodule_js

Integrate js-test-tool into testing infrastructure

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