Commit Graph

17035 Commits

Author SHA1 Message Date
David Ormsbee
7af4accc50 Preserve purchase amount choice and redisplay on final verification page. 2013-08-28 15:06:58 -04:00
David Ormsbee
1255ea79c9 forgot to add partial template 2013-08-28 11:29:08 -04:00
David Ormsbee
48484ef9e0 move suggested price listing to common include template 2013-08-28 11:28:44 -04:00
David Ormsbee
0d67827314 Fix simple links in verification flow. 2013-08-27 19:35:46 -04:00
David Ormsbee
ee8d28dacc Fix webcam capture for Firefox 2013-08-27 19:01:27 -04:00
David Ormsbee
256c112d02 re-add full user name to verify page 2013-08-27 11:20:44 -04:00
David Ormsbee
6447e02f02 Merge branch 'ormsbee/verify2' into ormsbee/verifyuser3
Conflicts:
	lms/templates/verify_student/photo_verification.html
2013-08-27 11:08:38 -04:00
Frances Botsford
e6bfb887c4 more cleanup on photos for vcerts 2013-08-27 11:04:34 -04:00
Frances Botsford
28db6a2fda cleanup on the photo page for vcerts 2013-08-27 10:55:09 -04:00
Diana Huang
40393b21f7 Add in a new HTML class that represents the enrollment mode. 2013-08-27 09:42:25 -04:00
David Ormsbee
134e09b229 Remove old commented out HTML 2013-08-27 09:41:58 -04:00
David Ormsbee
6bb9360724 Merge branch 'ormsbee/verify2' into ormsbee/verifyuser3 2013-08-27 09:05:18 -04:00
Brian Talbot
bae9c307ef Verification: revised semantic classes/organization - WIP 2013-08-26 19:26:28 -04:00
Brian Talbot
af8339c72d Verification: revised Sass organization - WIP 2013-08-26 19:25:52 -04:00
Frances Botsford
e5cede572a fixing up some styling on vcerts 2013-08-26 18:36:56 -04:00
David Ormsbee
0712464f50 Remove mock verify enrollment link 2013-08-26 16:02:56 -04:00
David Ormsbee
d8a693fb16 Fix to make the submission from verified to payment go through again. 2013-08-26 16:01:08 -04:00
David Ormsbee
0387d76610 Fix disable/enable buttons in verification workflow. 2013-08-26 15:48:05 -04:00
David Ormsbee
dd50ec4e82 Merge design and dev JS/UI for verify student 2013-08-26 15:32:40 -04:00
Diana Huang
874c6314f5 Allow users who are not logged in to register. 2013-08-26 15:29:12 -04:00
David Ormsbee
15b23a16e8 Merge in latest design for enrollment mode selection 2013-08-26 11:05:54 -04:00
David Ormsbee
2012bb018f Merge branch 'ormsbee/verifyuser' into ormsbee/verify2 2013-08-26 10:05:08 -04:00
David Ormsbee
0b625a6f2a Merge branch 'ormsbee/verifyuser' into ormsbee/verify2
Conflicts:
	lms/static/sass/views/_verification.scss
	lms/templates/verify_student/photo_id_upload.html
2013-08-26 10:04:28 -04:00
Frances Botsford
770ec2dbb3 adjusting the progress bar styling for vcerts 2013-08-26 09:56:04 -04:00
Frances Botsford
b5302a192f refinements to the vcert requirements page 2013-08-23 16:49:01 -04:00
David Ormsbee
da829b1681 Make client-side capture work for photo IDs 2013-08-23 13:20:25 -04:00
Frances Botsford
0fabba1553 added vcert images and some fake js functionality for photos 2013-08-23 13:08:05 -04:00
David Ormsbee
3c79e81c9d default to a min price if we loose track of how much they wanted to pay 2013-08-23 11:37:34 -04:00
David Ormsbee
cbb259eb1f Allow amounts specified to actually work for purchasing certificates 2013-08-23 11:07:06 -04:00
Frances Botsford
cb16852313 completed styling on select a track for verification 2013-08-23 10:17:52 -04:00
David Ormsbee
2cdddef924 Remove useless critical log, remove unnecessary course_id escaping. 2013-08-23 01:27:08 -04:00
David Ormsbee
8ee9a96766 quick experiment to force student verification urls to be active 2013-08-23 01:02:23 -04:00
Frances Botsford
d4e8034fca refinements on the verification html and sass 2013-08-22 23:25:57 -04:00
Frances Botsford
061b994eb7 initial html bones of the verification requirements page 2013-08-22 22:53:51 -04:00
Frances Botsford
e7b06c1a33 almost all of the styling for the select page of verification 2013-08-22 22:33:27 -04:00
David Ormsbee
25874c29b0 add face capture button 2013-08-22 22:33:05 -04:00
David Ormsbee
9b43871373 Verification purchase goes through to CyberSource 2013-08-22 21:14:18 -04:00
David Ormsbee
acd01306fe minor style change to keep videos from blowing out in verification 2013-08-22 18:09:36 -04:00
David Ormsbee
478fc376f7 Connect new button to mode selection 2013-08-22 17:50:50 -04:00
David Ormsbee
52d33c0dee Merge branch 'master' into ormsbee/verifyuser_func 2013-08-22 17:33:20 -04:00
David Ormsbee
ff472e16f1 Grabbing the basic order information we need to sent to CyberSource. 2013-08-22 15:52:59 -04:00
David Ormsbee
247c3ade70 Fix double requirement specification (django-model-utils) 2013-08-22 15:00:56 -04:00
David Ormsbee
2b052c6fd3 fix typo in config file 2013-08-22 14:58:51 -04:00
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
David Ormsbee
d46ed7ff53 very stupid initial photo verification attempt save just so we can stuff into a cart 2013-08-22 14:54:38 -04:00
David Ormsbee
5422fc94ca very stupid initial photo verification attempt save just so we can stuff into a cart 2013-08-22 14:54:29 -04:00
David Ormsbee
25d9c2f385 Merge design first pass at mode choice page 2013-08-22 14:17:57 -04:00
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
chrisndodge
0191ae9417 Merge pull request #652 from edx/feature/ichuang/import-with-no-static
Enable mongodb to be used as back-end for git-based authoring workflow
2013-08-22 11:05:02 -07:00
chrisndodge
1e9621cf4f Merge pull request #763 from edx/fix/cdodge/strip-transient-draft-serialization-attributes
fix some gaps which would allow the temporary xml attributes 'parent_seq...
2013-08-22 11:00:55 -07:00