VikParuchuri 9a59336b5e Merge pull request #1676 from MITx/fix/vik/xblock-state-overwrite ...

Fix version handling for combined open ended

2013-03-18 11:58:38 -07:00

..

djangoapps

Make relative imports explicitly relative

2013-03-15 11:23:22 -04:00

lib

Reformat code

2013-03-15 16:21:36 -04:00

static

Merge remote-tracking branch 'origin/master' into feature/alex/poll-merged

2013-03-15 10:33:54 -04:00

templates

Fixed jasmine test issue with cms caused by previous change

2013-03-11 11:27:49 -04:00

test

fix test_conditional, add new conditional to "conditional_and_poll" test course

2013-03-06 19:52:18 +02:00

xml_cleanup.py

Pep8 autofixes

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