mirrors/jellyfin-web
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin-web synced 2025-03-30 19:56:21 +00:00
Code Activity

Merge branch 'dev' of https://github.com/MediaBrowser/MediaBrowser into dev

Browse source 
Conflicts:
	MediaBrowser.WebDashboard/dashboard-ui/scripts/mediaplayer-video.js
This commit is contained in:
Luke Pulverenti 2015-06-07 17:23:05 -04:00
commit 4a0f78149a
16 changed files with 433 additions and 228 deletions
Download patch file Download diff file Expand all files Collapse all files

3
dashboard-ui/thirdparty/apiclient/connectionmanager.js vendored
View file

@ -964,6 +964,9 @@
function normalizeAddress(address) {
// attempt to correct bad input
address = address.trim();
if (address.toLowerCase().indexOf('http') != 0) {
address = "http://" + address;
}