Commit graph

2074 commits

Author SHA1 Message Date
schweby
06dfbe7552 rc3_21: update about:future slug and shortname (#167) 2021-12-26 12:11:35 +01:00
derchris
b1428771fe fix feedback form 2021-12-26 06:18:09 +01:00
derchris
4027cce03f add HLS player option 2021-12-26 06:17:50 +01:00
derchris
1e5e18d39d enable audio again with HLS 2021-12-26 06:17:25 +01:00
derchris
7e75077fdb some color changes for schedule view 2021-12-26 05:24:42 +01:00
derchris
1eb01a6b40 Merge branch 'staging' of git.c3voc.de:streaming-website into staging 2021-12-26 05:16:56 +01:00
Andreas Hubel
33e25c42a5 Merge branch 'master' into staging 2021-12-26 03:21:34 +01:00
Andreas Hubel
02c08de9f5 try some rC3_21 styling... 2021-12-26 03:16:40 +01:00
derchris
d728151d92 Merge branch 'staging' of git.c3voc.de:streaming-website into staging 2021-12-26 02:40:32 +01:00
derchris
bcab4f0034 remove only dash, not ALL streams ;) 2021-12-26 02:38:18 +01:00
derchris
6ef3ed8ab5 remove dash from streams.v2.json when h264only is set 2021-12-26 02:21:10 +01:00
lujoga
ea0b5bf0cc Rename "franconian.net Livestream" to "franconian.net" (#166) 2021-12-25 18:23:44 +01:00
derchris
0f6abdd510 Merge branch 'master' into staging 2021-12-25 14:55:10 +01:00
derchris
04f1f1dee4 don't display dash link if h264only is set 2021-12-25 14:53:02 +01:00
Andreas Hubel
e2f7bcd644 fix indentation
using tabs
2021-12-25 12:00:29 +01:00
Andreas Hubel
70f2e41bf3 rc3_21: update sm hash tag
# Conflicts:
#	configs/conferences/rc3/config.php
2021-12-25 12:00:29 +01:00
derchris
44a9cf5e7a add video, remove audio
# Conflicts:
#	configs/conferences/rc3/config.php
2021-12-25 12:00:10 +01:00
Lukas Schauer
c2074e8a10 fix deployment script? 2021-12-25 11:57:50 +01:00
Andreas Hubel
ee49ce7a74 fix indentation
using tabs
2021-12-25 11:52:35 +01:00
Andreas Hubel
17e1226971 rc3_21: update sm hash tag
# Conflicts:
#	configs/conferences/rc3/config.php
2021-12-25 11:51:57 +01:00
derchris
a709cea43c add video, remove audio 2021-12-24 16:24:24 +01:00
Lukas Schauer
65f80b18aa
more h264 only 2021-12-24 14:59:55 +01:00
Lukas Schauer
45f4b93791 Merge branch 'master' into staging 2021-12-24 13:53:45 +00:00
Lukas Schauer
332e0b8542 fix deployment script? 2021-12-24 13:53:23 +00:00
Lukas Schauer
ca83b010d7
no agent forwarding.. 2021-12-24 14:51:35 +01:00
Lukas Schauer
aeefff11ec
hls only 2021-12-24 14:50:40 +01:00
VOC
5df492aec7 add two additional test streams 2021-12-23 23:05:54 +01:00
Andreas Hubel
5b57354e19 rC3_21: update config
# Conflicts:
#	configs/conferences/rc3/config.php

# Conflicts:
#	configs/conferences/rc3/config.php
2021-12-23 23:05:54 +01:00
Andreas Hubel
5ceb10c08d open rc3 for test instance
# Conflicts:
#	configs/conferences/rc3/config.php
2021-12-23 23:05:54 +01:00
Andreas Hubel
abfcfd30ea rc3_21: misc 2021-12-23 23:05:35 +01:00
Andreas Hubel
987dee2913
Merge pull request #165 from voc/feature/info
Feature/info
2021-12-22 15:06:26 +01:00
Andreas Hubel
36c1b60404
Update mirroring.yml 2021-12-22 15:05:40 +01:00
derchris
ab093c2d98 fix typo 2021-12-22 03:34:46 +01:00
derchris
1183def6dd Add per room info tab (HTML) 2021-12-22 03:23:03 +01:00
derchris
6f1f8dc6c0 Make download command Windows compatible 2021-12-22 03:21:57 +01:00
Andreas Hubel
db15f593dd rc3_21: use xhain instead of xHain stream 2021-12-21 22:47:11 +01:00
lujoga
2a8e14d91b Update short display name of franconian.net (#164) 2021-12-21 22:39:15 +01:00
Jannik Beyerstedt
4934fd083f Update rC3 2021 Chaosstudio Hamburg config (#163)
Stream ID and slug is "csh" this year instead of "chaosstudio-hamburg". IRC and twitter are correct.
2021-12-21 22:39:08 +01:00
Andreas Hubel
da27e376c6 rC3: refactor names, add abchillgleis, misc 2021-12-21 22:38:16 +01:00
Andreas Hubel
b6acafec81 rC3_21: update xHain 2021-12-20 03:00:25 +01:00
Andreas Hubel
356a088f9b fix schedule exception with php 7.4 2021-12-17 11:13:45 +01:00
Andreas Hubel
619aa944e1 rC3_21: remove kreaturworks aka SalonG 2021-12-17 10:09:03 +01:00
Andreas Hubel
6b66843efd rC3_21: update config
# Conflicts:
#	configs/conferences/rc3/config.php
2021-12-17 10:08:39 +01:00
Andreas Hubel
1f002c9838 fix #152 2021-12-17 10:05:28 +01:00
derchris
b79125f3a2 fiffkon21: add release link 2021-11-13 15:24:35 +01:00
derchris
ed04a6703b fiffkon21: add relive 2021-11-12 15:48:46 +01:00
derchris
9ef8bab5be add fiffkon21 2021-11-11 23:57:55 +01:00
Daniel Molkentin
e3c27cde2d Do not escape & 2021-11-06 19:27:25 +01:00
Daniel Molkentin
8f42888184 Add Make and Tell 2021-11-06 19:24:59 +01:00
Markus Otto
f5eee011ba
Merge pull request #160 from windauer/master
Debate 24 - Über die Tiefen des Bergbaus
2021-11-04 01:30:55 +01:00