Commit Graph

16998 Commits

Author SHA1 Message Date
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
Chris Dodge
0c1c3f11af loop in static import testing into common/* tests 2013-08-21 20:48:56 -04:00
Chris Dodge
fb3a5bf9db remove unused class 2013-08-21 20:10:36 -04:00
Chris Dodge
ef98c54f5b fix some pylint violations 2013-08-21 20:06:10 -04:00
Chris Dodge
2ba0d40d7b fix pep8 violations 2013-08-21 20:02:58 -04:00
Jason Bau
a5ee2add05 started view tests 2013-08-21 14:54:00 -07:00
Diana Huang
f5290e4397 Make each item purchase transaction atomic
and add the ability to record the fulfillment time
2013-08-21 17:35:15 -04:00
David Ormsbee
1676fc31a5 Halfway state for course enrollment by mode 2013-08-21 16:21:53 -04:00
David Ormsbee
775ae010a2 Shorted names of models in verify_student 2013-08-21 16:21:52 -04:00
David Ormsbee
8f572e537e Flesh out the Software Secure model and add SS-specific encryption functions 2013-08-21 16:21:52 -04:00
David Ormsbee
086f55643e Bare bones outline of ID verification templates 2013-08-21 16:21:52 -04:00
David Ormsbee
0db7884354 Basic first commit of Photo ID Verification model and test code 2013-08-21 16:21:52 -04:00
JonahStanley
b2480b5f00 Changed way feature flags are interpreted
Configurations must be defined before hand

Reduced pylint violations

We only support 4 browsers
2013-08-21 16:05:53 -04:00
JonahStanley
21f75ff250 Various stylistic and pylint fixes / changes
Version numbers have very different ranges for different browsers so not having a dictionary of those.

Fixed a whitespace issue

Fixed pylint/pep8 violations

Don't need django_url

Spacing issues

Changed how commenting works

Forgot one

Used wrong name

Changed around importing

Remove django_url

Fixed function orderingn

Made logic nicer for getting a new browser

Modifying tests to run in opera

Needed to increase time to account for slow sauce loading

Now safari LMS works

Forgot an assert statement

Skipping a few tests for opera
2013-08-21 16:05:52 -04:00
JonahStanley
bb7cbf4d62 If sauce is not enabled, allow full range of ports
Forgot an import
2013-08-21 16:05:03 -04:00
JonahStanley
4c3dcda7e8 Hack to get around many types of string encodings
Changed the port listing

Changing to better readability
2013-08-21 16:05:03 -04:00
JonahStanley
22b3f2b161 Factored out Sauce related things to one file
LMS was arbitrarily chosen for now.

Fixed up pylint and pep8 errors

Fixed up pylint and pep8 errors

Changed naming to be better

Changed Sauce Info to obtaining a JSON string
2013-08-21 16:05:03 -04:00