David Ormsbee 91fab4579b Merge branch 'diana/verified-certs-payment' into ormsbee/verifyuser_func ...

Conflicts:
	common/djangoapps/course_modes/models.py
	lms/envs/common.py
	lms/envs/dev.py

2013-08-22 14:57:34 -04:00

..

djangoapps

Merge branch 'diana/verified-certs-payment' into ormsbee/verifyuser_func

2013-08-22 14:57:34 -04:00

lib

Merge pull request #700 from edx/peter-fogg/course-image-upload

2013-08-21 11:17:12 -07:00

static

Add jsinput_spec back in.

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

templates

very stupid initial photo verification attempt save just so we can stuff into a cart

2013-08-22 14:54:29 -04:00

test

Merge pull request #700 from edx/peter-fogg/course-image-upload

2013-08-21 11:17:12 -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