main branch synced with dspace-7.6.1 tag (Angular version)
#3114
Conversation
This file contains 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
…om at this time) (cherry picked from commit d75d12b)
[Port dspace-7_x] Add GitHub action to automatically create a port PR (based on label) & minor bug fixes
Contributed by Reeta Kuukoski from the National Library of Finland.
Bumps [semver](https://github.com/npm/node-semver) from 5.7.1 to 5.7.2. - [Release notes](https://github.com/npm/node-semver/releases) - [Changelog](https://github.com/npm/node-semver/blob/v5.7.2/CHANGELOG.md) - [Commits](npm/node-semver@v5.7.1...v5.7.2) --- updated-dependencies: - dependency-name: semver dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> (cherry picked from commit 0b0c60e)
[Port dspace-7_x] Bump semver from 5.7.1 to 5.7.2
[Port dspace-7_x] refactor: rename aletr-type.ts to alert-type.ts
src/assets/i18n: update Finnish language strings
(cherry picked from commit a35b7d8)
…laying-twiced-in-ui_contribute-maintenance-7.6 [Port dspace-7_x] Fixed MathJax code being displayed twice by `dsMarkdown` pipe
[Port dspace-7_x] Catch and handle unsuccessful "convert rels to items" responses
(cherry picked from commit e6546b4)
[Port dspace-7_x] Show error message from the password validation response
New strings for status filter entries: search.filters.namedresourcetype.* Refactored strings introduced with DSpace#2068 (refactor badged), e.g. mydspace.status.archived -> mydspace.status.mydspaceArchived
[Port dspace-7_x] fix(i18n): add and update missing status strings
…orm-bugs_contribute-maintenance-7.6 [Port dspace-7_x] Fix minor collection form bugs
[Port dspace-7_x] ProcessDetailComponent test improvement
Bumps [word-wrap](https://github.com/jonschlinkert/word-wrap) from 1.2.3 to 1.2.5. - [Release notes](https://github.com/jonschlinkert/word-wrap/releases) - [Commits](jonschlinkert/word-wrap@1.2.3...1.2.5) --- updated-dependencies: - dependency-name: word-wrap dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> (cherry picked from commit 2fec33e)
[Port dspace-7_x] Bump word-wrap from 1.2.3 to 1.2.5
- Correct the path in commented-out code in the custom theme's components - Clarify that the workflow-item-sen-back.component.scss file is a stub - It has no corresponding SCSS file in the base theme (cherry picked from commit 0906234)
(cherry picked from commit 518cc71)
[Port dspace-7_x] 2437 Correct and clarify commented-out code in several custom components
[Port dspace-7_x] Replace mentions of demo7.dspace.org and api7.dspace.org with new demo URLs
Update from 7.4 to 7.6 version (cherry picked from commit b439ab4)
(cherry picked from commit 75b788d)
[Port dspace-7_x] Fix handle redirect not working with custom nameSpace
[Port dspace-7_x] adding new access-status-list-element-badge css classes
…l.handle.net/ (cherry picked from commit a7faf7d)
…prevent circular dependencies (cherry picked from commit da8880e)
…fined whey calling the ngOnDestroy in the ThemedComponent (cherry picked from commit 4e54cca)
(cherry picked from commit 7529ed8)
(cherry picked from commit ccf1cc4)
(cherry picked from commit b6d515f)
(cherry picked from commit 6f64db1)
[Port dspace-7_x] Fix match theme by handle with canonical prefix https://hdl.handle.net/ not working
(cherry picked from commit 35f8b55)
(cherry picked from commit fbbbc18)
[Port dspace-7_x] Fixes "some item edit pages are accessible by anonymous users"
[Port dspace-7_x] Edit-item view: random order of buttons in status tab
[Port dspace-7_x] Fixed menu not updating when a new sub section is added after rendering has already completed
artlowel
approved these changes
Jun 20, 2024
There was a problem hiding this comment.
Thanks @tdonohue!
This looks good, everything seems to work as it should.
If you compare the directories of the main branch and this PR (with the latest main merged in), they are identical, and if you look at the git history of a file that had different changes on 7.x and main, it simply looks like the 7.x changes came first and were replaced by the ones on main.
So this seems like a good way to do it
|
Closing, this change was made directly on See db08e48 |
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.
References
mainbranch synced withdspace-7.6.1tag DSpace#9647Description
This PR shows the behavior of running
git merge -s ours dspace-7.6.1on themainbranch.This command will reset their common ancestor and is also the recommended way to "supersede old development history of side branches" according to Git documentation.
How to test
Pretend you are starting with a 7.6.1 release, and attempt an upgrade
git checkout -b test_upgrade_from_7.6.1 dspace-7.6.1git merge main_synched_with_7.6.1Alternatively, see what it looks like in git diff:
DO NOT MERGE: This PR is simply a reference example for what this merger looks like.