Will Daly 6728f16ae4 Merge branch 'feature/zoldak/refactor-factories' into feature/will/speed_up_lettuce_tests ...

Conflicts:
	lms/djangoapps/courseware/features/problems.py

2013-03-21 10:49:04 -04:00

..

djangoapps

Merge branch 'feature/zoldak/refactor-factories' into feature/will/speed_up_lettuce_tests

2013-03-21 10:49:04 -04:00

lib

Merge branch 'feature/zoldak/refactor-factories' into feature/will/speed_up_lettuce_tests

2013-03-21 10:49:04 -04:00

static

Merge pull request #1687 from MITx/hotfix/edz/pinning

2013-03-19 09:31:14 -07: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