David Ormsbee 5202bdf85a Merge branch 'ormsbee/verify2' into ormsbee/verifyuser3 ...

Conflicts:
	common/templates/course_modes/choose.html
	lms/templates/verify_student/photo_verification.html

2013-08-29 14:34:52 -04:00

..

djangoapps

Make it so that auto-filling of selected price works again on confirmation screen before submitting credit card info.

2013-08-28 22:25:14 -04:00

lib

Merge pull request #652 from edx/feature/ichuang/import-with-no-static

2013-08-22 11:05:02 -07:00

static

Add jsinput_spec back in.

2013-08-21 13:54:22 -04:00

templates

Merge branch 'ormsbee/verify2' into ormsbee/verifyuser3

2013-08-29 14:34:52 -04:00

test

Merge pull request #652 from edx/feature/ichuang/import-with-no-static

2013-08-22 11:05:02 -07: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