Merge develop into release branch #707
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
* feat(scheduled-banner): refactored and tested the scheduled banner * chore(testing): added tests for scheduled banner * chore(update-tests): updated tests and had to skip tests to * fix(pr): fixed a pr request
* fix(contributors): fixed contributors 2 bugs * fix(styles): fixed styles for contributors
* fix(components): fixed permissions issues for settings, components and contributors tabs * fix(project-overview): added redirection after project duplication * fix(components): fixed styles * fix(components): fixed project name display in project wiki settings * fix(recent-activity): fixed templated from message and redirect link * fix(recent-activity): fixed activity logs mapper error
* fix(contributors): fixed contributors 2 bugs * fix(styles): fixed styles for contributors * fix(resource-information): fixed bug * fix(search): fixed search config * fix(addons): fixed addons
* chore(merges): renamed merged files * chore(renames): renamed files * chore(renames): renamed files part 2 * chore(pr-updates): updates to the file names, removed imports and fixed the hamburger
* fix(registration): fixed bugs * fix(doi): added condition
* fix(uat): registrations bugs * fix(files): multiple uploads * fix(files): multiple uploads
* chore(merge conflicts): fixed merge conflicts - 2 * chore(renames): renamed files part 2 * chore(pr-updates): updates to the file names, removed imports and fixed the hamburger * feat(eng-8901-5): updated the cookie-consent-banner with tests * chore(test fixes): fixed some broken tests * feat(eng-8901-5): finished css with colors
* fix(uat): registrations bugs * fix(files): multiple uploads * fix(files): multiple uploads * fix(files): hierarchy dragging files
* feat(eng-8901-6): update the tos banner * feat(eng-8901-6): tests for consent banner
* chore(fix test): fixed a test * chore(fixed-test): fixed another test
* fix(uat): registrations bugs * fix(files): multiple uploads * fix(files): multiple uploads * fix(files): hierarchy dragging files * fix(files): fixed copy and move files for addons
* fix(metadata): added title, fixed doi and description * fix(translation): fixed translation * fix(tests): fixed tests
Co-authored-by: Nazar Semets <nazar690@gmail.com>
* fix(bugs): fixed institutions and share bugs * fix(wiki): fixed wiki bugs * fix(truncated-text): fixed truncated text and styles
* fix(uat): registrations bugs * fix(files): multiple uploads * fix(files): multiple uploads * fix(files): hierarchy dragging files * fix(files): fixed copy and move files for addons * fix(file): file revisions * fix(file): add replace files functionality
* fix(wiki): removed wiki tooltip * fix(contributors): fixed placeholder
* fix(global-search): Fixed bugs * fix(global-search): Fixed error when no search results * fix(submissions-sort): Fixed sorting for registration submissions * fix(institution-dashboard): Added overflow ellipsis for long column content * fix(global-search): Fixed order of applying filters * fix(registry-provider): Fixed branding colors * fix(registry-provider): Fixed branding colors * fix(resource-card): Fixed label text wrapping * fix(scroll-to-top): Improved scrollToTop directive * fix(provider-description): Simplified hover color styling for links
* fix(project-wiki): fixed disabled wiki * fix(project-wiki): Fixed wiki page visibility in the sidenav --------- Co-authored-by: Nazar Semets <nazar690@gmail.com>
* fix(addons): added alphabetical addons sorting, fixed logo absence, structure improvements * fix(addons): fixed issue after merging with main * fix(addons): renamed models * fix(addons): addon models separation * fix(addons): minor bug
* fix(submissions): updated submissions navigation * fix(tests): fixed unit tests * fix(view-only-link): fixed bug
* fix(submissions): updated submissions navigation * fix(tests): fixed unit tests * fix(view-only-link): fixed bug * fix(submissions): fixed routing
…tion init on the profile page (#657)
* feat(ang-941): added citation addon-card * feat(ang-941): pre push fix * feat(ang-941): added citation widget base logic * fix(addons): fixed infinite requests for configured citation addons * feat(ang-1059): added citation addons widget logic * feat(ang-1059): refactored citation addon widget * feat(ang-941): added skip tests
* fix(tests): fixed skipped tests * fix(tests): added tests for skipped files * fix(tests): fixed tests for registry and token-add-edit-form * fix(tests): fixed tests preprint-withdrawal-submissions * test(registry-components): added new tests
* fix(my-projects): added new filter for projects * fix(my-projects): updated styles
Co-authored-by: Nazar Semets <nazar690@gmail.com>
* fix(components): fixed vol for components * fix(parent): fixed parent vol
* fix(make-decision): added limit for make decision comment * fix(make-decision): updated make decision dialogs --------- Co-authored-by: Nazar Semets <nazar690@gmail.com>
…linked items (#661) * fix(analytics): implemented linked projects * chore(analytics): clean up models and components * chore(analytics): consolidated node models * fix(linked-projects): removed unused stuff
* fix(bugs): fixed ui bugs * fix(contributors): fixed pagination for contributors
[ENG-9612] Update allowed merge methods
Merge all commits from main into develop
Merge `main` into `develop`
brianjgeiger
approved these changes
Oct 23, 2025
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
Summary of Changes
Screenshot(s)
Side Effects
QA Notes