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 |
|
David Ormsbee
|
0dd5819683
|
basic flow from enroll mode selection to verify screen
|
2013-08-22 13:56:23 -04:00 |
|
Jason Bau
|
dad67cb90a
|
change error HTTP response codes to 400 where appropriate
|
2013-08-22 10:43:10 -07:00 |
|
Chris Dodge
|
7138aed2a9
|
add xlint tests in test_mongo.py
|
2013-08-22 13:30:52 -04:00 |
|
Jonah Stanley
|
51a21cb004
|
Merge pull request #777 from edx/jonahstanley/fix-platform-error
Removed space
|
2013-08-22 09:57:34 -07:00 |
|
JonahStanley
|
5c483d32e6
|
Removed space
|
2013-08-22 12:53:58 -04:00 |
|
Chris Dodge
|
bd412182c7
|
verticals shouldn't have 'data'
|
2013-08-22 12:01:17 -04:00 |
|
chrisndodge
|
2699ba65ba
|
Merge pull request #756 from edx/fix/cdodge/incorrect-html-serialization
Fix/cdodge/incorrect html serialization
|
2013-08-22 08:58:56 -07:00 |
|
Chris Dodge
|
079470d439
|
add some more tests in common to increase coverage
|
2013-08-22 11:48:37 -04:00 |
|
Frances Botsford
|
0086a054d6
|
first pass at select a track for verification
|
2013-08-22 11:37:36 -04:00 |
|
Diana Huang
|
a0948668f4
|
Remove unnecessary verified certificate view.
|
2013-08-22 11:01:09 -04:00 |
|
Diana Huang
|
bd576e1e23
|
Pep8 fixes
|
2013-08-22 10:34:16 -04:00 |
|
Jonah Stanley
|
a7851a9850
|
Merge pull request #678 from edx/zoldak/acceptance-sauce
Zoldak/acceptance sauce
|
2013-08-22 07:32:43 -07:00 |
|
JonahStanley
|
d96595318a
|
Stylistic changes
CMS tests should now run on IE
CMS tests will now run on Safari
Rebased wrong
Forgot to update the test_acceptance.sh
Changed way of string splitting
|
2013-08-22 10:08:35 -04:00 |
|
Chris Dodge
|
842556d284
|
add new test data with draft content
|
2013-08-22 08:57:10 -04:00 |
|
polesye
|
e950205206
|
Merge pull request #746 from edx/anton/support_failover_from_yt
Add supporting failover from Youtube.
|
2013-08-21 23:07:19 -07:00 |
|
Anton Stupak
|
03111cb98e
|
Remove onTouchBasedDevice function.
|
2013-08-22 08:45:44 +03:00 |
|
Anton Stupak
|
22b5decc95
|
Small fixes.
|
2013-08-22 08:45:43 +03:00 |
|
Anton Stupak
|
63c5ec5277
|
Add supporting failover from Youtube.
|
2013-08-22 08:45:43 +03:00 |
|
Jason Bau
|
b674aabbe7
|
remove DEBUG flag from cart addition urls--causing test failure
|
2013-08-21 19:17:31 -07:00 |
|
Chris Dodge
|
77a38afaeb
|
add some draft courseware importing paths in common/* tests
|
2013-08-21 22:00:33 -04:00 |
|
Jason Bau
|
5b25940cde
|
shopping cart view tests. coverage full except for debug line
|
2013-08-21 18:56:03 -07:00 |
|