Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
30,917 Commits 1 Branch 0 Tags
54f62a85f6164545151c32a063916cbeec94de46
Commit Graph

30917 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Christine Lytwynec
ddb1ae667e Split lms unittests into multiple shards 2015-05-07 09:17:26 -04:00
Gabe Mulley
411df0ae3a Merge pull request #7802 from edx/gabe/user-track 
Make user_track use eventtracking
 2015-05-07 08:43:21 -04:00
Jim Abramson
56d380c812 Merge pull request #7954 from edx/jsa/xcom-270 
add custom PayPal payment button and js tests for buttons.
 2015-05-07 08:15:34 -04:00
Clinton Blackburn
19d0eda60c Merge pull request #7952 from edx/clintonb/paypal-receipt 
Hiding Billing Address for Orders without Billing Addresses
 2015-05-07 08:07:09 -04:00
Jim Abramson
2a449ade58 Merge pull request #7938 from edx/jsa/xcom-287 
fix ecommerce api calls in verify_student and add tests.
 2015-05-07 08:03:39 -04:00
Eugeny Kolpakov
9445534c55 Merge pull request #7955 from edx/problem-builder-bump 
Problem builder version bump [OSPR-575]
 2015-05-07 13:10:19 +03:00
E. Kolpakov
400d90bc3e Problem builder version bump: includes presentation updates and accessibility improvements [OSPR-575] 2015-05-07 11:32:31 +03:00
marjev
8107073c58 (SOL-776)(SOL-740)(SOL-532) Added setting flags for COURSE DISCOVERY feature; Exposed course search input as well as the course result page; Added flag for limiting the number of course cards on the homepage; 2015-05-07 08:57:04 +02:00
zubair-arbi
ede1c70ed8 Merge pull request #7944 from edx/zub/bugfix/ecom-1470-photo-verification-heading 
change photo reverification page heading from h3 to h1
 2015-05-07 11:52:54 +05:00
jsa
cc1c7d5012 fix ecommerce api calls in verify_student and update tests. 
XCOM-287
 2015-05-06 23:44:25 -04:00
Gabe Mulley
4a8b0c5ef5 Make user_track use eventtracking 2015-05-06 20:57:46 -04:00
jsa
a5c9d0b0f3 add custom PayPal payment button and js tests for buttons. 
XCOM-270
 2015-05-06 19:01:56 -04:00
Kevin Luo
5c36bd1052 Clean up keyword_substitution.py 
Update docstring and remove unused import
This is cleanup after edx/edx-platform#7605
 2015-05-06 14:22:21 -07:00
Clinton Blackburn
7c75b34baf Hiding Billing Address for Orders without Billing Addresses 
Some orders, specifically those paid for with PayPal, do not have a billing address. This information will not be rendered in such cases.
 2015-05-06 15:43:44 -04:00
Christine Lytwynec
2817ce1473 Merge pull request #7913 from edx/clytwynec/unique-dirs-for-test-results 
Clytwynec/unique dirs for test results
 2015-05-06 14:24:21 -04:00
Ben Patterson
1f38b690ad Merge pull request #7916 from edx/benp/bok-choy-background 
Paver: Ability to run only servers or only tests
 2015-05-06 13:11:02 -04:00
Muzaffar yousaf
0ca9f9667a Merge pull request #7810 from edx/muzaffar/tnl1261-studio-prview 
Enable unit preview by default.
 2015-05-06 21:06:49 +05:00
Ben Patterson
259092696e Merge pull request #7931 from edx/benp/chrome-add-user-to-team 
Bok-choy on chrome: fix sequence for adding user to team.
 2015-05-06 11:58:08 -04:00
Ben Patterson
02800dcd12 Bok-choy on chrome: fix sequence for adding user to team. 
TE-849

This passes fine in firefox; however in chrome, the click is occurring before
the page is ready; and then the click itself is not specific enough. Also
refactored the add button method so it more-clearly returns the expected
end-state.
 2015-05-06 11:56:48 -04:00
Ben Patterson
db285cab02 Paver: Ability to run only servers or only tests 
This would allow a user to set up and run servers, with an open prompt for killing
them. Likewise a user could open a different terminal session and run tests only.

How-to:
* At a terminal/ssh session, start bok-choy servers with
    `paver test_bokchoy --serversonly`
    (or, if you've already run collectstatic on your system:
    `paver test_bokchoy --serversonly --fasttest`)
* When the above is running, you can now open a separate terminal/ssh session
and run:
    `paver test_bokchoy -t my_tests --testsonly`

Keep in mind, the 'testsonly' flag does no setup. There is some minimal teardown; however,
such as clearing mongo and flushing the lms database. (Some tests have non-unique identifiers
and could not be run more than once.)
 2015-05-06 11:49:25 -04:00
Christine Lytwynec
590a64bed1 resolve path differences with coverage combine using a coveragerc file specifically for jenkins 
Conflicts:
	scripts/jenkins-report.sh
 2015-05-06 11:31:50 -04:00
Feanil Patel
ffbb623d13 Merge pull request #7934 from edx/feanil/release-merge-test 
Feanil/release merge test
 2015-05-06 10:49:51 -04:00
Martyn James
f04036435d Merge pull request #7945 from edx/dcikatic/index_unpublished_fix 
Fixes index function to not index children without published version - Thank you @dino-cikatic!
 2015-05-06 10:38:02 -04:00
Ben Patterson
c049684dfd Merge pull request #7939 from edx/benp/tnl-1619-flaky 
Mark test as flaky. TNL-1619
 2015-05-06 10:27:34 -04:00
Ben Patterson
0a9ef9c422 Merge pull request #7935 from edx/benp/chromefix-csv-upload-wait 
On faster browsers, we need to wait for the toggle option to appear.
 2015-05-06 10:10:18 -04:00
Sarina Canelake
f66c118d0a Merge pull request #7941 from mcgachey/mcgachey-submissions-version 
[LTI Provider] Updating submissions dependency to pull in new scoring signals
 2015-05-06 09:45:28 -04:00
zubair-arbi
b393f167fe change photo reverification page heading from h3 to h1 
ECOM-1470
 2015-05-06 17:47:00 +05:00
Dino Cikatic
21917461cf Fixes index function to not index children without published version 2015-05-06 14:46:24 +02:00
Syed Hassan Raza
b7955fab77 Static tab as orphan 2015-05-06 16:18:14 +05:00
Phil McGachey
a6afc29ced [LTI Provider] Updating submissions dependency to pull in new scoring signals 2015-05-06 07:02:46 -04:00
Muzaffar yousaf
77d445c962 Merge pull request #7787 from edx/muzaffar/tnl2051-profile-image-hover 
Adding hover state to image profile for accessibility.
 2015-05-06 14:11:04 +05:00
muzaffaryousaf
f5de0bbf43 Enable unit preview by default. 
TNL-1261
 2015-05-06 12:40:44 +05:00
Muhammad Ammar
63f4aa8ceb Merge pull request #7761 from edx/ammar/tnl1886-add-certificate-columns-in-grade-report 
Add certificate columns in grade report
 2015-05-06 09:32:42 +05:00
Ben Patterson
eacf25673a Mark test as flaky. TNL-1619 2015-05-05 19:37:55 -04:00
Clinton Blackburn
4bd15cf200 Merge pull request #7911 from edx/clintonb/deprecate-verify-later 
Deprecated Verify Later Page
 2015-05-05 18:27:09 -04:00
Ben Patterson
314accdf4d On faster browsers, we need to wait for the toggle option to appear. 
TE-849
 2015-05-05 17:25:20 -04:00
Clinton Blackburn
f7e8b2e4ca Merge pull request #7932 from edx/clintonb/requirement-fix 
Corrected ecommerce-api-client dependency
 2015-05-05 16:54:36 -04:00
Clinton Blackburn
5e68753101 Deprecated Verify Later Page 
We are moving toward a single workflow for verification.
 2015-05-05 16:42:27 -04:00
Jesse Zoldak
43738e4bb4 Merge pull request #7933 from edx/zoldak/TE-871 
Skip intermittently failing test. TE-871
 2015-05-05 16:31:16 -04:00
Feanil Patel
aa6565959d Merge branch 'release' 
Conflict in import because someone had added an import in master that
was not in the release.

Conflicts:
	common/lib/xmodule/xmodule/modulestore/tests/test_xml_importer.py
 2015-05-05 16:27:45 -04:00
Jesse Zoldak
6c7cec6d3c Skip intermittently failing test. TE-871 2015-05-05 16:21:52 -04:00
Clinton Blackburn
cd9c900b9a Corrected ecommerce-api-client dependency 2015-05-05 15:58:07 -04:00
Ben Patterson
0cd749f6fc Merge pull request #7920 from edx/benp/fix-cohort-wait-chrome 
Add wait for upload form.
 2015-05-05 15:21:46 -04:00
Greg Price
f22756128d Merge pull request #7881 from edx/gprice/discussion-api-thread-list 
Add thread list endpoint to the new discussion API
 2015-05-05 13:56:10 -04:00
Marco Morales
6426e28846 Merge pull request #7591 from jolyonb/jbloomfield/printing-links 
Print CSS: Fixing Links
 2015-05-05 13:35:25 -04:00
Marco Morales
cc478af4e8 Merge pull request #7592 from jolyonb/jbloomfield/printing-pagesize 
Fix Print Media CSS: Page margins
 2015-05-05 13:34:01 -04:00
Christina Roberts
7c7b0dd7c2 Merge pull request #7915 from edx/christina/flaky-search 
Label flaky test test_reindex.
 2015-05-05 12:46:18 -04:00
Jim Abramson
1ce4baa67a Merge pull request #7892 from edx/jsa/xcom-208 
Pass tracking context to ecommerce api client.
 2015-05-05 12:42:08 -04:00
muzaffaryousaf
0d2e2660e2 Adding hover state to image profile for accessibility. 
TNL-2051
 2015-05-05 21:01:47 +05:00
Jolyon Bloomfield
bf4a1d47a9 Fixing page size print CSS (rebase commit). 2015-05-05 11:45:56 -04:00