Peter Fogg 5cb456ba85 Fix merge conflict.

2013-06-17 16:49:22 -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

Fix merge conflict.

2013-06-17 16:49:22 -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

Many changes to finish up PR. To wit:

2013-06-17 13:46:20 -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