diff options
| author | LukePulverenti <luke.pulverenti@gmail.com> | 2013-03-02 21:47:11 -0500 |
|---|---|---|
| committer | LukePulverenti <luke.pulverenti@gmail.com> | 2013-03-02 21:47:11 -0500 |
| commit | 7fb62b0a2fa818574e44415958b2aab6d523160f (patch) | |
| tree | 50570957282adf027c04d22c09406a676d2cff2e | |
| parent | 0ea90ef7c62dcdbc68fb250b1066340401c9d450 (diff) | |
| parent | 6103669ca028b5cb038c0e2aaad9d2620c2892db (diff) | |
Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser
| -rw-r--r-- | MediaBrowser.Common.Implementations/ScheduledTasks/Tasks/SystemUpdateTask.cs | 11 | ||||
| -rw-r--r-- | MediaBrowser.WebDashboard/Html/css/images/iossplash.png | bin | 22198 -> 10280 bytes | |||
| -rw-r--r-- | MediaBrowser.WebDashboard/Html/css/images/mblogoicon.png | bin | 99074 -> 47242 bytes | |||
| -rw-r--r-- | MediaBrowser.WebDashboard/Html/css/images/touchicon.png | bin | 8263 -> 4683 bytes | |||
| -rw-r--r-- | MediaBrowser.WebDashboard/Html/css/images/touchicon114.png | bin | 15830 -> 6840 bytes | |||
| -rw-r--r-- | MediaBrowser.WebDashboard/Html/css/images/touchicon72.png | bin | 10083 -> 5249 bytes |
6 files changed, 5 insertions, 6 deletions
diff --git a/MediaBrowser.Common.Implementations/ScheduledTasks/Tasks/SystemUpdateTask.cs b/MediaBrowser.Common.Implementations/ScheduledTasks/Tasks/SystemUpdateTask.cs index e6436639e..0091e14c0 100644 --- a/MediaBrowser.Common.Implementations/ScheduledTasks/Tasks/SystemUpdateTask.cs +++ b/MediaBrowser.Common.Implementations/ScheduledTasks/Tasks/SystemUpdateTask.cs @@ -80,12 +80,11 @@ namespace MediaBrowser.Common.Implementations.ScheduledTasks.Tasks progress.Report(10); - //>>> FOR TESTING - //if (!updateInfo.IsUpdateAvailable) - //{ - // progress.Report(100); - // return; - //} + if (!updateInfo.IsUpdateAvailable) + { + progress.Report(100); + return; + } cancellationToken.ThrowIfCancellationRequested(); diff --git a/MediaBrowser.WebDashboard/Html/css/images/iossplash.png b/MediaBrowser.WebDashboard/Html/css/images/iossplash.png Binary files differindex 6467ebe7d..981277891 100644 --- a/MediaBrowser.WebDashboard/Html/css/images/iossplash.png +++ b/MediaBrowser.WebDashboard/Html/css/images/iossplash.png diff --git a/MediaBrowser.WebDashboard/Html/css/images/mblogoicon.png b/MediaBrowser.WebDashboard/Html/css/images/mblogoicon.png Binary files differindex 058d09ee5..95c49e437 100644 --- a/MediaBrowser.WebDashboard/Html/css/images/mblogoicon.png +++ b/MediaBrowser.WebDashboard/Html/css/images/mblogoicon.png diff --git a/MediaBrowser.WebDashboard/Html/css/images/touchicon.png b/MediaBrowser.WebDashboard/Html/css/images/touchicon.png Binary files differindex c476cbb35..3aca7a4d3 100644 --- a/MediaBrowser.WebDashboard/Html/css/images/touchicon.png +++ b/MediaBrowser.WebDashboard/Html/css/images/touchicon.png diff --git a/MediaBrowser.WebDashboard/Html/css/images/touchicon114.png b/MediaBrowser.WebDashboard/Html/css/images/touchicon114.png Binary files differindex 7099b5970..f18e9f05a 100644 --- a/MediaBrowser.WebDashboard/Html/css/images/touchicon114.png +++ b/MediaBrowser.WebDashboard/Html/css/images/touchicon114.png diff --git a/MediaBrowser.WebDashboard/Html/css/images/touchicon72.png b/MediaBrowser.WebDashboard/Html/css/images/touchicon72.png Binary files differindex 680203270..4987cb905 100644 --- a/MediaBrowser.WebDashboard/Html/css/images/touchicon72.png +++ b/MediaBrowser.WebDashboard/Html/css/images/touchicon72.png |
