Adam Palay 67890b3c66 resolve merge conflict with hotfix branch

2013-09-03 16:00:24 -04:00

..

djangoapps

Fix for acceptance test static file issue

2013-09-03 11:36:23 -04:00

lib

resolve merge conflict with hotfix branch

2013-09-03 16:00:24 -04:00

static

Reset 'correctness' visual indicator of a problem on new input

2013-08-30 12:03:41 -04:00

templates

Fixed terribly annoying issues with back button. Back button is now on

2013-08-26 09:40:05 -04:00

test

Updated acceptance tests to match new behavior in video captions.

2013-08-30 16:17:01 -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