Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
17,034 Commits 1 Branch 0 Tags
ff5ca76aa67e645f7c5e4dece4aa85d7fdbddc73
Commit Graph

17034 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jason Bau
ff5ca76aa6 add Validation function for cybersource receipt POST 2013-08-22 15:39:54 -04:00
Jason Bau
3f9c52cd1c Move shopping cart from session into model/db 2013-08-22 15:39:54 -04:00
Jason Bau
ea7cf3a24e add parameterization of cybersource creds 2013-08-22 15:39:54 -04:00
Jason Bau
4d81383e0a added shopping cart list template, embedded form 2013-08-22 15:39:54 -04:00
Jason Bau
988a7a1fba initial commit of shopping cart and cybersource integration 2013-08-22 15:39:54 -04:00
Vik Paruchuri
26a301f42e Merge pull request #504 from edx/feature/vik/oe-ui 
Feature/vik/oe ui
 2013-08-22 12:23:29 -07:00
chrisndodge
f3943c7e22 Merge pull request #779 from edx/fix/cdodge/check-xml-attribute-existence 
ErrorDescriptors do not have xml_attributes field
 2013-08-22 12:08:40 -07:00
Chris Dodge
46ce931d51 ErrorDescriptors do not have xml_attributes field 2013-08-22 14:50:45 -04:00
Vik Paruchuri
21e13e44af Pep8 and pylint fixes 2013-08-22 14:29:39 -04:00
Vik Paruchuri
a06801432e Fix staff grading test 2013-08-22 14:12:12 -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
Vik Paruchuri
a6cc30d1fe Fix tests, address review feedback 2013-08-22 13:51:27 -04: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
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
Chris Dodge
77a38afaeb add some draft courseware importing paths in common/* tests 2013-08-21 22:00:33 -04: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
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
JonahStanley
35e5f4cab5 Moved global things in browser.py to functions 2013-08-21 16:05:02 -04:00
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
3cf8083717 Upgraded selenium version for sauce 2013-08-21 16:05:01 -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
010fd5771d Pass/Fail status updated properly 
Conflicts:
	common/djangoapps/terrain/browser.py
 2013-08-21 16:05:00 -04:00