Merge remote-tracking branch 'remotes/origin/develop' into beta

# Conflicts:
#	.travis.yml

.build/Gruntfile.js

@@ -87,11 +87,6 @@ module.exports = function(grunt) {
                 files: {
                     '../gui/slick/js/vender.min.js': ['./dist/bower.js']
                 }
-            },
-            core: {
-                files: {
-                    '../gui/slick/js/core.min.js': ['../gui/slick/js/core.js']
-                }
             }
         },
         sass: {

.gitignore

@@ -1,4 +1,4 @@
-#  SR User Related   #
+#  Medusa User Related   #
 ######################
 /cache/
 /Logs/
@@ -9,11 +9,12 @@ cache.db*
 config.ini*
 sickbeard.db*
 failed.db*
+*.db
 autoProcessTV.cfg
 server.crt
 server.key
 
-#  SR Test Related   #
+#  Medusa Test Related   #
 ######################
 /tests/Logs/
 /tests/cache/
@@ -71,3 +72,7 @@ lib/unrar2/UnRAR.exe
 .tox/
 .coverage
 htmlcov
+
+# Contrib #
+######################
+contrib/

.travis.yml

@@ -35,8 +35,3 @@ cache:
 after_failure:
   - cat ./Logs/sickrage.log
 
-notifications:
-  irc: "irc.freenode.net#pymedusa"
-  email:
-    on_success: change
-    on_failure: change

gui/slick/css/style.css

@@ -362,6 +362,31 @@ inc_top.mako
     background-position: -742px 0px;
 }
 
+.enable-daily-search-icon {
+    background-image: url("../images/search_daily_8x8.png")!important;
+    width: 8px;
+    height: 8px;
+    margin-top: 5px;
+    margin-right: 3px;
+}
+
+.enable-backlog-search-icon {
+    background-image: url("../images/search_backlog_8x8.png")!important;
+    width: 8px;
+    height: 8px;
+    margin-top: 5px;
+    margin-right: 3px;
+}
+
+.enable-manual-search-icon {
+    background-image: url("../images/search_manual_8x8.png")!important;
+    width: 8px;
+    height: 8px;
+    margin-top: 5px;
+    margin-right: 3px;
+}
+
+
 /* =======================================================================
 inc_bottom.mako
 ========================================================================== */
@@ -922,6 +947,10 @@ h1.title {
     border-bottom: 1px solid #888;
 }
 
+h1.title a {
+    text-decoration: none;
+}
+
 .displayspecials {
     position: relative;
     top: -24px;
@@ -1226,7 +1255,30 @@ td.col-legend {
 
 th.col-search,
 td.col-search {
-  width: 46px;
+	width: 65px;
+}
+
+td.col-date {
+	min-width: 104px;
+	text-align: center;
+	white-space: nowrap;
+}
+
+td.col-size {
+	min-width: 79px;
+	text-align: center;
+	white-space: nowrap;
+}
+
+td.col-provider {
+	min-width: 133px;
+	text-align: center;
+	white-space: nowrap;
+}
+
+td.col-group {
+	min-width: 90px;
+	text-align: center;
 }
 
 .showLegend {
@@ -2118,6 +2170,10 @@ span.true {
     /* green */
 }
 
+span.break-word {
+	word-break: break-all;
+}
+
 option.flag {
     padding-left: 35px;
     background-repeat: no-repeat;
@@ -3403,3 +3459,44 @@ input.tablesorter-filter.disabled {
 .ui-state-default, .ui-widget-content .ui-state-default, .ui-widget-header {
     font-weight: normal !important;
 }
+
+/* =======================================================================
+snatchSelection.mako
+========================================================================== */
+
+div#searchNotification {
+	display: inline-block;
+}
+
+.summaryTable tr td {
+    word-break: break-all;
+}
+
+
+/* =======================================================================
+viewLog.mako
+========================================================================== */
+
+/* Pull left in mobile resolutions */
+@media (max-width: 767px) {
+    .pull-xs-right {
+        float: right !important;
+    }
+    .pull-xs-left {
+        float: left !important;
+    }
+
+    .radio-inline.pull-xs-left  + .radio-inline.pull-xs-left ,
+    .checkbox-inline.pull-xs-left  + .checkbox-inline.pull-xs-left  {
+        margin-left: 0;
+    }
+    .radio-inline.pull-xs-left, .checkbox-inline.pull-xs-left{
+        margin-right: 10px;
+    }
+}
+
+/* Because the H1 has a margin of 20px withing the column col-sm-2 of 20px we need
+to configure the same for the columns which are used for the filter inputs.*/
+.log-filter {
+    margin-top: 20px;
+}

gui/slick/js/ajaxEpSearch.js

@@ -4,7 +4,7 @@ var qualityDownload = false;
 var selectedEpisode = '';
 PNotify.prototype.options.maxonscreen = 5;
 
-$.fn.manualSearches = [];
+$.fn.forcedSearches = [];
 
 function enableLink(el) {
     el.on('click.disabled', false);
@@ -27,7 +27,7 @@ function updateImages(data) {
         var htmlContent = '';
         //Try to get the <a> Element
         var el = $('a[id=' + ep.show + 'x' + ep.season + 'x' + ep.episode+']');
-        var img = el.children('img');
+        var img = el.children('img[data-ep-search]');
         var parent = el.parent();
         if (el) {
             var rSearchTerm = '';
@@ -48,6 +48,7 @@ function updateImages(data) {
                 img.prop('src',srRoot+'/images/' + queuedImage );
                 disableLink(el);
                 htmlContent = ep.searchstatus;
+
             } else if (ep.searchstatus.toLowerCase() === 'finished') {
                 //el=$('td#' + ep.season + 'x' + ep.episode + '.search img');
                 img.prop('title','Searching');
@@ -78,7 +79,7 @@ function updateImages(data) {
                 imageCompleteEpisodes.prop('alt','queued');
                 imageCompleteEpisodes.prop('src',srRoot+'/images/' + queuedImage );
             } else if (ep.searchstatus.toLowerCase() === 'finished') {
-                imageCompleteEpisodes.prop('title','Manual Search');
+                imageCompleteEpisodes.prop('title','Forced Search');
                 imageCompleteEpisodes.prop('alt','[search]');
                 imageCompleteEpisodes.prop('src',srRoot+'/images/' + searchImage);
                 if (ep.overview.toLowerCase() === 'snatched') {
@@ -126,12 +127,12 @@ $(document).ready(function () {
 (function(){
     $.ajaxEpSearch = {
         defaults: {
-            size:				16,
-            colorRow:         	false,
-            loadingImage:		'loading16.gif',
-            queuedImage:		'queued.png',
-            noImage:			'no16.png',
-            yesImage:			'yes16.png'
+            size: 16,
+            colorRow: false,
+            loadingImage: 'loading16.gif',
+            queuedImage: 'queued.png',
+            noImage: 'no16.png',
+            yesImage: 'yes16.png'
         }
     };
 
@@ -146,10 +147,10 @@ $(document).ready(function () {
 
             selectedEpisode = $(this);
 
-            $("#manualSearchModalFailed").modal('show');
+            $("#forcedSearchModalFailed").modal('show');
         });
 
-        function manualSearch(){
+        function forcedSearch(){
             var imageName, imageResult, htmlContent;
 
             var parent = selectedEpisode.parent();
@@ -165,21 +166,24 @@ $(document).ready(function () {
 
             var url = selectedEpisode.prop('href');
 
-            if (failedDownload === false) {
+            if (!failedDownload) {
                 url = url.replace("retryEpisode", "searchEpisode");
-            }
+            } 
 
-            url = url + "&downCurQuality=" + (qualityDownload ? '1' : '0');
+            // Only pass the down_cur_quality flag when retryEpisode() is called
+            if (qualityDownload && url.indexOf('retryEpisode') >= 0) {
+                url = url + "&down_cur_quality=1";
+            }
 
             $.getJSON(url, function(data){
 
                 // if they failed then just put the red X
                 if (data.result.toLowerCase() === 'failure') {
                     imageName = options.noImage;
                     imageResult = 'failed';
-
-                // if the snatch was successful then apply the corresponding class and fill in the row appropriately
-                } else {
+                } else { 
+                    // if the snatch was successful then apply the 
+                    // corresponding class and fill in the row appropriately
                     imageName = options.loadingImage;
                     imageResult = 'success';
                     // color the row
@@ -215,20 +219,41 @@ $(document).ready(function () {
             selectedEpisode = $(this);
 
             if ($(this).parent().parent().children(".col-status").children(".quality").length) {
-                $("#manualSearchModalQuality").modal('show');
+                $("#forcedSearchModalQuality").modal('show');
+            } else {
+                forcedSearch();
+            }
+        });
+
+         $('.epManualSearch').click(function(event){
+            event.preventDefault();
+            var performSearch = '0';
+            var showAllResults = '0';
+
+            //TODO: Omg this disables all the manual snatch icons, when one is clicked
+            if ($(this).hasClass('disabled')) {
+                return false;
+            }
+
+            $('.epManualSearch').addClass('disabled');
+            $('.epManualSearch').fadeTo(1, 0.1);
+
+            var url = this.href + '&perform_search=' + performSearch + '&show_all_results=' + showAllResults;
+            if (event.shiftKey || event.ctrlKey || event.which === 2){
+                window.open(url, '_blank');
             } else {
-                manualSearch();
+                window.location = url;
             }
         });
 
-        $('#manualSearchModalFailed .btn').click(function(){
+        $('#forcedSearchModalFailed .btn').click(function(){
             failedDownload = ($(this).text().toLowerCase() === 'yes');
-            $("#manualSearchModalQuality").modal('show');
+            $("#forcedSearchModalQuality").modal('show');
         });
 
-        $('#manualSearchModalQuality .btn').click(function(){
+        $('#forcedSearchModalQuality .btn').click(function(){
             qualityDownload = ($(this).text().toLowerCase() === 'yes');
-            manualSearch();
+            forcedSearch();
         });
     };
 })();

gui/slick/js/configProviders.js

@@ -73,7 +73,6 @@ $(document).ready(function(){
         newznabProviders[id] = newData;
 
         $('#editANewznabProvider').addOption(id, name);
-        $(this).populateNewznabSection();
 
         if ($('#provider_order_list > #'+id).length === 0 && showProvider !== false) {
             var toAdd = '<li class="ui-state-default" id="' + id + '"> <input type="checkbox" id="enable_' + id + '" class="provider_enabler" CHECKED> <a href="' + anonURL + url + '" class="imgLink" target="_new"><img src="' + srRoot + '/images/providers/newznab.png" alt="' + name + '" width="16" height="16"></a> ' + name + '</li>';