Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

(1/3) Merge questionnaire into master #603

Closed

Conversation

unterrichtsvideos
Copy link

Merged the branches that have diverged over 1+ year.

mlunzena and others added 30 commits May 26, 2020 08:00
`label.category` is only set for preexisting categories,
not for ones created during the current browser session.
With this patch, the frontend also knows about deleted labels,
categories, scales and scale values. This makes the behavior of
annotations carrying any of that deleted structure much more
consistent.
Previously it already showed the editing interface for the scale
of the category you got to the dialog with. It wasn't fully in edit
mode yet, though, so edits could get lost.
Arnei and others added 10 commits July 20, 2023 11:58
There were two functionally very similar `findById` functions.
Now there is only one.
Minimum version is now Opencast 13.
Apparently if you set parameters on a namedQuery directly,
there are some shenanigans that can happen when it comes to dates.
Opencast has a function called `configureQuery` https://github.com/opencast/opencast/blob/develop/modules/common/src/main/java/org/opencastproject/db/Queries.java#L58
to handle this, but does not grant anyone access to it. In my
plight I just copied it over.
…g our own.

Co-authored-by: Julian Kniephoff <me@juliankniephoff.com>
Make every caller pass their preferred type instead of doing a cast.
Co-authored-by: Julian Kniephoff <me@juliankniephoff.com>
Co-authored-by: Julian Kniephoff <me@juliankniephoff.com>
JulianKniephoff and others added 17 commits July 25, 2023 13:42
Fix db compatibility issues with Opencast 13
* Minimally improve the formatting
* Remove useless settings
This necessitates quoting some column names.

Also restrict this dependency to the `test` scope.
* Minimally improve the formatting
* Remove useless settings
That `when` was in the wrong place.
This makes the tests work with newer Java versions (tested with 20)
and also fixes a warning about invalid POMs during the Maven build.
When building with Maven's `-T` option the build was warning
about two plugins that might not be thread safe.

This patch updates one and removes the other.

Regarding static weaving: It might be interesting to look at
at some point, but it's "only" for performance and Opencast removed
this as well: opencast/opencast#3031.
Also some minor nitpicks and fixing of lints.
@JulianKniephoff JulianKniephoff deleted the branch opencast:merge December 13, 2023 17:00
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.

6 participants