Merge branch 'master' into h265

1 files changed, 5 insertions, 4 deletions

diff --git a/MediaBrowser.Model/Configuration/ServerConfiguration.cs b/MediaBrowser.Model/Configuration/ServerConfiguration.cs
index 0ba36b4b9..d64ea35eb 100644
--- a/MediaBrowser.Model/Configuration/ServerConfiguration.cs
+++ b/MediaBrowser.Model/Configuration/ServerConfiguration.cs
@@ -49,9 +49,9 @@ namespace MediaBrowser.Model.Configuration
         public bool EnableNormalizedItemByNameIds { get; set; }
 
         /// <summary>
-        /// Gets or sets the value pointing to the file system where the ssl certiifcate is located..
+        /// Gets or sets the value pointing to the file system where the ssl certificate is located..
         /// </summary>
-        /// <value>The value pointing to the file system where the ssl certiifcate is located..</value>
+        /// <value>The value pointing to the file system where the ssl certificate is located..</value>
         public string CertificatePath { get; set; }
         public string CertificatePassword { get; set; }
 
@@ -163,6 +163,7 @@ namespace MediaBrowser.Model.Configuration
 
         public string ServerName { get; set; }
         public string WanDdns { get; set; }
+        public string BaseUrl { get; set; }
 
         public string UICulture { get; set; }
 
@@ -243,6 +244,7 @@ namespace MediaBrowser.Model.Configuration
             SortRemoveCharacters = new[] { ",", "&", "-", "{", "}", "'" };
             SortRemoveWords = new[] { "the", "a", "an" };
 
+            BaseUrl = "jellyfin";
             UICulture = "en-US";
 
             MetadataOptions = new[]
@@ -259,7 +261,7 @@ namespace MediaBrowser.Model.Configuration
                 {
                     ItemType = "MusicVideo",
                     DisabledMetadataFetchers = new [] { "The Open Movie Database" },
-                    DisabledImageFetchers = new [] { "The Open Movie Database", "FanArt" }
+                    DisabledImageFetchers = new [] { "The Open Movie Database" }
                 },
                 new MetadataOptions
                 {
@@ -285,7 +287,6 @@ namespace MediaBrowser.Model.Configuration
                 {
                     ItemType = "Season",
                     DisabledMetadataFetchers = new [] { "TheMovieDb" },
-                    DisabledImageFetchers = new [] { "FanArt" }
                 },
                 new MetadataOptions
                 {