Brian Talbot cc02b4714c Merge branch 'master' into feature/btalbot/studio-alerts

2013-02-26 14:22:50 -05:00

..

djangoapps

Merge pull request #1474 from MITx/feature/victor/revert-revert-of-forums-ui

2013-02-25 09:03:33 -08:00

lib

Merge pull request #1536 from MITx/diana/rubric-hot-keys

2013-02-26 06:46:26 -08:00

static

Merge branch 'master' into feature/btalbot/studio-alerts

2013-02-26 14:22:50 -05:00

templates

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

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

test

remove empty attempts and weights from simple test course

2013-02-21 15:41:59 -05:00

xml_cleanup.py

Pep8 autofixes

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