Skip to content

Fix angular upgrade merge conflicts#953

Merged
brianjgeiger merged 23 commits intoCenterForOpenScience:feature/angular-upgradefrom
nsemets:fix/angular-upgrade-merge-conflicts
Apr 16, 2026
Merged

Fix angular upgrade merge conflicts#953
brianjgeiger merged 23 commits intoCenterForOpenScience:feature/angular-upgradefrom
nsemets:fix/angular-upgrade-merge-conflicts

Conversation

@nsemets
Copy link
Copy Markdown
Collaborator

@nsemets nsemets commented Apr 16, 2026

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

Purpose

Summary of Changes

  1. Fixed angular upgrade merge conflicts into develop

nsemets and others added 23 commits March 18, 2026 11:03
…ixes

[Hotfix] Added source maps for clear error messages
Hotfix for Angular SSR
…nce#921)

- Ticket: [ENG-10695]
- Feature flag: n/a

## Summary of Changes
1. Changed check to flagged content.
Misc. improvements and bug fixes
…tadata-records-service

[ENG-10414] revert(metadata): Prevent redirect on 403 error
Hotfix to prevent redirect on 403
* 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 requested a review from brianjgeiger April 16, 2026 08:04
@brianjgeiger brianjgeiger merged commit da326cc into CenterForOpenScience:feature/angular-upgrade 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