Jean Manuel Nater 3c67e2754a Merge branch 'master' into jnater/courseware_tests ...

Conflicts:
	lms/djangoapps/courseware/tests/tests.py
	lms/djangoapps/instructor/tests/test_enrollment.py

2013-06-27 13:53:47 -04:00

..

djangoapps

Make the UrlResetMixin load the urlconf after resetting it, and fix the comment client test that was leaving ENABLE_DISCUSSION_SERVICE at True

2013-06-27 11:05:09 -04:00

lib

Merge branch 'master' into jnater/courseware_tests

2013-06-27 13:53:47 -04:00

static

Fixed Jasmine tests in light of Logger changes, and wrote test to cover case where data passed is not a dictionary

2013-06-25 16:04:00 -04:00

templates

Abridge tests in light of learning how Segment.io works

2013-06-18 17:58:10 -04:00

test

Remove traling commas to make json valid

2013-06-25 22:34:36 -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