forked from opencast/opencast
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'upstream/develop' into t/remove-paella-6
- Loading branch information
Showing
56 changed files
with
2,232 additions
and
6,620 deletions.
There are no files selected for viewing
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
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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -26,7 +26,7 @@ jobs: | |
steps: | ||
# Batches Dependabot PRs into one by merging them into a combined branch, then raising a new PR | ||
- name: 'Dependabot Batcher' | ||
uses: Legal-and-General/[email protected].3 | ||
uses: Legal-and-General/[email protected].4 | ||
with: | ||
token: ${{ secrets.GITHUB_TOKEN }} #required | ||
baseBranchName: 'r/13.x' #optional | ||
|
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
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
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
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
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,20 @@ | ||
# Imprint and Privacy Statement | ||
|
||
Opencast allows you to provide imprint and a privacy statements for the admin-ui. Both documents are linked in the footer. | ||
|
||
Simply edit the default files in `/etc/ui-config/mh_default_org/admin-ui/`. The filenames follow these rules: | ||
|
||
``` | ||
imprint.%{language_code}.html | ||
privacy.%{language_code}.html | ||
``` | ||
|
||
The corresponding language codes can be found here: https://github.com/opencast/opencast-admin-interface/blob/admin-ui-picard/app/src/i18n/i18n.ts#L44 | ||
|
||
If a language is not provided, the english version will be displayed. | ||
|
||
To display both links in the footer, set the following in `etc/org.opencastproject.organization-mh_default_org.cfg`: | ||
|
||
``` | ||
prop.org.opencastproject.admin.display_about=true | ||
``` |
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
The old admin interface is now a plugin and needs to be specifically enabled before it can be used. |
1 change: 1 addition & 0 deletions
1
docs/guides/admin/docs/releasenotes/imprint-and-privacy-statement-added.txt
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
With this release you can now provide an imprint and a privacy statement to the admin-ui. For configuration see [the respective docs](../configuration/admin-ui/about.md) |
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
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
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
Oops, something went wrong.