mirror of
https://github.com/voc/streaming-website
synced 2024-11-10 06:34:17 +00:00
Merge branch 'master' into aalen
This commit is contained in:
commit
3e815d900a
3 changed files with 35 additions and 2 deletions
|
@ -24,7 +24,7 @@ $GLOBALS['CONFIG']['PREVIEW_DOMAIN'] = 'xlocalhost';
|
|||
* Protokollfreie URLs (welche, die mit // beginnen), werden automatisch mit dem korrekten Protokoll ergänzt.
|
||||
* In diesem Fall wird auch ein SSL-Umschalt-Button im Header angezeigt
|
||||
*/
|
||||
if(@$_SERVER['SERVER_NAME'] == 'localhost')
|
||||
if(@$_SERVER['SERVER_NAME'] == 'localhost' || @$_SERVER['SERVER_NAME'] == '0.0.0.0')
|
||||
{
|
||||
// keine Konfiguration -> BASEURL wird automatisch erraten
|
||||
}
|
||||
|
|
33
configs/conferences/digitalcourage-chatkontrolle/config.json
Normal file
33
configs/conferences/digitalcourage-chatkontrolle/config.json
Normal file
|
@ -0,0 +1,33 @@
|
|||
{
|
||||
"$schema": "../../../docs/config-schema.json",
|
||||
"conference": {
|
||||
"title": "#ChatkontrolleSTOPPEN! – Online-Diskussionsveranstaltung mit Europaabgeordneten",
|
||||
"acronym": "digitalcourage-chatkontrolle",
|
||||
"description": "",
|
||||
"keywords": [],
|
||||
"organizer": "Digitalcourage",
|
||||
"start": "2023-10-24T16:00:00+02:00",
|
||||
"end": "2023-10-24T20:00:00+02:00",
|
||||
"streamingConfig": {
|
||||
"features": {
|
||||
"embed": true,
|
||||
"relive": false,
|
||||
"releases": false,
|
||||
"feedback": false
|
||||
},
|
||||
// "overviewPage": {},
|
||||
"html": {
|
||||
"footer": "\n\t\tby <a href=\"https://digitalcourage.de\">Digitalcourage e.V.</a>, supported by <a href=\"https://c3voc.de\">C3VOC</a>\n\t",
|
||||
"not_started": null
|
||||
}
|
||||
},
|
||||
"rooms": [
|
||||
{
|
||||
"guid": "",
|
||||
"name": "Stream",
|
||||
"slug": "digitalcourage",
|
||||
"streamId": "digitalcourage"
|
||||
}
|
||||
]
|
||||
}
|
||||
}
|
|
@ -344,7 +344,7 @@ $CONFIG['ROOMS'] = array(
|
|||
* Wird diese Zeile auskommentiert oder auf False gesetzt, werden alle
|
||||
* Embedding-Funktionen deaktiviert.
|
||||
*/
|
||||
$CONFIG['EMBED'] = false;
|
||||
$CONFIG['EMBED'] = true;
|
||||
|
||||
/**
|
||||
* Konfigurationen zum Konferenz-Fahrplan
|
||||
|
|
Loading…
Reference in a new issue