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

30088 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Feanil Patel
4cc39abfa4 Update celery config for config files I missed. 2015-05-08 09:01:50 -04:00
Feanil Patel
3d7a6d8b90 Fix for when celery runs in eager mode. 
When celery runs in eager mode, there is a bug and an exception
is not thrown when using retry logic. A PR to fix the bug can
be found here: https://github.com/celery/celery/pull/2607

In the mean time, we have to deal with the fact that in eager mode
celery will not throw the exception but simply return it. So we
raise it ourselves.
 2015-05-08 09:01:50 -04:00
Feanil Patel
e4aa91d510 Remove the mock, it doesn't seem like it's needed. 2015-05-08 09:01:49 -04:00
Feanil Patel
3b2a750d33 Update the cache backend for the new version of celery and djcelery. 2015-05-08 09:01:49 -04:00
Feanil Patel
95c240d576 Fix a bug in the failure increment. 2015-05-08 09:01:49 -04:00
Feanil Patel
27223ae80f Load celery for CMS as well. 2015-05-08 09:01:48 -04:00
Feanil Patel
34df5a32d2 Get LMS tests passing. 2015-05-08 09:01:48 -04:00
Feanil Patel
dae643bee2 Update ora2 to match the new version of celery. 2015-05-08 09:01:43 -04:00
Feanil Patel
975f17968d Update to the latest version of celery, and django-celery. 
Changelog for 3.1 can be found here:
  http://celery.readthedocs.org/en/latest/whatsnew-3.1.html

Changelog from 3.1.0 to 3.1.18 can be found here:
  http://celery.readthedocs.org/en/latest/changelog.html
 2015-05-08 08:25:18 -04:00
Shrhawk
7b53584653 Merge pull request #7621 from edx/shr/bug/TNL-1858-Unable-to-delete-studio-page 
Delete static_tab for split courses raises 500 error
 2015-05-08 15:06:03 +05:00
Waheed Ahmed
710bb2342e Merge pull request #7960 from edx/waheed/ora-release-tag-updated 
Updated ora release tag.
 2015-05-08 12:56:39 +05:00
Waheed Ahmed
4270854ebc Updated ora release tag. 2015-05-08 11:59:44 +05:00
Aamir
17222bfa7c Merge pull request #7864 from edx/aamir-khan/ECOM-1476-send-email-on-reverification 
ECOM-1476: sending email on software secure response initial work
 2015-05-08 11:22:49 +05:00
Martyn James
06c152c1d8 Merge pull request #7914 from edx/mjames/SOL-825_6 
Exclude filtering for microsite orgs
 2015-05-07 22:50:10 -04:00
Clinton Blackburn
6577bb3bd6 Merge pull request #7950 from edx/clintonb/update-verify-now 
Updated Take Photo page to include verification requirements
 2015-05-07 22:46:28 -04:00
Martyn James
fb51c6abd3 Exclude filtering for micorosite orgs 2015-05-07 21:39:07 -04:00
Clinton Blackburn
fc61c292b9 Updated Take Photo page to include verification requirements 
As part of the unification of verify later/now, the take photo page needs to list the verification requirements.

XCOM-254
 2015-05-07 18:14:33 -04:00
Greg Price
822a2ce8ef Merge pull request #7936 from edx/gprice/discussion-api-thread-list-query-group 
Add params to CS query in thread list endpoint
 2015-05-07 18:04:23 -04:00
Greg Price
603eae65d8 Add params to CS query in thread list endpoint 
The thread list endpoint needs to restrict the set of threads it
retrieves if the course is cohorted and the user is not privileged.
This also adds an explicit default sort (by most recent activity).
 2015-05-07 15:59:23 -04:00
Martyn James
2f398559ae Merge pull request #7845 from edx/mjevtic/SOL-776 
(SOL-776)(SOL-740)(SOL-532) Prerequisites for course discovery feature
 2015-05-07 14:05:38 -04:00
Christine Lytwynec
f51dbc5b60 Merge pull request #7962 from edx/clytwynec/omit-lettuce-features-from-coverage 
add lettuce features to the omitted directories in coveragerc files
 2015-05-07 13:58:13 -04:00
Adam
e71ee2b566 Merge pull request #7953 from Stanford-Online/kluo/cleanup-keyword-sub 
Clean up keyword_substitution.py
 2015-05-07 13:09:58 -04:00
Christine Lytwynec
56580510ea add lettuce features to the omitted directories in coveragerc files 2015-05-07 11:50:02 -04:00
aamir-khan
a975b8384c ECOM-1476: sending email on software secure response initial work 2015-05-07 18:56:49 +05: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