Calen Pennington 8e68573243 Merge pull request #1041 from MITx/fix/cdodge/video-captions ...

wire through course asset path information to the video playback module ...

2012-11-26 08:29:05 -08:00

..

djangoapps

Merge remote-tracking branch 'origin/master' into feature/cale/cms-master

2012-11-16 09:03:15 -05:00

lib

Merge pull request #1041 from MITx/fix/cdodge/video-captions

2012-11-26 08:29:05 -08:00

static

Merge pull request #1053 from MITx/feature/jzoldak/common-jasmine-tests

2012-11-16 13:35:19 -08:00

templates

Make rake commands to run jasmine tests in browser and via phantomjs

2012-10-30 10:41:02 -04:00

test

Merge remote-tracking branch 'origin/master' into feature/cale/cms-master

2012-11-16 09:03:15 -05:00

xml_cleanup.py

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

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