3.0.5482.4

MediaBrowser · Jan 10, 2015 · 3552f81 · 3552f81
1 parent baf52ec
commit 3552f81
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 11 deletions.
diff --git a/MediaBrowser.Server.Implementations/Library/Resolvers/TV/SeriesResolver.cs b/MediaBrowser.Server.Implementations/Library/Resolvers/TV/SeriesResolver.cs
@@ -72,13 +72,13 @@ protected override Series Resolve(ItemResolveArgs args)
                 }
                 else
                 {
-                    if (args.HasParent<Series>())
-                    {
-                        return null;
-                    }
-
                     if (string.IsNullOrWhiteSpace(collectionType))
                     {
+                        if (args.HasParent<Series>())
+                        {
+                            return null;
+                        }
+
                         if (args.Parent.IsRoot)
                         {
                             return null;

diff --git a/MediaBrowser.Server.Implementations/Sync/SyncScheduledTask.cs b/MediaBrowser.Server.Implementations/Sync/SyncScheduledTask.cs
@@ -67,7 +67,7 @@ public IEnumerable<ITaskTrigger> GetDefaultTriggers()
 
         public bool IsHidden
         {
-            get { return false; }
+            get { return true; }
         }
 
         public bool IsEnabled

diff --git a/MediaBrowser.WebDashboard/dashboard-ui/scripts/sync.js b/MediaBrowser.WebDashboard/dashboard-ui/scripts/sync.js
@@ -203,8 +203,8 @@
 
     function isAvailable(item, user) {
 
-        //return false;
-        return item.SupportsSync;
+        return false;
+        //return item.SupportsSync;
     }
 
     window.SyncManager = {
@@ -226,7 +226,7 @@
         Dashboard.getCurrentUser().done(function (user) {
 
             if (user.Policy.EnableSync) {
-                $('.categorySyncButton', page).show();
+                $('.categorySyncButton', page).hide();
             } else {
                 $('.categorySyncButton', page).hide();
             }

diff --git a/SharedVersion.cs b/SharedVersion.cs
@@ -1,4 +1,4 @@
 using System.Reflection;
 
-[assembly: AssemblyVersion("3.0.*")]
-//[assembly: AssemblyVersion("3.0.5482.3")]
+//[assembly: AssemblyVersion("3.0.*")]
+[assembly: AssemblyVersion("3.0.5482.4")]