Commits · 2012bb018fcb04fa9e3e4a849bba29ac6b9dd21f · edx / edx-platform · GitLab

26 Aug, 2013 3 commits
- Merge branch 'ormsbee/verifyuser' into ormsbee/verify2 · 2012bb01
  David Ormsbee committed Aug 26, 2013
  
  2012bb01 Browse Files
- Merge branch 'ormsbee/verifyuser' into ormsbee/verify2 · 0b625a6f
```
Conflicts:
	lms/static/sass/views/_verification.scss
	lms/templates/verify_student/photo_id_upload.html
```
  David Ormsbee committed Aug 26, 2013
  0b625a6f Browse Files
- adjusting the progress bar styling for vcerts · 770ec2db
  Frances Botsford committed Aug 26, 2013
  
  770ec2db Browse Files
23 Aug, 2013 13 commits
- refinements to the vcert requirements page · b5302a19
  Frances Botsford committed Aug 23, 2013
  
  b5302a19 Browse Files
- Make client-side capture work for photo IDs · da829b16
  David Ormsbee committed Aug 23, 2013
  
  da829b16 Browse Files
- added vcert images and some fake js functionality for photos · 0fabba15
  Frances Botsford committed Aug 23, 2013
  
  0fabba15 Browse Files
- default to a min price if we loose track of how much they wanted to pay · 3c79e81c
  David Ormsbee committed Aug 23, 2013
  
  3c79e81c Browse Files
- Allow amounts specified to actually work for purchasing certificates · cbb259eb
  David Ormsbee committed Aug 23, 2013
  
  cbb259eb Browse Files
- completed styling on select a track for verification · cb168523
  Frances Botsford committed Aug 23, 2013
  
  cb168523 Browse Files
- Remove useless critical log, remove unnecessary course_id escaping. · 2cdddef9
  David Ormsbee committed Aug 23, 2013
  
  2cdddef9 Browse Files
- quick experiment to force student verification urls to be active · 8ee9a967
  David Ormsbee committed Aug 23, 2013
  
  8ee9a967 Browse Files
- refinements on the verification html and sass · d4e8034f
  Frances Botsford committed Aug 22, 2013
  
  d4e8034f Browse Files
- initial html bones of the verification requirements page · 061b994e
  Frances Botsford committed Aug 22, 2013
  
  061b994e Browse Files
- almost all of the styling for the select page of verification · e7b06c1a
  Frances Botsford committed Aug 22, 2013
  
  e7b06c1a Browse Files
- add face capture button · 25874c29
  David Ormsbee committed Aug 22, 2013
  
  25874c29 Browse Files
- Verification purchase goes through to CyberSource · 9b438713
  David Ormsbee committed Aug 22, 2013
  
  9b438713 Browse Files
22 Aug, 2013 24 commits
- minor style change to keep videos from blowing out in verification · acd01306
  David Ormsbee committed Aug 22, 2013
  
  acd01306 Browse Files
- Connect new button to mode selection · 478fc376
  David Ormsbee committed Aug 22, 2013
  
  478fc376 Browse Files
- Merge branch 'master' into ormsbee/verifyuser_func · 52d33c0d
  David Ormsbee committed Aug 22, 2013
  
  52d33c0d Browse Files
- Grabbing the basic order information we need to sent to CyberSource. · ff472e16
  David Ormsbee committed Aug 22, 2013
  
  ff472e16 Browse Files
- Fix double requirement specification (django-model-utils) · 247c3ade
  David Ormsbee committed Aug 22, 2013
  
  247c3ade Browse Files
- fix typo in config file · 2b052c6f
  David Ormsbee committed Aug 22, 2013
  
  2b052c6f Browse Files
- Merge branch 'diana/verified-certs-payment' into ormsbee/verifyuser_func · 91fab457
```
Conflicts:
	common/djangoapps/course_modes/models.py
	lms/envs/common.py
	lms/envs/dev.py
```
  David Ormsbee committed Aug 22, 2013
  91fab457 Browse Files
- very stupid initial photo verification attempt save just so we can stuff into a cart · d46ed7ff
  David Ormsbee committed Aug 22, 2013
  
  d46ed7ff Browse Files
- very stupid initial photo verification attempt save just so we can stuff into a cart · 5422fc94
  David Ormsbee committed Aug 22, 2013
  
  5422fc94 Browse Files
- Merge design first pass at mode choice page · 25d9c2f3
  David Ormsbee committed Aug 22, 2013
  
  25d9c2f3 Browse Files
- Merge branch 'ormsbee/verifyuser' into ormsbee/verifyuser_func · 4a70f758
```
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
```
  David Ormsbee committed Aug 22, 2013
  4a70f758 Browse Files
- Merge pull request #652 from edx/feature/ichuang/import-with-no-static · 0191ae94
```
Enable mongodb to be used as back-end for git-based authoring workflow
```
  chrisndodge committed Aug 22, 2013
  0191ae94 Browse Files
- Merge pull request #763 from edx/fix/cdodge/strip-transient-draft-serialization-attributes · 1e9621cf
```
fix some gaps which would allow the temporary xml attributes 'parent_seq...
```
  chrisndodge committed Aug 22, 2013
  1e9621cf Browse Files
- basic flow from enroll mode selection to verify screen · 0dd58196
  David Ormsbee committed Aug 22, 2013
  
  0dd58196 Browse Files
- change error HTTP response codes to 400 where appropriate · dad67cb9
  Jason Bau committed Aug 22, 2013
  
  dad67cb9 Browse Files
- add xlint tests in test_mongo.py · 7138aed2
  Chris Dodge committed Aug 22, 2013
  
  7138aed2 Browse Files
- Merge pull request #777 from edx/jonahstanley/fix-platform-error · 51a21cb0
```
Removed space
```
  Jonah Stanley committed Aug 22, 2013
  51a21cb0 Browse Files
- Removed space · 5c483d32
  JonahStanley committed Aug 22, 2013
  
  5c483d32 Browse Files
- verticals shouldn't have 'data' · bd412182
  Chris Dodge committed Aug 22, 2013
  
  bd412182 Browse Files
- Merge pull request #756 from edx/fix/cdodge/incorrect-html-serialization · 2699ba65
```
Fix/cdodge/incorrect html serialization
```
  chrisndodge committed Aug 22, 2013
  2699ba65 Browse Files
- add some more tests in common to increase coverage · 079470d4
  Chris Dodge committed Aug 22, 2013
  
  079470d4 Browse Files
- first pass at select a track for verification · 0086a054
  Frances Botsford committed Aug 22, 2013
  
  0086a054 Browse Files
- Remove unnecessary verified certificate view. · a0948668
  Diana Huang committed Aug 22, 2013
  
  a0948668 Browse Files
- Pep8 fixes · bd576e1e
  Diana Huang committed Aug 22, 2013
  
  bd576e1e Browse Files