Merge remote-tracking branch 'upstream/dev' into dev

4 files changed, 22 insertions, 13 deletions

diff --git a/MediaBrowser.Model/Configuration/ServerConfiguration.cs b/MediaBrowser.Model/Configuration/ServerConfiguration.cs
index df0e42869..993799f65 100644
--- a/MediaBrowser.Model/Configuration/ServerConfiguration.cs
+++ b/MediaBrowser.Model/Configuration/ServerConfiguration.cs
@@ -198,6 +198,8 @@ namespace MediaBrowser.Model.Configuration
         public bool EnableAnonymousUsageReporting { get; set; }
         public bool EnableStandaloneMusicKeys { get; set; }
         public bool EnableLocalizedGuids { get; set; }
+        public bool EnableFolderView { get; set; }
+        public bool EnableGroupingIntoCollections { get; set; }
 
         /// <summary>
         /// Initializes a new instance of the <see cref="ServerConfiguration" /> class.
diff --git a/MediaBrowser.Model/Configuration/UserConfiguration.cs b/MediaBrowser.Model/Configuration/UserConfiguration.cs
index 6195e3e70..69dc23b21 100644
--- a/MediaBrowser.Model/Configuration/UserConfiguration.cs
+++ b/MediaBrowser.Model/Configuration/UserConfiguration.cs
@@ -48,7 +48,8 @@ namespace MediaBrowser.Model.Configuration
         public bool RememberAudioSelections { get; set; }
         public bool RememberSubtitleSelections { get; set; }
         public bool EnableNextEpisodeAutoPlay { get; set; }
-    
+        public bool DisplayFoldersView { get; set; }
+
         /// <summary>
         /// Initializes a new instance of the <see cref="UserConfiguration" /> class.
         /// </summary>
diff --git a/MediaBrowser.Model/Entities/ImageType.cs b/MediaBrowser.Model/Entities/ImageType.cs
index 18097abb4..6e0ba717f 100644
--- a/MediaBrowser.Model/Entities/ImageType.cs
+++ b/MediaBrowser.Model/Entities/ImageType.cs
@@ -9,50 +9,50 @@ namespace MediaBrowser.Model.Entities
         /// <summary>
         /// The primary
         /// </summary>
-        Primary,
+        Primary = 0,
         /// <summary>
         /// The art
         /// </summary>
-        Art,
+        Art = 1,
         /// <summary>
         /// The backdrop
         /// </summary>
-        Backdrop,
+        Backdrop = 2,
         /// <summary>
         /// The banner
         /// </summary>
-        Banner,
+        Banner = 3,
         /// <summary>
         /// The logo
         /// </summary>
-        Logo,
+        Logo = 4,
         /// <summary>
         /// The thumb
         /// </summary>
-        Thumb,
+        Thumb = 5,
         /// <summary>
         /// The disc
         /// </summary>
-        Disc,
+        Disc = 6,
         /// <summary>
         /// The box
         /// </summary>
-        Box,
+        Box = 7,
         /// <summary>
         /// The screenshot
         /// </summary>
-        Screenshot,
+        Screenshot = 8,
         /// <summary>
         /// The menu
         /// </summary>
-        Menu,
+        Menu = 9,
         /// <summary>
         /// The chapter image
         /// </summary>
-        Chapter,
+        Chapter = 10,
         /// <summary>
         /// The box rear
         /// </summary>
-        BoxRear
+        BoxRear = 11
     }
 }
diff --git a/MediaBrowser.Model/LiveTv/LiveTvOptions.cs b/MediaBrowser.Model/LiveTv/LiveTvOptions.cs
index e00443d19..9e34ff042 100644
--- a/MediaBrowser.Model/LiveTv/LiveTvOptions.cs
+++ b/MediaBrowser.Model/LiveTv/LiveTvOptions.cs
@@ -73,9 +73,15 @@ namespace MediaBrowser.Model.LiveTv
 
         public string[] EnabledTuners { get; set; }
         public bool EnableAllTuners { get; set; }
+        public string[] NewsGenres { get; set; }
+        public string[] SportsGenres { get; set; }
+        public string[] KidsGenres { get; set; }
 
         public ListingsProviderInfo()
         {
+            NewsGenres = new string[] { "news" };
+            SportsGenres = new string[] { "sports", "basketball", "baseball", "football" };
+            KidsGenres = new string[] { "kids", "family", "children" };
             EnabledTuners = new string[] { };
             EnableAllTuners = true;
         }