Merge pull request #1005 from MediaBrowser/dev

3.0.5518.0

1 files changed, 33 insertions, 10 deletions

diff --git a/MediaBrowser.Model/Configuration/ServerConfiguration.cs b/MediaBrowser.Model/Configuration/ServerConfiguration.cs
index f9c5c6567..c15c76004 100644
--- a/MediaBrowser.Model/Configuration/ServerConfiguration.cs
+++ b/MediaBrowser.Model/Configuration/ServerConfiguration.cs
@@ -21,6 +21,12 @@ namespace MediaBrowser.Model.Configuration
         public int PublicPort { get; set; }
 
         /// <summary>
+        /// Gets or sets the public HTTPS port.
+        /// </summary>
+        /// <value>The public HTTPS port.</value>
+        public int PublicHttpsPort { get; set; }
+        
+        /// <summary>
         /// Gets or sets the HTTP server port number.
         /// </summary>
         /// <value>The HTTP server port number.</value>
@@ -31,7 +37,19 @@ namespace MediaBrowser.Model.Configuration
         /// </summary>
         /// <value>The HTTPS server port number.</value>
         public int HttpsPortNumber { get; set; }
-        
+
+        /// <summary>
+        /// Gets or sets a value indicating whether [use HTTPS].
+        /// </summary>
+        /// <value><c>true</c> if [use HTTPS]; otherwise, <c>false</c>.</value>
+        public bool EnableHttps { get; set; }
+
+        /// <summary>
+        /// Gets or sets the value pointing to the file system where the ssl certiifcate is located..
+        /// </summary>
+        /// <value>The value pointing to the file system where the ssl certiifcate is located..</value>
+        public string CertificatePath { get; set; }
+
         /// <summary>
         /// Gets or sets a value indicating whether [enable internet providers].
         /// </summary>
@@ -73,6 +91,12 @@ namespace MediaBrowser.Model.Configuration
         /// </summary>
         /// <value><c>true</c> if [enable localized guids]; otherwise, <c>false</c>.</value>
         public bool EnableLocalizedGuids { get; set; }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether [enable library metadata sub folder].
+        /// </summary>
+        /// <value><c>true</c> if [enable library metadata sub folder]; otherwise, <c>false</c>.</value>
+        public bool EnableLibraryMetadataSubFolder { get; set; }
         
         /// <summary>
         /// Gets or sets the preferred metadata language.
@@ -136,6 +160,7 @@ namespace MediaBrowser.Model.Configuration
         /// </summary>
         /// <value><c>true</c> if [enable dashboard response caching]; otherwise, <c>false</c>.</value>
         public bool EnableDashboardResponseCaching { get; set; }
+        public bool EnableDashboardResourceMinification { get; set; }
 
         /// <summary>
         /// Allows the dashboard to be served from a custom path.
@@ -143,13 +168,8 @@ namespace MediaBrowser.Model.Configuration
         /// <value>The dashboard source path.</value>
         public string DashboardSourcePath { get; set; }
 
-        /// <summary>
-        /// Gets or sets a value indicating whether [enable tv db updates].
-        /// </summary>
-        /// <value><c>true</c> if [enable tv db updates]; otherwise, <c>false</c>.</value>
-        public bool EnableTvDbUpdates { get; set; }
-        public bool EnableTmdbUpdates { get; set; }
-        public bool EnableFanArtUpdates { get; set; }
+        public bool MergeMetadataAndImagesByName { get; set; }
+        public bool EnableStandaloneMetadata { get; set; }
 
         /// <summary>
         /// Gets or sets the image saving convention.
@@ -177,13 +197,14 @@ namespace MediaBrowser.Model.Configuration
         public string[] InsecureApps8 { get; set; }
 
         public bool SaveMetadataHidden { get; set; }
-        public bool EnableWin8HttpListener { get; set; }
 
         public NameValuePair[] ContentTypes { get; set; }
 
         public bool EnableAudioArchiveFiles { get; set; }
         public bool EnableVideoArchiveFiles { get; set; }
 
+        public bool EnableLegacyCollections { get; set; }
+
         /// <summary>
         /// Initializes a new instance of the <see cref="ServerConfiguration" /> class.
         /// </summary>
@@ -192,12 +213,14 @@ namespace MediaBrowser.Model.Configuration
         {
             ImageSavingConvention = ImageSavingConvention.Compatible;
             PublicPort = 8096;
+            PublicHttpsPort = 8920;
             HttpServerPortNumber = 8096;
             HttpsPortNumber = 8920;
+            EnableHttps = false;
             EnableDashboardResponseCaching = true;
+            EnableDashboardResourceMinification = true;
 
             EnableAutomaticRestart = true;
-            EnableWin8HttpListener = true;
 
             EnableUPnP = true;