lapentab b9ca9a84d7 Merge branch 'master' into blapenta/fix-test-coverage ...

Conflicts:
	AUTHORS
	common/lib/xmodule/xmodule/tests/test_annotatable_module.py
	common/lib/xmodule/xmodule/tests/test_capa_module.py
	common/lib/xmodule/xmodule/tests/test_combined_open_ended.py
	common/lib/xmodule/xmodule/tests/test_conditional.py
	common/lib/xmodule/xmodule/tests/test_html_module.py
	common/lib/xmodule/xmodule/tests/test_progress.py
	common/lib/xmodule/xmodule/tests/test_xml_module.py
	lms/djangoapps/courseware/tests/__init__.py

2013-06-18 13:41:53 -04:00

..

djangoapps

Remove waits by adding code in click that will try the operation multiple times (thanks to Jonah).

2013-06-17 13:55:15 -04:00

lib

Merge branch 'master' into blapenta/fix-test-coverage

2013-06-18 13:41:53 -04:00

static

Merge branch 'master' into feature/christina/metadata-ui

2013-05-31 09:46:17 -04:00

templates

Record junit reports of jasmine tests

2013-05-22 22:01:44 -04:00

test

Merge branch 'master' into feature/christina/unify-fields

2013-06-13 10:55:13 -04:00

.gitignore

Gitignore jasmine_test_runner.html in the appropriate place.

2013-05-16 12:39:48 -04:00

xml_cleanup.py

Pep8 autofixes

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