Mirrors/streaming-website
2
0
Fork 0
mirror of https://github.com/voc/streaming-website synced 2024-09-20 22:41:55 +00:00
Code Issues Projects Releases Packages Wiki Activity
2113 commits 13 branches 0 tags 113 MiB
Commit graph

2113 commits

This branch
This branch
All branches
Author SHA1 Message Date
Andreas Hubel
cdd70e0484 rC3_21: misc 2021-12-28 12:46:13 +01:00
Andreas Hubel
115f8dc7e3 overview page: order rooms by time of current/next talk 2021-12-28 12:46:13 +01:00
Andreas Hubel
7f98aaf293 relive player: allow lookup by guid, not only id 2021-12-28 12:34:37 +01:00
Andreas Hubel
b1417ca543 overview page: Do not show 'None' 2021-12-28 12:16:03 +01:00
Andreas Hubel
f97deae2e0 overview page: order rooms by time of next talk 2021-12-28 12:16:03 +01:00
derchris
89bce66f1b Merge branch 'rc3-csh-infocard' 2021-12-27 19:22:18 +01:00
Christian Gerbrandt
c38ec1c0b3
Merge pull request #170 from MarcusWolschon/master 
#169  no IRC config for FeM
 2021-12-27 18:44:43 +01:00
Christian Gerbrandt
ba32b9c6df
Update configs/conferences/rc3/config.php 
Co-authored-by: Xiretza <xiretza@xiretza.xyz>
 2021-12-27 18:42:06 +01:00
Marcus Wolschon
ef459e672d #169 no IRC config for FeM 
fixed missing IRC config entry
 2021-12-27 18:30:54 +01:00
Jannik Beyerstedt
53508dc243 rC3: Add info card for CSH channel 2021-12-27 15:01:58 +01:00
Andreas Hubel
745d6c1df9 improve wording 2021-12-27 13:20:20 +01:00
Andreas Hubel
26992a1a17 use schedule.xml with lounges programme 2021-12-27 13:20:20 +01:00
Lukas Schauer
d4b4591ace
moar routes 2021-12-27 11:42:16 +01:00
Andreas Hubel
f647127924 add hls to embed route regexp 2021-12-27 11:07:46 +01:00
derchris
51b07f6ef8 Revert "order rooms in overview page by time of next talk" 
This reverts commit 26d9ab154c.
 2021-12-27 09:41:02 +01:00
derchris
41df99afe4 Merge branch 'master' of git.c3voc.de:streaming-website 2021-12-27 09:24:46 +01:00
Andreas Hubel
7355c032fd hide HLS from room / video stream title 2021-12-27 05:41:55 +01:00
Andreas Hubel
11d9751b04 rC3_21: display music group on top from 0 - 10am 2021-12-27 05:39:12 +01:00
Andreas Hubel
9014cc16e2 Merge branch 'staging' 
# Conflicts:
#	configs/conferences/rc3/config.php
 2021-12-27 05:21:47 +01:00
Andreas Hubel
e800311b05 cleanup for prod 
# Conflicts:
#	configs/conferences/rc3/config.php
 2021-12-27 05:20:04 +01:00
Andreas Hubel
24180ef269 rC3_21: improve long display names 2021-12-27 05:17:22 +01:00
Andreas Hubel
26d9ab154c order rooms in overview page by time of next talk 2021-12-27 05:17:22 +01:00
derchris
5187285e4b add new edge node 2021-12-27 05:17:22 +01:00
derchris
ec975e5dad modify channel list for rc3 2021-12-27 05:17:22 +01:00
derchris
33555ade93 add new lb 2021-12-27 05:17:22 +01:00
derchris
50ca98e878 fix merge conflict 2021-12-26 22:43:45 +01:00
derchris
f2f7d1960c add new edge node 2021-12-26 22:41:44 +01:00
Andreas Hubel
0fc82fc815 cleanup for prod 2021-12-26 22:41:16 +01:00
derchris
4bb4b41e09 Merge branch 'staging' 2021-12-26 22:38:30 +01:00
Andreas Hubel
d77e52ddbc rC3_21: fix css bugs, add fonts 2021-12-26 22:37:43 +01:00
Andreas Hubel
bdc55523f4 rC3_21: fix spelling error schedule name + add some guid's 2021-12-26 22:37:37 +01:00
Andreas Hubel
5bdd742959 rC3_21: fix css bugs, add fonts 2021-12-26 22:13:23 +01:00
Andreas Hubel
77987196be rC3_21: fix spelling error schedule name + add some guid's 2021-12-26 21:47:12 +01:00
derchris
29c3d8a525 modify channel list for rc3 2021-12-26 21:25:28 +01:00
derchris
e09f7bf45f Merge branch 'staging' 2021-12-26 21:19:07 +01:00
derchris
709d329bee some minor css changes for navbar 2021-12-26 20:32:39 +01:00
derchris
7f8cdac833 add new lb 2021-12-26 20:06:37 +01:00
derchris
693df7089c fix SD/HD label in voc-player 2021-12-26 16:17:18 +01:00
Andreas Hubel
2765596253 feedback form: update OS options 2021-12-26 12:12:01 +01:00
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