Arthur Barrett 610e210cc8 Merge branch 'feature/victor/annotation-input' into feature/abarrett/annotatable_xmodule

2013-02-20 11:32:46 -05:00

..

djangoapps

Move terrain module from lms to common.

2013-02-19 16:46:32 -05:00

lib

Merge branch 'feature/victor/annotation-input' into feature/abarrett/annotatable_xmodule

2013-02-20 11:32:46 -05:00

static

Merge branch 'feature/victor/annotation-input' into feature/abarrett/annotatable_xmodule

2013-02-20 11:32:46 -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