David Ormsbee 48f867bd6b Merge branch 'master' into ormsbee/verifyuser3 ...

Conflicts:
	lms/envs/common.py

2013-09-09 10:18:25 -04:00

..

djangoapps

Merge branch 'master' into ormsbee/verifyuser3

2013-09-09 10:18:25 -04:00

lib

Merge pull request #825 from edx/fix/vik/staff-information

2013-09-06 14:14:31 -07:00

static

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

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

templates

ux adjustments to vcert flow

2013-09-06 12:02:37 -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

…