Skip to content

Commit

Permalink
Merge branch 'r/15.x' into develop
Browse files Browse the repository at this point in the history
* r/15.x:
  Opencast 14.7 release notes
  Paella 7: Hide/Show timeline bar on live events (opencast#5420)
  Automatically update translation keys (r/14.x)
  Automatically update translation keys (r/15.x)
  Fix update translations workflow
  Clean up build config
  • Loading branch information
mtneug committed Dec 12, 2023
2 parents 657b1e0 + f49b234 commit 13b806a
Show file tree
Hide file tree
Showing 6 changed files with 54 additions and 11 deletions.
2 changes: 0 additions & 2 deletions assemblies/resources/build.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@
<replaceregexp file="target/assembly/bin/inc" match="-Dcom.sun.management.jmxremote" replace="" byline="true"/>
<!-- Correct the start script name -->
<replaceregexp file="target/assembly/bin/karaf" match="^KARAF_SCRIPT=.*$" replace="KARAF_SCRIPT='start-opencast'" byline="true"/>
<!-- Mitigation for https://issues.apache.org/jira/browse/KARAF-5526 -->
<replaceregexp file="target/assembly/bin/karaf" match=" init$" replace=" [ -z &quot;${TERM##*256color}&quot; ] &amp;&amp; export TERM=xterm-color&#x0A; init" byline="true"/>
<!-- Make sure bundle cache gets cleared by default -->
<replaceregexp file="target/assembly/etc/system.properties" match="^karaf.clean.cache .*=.*$" replace="karaf.clean.cache = true" byline="true"/>
<!-- Disable feature auto refresh (it's broken rn, see #5151) -->
Expand Down
13 changes: 13 additions & 0 deletions docs/guides/admin/docs/changelog.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,19 @@ Changelog
Opencast 14
-----------

### Opencast 14.7

*Released on December 12th, 2023*

- [[#5425](https://github.com/opencast/opencast/pull/5425)] -
Fix Unsaved ACL Changes popup if user can't request ACL
- [[#5416](https://github.com/opencast/opencast/pull/5416)] -
Silence detection: Skip attaching smil file if empty
- [[#5412](https://github.com/opencast/opencast/pull/5412)] -
Update Karaf from 4.4.3 to 4.4.4
- [[#5270](https://github.com/opencast/opencast/pull/5270)] -
Fix logging for WhisperEngine

### Opencast 14.6

*Released on November 16th, 2023*
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ Paella Player 7
Paella 7 is Opencast's default player.

The Paella `(pronounced 'paeja')` [Player](https://paellaplayer.upv.es) is an Open Source
JavaScript video player capable of playing an unlimited number of audio & video streams
synchronously, Live Streaming, Zoom, Captions, contributed user plugins and a lot more.
JavaScript video player capable of playing an unlimited number of audio & video streams
synchronously, Live Streaming, Zoom, Captions, contributed user plugins and a lot more.
It is easy to install and customize for your own needs.

Paella 7 will be a complete rewrite of Paella, aiming several issues
Expand Down Expand Up @@ -98,11 +98,11 @@ Cookie consent
Paella uses cookies to store some user parameters (layout configuration, volume, etc...).
And, if enabled, the paella user tracking plugin can use cookie to track the user.

To comply with GDPR, ePrivacy Directive, or any other privacy laws, the opencast player uses
the [Terms Feed Privacy Consent](https://www.termsfeed.com/privacy-consent/) banner and the
paella `config.json` file is configured to use it.
To comply with GDPR, ePrivacy Directive, or any other privacy laws, the opencast player uses
the [Terms Feed Privacy Consent](https://www.termsfeed.com/privacy-consent/) banner and the
paella `config.json` file is configured to use it.

To Learn more about paella cookie consent you can read paella
To Learn more about paella cookie consent you can read paella
[cookie consent documentation](https://paellaplayer.upv.es/#/doc/cookie_consent.md).

You can enable/disable the cookie consent banner in `config.json` file:
Expand All @@ -119,3 +119,24 @@ You can enable/disable the cookie consent banner in `config.json` file:
...
}
```

Hide/Show the timeline bar on Live events
-----------------------------------------
Paella can hide the timeline bar in live events using the `opencast.hideTimeLineOnLive` property
in the configuration file.

If your live stream offers a time buffer to go back in time, you can configure paella so that
the time buffer bar is displayed and visitors will be able to go back in time.

Example:

```json
{
...
"opencast": {
"hideTimeLineOnLive": false
...
}
...
}
```
6 changes: 6 additions & 0 deletions docs/guides/admin/docs/releasenotes.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
# Opencast 14: Release Notes

## Opencast 14.7

Opencast 14.7 is a minor release. This release includes bug fixes and improvements.

See [changelog](changelog.md#opencast-147) for a comprehensive list of changes.

## Opencast 14.6

Opencast 14.6 is a minor release. This release includes bug fixes and improvements.
Expand Down
3 changes: 2 additions & 1 deletion etc/ui-config/mh_default_org/paella7/config.json
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,8 @@
"presenter/player+preview",
"presentation/player+preview"
],
"theme": "custom_theme"
"theme": "custom_theme",
"hideTimeLineOnLive": false
},

"cookieConsent": [
Expand Down
8 changes: 6 additions & 2 deletions modules/engage-paella-player-7/src/js/EpisodeConversor.js
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ function getSourceData(track, config) {
return data;
}

function getMetadata(episode) {
function getMetadata(episode, config) {
const { duration, title, language, series, seriestitle, subjects, license, type } = episode.mediapackage;
const startDate = new Date(episode.dcCreated);
const presenters = episode?.mediapackage?.creators?.creator
Expand All @@ -120,6 +120,9 @@ function getMetadata(episode) {
: [episode.mediapackage.contributors.contributor])
: [];

const isLive = episode?.mediapackage?.media?.track?.some((track) => track.live === true);
const visibleTimeLine = !(isLive && config?.hideTimeLineOnLive);

const result = {
title,
subject: subjects?.subject,
Expand All @@ -136,7 +139,8 @@ function getMetadata(episode) {
location: episode?.dcSpatial,
UID: episode?.id,
type,
opencast: {episode}
opencast: {episode},
visibleTimeLine
};

return result;
Expand Down

0 comments on commit 13b806a

Please sign in to comment.