diff --git a/src/UI/Cells/RelativeDateCell.js b/src/UI/Cells/RelativeDateCell.js index 0b4ac1774..eb69fc855 100644 --- a/src/UI/Cells/RelativeDateCell.js +++ b/src/UI/Cells/RelativeDateCell.js @@ -12,7 +12,7 @@ module.exports = NzbDroneCell.extend({ if (dateStr) { var date = moment(dateStr); - var diff = date.diff(moment().utcOffset() == - moment.tz.zone()).startOf('day'), 'days', true); + var diff = date.diff(moment().zone(date.zone()).startOf('day'), 'days', true); var result = '{1}'; var tooltip = date.format(UiSettings.longDateTime()); var text; diff --git a/src/UI/Commands/CommandController.js b/src/UI/Commands/CommandController.js index ea301e32f..8ca7157da 100644 --- a/src/UI/Commands/CommandController.js +++ b/src/UI/Commands/CommandController.js @@ -20,7 +20,7 @@ var singleton = function() { var attr = _.extend({ name : name.toLocaleLowerCase() }, properties); var commandModel = new CommandModel(attr); - if (this._lastCommand.command && this._lastCommand.command.isSameCommand(attr) && moment().add(-5, 'seconds').isBefore(this._lastCommand.time)) { + if (this._lastCommand.command && this._lastCommand.command.isSameCommand(attr) && moment().add('seconds', -5).isBefore(this._lastCommand.time)) { Messenger.show({ message : 'Please wait at least 5 seconds before running this command again', diff --git a/src/UI/Content/Images/background/logo.png b/src/UI/Content/Images/background/logo.png index 93d561017..4e7413243 100644 Binary files a/src/UI/Content/Images/background/logo.png and b/src/UI/Content/Images/background/logo.png differ diff --git a/src/UI/Content/Images/favicon/apple-touch-icon-57x57.png b/src/UI/Content/Images/favicon/apple-touch-icon-57x57.png index 26d9ba05c..5ff76e55d 100644 Binary files a/src/UI/Content/Images/favicon/apple-touch-icon-57x57.png and b/src/UI/Content/Images/favicon/apple-touch-icon-57x57.png differ diff --git a/src/UI/Content/Images/favicon/apple-touch-icon-60x60.png b/src/UI/Content/Images/favicon/apple-touch-icon-60x60.png index b7a9eee7a..3f719f619 100644 Binary files a/src/UI/Content/Images/favicon/apple-touch-icon-60x60.png and b/src/UI/Content/Images/favicon/apple-touch-icon-60x60.png differ diff --git a/src/UI/Content/Images/favicon/favicon-32x32.png b/src/UI/Content/Images/favicon/favicon-32x32.png index 49e621a19..d1311588d 100644 Binary files a/src/UI/Content/Images/favicon/favicon-32x32.png and b/src/UI/Content/Images/favicon/favicon-32x32.png differ diff --git a/src/UI/Content/Images/logos/128.png b/src/UI/Content/Images/logos/128.png index d2f4acbf6..f55ef6bf7 100644 Binary files a/src/UI/Content/Images/logos/128.png and b/src/UI/Content/Images/logos/128.png differ diff --git a/src/UI/Content/Images/logos/64.png b/src/UI/Content/Images/logos/64.png index fa33f9ee1..aa091eee8 100644 Binary files a/src/UI/Content/Images/logos/64.png and b/src/UI/Content/Images/logos/64.png differ diff --git a/src/UI/Movies/Details/SeasonLayout.js b/src/UI/Movies/Details/SeasonLayout.js index fb2d0f516..2638a2b70 100644 --- a/src/UI/Movies/Details/SeasonLayout.js +++ b/src/UI/Movies/Details/SeasonLayout.js @@ -214,8 +214,8 @@ module.exports = Marionette.Layout.extend({ }, _shouldShowEpisodes : function() { - var startDate = moment().add(-1, 'month'); - var endDate = moment().add(1, 'year'); + var startDate = moment().add('month', -1); + var endDate = moment().add('year', 1); return this.episodeCollection.some(function(episode) { var airDate = episode.get('airDateUtc'); diff --git a/src/UI/Series/Details/SeasonLayout.js b/src/UI/Series/Details/SeasonLayout.js index 0aff5423e..cf10b6fa8 100644 --- a/src/UI/Series/Details/SeasonLayout.js +++ b/src/UI/Series/Details/SeasonLayout.js @@ -214,8 +214,8 @@ module.exports = Marionette.Layout.extend({ }, _shouldShowEpisodes : function() { - var startDate = moment().add(-1, 'month'); - var endDate = moment().add(1, 'year'); + var startDate = moment().add('month', -1); + var endDate = moment().add('year', 1); return this.episodeCollection.some(function(episode) { var airDate = episode.get('airDateUtc'); diff --git a/src/UI/Shared/FormatHelpers.js b/src/UI/Shared/FormatHelpers.js index f804145a8..303f60ff6 100644 --- a/src/UI/Shared/FormatHelpers.js +++ b/src/UI/Shared/FormatHelpers.js @@ -40,7 +40,7 @@ module.exports = { return 'in ' + date.fromNow(true); } - if (date.isBefore(moment().add(-1, 'years'))) { + if (date.isBefore(moment().add('years', -1))) { return date.format(UiSettings.get('shortDateFormat')); } diff --git a/src/UI/System/Logs/Table/LogTimeCell.js b/src/UI/System/Logs/Table/LogTimeCell.js index 0e137c7ee..1adbab10e 100644 --- a/src/UI/System/Logs/Table/LogTimeCell.js +++ b/src/UI/System/Logs/Table/LogTimeCell.js @@ -9,7 +9,7 @@ module.exports = NzbDroneCell.extend({ render : function() { var dateStr = this._getValue(); var date = moment(dateStr); - var diff = date.diff(moment().utcOffset() == - moment.tz.zone()).startOf('day'), 'days', true); + var diff = date.diff(moment().zone(date.zone()).startOf('day'), 'days', true); var result = '{1}'; var tooltip = date.format(UiSettings.longDateTime(true)); var text;