Skip to content

Merged develop into pbs-26-9#996

Merged
brianjgeiger merged 16 commits into
CenterForOpenScience:feature/pbs-26-9from
nsemets:fix/merge-conflicts-pbs-26-9
May 26, 2026
Merged

Merged develop into pbs-26-9#996
brianjgeiger merged 16 commits into
CenterForOpenScience:feature/pbs-26-9from
nsemets:fix/merge-conflicts-pbs-26-9

Conversation

@nsemets
Copy link
Copy Markdown
Collaborator

@nsemets nsemets commented May 26, 2026

  • Ticket: []
  • Feature flag: n/a

Summary of Changes

  1. Fixed merge conflicts.
  2. Merged develop into pbs-26-9.

nsemets and others added 16 commits May 5, 2026 10:27
…1002

[ENG-11002] Allow for new version on a rejected preprint
…enScience#967)

* fixed login url encoding
* unified encoding of login
* Update logout url
* Add sso_availability attribute to Institution model and mapper
* simplify login url construction and remove helper
* fix institution unit tests
* update logout redirect url to ensure proper navigation

---------

Co-authored-by: Ihor Sokhan <isokhan@exoft.net>
Co-authored-by: nsemets <nsemets@exoft.net>
Co-authored-by: Vlad0n20 <vlad.onischuk1234@gmail.com>
Co-authored-by: Longze Chen <cslzchen@gmail.com>
OSF4I In-progress SSO Project - FE Piece
…1147

Hotfix: [ENG-11147] Users are resolving to the dashboard instead of links that they click
Hotfix to not redirect users to dashboard
@nsemets nsemets requested a review from brianjgeiger May 26, 2026 15:28
@nsemets nsemets changed the title Merged develop into pbs-26-9. Merged develop into pbs-26-9 May 26, 2026
@brianjgeiger brianjgeiger merged commit 68e47d2 into CenterForOpenScience:feature/pbs-26-9 May 26, 2026
3 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants