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

..

djangoapps

Merge pull request #1382 from MITx/feature/brian/pearson-status

2013-01-30 09:55:45 -08:00

lib

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

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

static

Merge branch 'feature/dhm/drag' of github.com:MITx/mitx into feature/dhm/drag

2013-01-29 13:17:15 -05:00

templates

Update jquery ui. Overrode draggable w/ an in place fix for scroll

2013-01-25 12:44:58 -05:00

test

cleaned up conditional module a bit; add test for conditional module

2013-02-03 20:59:05 -05:00

xml_cleanup.py

{} -> {0} etc in .format statements

2012-08-16 16:22:26 -04:00