Commit Graph

22621 Commits

Author SHA1 Message Date
JonahStanley
0b6e62984e Using requests instead of a HTTPConnect 2013-08-21 16:05:02 -04:00
JonahStanley
58bb6e1ea3 Changed tags to be lowercase to prevent preprocessing
Changed to have a default for device since it isn't always needed

Tags are more clear

Fixed stylistic issues
2013-08-21 16:05:02 -04:00
JonahStanley
027cbfd09a Added logic to test_acceptance.sh so that the proper tests will be skipped for each browser
This logic also covers if a lettuce_browser is specified

Removing browser matrix from readme
2013-08-21 16:05:02 -04:00
JonahStanley
d422cb9206 Fixed desired_capabilities issues
Also, now lettuce browser can be specified by jenkins
2013-08-21 16:05:02 -04:00
JonahStanley
ee23b9d161 Changed method of obtaining feature flags to environment variables
Conflicts:
	common/djangoapps/terrain/browser.py
2013-08-21 16:05:02 -04:00
JonahStanley
9fb0529036 Sauce can only connect on certain ports 2013-08-21 16:05:02 -04:00
JonahStanley
2812b9cd5c Fixed how config was obtained
Added comment about the feature
2013-08-21 16:05:01 -04:00
JonahStanley
682d85c2f3 Changed feature to being one dictionary
Conflicts:
	common/djangoapps/terrain/browser.py
2013-08-21 16:05:01 -04:00
JonahStanley
3746c654d8 Added a tag for things that will not work on Firefox
Added tags for tests that will not work on Sauce

Changed build name

Tightened up logic

Conflicts:
	common/djangoapps/terrain/browser.py

Added flag for session name
2013-08-21 16:05:01 -04:00
JonahStanley
97df5aa997 Added feature flag for device type. Needed for android tablets 2013-08-21 16:05:01 -04:00
JonahStanley
1d7284b7cd Refactored out more for feature flags
Refactored more for feature flags
2013-08-21 16:05:01 -04:00
JonahStanley
f4c19919cd Beginnings of a feature flag
Conflicts:
	common/djangoapps/terrain/browser.py

Changed way feature flag was checked

Conflicts:
	common/djangoapps/terrain/browser.py
2013-08-21 16:05:00 -04:00
Diana Huang
bd4cc448af Clean up models, add some error handling 2013-08-21 15:55:30 -04:00
Frances Botsford
c392349fb0 adjusted controls for v photos 2013-08-21 15:40:08 -04:00
Frances Botsford
abd678e464 initial step interaction for verification 2013-08-21 15:27:37 -04:00
Diana Huang
e2ae0b2970 Remove line_cost from OrderItem 2013-08-21 14:49:18 -04:00
Peter Fogg
e177270d0d Merge pull request #700 from edx/peter-fogg/course-image-upload
WIP: Peter fogg/course image upload
2013-08-21 11:17:12 -07:00
Jason Bau
ef4e8f7e13 move currency formatting into template 2013-08-21 10:31:26 -07:00
Jason Bau
f59e7edb8f minor changes to PaidCourseRegistrationTest.test_purchased_callback 2013-08-21 13:16:06 -04:00
Jason Bau
1c2d84077b 100% coverage on shoppingcart/models.py 2013-08-21 13:15:37 -04:00
Diana Huang
42f8b970fc Clean up views and models. 2013-08-21 13:14:23 -04:00
Diana Huang
76766cbcae Some pep8/pylint cleanup 2013-08-21 13:14:22 -04:00
Jason Bau
d38748b300 100% coverage on CyberSource.py 2013-08-21 13:14:22 -04:00
Jason Bau
3da149ad76 Start of tests for CyberSource processor 2013-08-21 13:14:22 -04:00
Jason Bau
3ecdb6711f change method sig of process_postpay_callback 2013-08-21 13:14:22 -04:00
Jason Bau
64c8a7444f add handling of CyberSource non-ACCEPT decisions 2013-08-21 13:14:22 -04:00
Jason Bau
efbb439cb5 Adding migration to store purchased mode in PaidCourseRegistration 2013-08-21 13:14:22 -04:00
Jason Bau
65f2814d73 make PaidCourseRegistration mode aware 2013-08-21 13:14:22 -04:00
Diana Huang
c5f353ec05 Major cleanup work on ShoppingCart models
* Make currency a property of the Order (for validation purposes)
* Remove null=True from Char fields
* Use InheritanceManager for subclassing OrderItem
* Change VerifiedCertificate to better handle some new use cases
* Cleaned out old migrations
* Tests!
2013-08-21 13:14:21 -04:00
Diana Huang
38ba856ddc Start building tests 2013-08-21 13:14:21 -04:00
Diana Huang
88f54fff20 Put shopping cart views behind flags 2013-08-21 13:14:21 -04:00
Diana Huang
77ee243e77 Some cleanup fixes to get verified certs working. 2013-08-21 13:14:21 -04:00
Diana Huang
d6e777bc1b Remove enrollment_cost from course_module 2013-08-21 13:14:21 -04:00
Diana Huang
cff5491f8c Pull CyberSource values from environment variables
when in a dev environment.
2013-08-21 13:14:21 -04:00
Diana Huang
d719f14a52 Add in new VerifiedCertificate order item 2013-08-21 13:14:21 -04:00
Jason Bau
a4f5f4e42f about page changes, refactor processor reply handling 2013-08-21 13:14:21 -04:00
Jason Bau
0b8f41443f Lots more verification of CyberSource reply + receipt generation 2013-08-21 13:14:21 -04:00
Jason Bau
cf9d42772f factor out cybersource processor from cart 2013-08-21 13:14:21 -04:00
Jason Bau
ab1452cb1a add Order model fields for receipt generation 2013-08-21 13:14:21 -04:00
Jason Bau
1f6bdca6dd add Validation function for cybersource receipt POST 2013-08-21 13:14:21 -04:00
Jason Bau
ed4e7f54c7 Move shopping cart from session into model/db 2013-08-21 13:14:21 -04:00
Jason Bau
1a3953ca89 add parameterization of cybersource creds 2013-08-21 13:14:21 -04:00
Jason Bau
9e56028091 added shopping cart list template, embedded form 2013-08-21 13:14:20 -04:00
Jason Bau
b7d73933b7 initial commit of shopping cart and cybersource integration 2013-08-21 13:14:20 -04:00
Diana Huang
deb55380d5 Merge pull request #760 from edx/diana/move-course-modes-to-common
Move course modes to common and enable in Studio admin
2013-08-21 10:12:26 -07:00
Kevin Chugh
2f4665375f Merge pull request #745 from edx/dave/block_forums_for_unenrolled
Make it so that students who are not enrolled cannot see the forum
2013-08-21 09:13:10 -07:00
Your Name
25d98778cc Merge branch 'master' into dave/block_forums_for_unenrolled 2013-08-21 12:00:06 -04:00
Your Name
541aa08471 update forum access to include check for valid date range 2013-08-21 11:59:39 -04:00
ichuang
42af561a17 pep8 and pylint for tests of nostatic import 2013-08-21 11:23:00 -04:00
Your Name
a36e3b1957 CourseEnrollment no longer needed in forum/views 2013-08-21 11:06:30 -04:00