Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
56,421 Commits 1 Branch 0 Tags
afeea75d9ef8ecd53beddc85522688e293d8f10e
Commit Graph

56421 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Diana Huang
afeea75d9e Add changes to support ES7 and edx-search 2.0 back into the tree. 2020-11-17 13:23:13 -05:00
Fred Smith
8654feb7e1 Merge pull request #22966 from open-craft/samuel/remove-unused-defaults 
SE-1841 remove unused defaults
 2020-11-17 12:34:01 -05:00
David Ormsbee
6a55b833dc Merge pull request #25045 from open-craft/gabor/expose-banner-image-url 
[SE-3329] Expose banner image url in course API
 2020-11-17 11:08:18 -05:00
Albert (AJ) St. Aubin
70a82580fb Added data to the refresh endpoint for investigation. 
[MICROBA-585]

In support of an investigation into errors we are receiving for
JWT tokens we are adding some data to the JSON response on a token
refresh.
 2020-11-17 10:30:01 -05:00
Thomas Tracy
44187fb4d2 Fix courserun_key name to properly be picked up by snowflake (#25605) 2020-11-17 10:18:07 -05:00
Usama Sadiq
07a01edbd5 Merge pull request #25607 from edx/jenkins/upgrade-python-requirements-6716d89 
Python Requirements Update
 2020-11-17 14:27:12 +05:00
edX requirements bot
f4e4dac965 Updating Python Requirements 2020-11-16 23:46:15 -05:00
Felipe Espinoza
6716d89e5d Merge PR #25343: Adding lynx to Dockerfile (#25343) 
It is required by edx-platform/openedx/core/lib/html_to_text.py
 2020-11-16 16:09:15 -08:00
Ned Batchelder
dc780049c0 Merge pull request #25604 from edx/nedbat/squash-regex-warning 
Squash a regex warning
 2020-11-16 15:01:09 -05:00
Carla Duarte
0ee7546379 Merge pull request #25541 from edx/ciduarte/AA-199 
AA-199: Surfacing program progress in courseware API
 2020-11-16 14:03:41 -05:00
Michael Terry
44b23fcc2c Merge pull request #25592 from edx/mikix/courseware-request-user 
When masquerading in courseware API, reset the request user
 2020-11-16 13:14:08 -05:00
Carla Duarte
9545ae8868 AA-199: Surfacing program progress in courseware API 2020-11-16 11:57:50 -05:00
Ned Batchelder
9a72148310 Squash a regex warning 
warnings.py:109 - /edx/app/edxapp/edx-platform/common/djangoapps/static_replace/__init__.py:76: DeprecationWarning: Flags not at the start of the expression '\n        (?x)       ' (truncated)
 2020-11-16 10:21:49 -05:00
Patrick Cockwell
586d6721e1 [BD-29] [TNL-7264] Add Milestones, Content Gating, and Special Exams Outline Processors (#24545) 
Extend the learning_sequences Course Outline API to handle milestones,
content gating, and special exams. This includes things like entrance exams
that would block other content from being accessible, and proctored exams
which would be unavailable until an exam is started.

Co-authored-by: Agrendalath <piotr@surowiec.it>
 2020-11-16 09:29:40 -05:00
edX requirements bot
73831539d9 Updating Python Requirements (#25599) 2020-11-16 14:36:17 +05:00
Saleem Latif
903ca33aff Merge pull request #25586 from edx/saleem-latif/ENT-3680-fix 
ENT-3680: Do not send email if profile not created, this code path is run as a result UserPreference save signal before profile is created.
 2020-11-16 11:59:07 +05:00
edX Transifex Bot
1ca41a7861 fix(i18n): update translations 2020-11-15 16:34:09 -05:00
Feanil Patel
472c608d67 Merge pull request #25595 from edx/feanil/fix_warning 
Remove a deprecation warning.
 2020-11-13 15:17:13 -05:00
Feanil Patel
ae81d3347f Remove a deprecation warning. 
DeprecationWarning: The unescape method is deprecated and will be
removed in 3.5, use html.unescape() instead.
 2020-11-13 14:40:52 -05:00
Diana Huang
eb79e167f5 Merge pull request #25593 from edx/diana/revert-search 
Revert "Merge pull request #25515 from edx/diana/edx-search"
 2020-11-13 14:28:10 -05:00
Usama Sadiq
617922b47a Merge pull request #25589 from edx/testeng/bokchoy_auto_cache_update_c9a505492b25cb4bb326f9cdc6aba945997da1df 
Bokchoy Testing DB Cache update
 2020-11-13 23:44:22 +05:00
Adam Stankiewicz
280d45dbc2 bump edx-enterprise to 3.12.0 (#25591) 2020-11-13 13:18:57 -05:00
Diana Huang
8d652e6a4b Revert "Merge pull request #25515 from edx/diana/edx-search" 
This reverts commit 9714d7412f, reversing
changes made to 5bc7c3996b.
 2020-11-13 13:16:16 -05:00
Diana Huang
9714d7412f Merge pull request #25515 from edx/diana/edx-search 
Update edx-platform to use Elasticsearch 7.
 2020-11-13 13:11:32 -05:00
Feanil Patel
5bc7c3996b Merge pull request #25590 from edx/feanil/update_ownership_mappings 
ARCHBOM-1369 Update ownership mappings.
 2020-11-13 13:07:19 -05:00
Michael Terry
7697b7dd46 When masquerading in courseware API, reset the request user 
It's important that request.user be set as the effective user,
because waffle flags and bits of code around the place look at it.

This should make masquerading more accurate to what the learner
sees.
 2020-11-13 12:58:18 -05:00
Feanil Patel
3cd9b8c41a Update ownership mappings. 
Add mapping from django apps to repos so we can look up owners by this repo
in the ownership mapping.
 2020-11-13 12:05:14 -05:00
edX cache uploader bot
19fba4f76d Updating Bokchoy testing database cache 2020-11-13 11:51:26 -05:00
Kyle McCormick
4bc913e497 Upgrade to edx-organizations 6.0.0. Makes short_name unique (#25588) 
This upgrades edx-organizations from 5.3.0 to 6.0.0,
the notable change being the addition of a uniqueness
constraint on `Organization.short_name`.

TNL-7645
 2020-11-13 11:46:36 -05:00
AsadAzam
16ae282470 Merge pull request #25587 from edx/asad/tnl-7676 
Fixed social icons color
 2020-11-13 21:29:56 +05:00
Diana Huang
fd730a7af3 Set maximum search size to the ES default max. 2020-11-13 11:13:02 -05:00
Diana Huang
ece3c30ee3 Quality fixes 2020-11-13 11:13:02 -05:00
Diana Huang
33d0a18d56 Update edx-platform to use Elasticsearch 7. 
This reverts commit b73f755487.
 2020-11-13 11:13:01 -05:00
Asad
da640c13b5 Fixed social icons color 2020-11-13 19:35:26 +05:00
Gábor Boros
2a35410fe4 Expose banner image URL in course API 
Banner image URL is exposed on the course list and course details API
endpoints. The new `banner_image_url` API field has both the relative
and absolute URLs for the image it represents, if it is set.
 2020-11-13 15:35:13 +01:00
Zainab Amir
2cf023bf27 VAN-92: Update TPA Context with platform name (#25580) 2020-11-13 17:15:53 +05:00
Usama Sadiq
5e0a70930e Merge pull request #25585 from edx/jenkins/upgrade-python-requirements-161c089 
Python Requirements Update
 2020-11-13 14:22:51 +05:00
Saleem Latif
4a3f9b89fe Do not send email if profile not created, this code path is run as a result UserPreference save signal before profile is created. 2020-11-13 13:13:14 +05:00
edX requirements bot
10b92eed17 Updating Python Requirements 2020-11-12 23:46:29 -05:00
Bianca Severino
161c089081 Merge pull request #25583 from edx/bseverino/idv-expiration-date 
Default to expiry_date for older software secure photo verifications
 2020-11-12 13:21:02 -05:00
David Ormsbee
d83241e503 Merge pull request #24809 from open-craft/symbolist/convert-randomize-module-to-xblock 
[BD-04] Convert Randomize XModule to XBlock
 2020-11-12 13:06:57 -05:00
David Ormsbee
2086f11a22 Merge pull request #24838 from open-craft/symbolist/convert-conditional-module-to-xblock 
[BD-04] Convert Conditional XModule to XBlock
 2020-11-12 13:04:26 -05:00
Bianca Severino
e4366646f9 Default to expiry_date for older software secure photo verifications 2020-11-12 12:34:04 -05:00
Michael Terry
6424a3f3e8 Merge pull request #25547 from edx/mikix/course-update-rewrite 
AA-289: rewrite how course updates behave when dismissed
 2020-11-12 11:28:56 -05:00
Awais Jibran
3f4099a16f Merge pull request #25574 from edx/aj/branding/add-brand-edx-deps 
Adding brand-edx.org as a dependency to edx-platform
 2020-11-12 21:05:57 +05:00
Bianca Severino
60cab77c53 Merge pull request #25568 from edx/bseverino/idv-expiration 
Set expiration_date field in IDVerificationAttempt model
 2020-11-12 10:06:45 -05:00
Awais Jibran
2b1e239633 Adding brand-edx.org as a dependency to edx-platform 2020-11-12 19:45:34 +05:00
Michael Terry
40fbef4af2 AA-289: rewrite how course updates behave when dismissed 
Previously, dismissing one course update would disable all future
updates. But that feels a bit limiting.

Instead, these are the new rules:
- If the newest update has not been dismissed yet, it gets displayed.
- If the newest update has been dismissed, we display nothing.
- Editing the newest update will cause it to be displayed again.
- New updates get displayed, even if previous updates were dismissed.

This commit includes a light refactoring and addition of some utility
methods to help manage the above.

It also notes that the learning MFE does not use the "latest_update"
waffle option, which controls the labeling of the update message.
 2020-11-12 09:39:15 -05:00
Albert (AJ) St. Aubin
9551b23d08 [MICROBA-721] Updates the notify_credentials job to run over new window 2020-11-12 08:27:03 -05:00
Saleem Latif
1858e28875 Merge pull request #25576 from edx/saleem-latif/ENT-3680 
ENT-3680: Updated edx-enterprise version and only set user language preference on signup if it does not already exist.
 2020-11-12 17:43:33 +05:00