Vik Paruchuri 48719a7a45 Merge branch 'feature/vik/oe-versioning' into feature/vik/improve-oe-ui ...

Conflicts:
	common/lib/xmodule/xmodule/js/src/peergrading/peer_grading_problem.coffee
	lms/static/sass/course/_staff_grading.scss

2013-02-06 16:04:01 -05:00

..

djangoapps

Pep8 autofixes

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

lib

Merge branch 'feature/vik/oe-versioning' into feature/vik/improve-oe-ui

2013-02-06 16:04:01 -05:00

static

Pep8 autofixes

2013-02-06 11:13: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

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