Skip to content

[ENG-10823] Merge develop into feature/pbs-26-6#956

Merged
brianjgeiger merged 8 commits intoCenterForOpenScience:feature/pbs-26-6from
nsemets:fix/ENG-10823
Apr 16, 2026
Merged

[ENG-10823] Merge develop into feature/pbs-26-6#956
brianjgeiger merged 8 commits intoCenterForOpenScience:feature/pbs-26-6from
nsemets:fix/ENG-10823

Conversation

@nsemets
Copy link
Copy Markdown
Collaborator

@nsemets nsemets commented Apr 16, 2026

Summary of Changes

  1. Fixed merge conflicts.

futa-ikeda and others added 7 commits April 8, 2026 10:46
* feat(profile-settings): Add query-param to specify a tab (CenterForOpenScience#906)

* [ENG-10584][ENG-10585] Allow users to disconnect existing orcid in social tab (CenterForOpenScience#912)

* feat(settings): Allow users to disconnect orcid in social tab

* feat(settings): Add dummy connect button when no orcid is associated with user

* chore(settings): move authenticated identity to own component

* refactor(settings): Implement CR suggestions; Update tests

* refactor(settings): Update authenticated identity test

* refactor(settings): Update authenticated identity test to use OSFTestingModule

* feat(settings): Allow user to connect ORCID in profile settings page (CenterForOpenScience#918)

* [ENG-10684] Update Authenticated Identity section (CenterForOpenScience#924)

* feat(settings): update authenticated identity section

* style(settings): Update styles

* refactor(settings): Update Authenticated Identity section

* chore(settings): Update Authenticated identity section language (CenterForOpenScience#930)

* fix(settings): Update connectOrcid to properly logging user out (CenterForOpenScience#934)
ORCiD Integration Project - FE Part
@nsemets nsemets changed the base branch from develop to feature/pbs-26-6 April 16, 2026 15:34
brianjgeiger
brianjgeiger previously approved these changes Apr 16, 2026
@brianjgeiger brianjgeiger merged commit 747ca7c into CenterForOpenScience:feature/pbs-26-6 Apr 16, 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