Victor Shnayder c81abe1e35 Merge remote-tracking branch 'origin/master' into 700x-sandbox

2013-02-07 16:27:08 -05:00

..

djangoapps

Fix loads of local static files when running in dev mode

2013-02-07 10:13:53 -05:00

lib

Merge pull request #1454 from MITx/hotfix/dave/youtube_object

2013-02-06 19:41:12 -08:00

static

Revert "Protex now loads correctly in every scenario" --- actually breaks grading, though it did fix loading

2013-02-07 16:14:42 -05:00

templates

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

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

test

Fix some issues with peer grading service

2013-02-05 13:37:55 -05:00

xml_cleanup.py

Pep8 autofixes

2013-02-06 11:13:50 -05:00