From: Marcel Werk Date: Sun, 5 Jan 2020 22:04:34 +0000 (+0100) Subject: Merge branch 'master' into next X-Git-Tag: 5.2.1~14 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=3ab6efab982044e1ac4f54302df6166bb901bc06;p=GitHub%2FWoltLab%2FWCF.git Merge branch 'master' into next --- 3ab6efab982044e1ac4f54302df6166bb901bc06 diff --cc com.woltlab.wcf/mediaProvider.xml index f4e0ad43ad,073ed67ad9..4f065ecaaa --- a/com.woltlab.wcf/mediaProvider.xml +++ b/com.woltlab.wcf/mediaProvider.xml @@@ -47,11 -55,7 +47,6 @@@ https?://vimeo\.com/groups/[^/]+/videos [a-zA-Z0-9_-]+)]]> ]]> - - Imgur - [a-zA-Z0-9-]+)]]> - ]]> - - Spotify Playlist [0-9a-zA-Z]+)/playlist/(?[0-9a-zA-Z]+) @@@ -80,12 -88,10 +75,16 @@@ https?://open.spotify.com/(?[a-zA https?://www.twitch.tv/[a-zA-Z0-9]+/v/(?[0-9]+)]]> ]]> + + Twitter Tweet + [0-9a-zA-Z_]+)/status/(?[0-9]+)]]> + window.twttr=function(t,e,r){var n,i=t.getElementsByTagName(e)[0],w=window.twttr||{};return t.getElementById(r)?w:((n=t.createElement(e)).id=r,n.src="https://platform.twitter.com/widgets.js",i.parentNode.insertBefore(n,i),w._e=[],w.ready=function(t){w._e.push(t)},w)}(document,"script","twitter-wjs"); +
+]]> + + + - + +