David Ormsbee 4a70f7588e Merge branch 'ormsbee/verifyuser' into ormsbee/verifyuser_func ...

Conflicts:
	lms/djangoapps/verify_student/models.py
	lms/djangoapps/verify_student/tests/test_models.py
	lms/djangoapps/verify_student/tests/test_views.py
	lms/djangoapps/verify_student/urls.py
	lms/djangoapps/verify_student/views.py
	lms/envs/dev.py
	lms/templates/verify_student/face_upload.html
	lms/templates/verify_student/photo_id_upload.html
	lms/urls.py

2013-08-22 14:07:08 -04:00

..

admin

Pep8 autofixes

2013-02-06 11:13:50 -05:00

candy_res

Simple port of Class2Go's chat feature

2013-07-18 15:00:53 -07:00

coffee

switch from log_event to Logger.log

2013-08-20 16:52:18 -04:00

contrib

…

css/vendor

update annotator.min.css with change to fix adder button and serve the minified one.

2013-05-16 14:48:06 -04:00

files

Update edX media kit (LH #221)

2013-02-28 20:16:19 -05:00

fonts

added in vendor font references to lms for font-awesome

2013-07-22 10:10:23 -04:00

images

add member list widget, add segment.io call for section view

2013-08-02 09:53:21 -04:00

js

initial step interaction for verification

2013-08-21 15:27:37 -04:00

maintenance

adding maintenance static data

2012-08-23 08:30:04 -04:00

sass

Merge branch 'ormsbee/verifyuser' into ormsbee/verifyuser_func

2013-08-22 14:07:08 -04:00

scripts

perform a new merge from master, resolve conflicts

2013-01-03 10:43:03 -05:00

staff

…

.gitignore

Added Gemfile.lock to ignore

2012-07-30 09:51:50 -04:00

.hgignore

…

green-pointer.png

…

pixel.jpg

…