Commit Graph

55357 Commits

Author SHA1 Message Date
Diana Huang
db93b66ddc Merge pull request #24411 from edx/diana/shoppingcart-removal-instructor
DEPR-43 - Remove final shoppingcart references from instructor.
2020-07-08 10:13:50 -04:00
Diana Huang
1655ecd063 Remove final shoppingcart references from instructor. 2020-07-08 09:36:43 -04:00
Feanil Patel
e8a7529243 Merge pull request #24414 from edx/feanil/shoppingcart-remove-student-transfer-command-refs
DEPR-43 Remove shoppingcart certs refs.
2020-07-08 09:30:50 -04:00
Feanil Patel
5fe7b0ad94 Merge pull request #24413 from edx/feanil/shoppingcart-removal-instructor-analytics
DEPR-43 - Remove shopping cart from instructor analytics.
2020-07-08 09:30:28 -04:00
Justin Lapierre
ea314a9314 Merge branch 'master' of github.com:edx/edx-platform into EDUCATOR-5080 2020-07-08 08:53:44 -04:00
Justin Lapierre
d5a01142a8 EDUCATOR-5080 - All tests passing, all code review comments addressed 2020-07-08 08:27:04 -04:00
edX requirements bot
4b078a056d Updating Python Requirements (#24419) 2020-07-08 17:06:07 +05:00
Justin Lapierre
6797c9c0fa EDUCATOR-5080 - Fixing tests 2020-07-08 07:52:29 -04:00
Waheed Ahmed
4f80fd6540 Improve password reset rate limit.
Used django-ratelimit instead of django-ratelimit-backend
to configure two different rate limit configurations for same
endpoint.

PROD-1708
2020-07-08 16:19:07 +05:00
Justin Lapierre
64e94867fc Merge branch 'master' of github.com:edx/edx-platform into EDUCATOR-5080 2020-07-08 07:11:07 -04:00
Waheed Ahmed
a6a69224d1 Ratelimit login_user endpoint.
Ratelimited `login_user` endpoint using `django-ratelimit`, also
decreased default value of logistration rate limit to 100 requests
per five minutes per IP.

PROD-1877
2020-07-08 15:36:11 +05:00
Justin Lapierre
79f596a74e Merge branch 'master' of github.com:edx/edx-platform into EDUCATOR-5080 2020-07-07 22:03:27 -04:00
Luis Moreno
a96c218553 Use PyPi release of django-ratelimit 2020-07-07 19:19:55 -04:00
edX cache uploader bot
50a81db551 Updating Bokchoy testing database cache 2020-07-07 17:01:52 -04:00
Kellie Selinka
d26854c14f Merge pull request #24410 from edx/kselinka-update-edx-enterprise/ENT-3073
update edx-enterprise version
2020-07-07 16:57:21 -04:00
Feanil Patel
20687f9548 DEPR-43 Remove shoppingcart certs refs.
There's a chance that the whole management command should be removed since we
don't do change modes with the command anymore but that's a different problem
for a different day I think.
2020-07-07 16:54:21 -04:00
Feanil Patel
ca85021187 DEPR-43 - Remove shopping cart from instructor analytics. 2020-07-07 16:38:32 -04:00
Robert Raposa
081a751d2c fix temp_flag_no_request_default_match (#24409)
Fix bug in metric temp_flag_no_request_default_match.
Metric renamed to temp_flag_no_request_default_match_2
to ensure we are looking at the right data.

This extends Phase 1 of the rollout, as documented in:
https://github.com/edx/edx-platform/pull/24392

ARCHBOM-1331
2020-07-07 16:32:11 -04:00
Kellie Selinka
4ac48c5ff8 update edx-enterprise version
ENT-3073
2020-07-07 15:47:31 -04:00
Robert Raposa
10ab63995a remove temporary USE_DEFAULT_TRUE_NAMESPACE (#24404)
Once USE_DEFAULT_TRUE_NAMESPACE is fully rolled out
and proves to return True where we wish, we can
remove this temporary roll-out flag introduced in:
https://github.com/edx/edx-platform/pull/24322

ARCHBOM-1316
2020-07-07 15:07:59 -04:00
Christie Rice
b81888323e Revert "MICROBA-393 Add customized partner report headings" (#24406) 2020-07-07 14:12:52 -04:00
daphneli-chen
51eff80553 Merge pull request #24329 from edx/dlichen/AA-202-Setup
dlichen/AA-202 setup
2020-07-07 13:15:32 -04:00
Christie Rice
011259bb3a MICROBA-393 Add customized partner report headings (#24321)
* MICROBA-393 Add customized partner report headings

* Add sorting
2020-07-07 13:03:59 -04:00
Alex Wang
6cc47a6803 update version of edx-proctoring library for MST-297 (#24402) 2020-07-07 13:03:43 -04:00
Robert Raposa
9b9259c160 phase 1: update waffle no request default (#24392)
This is Phase 1 of a 2 part rollout.

Here, we want to ensure that checking if the waffle flag
is set to active for everyone would provide the same value
as the current implementation for calls that have no request.
The current implementation is to use flag_undefined_default,
which is deprecated and we are trying to remove.

We are adding a custom metric to see if they match in
Production. If all goes well, in Phase 2 we will switch to
this new approach.

ARCHBOM-1331
2020-07-07 12:01:08 -04:00
Daphne Li-Chen
76a2523c6e AA-203: created API framework for Progress tab, sending user information 2020-07-07 11:54:39 -04:00
Aura Milena Alba
6026a98e11 Remove pattern library in course_home.py (#24157)
[BD-10] [DEPR-83][DEPR-81] Remove pattern library in course_home.py
2020-07-07 11:23:22 -04:00
Christie Rice
31a525580d Add sorting 2020-07-07 10:59:58 -04:00
Christie Rice
8f64860b85 MICROBA-393 Add customized partner report headings 2020-07-07 10:59:58 -04:00
Alex Dusenbery
acb9111beb cleanup devstack.py to only toggle ENABLE_ENTERPRISE_INTEGRATION in one place. 2020-07-07 10:43:37 -04:00
Feanil Patel
b617575163 Merge pull request #24401 from edx/feanil/constrain_enterprise_package
Constrain edx-enterprise.
2020-07-07 10:41:45 -04:00
Carla Duarte
24b4a4d1f2 AA-200: Redirecting logged out users on Dates Tab 2020-07-07 09:44:22 -04:00
Tim McCormack
df3f8d4344 Enable "Sign in with Apple" auth backend (ARCHBOM-1281) (#24368) 2020-07-07 13:25:33 +00:00
Justin Lapierre
c371af4778 Merge branch 'master' of github.com:edx/edx-platform into EDUCATOR-5080 2020-07-07 08:36:10 -04:00
edX Transifex Bot
ffbfe6bf83 fix(i18n): update translations 2020-07-06 14:43:53 +05:00
Ali Akbar
0caf336fb0 Merge pull request #24355 from edx/aakbar/PROD-1740
optimize course enrollment count query
2020-07-06 14:16:00 +05:00
Florian Haas
26281cbe36 Fix profile image URLs for image storage on non-public S3 buckets
In image_helpers.py, the _get_profile_image_urls() method would append
"?v=<version>" to the query string for serving profile images.

This might break serving profile images if

* EDXAPP_PROFILE_IMAGE_BACKEND was configured with its class option
  set to django.storages.s3boto3.S3Boto3Storage (or its deprecated
  predecedessor, django.storages.s3boto.S3BotoStorage), and
* that backend used signed URLs with query-string authentication (i.e.
  was *not* configured with an S3 custom domain).

When both the above conditions are met, then the URL returned by the
storage backend's url() method already contains "?", and
_get_profile_image_urls() would add another. This results in a query
string that doesn't exactly violate RFC 3986, but is discouraged by
it.[1]

Amazon S3 itself may be able to parse these query strings correctly,
but other S3 API implementations (such as Ceph radosgw[2]) may not,
and the problem is easily avoided by just looking for "?" in the
rendered URL, and using "&v=<version>" instead if we find a match.

The proper way of appending the v=<version> query parameter would
probably be to pull the URL and the query string apart and then back
together[3], but that's most likely overdoing it.

[1] https://tools.ietf.org/html/rfc3986#section-3.4 says:
"However, as query components are often used to carry identifying
information in the form of "key=value" pairs and one frequently used
value is a reference to another URI, it is sometimes better for
usability to avoid percent- encoding those characters." ("Those
characters" being "/" and "?".)

[2] https://docs.ceph.com/docs/master/radosgw/s3/

[3] https://docs.python.org/3/library/urllib.parse.html
2020-07-06 11:09:16 +02:00
Ali-D-Akbar
b2755a35a0 optimize course enrollment count query 2020-07-06 12:47:46 +05:00
Samuel Walladge
34516b9660 Consolidate get_transcript methods
There were two get_transcript methods. The broken one that was being
used (VideoTranscriptsMixin.get_transcript) is stripped out here - it
has been superseded by transcripts_utils.get_transcript. The latter
includes support for blockstore and VAL, while the former did not.

This fixes the `AttributeError: 'LibraryLocatorV2' object has no
attribute 'make_asset_key'` error seen when attempting to load a
transcript from a video through the xblock api when the video had the
transcript stored in blockstore.

Note that if you were previously using video.get_transcript, you should
now use `transcripts_utils.get_transcript(video, ...)`, and note that
the returned 'filename' will be prefixed with the language code, as
other `get_transcript*` functions already do.
2020-07-03 08:20:55 +09:30
Feanil Patel
db2656ae98 Constrain edx-enterprise.
This will allow for more controlled releases of enterprise code in edx-platform.
2020-07-02 16:00:10 -04:00
Robert Raposa
7f22041fc1 ARCHBOM-1316: always enable some course_experience flags (#24322)
In order to remove the deprecated flag_undefined_default=True
argument, this commit updates the following flags to always be
enabled using a new temporary class:

- course_experience.course_outline_page
- course_experience.unified_course_tab

Adds a temporary setting `USE_DEFAULT_TRUE_NAMESPACE`,
to enable a monitored rollout of this change.

TNL-7061 is the ticket where these flags will actually be
removed. This requires more careful work including removing
all dead code, and potentially refactoring tests that were
testing shared functionality, but only when the flag was
False.

ARCHBOM-1316
2020-07-02 12:00:23 -04:00
Michael Terry
c9c548a550 Merge pull request #24365 from edx/ddumesnil/AA-220
AA-220: Making Library Content an Aggregator CompletionMode
2020-07-02 10:57:01 -04:00
Alex Dusenbery
c3e5ec8272 Turn on enterprise integration in devstack settings. We are first-class citizens, and we demand respect! :p 2020-07-02 10:51:03 -04:00
edX cache uploader bot
691649362e Updating Bokchoy testing database cache (#24374) 2020-07-02 09:51:28 -04:00
edX requirements bot
0e4fe2eb15 Updating Python Requirements (#24383) 2020-07-02 17:59:36 +05:00
Awais Jibran
215c4cddb9 Merge pull request #24382 from edx/aj/update-id-v-emails-patch
Patch IDV emails approved
2020-07-02 15:30:19 +05:00
Awais Jibran
44bde2f9da Patch IDV emails approved 2020-07-02 14:47:09 +05:00
Dillon Dumesnil
35549f56ba AA-220: Making Library Content an Aggregator CompletionMode
This change will prevent Library Content from being marked as
complete on view and the corresponding version bump to
edx-completion contains code that will start looking at the
children of the library content for completeness.
2020-07-01 17:33:54 -04:00
edX Transifex Bot
cb0973317e geoip2: update maxmind geolite country database 2020-07-01 17:16:01 -04:00
Ben Warzeski
d99890fb1a Team card teamset name (#24360)
* show teamset as pennant in team cards within my_teams view

* update verifyCards spec helper to be able to check teamset label

* update tests for team_card teamset label.

Co-authored-by: Ben Warzeski <benwarzeski@edX-C02CD0HCLVDM.cable.rcn.com>
2020-07-01 15:37:45 -04:00