update to jquery mobile 1.4.3

8 files changed, 50 insertions, 17 deletions

diff --git a/MediaBrowser.Model/Configuration/ServerConfiguration.cs b/MediaBrowser.Model/Configuration/ServerConfiguration.cs
index f7b888f824..36c353479f 100644
--- a/MediaBrowser.Model/Configuration/ServerConfiguration.cs
+++ b/MediaBrowser.Model/Configuration/ServerConfiguration.cs
@@ -1,4 +1,5 @@
-using MediaBrowser.Model.Weather;
+using MediaBrowser.Model.Notifications;
+using MediaBrowser.Model.Weather;
 using System;
 
 namespace MediaBrowser.Model.Configuration
@@ -178,8 +179,6 @@ namespace MediaBrowser.Model.Configuration
         /// <value>The encoding quality.</value>
         public EncodingQuality MediaEncodingQuality { get; set; }
 
-        public bool AllowVideoUpscaling { get; set; }
-
         public MetadataOptions[] MetadataOptions { get; set; }
 
         public bool EnableDebugEncodingLogging { get; set; }
@@ -268,10 +267,7 @@ namespace MediaBrowser.Model.Configuration
                 new MetadataOptions(0, 1280) {ItemType = "Season"}
             };
 
-            NotificationOptions = new NotificationOptions();
-
             SubtitleOptions = new SubtitleOptions();
-
             LiveTvOptions = new LiveTvOptions();
             TvFileOrganizationOptions = new TvFileOrganizationOptions();
         }
diff --git a/MediaBrowser.Model/MediaBrowser.Model.csproj b/MediaBrowser.Model/MediaBrowser.Model.csproj
index d2b0a8caf3..d758f2f394 100644
--- a/MediaBrowser.Model/MediaBrowser.Model.csproj
+++ b/MediaBrowser.Model/MediaBrowser.Model.csproj
@@ -88,11 +88,11 @@
     <Compile Include="Configuration\MetadataOptions.cs" />
     <Compile Include="Configuration\MetadataPluginSummary.cs" />
     <Compile Include="Configuration\MetadataPluginType.cs" />
-    <Compile Include="Configuration\NotificationOption.cs" />
-    <Compile Include="Configuration\NotificationOptions.cs" />
-    <Compile Include="Configuration\NotificationType.cs" />
+    <Compile Include="Notifications\NotificationOption.cs" />
+    <Compile Include="Notifications\NotificationOptions.cs" />
+    <Compile Include="Notifications\NotificationType.cs" />
     <Compile Include="Configuration\PathSubstitution.cs" />
-    <Compile Include="Configuration\SendToUserType.cs" />
+    <Compile Include="Notifications\SendToUserType.cs" />
     <Compile Include="Configuration\ServerConfiguration.cs" />
     <Compile Include="Configuration\SubtitleOptions.cs" />
     <Compile Include="Configuration\UnratedItem.cs" />
diff --git a/MediaBrowser.Model/Configuration/NotificationOption.cs b/MediaBrowser.Model/Notifications/NotificationOption.cs
index 5fcf3550c9..09f7072dd3 100644
--- a/MediaBrowser.Model/Configuration/NotificationOption.cs
+++ b/MediaBrowser.Model/Notifications/NotificationOption.cs
@@ -1,4 +1,6 @@
-namespace MediaBrowser.Model.Configuration
+using MediaBrowser.Model.Configuration;
+
+namespace MediaBrowser.Model.Notifications
 {
     public class NotificationOption
     {
diff --git a/MediaBrowser.Model/Configuration/NotificationOptions.cs b/MediaBrowser.Model/Notifications/NotificationOptions.cs
index dd523d9478..7d80f31774 100644
--- a/MediaBrowser.Model/Configuration/NotificationOptions.cs
+++ b/MediaBrowser.Model/Notifications/NotificationOptions.cs
@@ -1,6 +1,7 @@
-using MediaBrowser.Model.Extensions;
+using MediaBrowser.Model.Configuration;
+using MediaBrowser.Model.Extensions;
 
-namespace MediaBrowser.Model.Configuration
+namespace MediaBrowser.Model.Notifications
 {
     public class NotificationOptions
     {
diff --git a/MediaBrowser.Model/Configuration/NotificationType.cs b/MediaBrowser.Model/Notifications/NotificationType.cs
index d8043b0e14..34e4d32b53 100644
--- a/MediaBrowser.Model/Configuration/NotificationType.cs
+++ b/MediaBrowser.Model/Notifications/NotificationType.cs
@@ -1,4 +1,4 @@
-namespace MediaBrowser.Model.Configuration
+namespace MediaBrowser.Model.Notifications
 {
     public enum NotificationType
     {
diff --git a/MediaBrowser.Model/Configuration/SendToUserType.cs b/MediaBrowser.Model/Notifications/SendToUserType.cs
index a2eac4c2d9..1998d3102f 100644
--- a/MediaBrowser.Model/Configuration/SendToUserType.cs
+++ b/MediaBrowser.Model/Notifications/SendToUserType.cs
@@ -1,4 +1,4 @@
-namespace MediaBrowser.Model.Configuration
+namespace MediaBrowser.Model.Notifications
 {
     public enum SendToUserType
     {
diff --git a/MediaBrowser.Model/Updates/PackageVersionInfo.cs b/MediaBrowser.Model/Updates/PackageVersionInfo.cs
index de8f4e8b86..b9bf6e7fe6 100644
--- a/MediaBrowser.Model/Updates/PackageVersionInfo.cs
+++ b/MediaBrowser.Model/Updates/PackageVersionInfo.cs
@@ -1,4 +1,6 @@
-
+using System;
+using System.Runtime.Serialization;
+
 namespace MediaBrowser.Model.Updates
 {
     /// <summary>
@@ -25,6 +27,32 @@ namespace MediaBrowser.Model.Updates
         public string versionStr { get; set; }
 
         /// <summary>
+        /// The _version
+        /// </summary>
+        private Version _version;
+        /// <summary>
+        /// Gets or sets the version.
+        /// Had to make this an interpreted property since Protobuf can't handle Version
+        /// </summary>
+        /// <value>The version.</value>
+        [IgnoreDataMember]
+        public Version version
+        {
+            get { return _version ?? (_version = new Version(ValueOrDefault(versionStr, "0.0.0.1"))); }
+        }
+
+        /// <summary>
+        /// Values the or default.
+        /// </summary>
+        /// <param name="str">The STR.</param>
+        /// <param name="def">The def.</param>
+        /// <returns>System.String.</returns>
+        private static string ValueOrDefault(string str, string def)
+        {
+            return string.IsNullOrEmpty(str) ? def : str;
+        }
+
+        /// <summary>
         /// Gets or sets the classification.
         /// </summary>
         /// <value>The classification.</value>
@@ -60,4 +88,4 @@ namespace MediaBrowser.Model.Updates
         /// <value>The target filename.</value>
         public string targetFilename { get; set; }
     }
-}
+}
\ No newline at end of file
diff --git a/MediaBrowser.Model/Users/AuthenticationResult.cs b/MediaBrowser.Model/Users/AuthenticationResult.cs
index 998aaa3a7f..8046e83c7f 100644
--- a/MediaBrowser.Model/Users/AuthenticationResult.cs
+++ b/MediaBrowser.Model/Users/AuthenticationResult.cs
@@ -16,5 +16,11 @@ namespace MediaBrowser.Model.Users
         /// </summary>
         /// <value>The session information.</value>
         public SessionInfoDto SessionInfo { get; set; }
+
+        /// <summary>
+        /// Gets or sets the authentication token.
+        /// </summary>
+        /// <value>The authentication token.</value>
+        public string AuthenticationToken { get; set; }
     }
 }