Commit Graph

55377 Commits

Author SHA1 Message Date
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
Tim McCormack
bba346cb7f Unpin PyJWT to unblock use of Apple auth backend (ARCHBOM-1281) (#24375)
...and pin django-ipware for the moment
2020-07-01 17:55:34 +00:00
edX Transifex Bot
fba65965f2 fix(i18n): update translations 2020-07-01 11:47:50 -04:00
Justin Lapierre
3c5edb9524 EDUCATOR-5080 - Switched back to using topid_id in the method due to a cascade of test failures. Added ticket to cover the refactor at a future time 2020-07-01 11:02:37 -04:00
Justin Lapierre
70f5c98fb7 EDUCATOR-5080 - Updated views test case to account for teamset_id as opposed to topic_id 2020-07-01 09:40:46 -04:00
Saleem Latif
625b85c836 Merge pull request #24370 from edx/saleem-latif/ENT-2657-bug-fix
Fixed COURSE_CATALOG_URL_ROOT attribute error for studio
2020-07-01 18:29:59 +05:00
Justin Lapierre
7d47bc39dc EDUCATOR-5080 - Fixed test according to linting rules 2020-07-01 09:28:43 -04:00
Justin Lapierre
8735f8aa0d EDUCATOR-5080 - Fixed linting issue in the tests 2020-07-01 09:07:44 -04:00
Justin Lapierre
ae848f9830 EDUCATOR-5080 - Responding to code review comments, removed deprecated test, updated docstrings, fixed linting issue 2020-07-01 08:39:43 -04:00
Saleem Latif
300d361de4 Fixed COURSE_CATALOG_URL_ROOT attribute error for studio 2020-07-01 15:27:37 +05:00
Justin Lapierre
6980a996c1 Merge branch 'master' of github.com:edx/edx-platform into EDUCATOR-5080 2020-07-01 06:26:56 -04:00
Awais Qureshi
232fd14f65 Merge pull request #24356 from edx/BOM-1843-ddt
BOM-1521
2020-07-01 12:39:31 +05:00
Awais Qureshi
d3f3c87186 BOM-1521
Removing ddt constraint.
2020-07-01 11:50:41 +05:00
Jeremy Bowman
76ad393cd1 Pin edx-enterprise until bug in new releases is fixed ARCHBOM-1324 (#24366)
The new releases end up importing code in Studio that relies on an LMS-only setting. Pinning until resolved.

Also pinning edx-completion until the test failures in #24365 get resolved.
2020-06-30 17:13:10 -04:00
Tim McCormack
ff203efe1f Envs doc updates: Django version, update aws.py reference in image (#24364)
- Reference correct version of Django docs
- Updates to LMS envs diagram:
    - Rename aws.py reference in image (now production.py)
    - Remove deprecated and deleted environments
- Update note on `devstack_docker.py` to explain history
2020-06-30 20:14:41 +00:00
stvn
dbfbc4bb32 Merge PR #24215 deprecate/studio/old-course-keys
* Commits:
  Add Studio warning for deprecated course keys
2020-06-30 12:55:10 -07:00
stvn
65db925948 Add Studio warning for deprecated course keys
in preparation of dropping support for them entirely.

Re: timing: We will _not_ be going live with this on edx.org at launch;
we'll override this setting on our own installs, initially.

We do, however, want to get this merged ASAP, so that it can still be
pulled into Juniper. That will allow us to drop support in time for the
Koa Named Release, while still providing community operators with a full
Named Release cycle to handle deprecation on their installations.

References:
- [0] TNL-7097
2020-06-30 12:26:53 -07:00
atesker
d70303a893 EDUCATOR-5127 - update message 2020-06-30 11:55:21 -04:00
M. Zulqarnain
061faba726 unpin sailthru-client and django-cookies samesite (#24358) 2020-06-30 20:26:58 +05:00
edx-pipeline-bot
a678f43e37 Merge pull request #24363 from edx/private_to_public_cb8556b
Mergeback PR from private to public.
2020-06-30 20:18:20 +05:00
Waheed Ahmed
cb8556bfa6 Merge pull request #182 from edx/aehsan/fix_xss_linting_issues
fixed xss linting issues
2020-06-30 19:30:25 +05:00
Dave St.Germain
39639fef65 Merge pull request #24349 from edx/dcs/update-lti
Upgrade lti-consumer-xblock
2020-06-30 10:18:15 -04:00
Awais Qureshi
d156cae333 Merge pull request #24330 from eduNEXT/lmm/regex_deprecation_warning
[BD-6] Fix invalid escape sequence deprecation warning.
2020-06-30 19:13:33 +05:00
Saleem Latif
199631a2d5 Merge pull request #24248 from edx/saleem-latif/ENT-2657
ENT-2657: Added COURSE_CATALOG_URL_ROOT to django settings
2020-06-30 18:16:55 +05:00
Dave St.Germain
b03b5744da Upgrade lti-consumer-xblock 2020-06-30 08:59:38 -04:00
Saleem Latif
85bf89db3e Added COURSE_CATALOG_URL_ROOT to django settings 2020-06-30 14:19:54 +05:00
Zachary Hancock
02305408fd fix to apply changes from #24325 in edx theme (#24354) 2020-06-29 19:40:30 -04:00
Michael Terry
f1af32990f Merge pull request #24351 from edx/downgrade-pycontracts
Downgrade pycontracts to 1.8.12
2020-06-29 16:11:47 -04:00
Michael Terry
a1672db5dc Downgrade pycontracts to 1.8.12
They seem to have removed 1.8.14 from pypi.
2020-06-29 15:22:41 -04:00
Mike OConnell
2271f3112e Merge pull request #24347 from edx/moco/ENT-3049-2
Check current enterprise for consent
2020-06-29 14:14:19 -04:00
Michael Terry
e8c2f351fe Merge pull request #24289 from edx/mikix/masquerade-learning-mfe
AA-177: Add masquerading for course home MFE
2020-06-29 13:10:26 -04:00