Victor Shnayder d7570de5d7 Merge pull request #1418 from MITx/feature/ichuang/conditional-xmodule-fix-display ...

fix bug in conditional - videos were not playing, because a js function changed syntax

2013-02-04 14:14:18 -08:00

..

test_files

Merge remote-tracking branch 'origin/master' into dormsbee/multicourse

2012-07-05 16:22:50 -04:00

xmodule

Merge pull request #1418 from MITx/feature/ichuang/conditional-xmodule-fix-display

2013-02-04 14:14:18 -08:00

.coveragerc

perform a new merge from master, resolve conflicts

2013-01-03 10:43:03 -05:00

jasmine_test_runner.html.erb

Clean up some JS errors showing up in the xmodule jasmine tests

2013-01-30 09:31:20 -05:00

setup.py

initial implementation of conditional_module; doesn't load dynamically yet

2013-02-03 18:53:51 -05:00