Repository navigation
Conversation
…rForOpenScience#11943) * Add external identity access and refresh tokens handling in ExternalLogin
…terForOpenScience#11940) ## Ticket https://openscience.atlassian.net/browse/ENG-11841 ## Purpose When the Terms of Use are updated, all users need to explicitly re-accept them for GDPR purposes. OSF currently stores a single accepted_terms_of_service datetime on the user record with no notion of which version of the terms was accepted, so there is no way to tell whether a stored acceptance is still current. Clearing the field for every user would force re-acceptance but would destroy the record of when each user last agreed, which is the evidence the field exists to provide. A configurable cutoff date solves both: acceptance is evaluated against the date the terms last changed, and each user's actual acceptance timestamp is preserved.
…penScience#11949) Exclude non-contributors from campaign emails
…ed with ORCiD (CenterForOpenScience#11914) * Generate unique passwords for unconfirmed users and when deleting external identities
## Ticket https://openscience.atlassian.net/browse/ENG-12162 ## Purpose All share-related models besides files didn't have `date_last_indexed` updated
…RL (CenterForOpenScience#11913) ## Ticket Main: https://openscience.atlassian.net/browse/ENG-9994 Sub: https://openscience.atlassian.net/browse/ENG-12168 ## Purpose Add an endpoint so FE can send a request to resend the confirmation URL for the email ## Changes Add an endpoint and a View so FE can send a request to resend the confirmation URL for the email
…equests (CenterForOpenScience#11951) * Add requested_deactivation filter to campaign notification * Update help text to clarify exclusion of unconfirmed and deactivated accounts from recipient list * Update filter logic to exclude unconfirmed accounts and those with requested deactivation
…s bug related with ORCiD (CenterForOpenScience#11957) * Set a unique password for users without a usable password when deleting external identities (API route)
…enterForOpenScience#11956) * Block CAS login for disabled users * Fix comments, and rebased on top of feature/pbs-26-19 * Add confirmed spam user to the clearing CAS session logic * Update/add unit tests --------- Co-authored-by: Longze Chen <cslzchen@gmail.com>
## Ticket https://openscience.atlassian.net/browse/ENG-12333 ## Purpose Re-activate `API3_and_OSF` tests
## Ticket https://openscience.atlassian.net/browse/ENG-11880 ## Purpose Initial approval emails are not sent for usual and embargoed registrations `node_pending_embargo_admin` and `node_pending_registration_admin` emails are not sent. ## Changes Use retry to avoid race condition See PR description for abandoned alternate approach.
…d deactivation requested users for ENTER (CenterForOpenScience#11960) * Expand filter to exclude disabled users in notification campaign * Expand filter label to clarify exclusion of unconfirmed, disabled, and deactivation requested users
…ce/feature/pbs-26-19 PBS-26-19 / osf.io 26.25 - PB&S
PB&S Release: PBS-26-19
cslzchen
merged commit Oct 9, 2026
466acda
into
CenterForOpenScience:feature/post-enter-p2
8 checks passed
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
8 participants
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.
Ticket
Purpose
Merge develop into feature and fix expected conflicts
Changes
See diff
Side Effects
Make sure the following changes are not lost:
There may be other notification campaign changes (beyond Post-ENTER) I'm unaware of. Basically, any changes to
notification_campaign.py, that was splitted into 4 submodules in the Post-ENTER, - are at risk to be overwritten by this mergeQE Notes
N/A
CE Notes
N/A
Documentation
N/A