Vik Paruchuri d5ba5457dc Merge remote-tracking branch 'origin/master' into feature/vik/check-if-submission-allowed ...

Conflicts:
	common/lib/xmodule/xmodule/open_ended_grading_classes/combined_open_ended_modulev1.py

2013-02-20 16:49:59 -05:00

..

djangoapps

Move terrain module from lms to common.

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

lib

Merge remote-tracking branch 'origin/master' into feature/vik/check-if-submission-allowed

2013-02-20 16:49:59 -05:00

static

Merge pull request #1484 from MITx/feature/vik/improve-oe-ui

2013-02-19 07:27:29 -08: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