Adam Palay cfeb76e67f Merge remote-tracking branch 'origin/release' into adam/resolve-merge-conflicts ...

Conflicts:
	common/lib/xmodule/xmodule/modulestore/tests/test_mixed_modulestore.py

2014-09-05 13:20:15 -04:00

..

discussion

Merge remote-tracking branch 'origin/release' into adam/resolve-merge-conflicts

2014-09-05 13:20:15 -04:00

xblock

Add a request-token to identify which xblock html was rendered as part of the current request

2014-08-15 11:04:52 -04:00

.gitignore

Add leanModal vendor src to files.json for cms jasmine tests. Also .gitignore compiled js from coffee specs

2013-04-30 15:22:08 -04:00

jquery.immediateDescendents_spec.coffee

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

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

logger_spec.coffee

Convert Studio JS to use require.js

2013-10-04 13:43:50 -04:00