Don Mitchell 0f5571f499 Merge branch 'feature/btalbot/studio-softlanding' of github.com:MITx/mitx into feature/btalbot/studio-softlanding

2013-02-06 09:48:09 -05:00

..

djangoapps

Merge pull request #1437 from MITx/fix/cdodge/static-content-server-return-404

2013-02-05 13:36:28 -08:00

lib

Merge pull request #1434 from MITx/bug/btalbot/studio-boldblockquote

2013-02-05 13:13:44 -08:00

static

studio - soft landing/nav: added in functionality/content to soft landing view and started punch list

2013-02-05 11:34:28 -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

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

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