Stage to Main #1041
Closed
Stage to Main #1041
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
…nd to ignore the renovate.json file
Configure Renovate
Update dependency @types/jsonwebtoken to v9.0.10
Update dependency loglevel to v1.9.2
…search-outputs Feature/710/js static page for research outputs
…lude new form fields and functionality
…ypeAheadWithOther for Affiliation search, adding field validation, and updating useEffect for handling collaboratorData
…inyMCEEditor to import a config file so it isn't included for every TinyMCEEditor request
…ly created before creating the new Edit Guidance Group. Added unit test for guidance group create page
removed research outputs section from project overview
…to-15.5.7-due-to-vulnerability Updated version of 'next' to 15.5.7 due to vulnerability
…th-handling-in-frontend Fixed some issues in middleware and authHelper and made improvements…
…anceTags-removed Feature/934/js update since guidance tags removed
[Chore] Development to Stage
Collaborator
Author
|
Going to fix conflicts and close this PR and create another one |
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.
Description
Merging stage into main
Changes
64e118d (stage) Merge pull request #936 from CDLUC3/development
d2e7441 Merge pull request #922 from CDLUC3/feature/735/add-filter-for-research-org-in-template-page
72c6e24 Merge pull request #921 from CDLUC3/chore/JS-update-cypress-fix-tests-and-fix-TinyMCE-to-only-load-when-used
115bea8 (origin/feature/735/add-filter-for-research-org-in-template-page, feature/735/add-filter-for-research-org-in-template-page) Added users org to filters, and updated filter language to include 'organization'. Moved filters below search input field, fixed some filtering issues, improved code and updated unit tests
8203146 Added users org to filters, and updated filter language to include 'organization'. Moved filters below search input field, fixed some filtering issues, improved code and updated unit tests
6d78bdc (origin/chore/JS-update-cypress-fix-tests-and-fix-TinyMCE-to-only-load-when-used, chore/JS-update-cypress-fix-tests-and-fix-TinyMCE-to-only-load-when-used) Made tiny fix to loadTinymceScript
13951aa Updated version of cypress to 14.5.4 and fixed broken cypress tests and removed loading of 'tinymce' from layout.tsx to TinyMCEEditor
44e461a Merge pull request #914 from CDLUC3/bug/846/JS-fix-typo-on-collaborator-invite
8a25b41 (origin/bug/846/JS-fix-typo-on-collaborator-invite, bug/846/JS-fix-typo-on-collaborator-invite) merged development into branch
ff2166c Merge branch 'development' into bug/846/JS-fix-typo-on-collaborator-invite
f839912 Merge pull request #913 from CDLUC3/feature/874/JS-remove-Title-field-from-Insert-Link-window-and-make-new-window-default
c0284e7 (origin/feature/874/JS-remove-Title-field-from-Insert-Link-window-and-make-new-window-default, feature/874/JS-remove-Title-field-from-Insert-Link-window-and-make-new-window-default) merged development into branch
98517e0 Integrate related works with GraphQL endpoints (#885)
a31ba6f Fixed some typos in some translation text for hte Collaboration Invite page and added missing Owner access level radio option
f94209d Merge pull request #912 from CDLUC3/feature/873/JS-update-TinyMCEEditor-to-allow-text-color-change
233c055 Removed 'Title' field from TinyMCEEditors 'Insert Link' form and made 'new window' the default for 'Open link in...' on the Insert Link form
fb707b6 Updated translation text for collaborator invite page
cd62dcf Fixed a typo in some translation text for the page
80ce6f2 (origin/feature/873/JS-update-TinyMCEEditor-to-allow-text-color-change, feature/873/JS-update-TinyMCEEditor-to-allow-text-color-change) Updated TinyMCEEditor to allow text color change
569e368 Merge pull request #908 from CDLUC3/chore/JS-disable-apollo-graphql-package-PR
29034e4 (origin/chore/JS-disable-apollo-graphql-package-PR, chore/JS-disable-apollo-graphql-package-PR) Configured renovate.json to stop current PRs for updates to apollo/client and apollo/experimental-nextjs-app-support since it collides with graphql-codegen
4c72ba1 Merge pull request #906 from CDLUC3/chore/JS-disable-apollo-graphql-package-PR
e563319 Disable Apollo Graphql renovate PR and fix missing logs from CHANGELOG
b68ffdb Merge pull request #890 from CDLUC3/renovate/node-24.x
b0a65a7 (chore/JS-switch-off-of-@apollo/experimental-nextjs-app-support) Merge pull request #901 from CDLUC3/feature/621/add-template-info-and-published-date-on-plan-overiew-page
aebf20e (origin/feature/621/add-template-info-and-published-date-on-plan-overiew-page) Adding missing translation, and removed .only from unit test
95fefc2 Updated Plan Overview page with new description that includes template source and affiliation name and version and published date
cbde8f5 Merge pull request #888 from CDLUC3/renovate/react-spectrum-monorepo
258f971 (origin/renovate/react-spectrum-monorepo, renovate/react-spectrum-monorepo) Update react-spectrum monorepo
1dc4077 Merge pull request #887 from CDLUC3/renovate/react-monorepo
f7c5147 Merge pull request #897 from CDLUC3/feature/870/update-add-project-member-to-match-new-design
2deddc2 Merge pull request #884 from CDLUC3/renovate/jest-monorepo
619a76c (origin/feature/870/update-add-project-member-to-match-new-design, feature/870/update-add-project-member-to-match-new-design) Removed commented out code, added new translation key
2a40d99 Fixed scss warnings
87cdd44 fixed linting errors
12b3d06 Added hooks to streamline code
86bbc86 updated to use TypeaheadWithOther
156603a Added more updates to the Project member search page, such as using TypeAheadWithOther for Affiliation search, adding field validation, and updating useEffect for handling collaboratorData
91080df Update react monorepo
17e0a70 (origin/renovate/jest-monorepo) Update jest monorepo
0d8a781 (renovate/node-24.x) Update dependency @types/node to v24.9.1
ef1ae98 Updated the Project Member Search field with initial changes that include new form fields and functionality
ec83fe5 Merge pull request #896 from CDLUC3/feature/710/JS-static-page-for-research-outputs
3ea073d (origin/feature/710/JS-static-page-for-research-outputs, feature/710/JS-static-page-for-research-outputs) Updated package-lock.json using latest npm version
17e4511 Merged development into this branch
da0874c Merge branch 'development' into feature/710/JS-static-page-for-research-outputs
09c6061 Merge pull request #881 from CDLUC3/renovate/loglevel-1.x
909ceee Merge pull request #880 from CDLUC3/renovate/jsonwebtoken-9.x
90653c1 added more unit tests, and fixed linting and type errors
1b8bd9a Added more unit tests for the Research Outputs fields
b0af2ad Added LicenseField test
a8c9c51 Added translations for resaerch output pages and missing ones as well
b837580 Added translations
fe7166a separated out OutputType and LicenseField into their own components
4d0cc66 fixed type errors
e4efd6d Added additional question section
33a2e80 Added Repo selector, MetaDataStandards, and Licenses
e0baed7 Initial changes for Research Outputs
19714be added outputType component
241bb4f (origin/renovate/loglevel-1.x) Update dependency loglevel to v1.9.2
635f6e5 (origin/renovate/jsonwebtoken-9.x) Update dependency @types/jsonwebtoken to v9.0.10
3c2fbe9 Merge pull request #877 from CDLUC3/renovate/configure
8ad607c (origin/renovate/configure) removed renovate.json from gitignore
6b7a99a initial changes for researchOutput
d690a0c Updated renovate.json config to exclude everything but package.json and to ignore the renovate.json file
16d30a2 Add renovate.json