Skip to content

Merge OPUS 4.8.0.14 (master) into v4.9#1351

Merged
j3nsch merged 137 commits into
v4.9from
merge4.8.0.14
May 21, 2025
Merged

Merge OPUS 4.8.0.14 (master) into v4.9#1351
j3nsch merged 137 commits into
v4.9from
merge4.8.0.14

Conversation

@j3nsch

@j3nsch j3nsch commented Apr 30, 2025

Copy link
Copy Markdown
Member

No description provided.

j3nsch and others added 30 commits October 21, 2024 10:57
Prevent ENTER in text input elements to trigger submit
Commands for Enrichment management, incl. export/import
#1258 Limit ENTER handling to forms publish and metadata
Patch Release OPUS 4.8.0.8
Enable Host Access to MySQL Database in Vagrantfile
j3nsch added 17 commits April 13, 2025 22:43
#1334 Fixed call to wrong object
#1339 Always define $progressBar
* #1226 Separate Add button from MultiSubForm

* #1226 Create separate class for GndSubjects

* #1226 Tests for DefaultMultiSubForm

* #1226 Using DefaultMultiSubForm directly

* #1226 Fix table mode of MultiSubForm

* #1226 Fix missing return

* #1226 Create separate GndSubjects form class

* #1226 Adding multiple subjects at once

* #1226 Coding style fix

* #1226 Include in Release Notes
# Conflicts:
#	.github/workflows/php.yml
#	application/configs/application.ini
#	application/configs/doctypes/doi.xml
#	composer.json
#	library/Application/Configuration.php
#	library/Application/Console/App.php
#	modules/frontdoor/views/scripts/index/templates/metadata.xslt
#	modules/oai/models/DefaultServer.php
#	modules/solrsearch/controllers/BrowseController.php
#	public/layouts/opus4/js/getDoi.js
#	tests/modules/solrsearch/controllers/BrowseControllerTest.php
@j3nsch j3nsch added this to OPUS 4.9 Apr 30, 2025
@j3nsch j3nsch self-assigned this Apr 30, 2025
@j3nsch

j3nsch commented Apr 30, 2025

Copy link
Copy Markdown
Member Author

@alw-bsz Das Merging dieser vielen Änderungen ist nicht einfach. Manchmal gehen Änderungen verloren. Ich muss hier noch Sachen fixen, bei denen sich alter Code von master eingeschlichen hat.

Die getDoi.js Datei konnte ich nicht zusammenführen. Es gab zu viele Änderungen und Konflikte, die ich nicht nachvollziehen kann. Ihr müsst mir einen PR liefern, der die Datei in den gewünschten Zustand bringt. Der Merge soll am 19. Mai erfolgen. Vielen Dank!

@alw-bsz

alw-bsz commented May 15, 2025

Copy link
Copy Markdown
Contributor

Einen PR mit getDoi.js sowie den weiteren Anpassungen habe ich eingebracht. Sobald alles zusammengeführt ist, würden wir dann die noch die ausstehenden Punkte einbringen (#1355, Import von Konferenzen: #1196).

#1283, #1351: DOI import code for v4.9, includes adjusting of bug fix for to many authors to v4.9
@j3nsch j3nsch merged commit e7127e7 into v4.9 May 21, 2025
2 checks passed
@github-project-automation github-project-automation Bot moved this to Done in OPUS 4.9 May 21, 2025
@j3nsch j3nsch deleted the merge4.8.0.14 branch May 21, 2025 08:38
@j3nsch j3nsch added the Release Notes Issue has been reviewed for Release Notes label Apr 2, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Release Notes Issue has been reviewed for Release Notes

Projects

No open projects
Status: Done

Development

Successfully merging this pull request may close these issues.

5 participants