Commit Graph

58450 Commits

Author SHA1 Message Date
Giovanni Cimolin da Silva
c20f7cb7f5 Fix services tests 2019-12-10 19:23:44 -03:00
Feanil Patel
0e1116003a Ignore bad cached data.
When migrating from python 2 to 3 we can get in a situation where the
cache has data that the new version of python can't read.  In this case
drop the bad data and re-cache the correct data.
2019-12-10 16:15:46 -05:00
Diana Huang
ce0de597fd Merge pull request #22483 from edx/diana/update-xblock-lti-consumer
Upate xblock-lti-consumer to get more Python 3 fixes.
2019-12-10 16:01:45 -05:00
Jeremy Bowman
86186e2026 Fix graph traversal under Python 3 (#22484) 2019-12-10 15:52:26 -05:00
Diana Huang
4b6a522a87 Upate xblock-lti-consumer to get more Python 3 fixes. 2019-12-10 15:11:17 -05:00
Feanil Patel
fb73bcb27c Merge pull request #22478 from edx/diana/handle-branding-string
Redirect to the view names directly.
2019-12-10 15:06:32 -05:00
Diana Huang
b4825c52be Merge pull request #22481 from edx/diana/py3-cleaned-data
Remove items from a different dictionary than the one we're iterating over.
2019-12-10 14:53:21 -05:00
Diana Huang
5d095b3a7b Merge pull request #22477 from edx/diana/reraise-capa
Use six to reraise a capa error.
2019-12-10 14:50:48 -05:00
Jeremy Bowman
0e1881f525 Fixes for celery worker Python 3 bugs (#22479) 2019-12-10 14:07:27 -05:00
Diana Huang
6e7d54e820 Use the view names for redirect. 2019-12-10 13:39:54 -05:00
Diana Huang
4a828d749a Remove items from a different dictionary than the one we're
iterating over.
2019-12-10 13:21:03 -05:00
Diana Huang
5cc562b5b8 Use six to reraise a capa error. 2019-12-10 12:47:27 -05:00
Matthew Piatetsky
b7452ca61b Merge pull request #22430 from edx/REV-954
[REV-954] get optimizely from cloudflare
2019-12-10 11:13:31 -05:00
hasnain.naveed
ece5e48f1c ENT-2505 | By passing the check for forcing the login by third auth when user is already authenticated by third party. 2019-12-10 19:14:32 +05:00
Giovanni Cimolin da Silva
a78c21db10 Fix course export issue 2019-12-10 09:39:27 -03:00
hasnain.naveed
c926a13f41 ENT-1961 | Making the manual enrollment reason field optional via configuration flag ENABLE_MANUAL_ENROLLMENT_REASON_FIELD. 2019-12-10 17:31:58 +05:00
Adeel Khan
2b80fdbf66 Automate retry_failed_photo_verification mgt command
This patch would enable a user to run management
command via jenkins job. Verification ids
are injected via a configuration model.

PROD-1005
2019-12-10 16:53:12 +05:00
David Ormsbee
f508ba3d01 Merge pull request #19941 from open-craft/jill/opt-out-weekly-highlight-messages
Add api support to let users opt out of email updates
2019-12-09 16:57:09 -05:00
Robert Raposa
06a0d3ff71 Merge pull request #22453 from edx/robrap/ARCH-1253-remove-UPDATE_LOGIN_USER_ERROR_STATUS_CODE
remove UPDATE_LOGIN_USER_ERROR_STATUS_CODE toggle
2019-12-09 14:16:57 -05:00
Giovanni Cimolin da Silva
ba4de2f933 Upgrade pymongo and fix issues
This commit upgrades the version of pymongo from 2.x to 3.x, removing usages to deprecated functions usage and fixing tests where necessary.

This version of pymongo supports MongoDB 2.x all the way up to 4.2, and this ensures that the platform will be able to run on a supported MongoDB version in the next release.
2019-12-09 15:43:56 -03:00
Feanil Patel
0c1a169731 Merge pull request #22469 from edx/jenkins/upgrade-python-requirements-a189baa
Python Requirements Update
2019-12-09 12:16:20 -05:00
Feanil Patel
01b6b19f2e Merge pull request #22454 from edx/feanil/handle_pickling_failure
Feanil/handle pickling failure
2019-12-09 11:44:14 -05:00
Feanil Patel
f485ff450d Deal with pylint. 2019-12-09 11:03:22 -05:00
edX cache uploader bot
fa24ed8e83 Updating Bokchoy testing database cache (#22463) 2019-12-09 09:01:59 -05:00
Taranjeet Singh
00653433a5 Adds optional "unsubscribe" link and api support to let users opt out of email updates.
Scheduled emails show "unsubscribe" link if waffle switch
`schedules.course_update_show_unsubscribe` is enabled, and
settings.ACE_ENABLED_POLICIES respects `bulk_email_optout`.

API endpoint allows GET/POST requests, which:

* GET asks for confirmation of opt-out
* POST accepts "unsubscribe" or "cancel", where "unsubscribe" creates the
  Optout entry, and "cancel" does nothing.

Fixes flaky tests:

* The resolvers handle users in "bins", which are groups that depend on the user ID.
* The test user ID varies depending on the test order.
* This change ensures that the bin requested matches the user for the test.
2019-12-09 22:49:57 +10:30
edX requirements bot
e7d5b0e6b1 Updating Python Requirements 2019-12-09 05:49:49 -05:00
Syed Muhammad Dawoud Sheraz Ali
a189baadae Merge pull request #22425 from edx/dsheraz/PROD-1055
create CSM service
2019-12-09 14:01:58 +05:00
DawoudSheraz
c58ec73210 create service for CSM 2019-12-09 12:21:16 +05:00
Guruprasad Lakshmi Narayanan
6f524ce223 Use a callable as the default value for CourseEnrollment.mode
The previous behaviour of using a variable causes Django to complain
about changes not reflected in a migration when the default course
mode slug is changed.
2019-12-09 12:26:07 +05:30
edX Transifex Bot
f6258affda fix(i18n): update translations 2019-12-08 16:24:04 -05:00
Robert Raposa
9e4706e7bb remove UPDATE_LOGIN_USER_ERROR_STATUS_CODE toggle
The toggle UPDATE_LOGIN_USER_ERROR_STATUS_CODE was added to roll out a
breaking change for `login_user` auth errors to return a 400 rather than
a 200.

This toggle was enabled in Production on 12/5/2019 with seemingly no
adverse affects.

ARCH-1253
2019-12-06 17:20:17 -05:00
Robert Raposa
adf6327196 Merge pull request #22465 from edx/robrap/ARCH-1253-fix-flaky-test
fix flaky test_login unit test
2019-12-06 17:03:45 -05:00
Robert Raposa
6fc75c834b fix flaky test_login unit test
ARCH-1253
2019-12-06 16:19:52 -05:00
Feanil Patel
bf482f4989 Respond to code review. 2019-12-06 15:02:22 -05:00
Albert (AJ) St. Aubin
8a529c63ad Merge pull request #22462 from edx/aj/ENT-2082_offers_2
Upgrade edx-enterprise
2019-12-06 14:11:15 -05:00
Alex Wang
f1d2ddc97a no student create team in instructor managed topic (#22432)
Students can't create team in an instructor-managed topic
2019-12-06 13:41:56 -05:00
Albert (AJ) St. Aubin
12a416486a Upgrade edx-enterprise 2019-12-06 13:20:14 -05:00
Diana Huang
ca5e408b2e Merge pull request #22439 from edx/diana/move-account-settings-url
Move account_settings into user_api.
2019-12-06 12:46:13 -05:00
Alex Dusenbery
07dfe4db1c EDUCATOR-4821 | Upgrade edx-bulk-grades to 0.6.5 2019-12-06 10:47:13 -05:00
Diana Huang
461b11650e Move account_settings into user_api. 2019-12-06 10:27:26 -05:00
David Ormsbee
be7df8ba9f Merge pull request #22451 from edx/ormsbee/course_staff_search_preview
Add ENABLE_COURSEWARE_SEARCH_FOR_COURSE_STAFF flag
2019-12-06 09:55:35 -05:00
AsadAzam
9032652cf7 Merge pull request #22457 from edx/dsheraz/PROD-1000-logs
log exception for further context
2019-12-06 15:42:11 +05:00
DawoudSheraz
99d694c86c log exception for further context 2019-12-06 15:06:19 +05:00
Feanil Patel
48e9724808 Handle other places where we might be unpickling things.
We use pickling in conjunction with caches in these cases so we should
be able to fallback to the uncached behavior if the pickled data is
corrupt in some way.

eg. it's a python 2 pickle we don't know how to read.
2019-12-05 17:06:12 -05:00
Feanil Patel
684f254a77 Add error handling in course structure cache.
When going between python 2 and python 3.5 we can get pickeld course
structires that are incompatible no matter what we do do to the bug
linked in the comment.  In this case, handle the error and delete the
corrupt data from the cache.

Making this fairly generic because if we have any bad data in cache we
don't want it to blow up the whole process.  Just delete the bad data
and try again.
2019-12-05 17:06:12 -05:00
Robert Raposa
054fa85fc6 Merge pull request #22452 from edx/robrap/ARCH-1253-login-cleanup-part-2
ARCH-1253: return json for third party auth failure
2019-12-05 17:02:54 -05:00
Robert Raposa
ebcff3fb4b return json for third party auth failure
Returning JSON from `login_user` for third party auth failures makes
the response more consistent with all other `login_user` responses.

The only calls to `login_user` with this failure are processed by
`shim_student_view` which will in-turn remove this JSON. This improves
the `login_user` response in advance of switching the logistration page
to use `login_user` without `shim_student_view`.

ARCH-1253
2019-12-05 16:29:35 -05:00
David Ormsbee
aaf4c46645 Add ENABLE_COURSEWARE_SEARCH_FOR_COURSE_STAFF flag
Add an LMS feature flag to enable courseware search for course staff
only. TNL-6931
2019-12-05 15:14:26 -05:00
Matthew Carter
cf961828c2 Merge pull request #22450 from edx/mattcarter/EDUCATOR-4820
EDUCATOR-4820 Update edx-ora2 to 2.4.7
2019-12-05 14:46:22 -05:00
Mat Carter
b4e3dfb731 EDUCATOR-4820 Update edx-ora2 to 2.4.7 2019-12-05 13:40:52 -05:00