Jean Manuel Nater 97275a3286 Refactored some of the classes in tests.py to not unnecessarily depend on the XML modulestore. ...

Conflicts:
	lms/djangoapps/courseware/tests/test_navigation.py
	lms/djangoapps/courseware/tests/test_view_authentication.py
	lms/djangoapps/courseware/tests/tests.py

2013-06-18 13:54:16 -04:00

..

djangoapps

Merge branch 'master' into jnater/playground

2013-06-18 13:36:24 -04:00

lib

Refactored some of the classes in tests.py to not unnecessarily depend on the XML modulestore.

2013-06-18 13:54:16 -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