Calen Pennington f4032caeaf Merge branch 'feature/cale/xmodule-storage-model' into feature/alex/poll-merged ...

Conflicts:
	common/lib/xmodule/xmodule/conditional_module.py

2013-03-01 14:13:58 -05:00

..

djangoapps

Fix more tests

2013-02-13 14:22:08 -05:00

lib

Merge branch 'feature/cale/xmodule-storage-model' into feature/alex/poll-merged

2013-03-01 14:13:58 -05:00

static

spread less than and greater than fix to responses and comments, and profile view

2013-02-12 09:18: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

poll and conditional finished

2013-02-15 18:48:39 +02:00

xml_cleanup.py

Pep8 autofixes

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