Brian Wilson d6a74a644d Merge branch 'master' into release ...

Conflicts:
	cms/static/js/views/modals/edit_xblock.js

2014-05-13 11:10:48 -04:00

..

coffee

Merge pull request #3511 from edx/adam/wiki-hide-fix-firefox

2014-05-09 07:04:03 -05:00

img

Update to page help on new Pages page in Studio

2014-03-21 16:33:26 -04:00

js

Apply Sarina's code review suggestions

2014-05-09 13:39:17 -04:00

sass

Merge branch 'master' into release

2014-05-13 11:10:48 -04:00

js_test_squire.yml

Allow multiple client-side runtimes on a single page

2014-02-04 08:55:36 -05:00

js_test.yml

Drag and drop on container page.

2014-05-02 15:09:15 -04:00

xmodule_js

Integrate js-test-tool into testing infrastructure

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