Merge branch 'master' into websocket

6 files changed, 18 insertions, 2 deletions

diff --git a/MediaBrowser.Model/Users/ForgotPasswordAction.cs b/MediaBrowser.Model/Users/ForgotPasswordAction.cs
index 2124126c19..f198476e3b 100644
--- a/MediaBrowser.Model/Users/ForgotPasswordAction.cs
+++ b/MediaBrowser.Model/Users/ForgotPasswordAction.cs
@@ -1,3 +1,5 @@
+#pragma warning disable CS1591
+
 namespace MediaBrowser.Model.Users
 {
     public enum ForgotPasswordAction
diff --git a/MediaBrowser.Model/Users/ForgotPasswordResult.cs b/MediaBrowser.Model/Users/ForgotPasswordResult.cs
index 2f9b4cf48a..368c642e8f 100644
--- a/MediaBrowser.Model/Users/ForgotPasswordResult.cs
+++ b/MediaBrowser.Model/Users/ForgotPasswordResult.cs
@@ -1,3 +1,5 @@
+#pragma warning disable CS1591
+
 using System;
 
 namespace MediaBrowser.Model.Users
@@ -9,11 +11,13 @@ namespace MediaBrowser.Model.Users
         /// </summary>
         /// <value>The action.</value>
         public ForgotPasswordAction Action { get; set; }
+
         /// <summary>
         /// Gets or sets the pin file.
         /// </summary>
         /// <value>The pin file.</value>
         public string PinFile { get; set; }
+
         /// <summary>
         /// Gets or sets the pin expiration date.
         /// </summary>
diff --git a/MediaBrowser.Model/Users/PinRedeemResult.cs b/MediaBrowser.Model/Users/PinRedeemResult.cs
index 35663ba57f..ab868cad43 100644
--- a/MediaBrowser.Model/Users/PinRedeemResult.cs
+++ b/MediaBrowser.Model/Users/PinRedeemResult.cs
@@ -1,3 +1,5 @@
+#pragma warning disable CS1591
+
 namespace MediaBrowser.Model.Users
 {
     public class PinRedeemResult
@@ -7,6 +9,7 @@ namespace MediaBrowser.Model.Users
         /// </summary>
         /// <value><c>true</c> if success; otherwise, <c>false</c>.</value>
         public bool Success { get; set; }
+
         /// <summary>
         /// Gets or sets the users reset.
         /// </summary>
diff --git a/MediaBrowser.Model/Users/UserAction.cs b/MediaBrowser.Model/Users/UserAction.cs
index 48b5bbef13..f6bb6451b6 100644
--- a/MediaBrowser.Model/Users/UserAction.cs
+++ b/MediaBrowser.Model/Users/UserAction.cs
@@ -1,3 +1,5 @@
+#pragma warning disable CS1591
+
 using System;
 
 namespace MediaBrowser.Model.Users
diff --git a/MediaBrowser.Model/Users/UserActionType.cs b/MediaBrowser.Model/Users/UserActionType.cs
index 5d843a7388..dbb1513f22 100644
--- a/MediaBrowser.Model/Users/UserActionType.cs
+++ b/MediaBrowser.Model/Users/UserActionType.cs
@@ -1,3 +1,5 @@
+#pragma warning disable CS1591
+
 namespace MediaBrowser.Model.Users
 {
     public enum UserActionType
diff --git a/MediaBrowser.Model/Users/UserPolicy.cs b/MediaBrowser.Model/Users/UserPolicy.cs
index 9c3e1f9808..ae2b3fd4e9 100644
--- a/MediaBrowser.Model/Users/UserPolicy.cs
+++ b/MediaBrowser.Model/Users/UserPolicy.cs
@@ -1,3 +1,5 @@
+#pragma warning disable CS1591
+
 using System;
 using MediaBrowser.Model.Configuration;
 
@@ -44,6 +46,7 @@ namespace MediaBrowser.Model.Users
         public bool EnableAudioPlaybackTranscoding { get; set; }
         public bool EnableVideoPlaybackTranscoding { get; set; }
         public bool EnablePlaybackRemuxing { get; set; }
+        public bool ForceRemoteSourceTranscoding { get; set; }
 
         public bool EnableContentDeletion { get; set; }
         public string[] EnableContentDeletionFromFolders { get; set; }
@@ -80,7 +83,7 @@ namespace MediaBrowser.Model.Users
         public UserPolicy()
         {
             IsHidden = true;
-            
+
             EnableContentDeletion = false;
             EnableContentDeletionFromFolders = Array.Empty<string>();
 
@@ -91,7 +94,7 @@ namespace MediaBrowser.Model.Users
             EnableAudioPlaybackTranscoding = true;
             EnableVideoPlaybackTranscoding = true;
             EnablePlaybackRemuxing = true;
-
+            ForceRemoteSourceTranscoding = false;
             EnableLiveTvManagement = true;
             EnableLiveTvAccess = true;