diff --git a/CHANGES.md b/CHANGES.md index 70fbcb4b..2953b7d1 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -21,6 +21,16 @@ * Update Six compatibility library 1.9.0 (r400) to 1.10.0 (r405) +### 0.11.3 (2016-01-16 20:00:00 UTC) + +* Fix Search Settings display fail +* Add Audience, Channel 5 (UK), Five US, Fox Channel, FreeForm, Global, HBO Canada, Keshet, More4, Rooster Teeth, TF1, + Toon Disney, WE tv, XBox Video +* Change BET network logo +* Change provider TB icon +* Delete 3fm and redundant network logo + + ### 0.11.2 (2016-01-14 21:10:00 UTC) * Fix issue with "Add Existing Shows" on new installations diff --git a/gui/slick/css/style.css b/gui/slick/css/style.css index 26a87a79..81af0fdf 100644 --- a/gui/slick/css/style.css +++ b/gui/slick/css/style.css @@ -3577,6 +3577,7 @@ div.formpaginate{ } .step-outer{ + padding-top:10px; overflow:hidden } diff --git a/gui/slick/images/network/3fm.png b/gui/slick/images/network/3fm.png deleted file mode 100644 index fc6a9c7c..00000000 Binary files a/gui/slick/images/network/3fm.png and /dev/null differ diff --git a/gui/slick/images/network/audience network.png b/gui/slick/images/network/audience network.png new file mode 100644 index 00000000..964db674 Binary files /dev/null and b/gui/slick/images/network/audience network.png differ diff --git a/gui/slick/images/network/bet.png b/gui/slick/images/network/bet.png index 0c6341db..f2567065 100644 Binary files a/gui/slick/images/network/bet.png and b/gui/slick/images/network/bet.png differ diff --git a/gui/slick/images/network/channel 5 (uk).png b/gui/slick/images/network/channel 5 (uk).png new file mode 100644 index 00000000..33faf258 Binary files /dev/null and b/gui/slick/images/network/channel 5 (uk).png differ diff --git a/gui/slick/images/network/comedy entral old.png b/gui/slick/images/network/comedy entral old.png deleted file mode 100644 index 31bf0876..00000000 Binary files a/gui/slick/images/network/comedy entral old.png and /dev/null differ diff --git a/gui/slick/images/network/five us.png b/gui/slick/images/network/five us.png new file mode 100644 index 00000000..f582999c Binary files /dev/null and b/gui/slick/images/network/five us.png differ diff --git a/gui/slick/images/network/fox channel.png b/gui/slick/images/network/fox channel.png new file mode 100644 index 00000000..ef7f5c6b Binary files /dev/null and b/gui/slick/images/network/fox channel.png differ diff --git a/gui/slick/images/network/freeform.png b/gui/slick/images/network/freeform.png new file mode 100644 index 00000000..a61e1d18 Binary files /dev/null and b/gui/slick/images/network/freeform.png differ diff --git a/gui/slick/images/network/global.png b/gui/slick/images/network/global.png new file mode 100644 index 00000000..24d90e2c Binary files /dev/null and b/gui/slick/images/network/global.png differ diff --git a/gui/slick/images/network/hbo canada.png b/gui/slick/images/network/hbo canada.png new file mode 100644 index 00000000..0f5ddb1a Binary files /dev/null and b/gui/slick/images/network/hbo canada.png differ diff --git a/gui/slick/images/network/more4.png b/gui/slick/images/network/more4.png new file mode 100644 index 00000000..9177f9e2 Binary files /dev/null and b/gui/slick/images/network/more4.png differ diff --git a/gui/slick/images/network/rooster teeth.png b/gui/slick/images/network/rooster teeth.png new file mode 100644 index 00000000..f9cdecf7 Binary files /dev/null and b/gui/slick/images/network/rooster teeth.png differ diff --git a/gui/slick/images/network/tf1.png b/gui/slick/images/network/tf1.png new file mode 100644 index 00000000..79a98d65 Binary files /dev/null and b/gui/slick/images/network/tf1.png differ diff --git a/gui/slick/images/network/toon disney.png b/gui/slick/images/network/toon disney.png new file mode 100644 index 00000000..696ad7d5 Binary files /dev/null and b/gui/slick/images/network/toon disney.png differ diff --git a/gui/slick/images/network/we tv.png b/gui/slick/images/network/we tv.png new file mode 100644 index 00000000..cdb65c75 Binary files /dev/null and b/gui/slick/images/network/we tv.png differ diff --git a/gui/slick/images/network/xbox video.png b/gui/slick/images/network/xbox video.png new file mode 100644 index 00000000..7d1c23d7 Binary files /dev/null and b/gui/slick/images/network/xbox video.png differ diff --git a/gui/slick/images/network/קשת.png b/gui/slick/images/network/קשת.png new file mode 100644 index 00000000..04d96130 Binary files /dev/null and b/gui/slick/images/network/קשת.png differ diff --git a/gui/slick/images/providers/torrentbytes.png b/gui/slick/images/providers/torrentbytes.png index d9138065..98ff9d7a 100644 Binary files a/gui/slick/images/providers/torrentbytes.png and b/gui/slick/images/providers/torrentbytes.png differ diff --git a/sickbeard/webserve.py b/sickbeard/webserve.py index 27e9d6b6..5248d58d 100644 --- a/sickbeard/webserve.py +++ b/sickbeard/webserve.py @@ -4066,10 +4066,12 @@ class ConfigSearch(Config): t = PageTemplate(headers=self.request.headers, file='config_search.tmpl') t.submenu = self.ConfigMenu t.using_rls_ignore_words = [(show.indexerid, show.name) - for show in sickbeard.showList if show.rls_ignore_words.strip()] + for show in sickbeard.showList if show.rls_ignore_words and + show.rls_ignore_words.strip()] t.using_rls_ignore_words.sort(lambda x, y: cmp(x[1], y[1]), reverse=False) t.using_rls_require_words = [(show.indexerid, show.name) - for show in sickbeard.showList if show.rls_require_words.strip()] + for show in sickbeard.showList if show.rls_require_words and + show.rls_require_words.strip()] t.using_rls_require_words.sort(lambda x, y: cmp(x[1], y[1]), reverse=False) return t.respond()