Merge Feature/pbs-25-16 into develop #11306
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…1246) * remove csrf protection from reset password endpoint * update test
[ENG-8656] Clean up password reset throttle error
Fix/eng 8552
[ENG-8743] subscribe_osf_general_email settings is not updated
* use same logic for admin and web password reset * fix tests
[ENG-8742] include ignored components when create a view-only link
## Purpose User should be able to filter preprints by their description ## Changes Added description to filterable fields, added tests ## Ticket https://openscience.atlassian.net/browse/ENG-8921?atlOrigin=eyJpIjoiNmY1MDUwZjI0Mjg2NDc2OGI2N2U1ZDQ0MjIwNzU0OTAiLCJwIjoiaiJ9
* Fix color picker for brands * Remove unnecessary exclusion
* fix: validate resource_type_general in api * fix: update search after updating addons
Johnetordoff
added a commit
to Johnetordoff/osf.io
that referenced
this pull request
Sep 17, 2025
into add-new-notifications-data-model * 'develop' of https://github.com/centerforopenscience/osf.io: Bump version no. and add CHANGELOG Merge Feature/pbs-25-16 into develop (CenterForOpenScience#11306) # Conflicts: # api/users/views.py # api_tests/users/views/test_user_settings.py
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Purpose
Changes
QA Notes
Please make verification statements inspired by your code and what your code touches.
What are the areas of risk?
Any concerns/considerations/questions that development raised?
Documentation
Side Effects
Ticket