From 22c5a5064f904ff9a60c9852c8de54bb49de910b Mon Sep 17 00:00:00 2001 From: Daniel Molkentin Date: Sat, 22 Sep 2018 20:41:09 +0200 Subject: ds2018: Fix relive URL --- configs/conferences/datenspuren18/config.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'configs/conferences/datenspuren18') diff --git a/configs/conferences/datenspuren18/config.php b/configs/conferences/datenspuren18/config.php index 52ba90f..b08ee0b 100644 --- a/configs/conferences/datenspuren18/config.php +++ b/configs/conferences/datenspuren18/config.php @@ -97,7 +97,7 @@ $CONFIG['CONFERENCE'] = array( * Wird beides aktiviert, hat der externe Link Vorrang! * Wird beides auskommentiert, wird der Link nicht angezeigt */ - 'RELIVE_JSON' => 'http://live.ber.c3voc.de/relive/DS2018/index.json', + 'RELIVE_JSON' => 'http://live.ber.c3voc.de/relive/datenspuren18/index.json', /** * APCU-Cache-Zeit in Sekunden -- cgit v1.2.3 From a78fb315851f606d4342817522efad18c963e7d2 Mon Sep 17 00:00:00 2001 From: Daniel Molkentin Date: Sat, 22 Sep 2018 20:41:39 +0200 Subject: ds2018: Remove all rooms but Großer Saal --- configs/conferences/datenspuren18/config.php | 46 ++++++++++++++-------------- 1 file changed, 23 insertions(+), 23 deletions(-) (limited to 'configs/conferences/datenspuren18') diff --git a/configs/conferences/datenspuren18/config.php b/configs/conferences/datenspuren18/config.php index b08ee0b..6f26d5c 100644 --- a/configs/conferences/datenspuren18/config.php +++ b/configs/conferences/datenspuren18/config.php @@ -121,7 +121,7 @@ $CONFIG['OVERVIEW'] = array( 'GROUPS' => array( 'Lecture rooms' => array( 'grosser-saal', - 'workshopraum', +# 'workshopraum', ), ), ); @@ -342,26 +342,26 @@ $CONFIG['ROOMS'] = array( // 'TEXT' => '#fossgis2016', // ), ), - 'workshopraum' => array( - 'DISPLAY' => 'Workshopraum', - 'STREAM' => 's4', - 'PREVIEW' => true, - 'TRANSLATION' => false, - 'STEREO' => false, - 'SD_VIDEO' => true, - 'HD_VIDEO' => true, - 'DASH' => true, - 'SLIDES' => true, - 'AUDIO' => true, - 'MUSIC' => false, - 'SCHEDULE' => true, - 'SCHEDULE_NAME' => 'Workshopraum', - 'FEEDBACK' => false, - 'SUBTITLES' => false, - 'EMBED' => true, - 'IRC' => false, - 'TWITTER' => true, - ), +// 'workshopraum' => array( +// 'DISPLAY' => 'Workshopraum', +// 'STREAM' => 's4', +// 'PREVIEW' => true, +// 'TRANSLATION' => false, +// 'STEREO' => false, +// 'SD_VIDEO' => true, +// 'HD_VIDEO' => true, +// 'DASH' => true, +// 'SLIDES' => true, +// 'AUDIO' => true, +// 'MUSIC' => false, +// 'SCHEDULE' => true, +// 'SCHEDULE_NAME' => 'Workshopraum', +// 'FEEDBACK' => false, +// 'SUBTITLES' => false, +// 'EMBED' => true, +// 'IRC' => false, +// 'TWITTER' => true, +// ), ); /** @@ -391,7 +391,7 @@ $CONFIG['SCHEDULE'] = array( * * Wird diese Zeile auskommentiert, werden alle Räume angezeigt */ - //'ROOMFILTER' => ['Goldberg Saal', 'Museumskino'], + 'ROOMFILTER' => ['Großer Saal'], /** * Skalierung der Programm-Vorschau in Sekunden pro Pixel @@ -405,7 +405,7 @@ $CONFIG['SCHEDULE'] = array( * Konferenz-Datum 2014-12-29 auf den heutigen Tag 2015-02-24 verschoben ist. */ //'SIMULATE_OFFSET' => strtotime(/* Conference-Date */ '2016-05-21') - strtotime(/* Today */ '2016-05-19'), - 'SIMULATE_OFFSET' => 3600*2, + //'SIMULATE_OFFSET' => 3600*2, ); /** -- cgit v1.2.3 From 7c96dffb050d58b478728a19a82e8eeb056d9d36 Mon Sep 17 00:00:00 2001 From: Daniel Molkentin Date: Sat, 22 Sep 2018 21:01:20 +0200 Subject: ds2018: Readd Workshopraum --- configs/conferences/datenspuren18/config.php | 44 ++++++++++++++-------------- 1 file changed, 22 insertions(+), 22 deletions(-) (limited to 'configs/conferences/datenspuren18') diff --git a/configs/conferences/datenspuren18/config.php b/configs/conferences/datenspuren18/config.php index 6f26d5c..8078178 100644 --- a/configs/conferences/datenspuren18/config.php +++ b/configs/conferences/datenspuren18/config.php @@ -121,7 +121,7 @@ $CONFIG['OVERVIEW'] = array( 'GROUPS' => array( 'Lecture rooms' => array( 'grosser-saal', -# 'workshopraum', + 'workshopraum', ), ), ); @@ -342,26 +342,26 @@ $CONFIG['ROOMS'] = array( // 'TEXT' => '#fossgis2016', // ), ), -// 'workshopraum' => array( -// 'DISPLAY' => 'Workshopraum', -// 'STREAM' => 's4', -// 'PREVIEW' => true, -// 'TRANSLATION' => false, -// 'STEREO' => false, -// 'SD_VIDEO' => true, -// 'HD_VIDEO' => true, -// 'DASH' => true, -// 'SLIDES' => true, -// 'AUDIO' => true, -// 'MUSIC' => false, -// 'SCHEDULE' => true, -// 'SCHEDULE_NAME' => 'Workshopraum', -// 'FEEDBACK' => false, -// 'SUBTITLES' => false, -// 'EMBED' => true, -// 'IRC' => false, -// 'TWITTER' => true, -// ), + 'workshopraum' => array( + 'DISPLAY' => 'Workshopraum', + 'STREAM' => 's4', + 'PREVIEW' => true, + 'TRANSLATION' => false, + 'STEREO' => false, + 'SD_VIDEO' => true, + 'HD_VIDEO' => true, + 'DASH' => true, + 'SLIDES' => true, + 'AUDIO' => true, + 'MUSIC' => false, + 'SCHEDULE' => true, + 'SCHEDULE_NAME' => 'Workshopraum', + 'FEEDBACK' => false, + 'SUBTITLES' => false, + 'EMBED' => true, + 'IRC' => false, + 'TWITTER' => true, + ), ); /** @@ -391,7 +391,7 @@ $CONFIG['SCHEDULE'] = array( * * Wird diese Zeile auskommentiert, werden alle Räume angezeigt */ - 'ROOMFILTER' => ['Großer Saal'], + 'ROOMFILTER' => ['Großer Saal', 'Workshopraum'], /** * Skalierung der Programm-Vorschau in Sekunden pro Pixel -- cgit v1.2.3 From b4240e8457deb35e10e723b6d7fda8f0b5a3e374 Mon Sep 17 00:00:00 2001 From: Daniel Molkentin Date: Sat, 22 Sep 2018 21:19:52 +0200 Subject: Revert "ds2018: Readd Workshopraum" This reverts commit 7c96dffb050d58b478728a19a82e8eeb056d9d36. --- configs/conferences/datenspuren18/config.php | 44 ++++++++++++++-------------- 1 file changed, 22 insertions(+), 22 deletions(-) (limited to 'configs/conferences/datenspuren18') diff --git a/configs/conferences/datenspuren18/config.php b/configs/conferences/datenspuren18/config.php index 8078178..6f26d5c 100644 --- a/configs/conferences/datenspuren18/config.php +++ b/configs/conferences/datenspuren18/config.php @@ -121,7 +121,7 @@ $CONFIG['OVERVIEW'] = array( 'GROUPS' => array( 'Lecture rooms' => array( 'grosser-saal', - 'workshopraum', +# 'workshopraum', ), ), ); @@ -342,26 +342,26 @@ $CONFIG['ROOMS'] = array( // 'TEXT' => '#fossgis2016', // ), ), - 'workshopraum' => array( - 'DISPLAY' => 'Workshopraum', - 'STREAM' => 's4', - 'PREVIEW' => true, - 'TRANSLATION' => false, - 'STEREO' => false, - 'SD_VIDEO' => true, - 'HD_VIDEO' => true, - 'DASH' => true, - 'SLIDES' => true, - 'AUDIO' => true, - 'MUSIC' => false, - 'SCHEDULE' => true, - 'SCHEDULE_NAME' => 'Workshopraum', - 'FEEDBACK' => false, - 'SUBTITLES' => false, - 'EMBED' => true, - 'IRC' => false, - 'TWITTER' => true, - ), +// 'workshopraum' => array( +// 'DISPLAY' => 'Workshopraum', +// 'STREAM' => 's4', +// 'PREVIEW' => true, +// 'TRANSLATION' => false, +// 'STEREO' => false, +// 'SD_VIDEO' => true, +// 'HD_VIDEO' => true, +// 'DASH' => true, +// 'SLIDES' => true, +// 'AUDIO' => true, +// 'MUSIC' => false, +// 'SCHEDULE' => true, +// 'SCHEDULE_NAME' => 'Workshopraum', +// 'FEEDBACK' => false, +// 'SUBTITLES' => false, +// 'EMBED' => true, +// 'IRC' => false, +// 'TWITTER' => true, +// ), ); /** @@ -391,7 +391,7 @@ $CONFIG['SCHEDULE'] = array( * * Wird diese Zeile auskommentiert, werden alle Räume angezeigt */ - 'ROOMFILTER' => ['Großer Saal', 'Workshopraum'], + 'ROOMFILTER' => ['Großer Saal'], /** * Skalierung der Programm-Vorschau in Sekunden pro Pixel -- cgit v1.2.3