diff --git a/CHANGES.md b/CHANGES.md index 4581539..4232c8c 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,5 +1,6 @@ -### 0.x.x (2014-11-11 xx:xx:xx UTC) +### 0.x.x (2014-11-12 xx:xx:xx UTC) +* Change logos, text etc. branding to SickGear * Add Bootstrap for UI features * Change UI to resize fluidly on different display sizes, fixes the issue where top menu items would disappear on smaller screens * Add date formats "dd/mm/yy", "dd/mm/yyyy", "day, dd/mm/yy" and "day, dd/mm/yyyy" @@ -26,7 +27,7 @@ * Change move Providers Priorities qtip options to a new Search Providers/Provider Options tab * Remove superfish-1.4.8.js and supersubs-0.2b.js as they are no longer required with new UI * Change overhaul Config Search Settings in line with General Configuration -* Fix error when a show folder is deleted outside of SickRage +* Fix error when a show folder is deleted outside of SickGear * Change combine the delete button function into the remove button on the display show page * Change other small UI tweaks * Fix keyerrors on backlog overview preventing the page to load @@ -47,13 +48,13 @@ * Add handler for when Trakt returns no results for Add Show/Add Trending Show page * Fix image links when anchor child images are not found at Trakt on Add Show/Add Trending Show page * Add image to be used when Trakt posters are void on Add Show/Add Trending Show page -* Fix growl registration not sending sickrage an update notification registration +* Fix growl registration not sending SickGear an update notification registration * Add an anonymous redirect builder for external links * Update xbmc link to Kodi at Config Notifications * Fix missing url for kickasstorrents in config_providers * Fix post processing when using tvrage indexer and mediabrowser metadata generation * Change reporting failed network_timezones.txt updates from an error to a warning -* Fix missing header and "on " when network is none and Layout "Poster" with Sort By "Network" on coming episodes page. +* Fix missing header and "on " when network is none and Layout "Poster" with Sort By "Network" on coming episodes page * Change how the "local/network" setting is handled to address some issues [develop changelog] @@ -77,29 +78,23 @@ * Fix display show status and subtitle searches to use new column class names * Fix API response header for JSON content type and the return of JSONP data * Update PNotify to version [2.0.1] -* Change the notification popups to always show the close button. -* Fix issue where popups did not show if multiple tabs are used. Popups now queue and display when a tab is brought into focus. -* Fix missing HTML in notifications resulting in incorrect formatting. +* Change the notification popups to always show the close button +* Fix issue where popups did not show if multiple tabs are used. Popups now queue and display when a tab is brought into focus +* Fix missing HTML in notifications resulting in incorrect formatting ### 0.2.2 (2014-11-12 08:25:00 UTC) -[full changelog](https://github.com/SickGear/SickGear/compare/release_0.2.1...release_0.2.2) - * Change updater URLs to reflect new repository location ### 0.2.1 (2014-10-22 06:41:00 UTC) -[full changelog](https://github.com/SickGear/SickGear/compare/release_0.2.0...release_0.2.1) - * Fix HDtorrents provider screen scraping ### 0.2.0 (2014-10-21 12:36:50 UTC) -[full changelog](https://github.com/SickGear/SickGear/compare/release_0.1.0...release_0.2.0) - * Fix for failed episodes not counted in total * Fix for custom newznab providers with leading integer in name * Add checkbox to control proxying of indexers diff --git a/COPYING.txt b/COPYING.txt index d64d8b2..bfafb4d 100644 --- a/COPYING.txt +++ b/COPYING.txt @@ -652,7 +652,7 @@ Also add information on how to contact you by electronic and paper mail. If the program does terminal interaction, make it output a short notice like this when it starts in an interactive mode: - SickRage - Copyright (C) 2010 - Nic Wolfe + Sick Beard - Copyright (C) 2010 - Nic Wolfe This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. This is free software, and you are welcome to redistribute it under certain conditions; type `show c' for details. diff --git a/SickBeard.py b/SickBeard.py index d9b3c25..1624489 100755 --- a/SickBeard.py +++ b/SickBeard.py @@ -2,20 +2,20 @@ # Author: Nic Wolfe # URL: http://code.google.com/p/sickbeard/ # -# This file is part of SickRage. +# This file is part of SickGear. # -# SickRage is free software: you can redistribute it and/or modify +# SickGear is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation, either version 3 of the License, or # (at your option) any later version. # -# SickRage is distributed in the hope that it will be useful, +# SickGear is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with SickRage. If not, see . +# along with SickGear. If not, see . # Check needed software dependencies to nudge users to fix their setup from __future__ import with_statement @@ -69,7 +69,7 @@ signal.signal(signal.SIGINT, sickbeard.sig_handler) signal.signal(signal.SIGTERM, sickbeard.sig_handler) -class SickRage(object): +class SickGear(object): def __init__(self): # system event callback for shutdown/restart sickbeard.events = Events(self.shutdown) @@ -147,7 +147,7 @@ class SickRage(object): # On non-unicode builds this will raise an AttributeError, if encoding type is not valid it throws a LookupError sys.setdefaultencoding(sickbeard.SYS_ENCODING) except: - print 'Sorry, you MUST add the SickRage folder to the PYTHONPATH environment variable' + print 'Sorry, you MUST add the SickGear folder to the PYTHONPATH environment variable' print 'or find another way to force Python to use ' + sickbeard.SYS_ENCODING + ' for string encoding.' sys.exit(1) @@ -280,12 +280,12 @@ class SickRage(object): if CUR_DB_VERSION > 0: if CUR_DB_VERSION < MIN_DB_VERSION: raise SystemExit("Your database version (" + str( - CUR_DB_VERSION) + ") is too old to migrate from with this version of SickRage (" + str( + CUR_DB_VERSION) + ") is too old to migrate from with this version of SickGear (" + str( MIN_DB_VERSION) + ").\n" + \ "Upgrade using a previous version of SB first, or start with no database file to begin fresh.") if CUR_DB_VERSION > MAX_DB_VERSION: raise SystemExit("Your database version (" + str( - CUR_DB_VERSION) + ") has been incremented past what this version of SickRage supports (" + str( + CUR_DB_VERSION) + ") has been incremented past what this version of SickGear supports (" + str( MAX_DB_VERSION) + ").\n" + \ "If you have used other forks of SB, your database may be unusable due to their modifications.") @@ -350,7 +350,7 @@ class SickRage(object): os._exit(1) if self.consoleLogging: - print "Starting up SickRage " + sickbeard.BRANCH + " from " + sickbeard.CONFIG_FILE + print "Starting up SickGear " + sickbeard.BRANCH + " from " + sickbeard.CONFIG_FILE # Fire up all our threads sickbeard.start() @@ -519,7 +519,7 @@ class SickRage(object): popen_list += sickbeard.MY_ARGS if '--nolaunch' not in popen_list: popen_list += ['--nolaunch'] - logger.log(u"Restarting SickRage with " + str(popen_list)) + logger.log(u"Restarting SickGear with " + str(popen_list)) logger.close() subprocess.Popen(popen_list, cwd=os.getcwd()) @@ -531,5 +531,5 @@ if __name__ == "__main__": if sys.hexversion >= 0x020600F0: freeze_support() - # start sickrage - SickRage().start() + # start SickGear + SickGear().start() diff --git a/autoProcessTV/autoProcessTV.py b/autoProcessTV/autoProcessTV.py index e02ead4..0092f9c 100755 --- a/autoProcessTV/autoProcessTV.py +++ b/autoProcessTV/autoProcessTV.py @@ -3,20 +3,20 @@ # Author: Nic Wolfe # URL: http://code.google.com/p/sickbeard/ # -# This file is part of SickRage. +# This file is part of SickGear. # -# SickRage is free software: you can redistribute it and/or modify +# SickGear is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation, either version 3 of the License, or # (at your option) any later version. # -# SickRage is distributed in the hope that it will be useful, +# SickGear is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with SickRage. If not, see . +# along with SickGear. If not, see . from __future__ import with_statement diff --git a/autoProcessTV/hellaToSickBeard.py b/autoProcessTV/hellaToSickBeard.py index 4458cb8..f3d64bd 100755 --- a/autoProcessTV/hellaToSickBeard.py +++ b/autoProcessTV/hellaToSickBeard.py @@ -3,20 +3,20 @@ # Author: Nic Wolfe # URL: http://code.google.com/p/sickbeard/ # -# This file is part of SickRage. +# This file is part of SickGear. # -# SickRage is free software: you can redistribute it and/or modify +# SickGear is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation, either version 3 of the License, or # (at your option) any later version. # -# SickRage is distributed in the hope that it will be useful, +# SickGear is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with SickRage. If not, see . +# along with SickGear. If not, see . import sys diff --git a/autoProcessTV/sabToSickBeard.py b/autoProcessTV/sabToSickBeard.py index 5e4b852..2e5b69e 100755 --- a/autoProcessTV/sabToSickBeard.py +++ b/autoProcessTV/sabToSickBeard.py @@ -3,20 +3,20 @@ # Author: Nic Wolfe # URL: http://code.google.com/p/sickbeard/ # -# This file is part of SickRage. +# This file is part of SickGear. # -# SickRage is free software: you can redistribute it and/or modify +# SickGear is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation, either version 3 of the License, or # (at your option) any later version. # -# SickRage is distributed in the hope that it will be useful, +# SickGear is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with SickRage. If not, see . +# along with SickGear. If not, see . import sys diff --git a/contributing.md b/contributing.md index 84395cd..51be915 100644 --- a/contributing.md +++ b/contributing.md @@ -1,8 +1,8 @@ -### Questions about SickRage? +### Questions about SickGear? -To get your questions answered, please ask in the [SickRage Forum], on IRC \#sickrage pn freenode.net, or webchat. +To get your questions answered, please ask in the [SickGear Forum], on IRC \#SickGear pn freenode.net, or webchat. -# Contributing to SickRage +# Contributing to SickGear 1. [Getting Involved](#getting-involved) 2. [How To Report Bugs](#how-to-report-bugs) @@ -11,30 +11,30 @@ To get your questions answered, please ask in the [SickRage Forum], on IRC \#sic ## Getting Involved -There are a number of ways to get involved with the development of SickRage. Even if you've never contributed code to an Open Source project before, we're always looking for help identifying bugs, cleaning up code, writing documentation and testing. +There are a number of ways to get involved with the development of SickGear. Even if you've never contributed code to an Open Source project before, we're always looking for help identifying bugs, cleaning up code, writing documentation and testing. -The goal of this guide is to provide the best way to contribute to the official SickRage repository. Please read through the full guide detailing [How to Report Bugs](#how-to-report-bugs). +The goal of this guide is to provide the best way to contribute to the official SickGear repository. Please read through the full guide detailing [How to Report Bugs](#how-to-report-bugs). ## Discussion -### Forum and IRC +### Issues and IRC -The SickRage development team frequently tracks posts on the [SickRage Forum](http://sickrage.tv/). If you have longer posts or questions please feel free to post them there. If you think you've found a bug please [file it in the bug tracker](#how-to-report-bugs). +If you think you've found a bug please [file it in the bug tracker](#how-to-report-bugs). -Additionally most of the SickRage development team can be found in the [#sickrage](http://webchat.freenode.net/?channels=sickrage) IRC channel on irc.freenode.net. +Additionally most of the SickGear development team can be found in the [#SickGear](http://webchat.freenode.net/?channels=SickGear) IRC channel on irc.freenode.net. ## How to Report Bugs -### Make sure it is a SickRage bug +### Make sure it is a SickGear bug Many bugs reported are actually issues with the user mis-understanding of how something works (there are a bit of moving parts to an ideal setup) and most of the time can be fixed by just changing some settings to fit the users needs. -If you are new to SickRage, it is usually a much better idea to ask for help first in the [Using SickRage Forum](http://sickrage.tv) or the [SickRage IRC channel](http://webchat.freenode.net/?channels=sickrage). You will get much quicker support, and you will help avoid tying up the SickRage team with invalid bug reports. +If you are new to SickGear, it is usually a much better idea to ask for help first in the [SickGear IRC channel](http://webchat.freenode.net/?channels=SickGear). You will get much quicker support, and you will help avoid tying up the SickGear team with invalid bug reports. -### Try the latest version of SickRage +### Try the latest version of SickGear -Bugs in old versions of SickRage may have already been fixed. In order to avoid reporting known issues, make sure you are always testing against the latest build/source. Also, we put new code in the `dev` branch first before pushing down to the `master` branch (which is what the binary builds are built off of). +Bugs in old versions of SickGear may have already been fixed. In order to avoid reporting known issues, make sure you are always testing against the latest build/source. Also, we put new code in the `dev` branch first before pushing down to the `master` branch (which is what the binary builds are built off of). ## Tips For Submitting Code @@ -51,14 +51,14 @@ Please follow these guidelines before reporting a bug: 1. **Update to the latest version** — Check if you can reproduce the issue with the latest version from the `dev` branch. -2. **Use the SickRage Forums search** — check if the issue has already been reported. If it has been, please comment on the existing issue. +2. **Use the SickGear Forums search** — check if the issue has already been reported. If it has been, please comment on the existing issue. -3. **Provide a means to reproduce the problem** — Please provide as much details as possible, e.g. SickRage log files (obfuscate apikey/passwords), browser and operating system versions, how you started SickRage, and of course the steps to reproduce the problem. Bugs are always reported in the forums. +3. **Provide a means to reproduce the problem** — Please provide as much details as possible, e.g. SickGear log files (obfuscate apikey/passwords), browser and operating system versions, how you started SickGear, and of course the steps to reproduce the problem. Bugs are always reported in the forums. ### Feature requests -Please follow the bug guidelines above for feature requests, i.e. update to the latest version and search for existing issues before posting a new request. You can submit Feature Requests in the [SickRage Forum] as well. +Please follow the bug guidelines above for feature requests, i.e. update to the latest version and search for existing issues before posting a new request. You can submit Feature Requests in the [SickGear Forum] as well. ### Pull requests @@ -85,9 +85,9 @@ Please follow this process; it's the best way to get your work included in the p ```bash # clone your fork of the repo into the current directory in terminal - git clone git@github.com:/SickRage.git + git clone git@github.com:/SickGear.git # navigate to the newly cloned directory - cd SickRage + cd SickGear # assign the original repo to a remote called "upstream" git remote add upstream https://github.com/SickGear/SickGear.git ``` diff --git a/gui/slick/css/browserconfig.xml b/gui/slick/css/browserconfig.xml index 068581e..821a2ae 100644 --- a/gui/slick/css/browserconfig.xml +++ b/gui/slick/css/browserconfig.xml @@ -2,10 +2,11 @@ - - - - #FFFFFF + + + + + #2b5797 \ No newline at end of file diff --git a/gui/slick/css/dark.css b/gui/slick/css/dark.css index 97fa083..594333c 100644 --- a/gui/slick/css/dark.css +++ b/gui/slick/css/dark.css @@ -167,12 +167,16 @@ inc_top.tmpl background-image: url("../images/menu/menu-icons-white.png"); } -[class^="icon16-"], +.infoTableHeader .icon16-sb { + background: url("../images/ico/favicon-16x16.png") 0 0 no-repeat; +} + +[class^="icon16-"], [class*=" icon16-"] { background-image: url("../images/glyphicons-config.png"); } -.ui-autocomplete-loading { +.ui-autocomplete-loading { background: white url("../images/loading16.gif") right center no-repeat; } diff --git a/gui/slick/css/light.css b/gui/slick/css/light.css index 666b6ea..e2cc2b7 100644 --- a/gui/slick/css/light.css +++ b/gui/slick/css/light.css @@ -1549,6 +1549,10 @@ select .selected { border-top: 1px dotted #666666; } +.infoTableHeader .icon16-sb { + background: url("../images/ico/favicon-16x16.png") 0 0 no-repeat; +} + [class^="icon16-"], [class*=" icon16-"] { background-image: url("../images/glyphicons-config-black.png"); background-position: -40px 0; diff --git a/gui/slick/images/banner.png b/gui/slick/images/banner.png index 8ae6c94..fae4d25 100644 Binary files a/gui/slick/images/banner.png and b/gui/slick/images/banner.png differ diff --git a/gui/slick/images/ico/apple-touch-icon-114x114.png b/gui/slick/images/ico/apple-touch-icon-114x114.png new file mode 100644 index 0000000..4e11db5 Binary files /dev/null and b/gui/slick/images/ico/apple-touch-icon-114x114.png differ diff --git a/gui/slick/images/ico/apple-touch-icon-120x120.png b/gui/slick/images/ico/apple-touch-icon-120x120.png new file mode 100644 index 0000000..86824fe Binary files /dev/null and b/gui/slick/images/ico/apple-touch-icon-120x120.png differ diff --git a/gui/slick/images/ico/apple-touch-icon-144x144.png b/gui/slick/images/ico/apple-touch-icon-144x144.png new file mode 100644 index 0000000..3997984 Binary files /dev/null and b/gui/slick/images/ico/apple-touch-icon-144x144.png differ diff --git a/gui/slick/images/ico/apple-touch-icon-152x152.png b/gui/slick/images/ico/apple-touch-icon-152x152.png new file mode 100644 index 0000000..e557bb1 Binary files /dev/null and b/gui/slick/images/ico/apple-touch-icon-152x152.png differ diff --git a/gui/slick/images/ico/apple-touch-icon-180x180.png b/gui/slick/images/ico/apple-touch-icon-180x180.png new file mode 100644 index 0000000..4ccac45 Binary files /dev/null and b/gui/slick/images/ico/apple-touch-icon-180x180.png differ diff --git a/gui/slick/images/ico/apple-touch-icon-57x57.png b/gui/slick/images/ico/apple-touch-icon-57x57.png new file mode 100644 index 0000000..7e42369 Binary files /dev/null and b/gui/slick/images/ico/apple-touch-icon-57x57.png differ diff --git a/gui/slick/images/ico/apple-touch-icon-60x60.png b/gui/slick/images/ico/apple-touch-icon-60x60.png new file mode 100644 index 0000000..752175b Binary files /dev/null and b/gui/slick/images/ico/apple-touch-icon-60x60.png differ diff --git a/gui/slick/images/ico/apple-touch-icon-72x72.png b/gui/slick/images/ico/apple-touch-icon-72x72.png new file mode 100644 index 0000000..e13145f Binary files /dev/null and b/gui/slick/images/ico/apple-touch-icon-72x72.png differ diff --git a/gui/slick/images/ico/apple-touch-icon-76x76.png b/gui/slick/images/ico/apple-touch-icon-76x76.png new file mode 100644 index 0000000..edf1550 Binary files /dev/null and b/gui/slick/images/ico/apple-touch-icon-76x76.png differ diff --git a/gui/slick/images/ico/apple-touch-icon-precomposed.png b/gui/slick/images/ico/apple-touch-icon-precomposed.png new file mode 100644 index 0000000..bb5e157 Binary files /dev/null and b/gui/slick/images/ico/apple-touch-icon-precomposed.png differ diff --git a/gui/slick/images/ico/apple-touch-icon.png b/gui/slick/images/ico/apple-touch-icon.png new file mode 100644 index 0000000..4ccac45 Binary files /dev/null and b/gui/slick/images/ico/apple-touch-icon.png differ diff --git a/gui/slick/images/ico/favicon-114.png b/gui/slick/images/ico/favicon-114.png deleted file mode 100644 index daa7f23..0000000 Binary files a/gui/slick/images/ico/favicon-114.png and /dev/null differ diff --git a/gui/slick/images/ico/favicon-120.png b/gui/slick/images/ico/favicon-120.png deleted file mode 100644 index 0271be0..0000000 Binary files a/gui/slick/images/ico/favicon-120.png and /dev/null differ diff --git a/gui/slick/images/ico/favicon-144.png b/gui/slick/images/ico/favicon-144.png deleted file mode 100644 index d2da269..0000000 Binary files a/gui/slick/images/ico/favicon-144.png and /dev/null differ diff --git a/gui/slick/images/ico/favicon-150.png b/gui/slick/images/ico/favicon-150.png deleted file mode 100644 index 19102c3..0000000 Binary files a/gui/slick/images/ico/favicon-150.png and /dev/null differ diff --git a/gui/slick/images/ico/favicon-152.png b/gui/slick/images/ico/favicon-152.png deleted file mode 100644 index 8295ea5..0000000 Binary files a/gui/slick/images/ico/favicon-152.png and /dev/null differ diff --git a/gui/slick/images/ico/favicon-16.png b/gui/slick/images/ico/favicon-16.png deleted file mode 100644 index f7e20e9..0000000 Binary files a/gui/slick/images/ico/favicon-16.png and /dev/null differ diff --git a/gui/slick/images/ico/favicon-160.png b/gui/slick/images/ico/favicon-160.png deleted file mode 100644 index 0ccfa33..0000000 Binary files a/gui/slick/images/ico/favicon-160.png and /dev/null differ diff --git a/gui/slick/images/ico/favicon-160x160.png b/gui/slick/images/ico/favicon-160x160.png new file mode 100644 index 0000000..4db7889 Binary files /dev/null and b/gui/slick/images/ico/favicon-160x160.png differ diff --git a/gui/slick/images/ico/favicon-16x16.png b/gui/slick/images/ico/favicon-16x16.png new file mode 100644 index 0000000..49e1c40 Binary files /dev/null and b/gui/slick/images/ico/favicon-16x16.png differ diff --git a/gui/slick/images/ico/favicon-192x192.png b/gui/slick/images/ico/favicon-192x192.png new file mode 100644 index 0000000..95b9f62 Binary files /dev/null and b/gui/slick/images/ico/favicon-192x192.png differ diff --git a/gui/slick/images/ico/favicon-196.png b/gui/slick/images/ico/favicon-196.png deleted file mode 100644 index 6461a9b..0000000 Binary files a/gui/slick/images/ico/favicon-196.png and /dev/null differ diff --git a/gui/slick/images/ico/favicon-310.png b/gui/slick/images/ico/favicon-310.png deleted file mode 100644 index 6166a4f..0000000 Binary files a/gui/slick/images/ico/favicon-310.png and /dev/null differ diff --git a/gui/slick/images/ico/favicon-32.png b/gui/slick/images/ico/favicon-32.png deleted file mode 100644 index 4e37575..0000000 Binary files a/gui/slick/images/ico/favicon-32.png and /dev/null differ diff --git a/gui/slick/images/ico/favicon-32x32.png b/gui/slick/images/ico/favicon-32x32.png new file mode 100644 index 0000000..e2b2cbd Binary files /dev/null and b/gui/slick/images/ico/favicon-32x32.png differ diff --git a/gui/slick/images/ico/favicon-57.png b/gui/slick/images/ico/favicon-57.png deleted file mode 100644 index 64abfa5..0000000 Binary files a/gui/slick/images/ico/favicon-57.png and /dev/null differ diff --git a/gui/slick/images/ico/favicon-64.png b/gui/slick/images/ico/favicon-64.png deleted file mode 100644 index 2b6771e..0000000 Binary files a/gui/slick/images/ico/favicon-64.png and /dev/null differ diff --git a/gui/slick/images/ico/favicon-70.png b/gui/slick/images/ico/favicon-70.png deleted file mode 100644 index 2c5bc04..0000000 Binary files a/gui/slick/images/ico/favicon-70.png and /dev/null differ diff --git a/gui/slick/images/ico/favicon-72.png b/gui/slick/images/ico/favicon-72.png deleted file mode 100644 index 50d1fc2..0000000 Binary files a/gui/slick/images/ico/favicon-72.png and /dev/null differ diff --git a/gui/slick/images/ico/favicon-76.png b/gui/slick/images/ico/favicon-76.png deleted file mode 100644 index bb44fce..0000000 Binary files a/gui/slick/images/ico/favicon-76.png and /dev/null differ diff --git a/gui/slick/images/ico/favicon-96.png b/gui/slick/images/ico/favicon-96.png deleted file mode 100644 index 827794c..0000000 Binary files a/gui/slick/images/ico/favicon-96.png and /dev/null differ diff --git a/gui/slick/images/ico/favicon-96x96.png b/gui/slick/images/ico/favicon-96x96.png new file mode 100644 index 0000000..865fedf Binary files /dev/null and b/gui/slick/images/ico/favicon-96x96.png differ diff --git a/gui/slick/images/ico/favicon.ico b/gui/slick/images/ico/favicon.ico index 277e9f8..3d4540f 100644 Binary files a/gui/slick/images/ico/favicon.ico and b/gui/slick/images/ico/favicon.ico differ diff --git a/gui/slick/images/ico/mstile-144x144.png b/gui/slick/images/ico/mstile-144x144.png new file mode 100644 index 0000000..4e26caa Binary files /dev/null and b/gui/slick/images/ico/mstile-144x144.png differ diff --git a/gui/slick/images/ico/mstile-150x150.png b/gui/slick/images/ico/mstile-150x150.png new file mode 100644 index 0000000..d76ffe2 Binary files /dev/null and b/gui/slick/images/ico/mstile-150x150.png differ diff --git a/gui/slick/images/ico/mstile-310x150.png b/gui/slick/images/ico/mstile-310x150.png new file mode 100644 index 0000000..6003c35 Binary files /dev/null and b/gui/slick/images/ico/mstile-310x150.png differ diff --git a/gui/slick/images/ico/mstile-310x310.png b/gui/slick/images/ico/mstile-310x310.png new file mode 100644 index 0000000..85a087f Binary files /dev/null and b/gui/slick/images/ico/mstile-310x310.png differ diff --git a/gui/slick/images/ico/mstile-70x70.png b/gui/slick/images/ico/mstile-70x70.png new file mode 100644 index 0000000..6fba571 Binary files /dev/null and b/gui/slick/images/ico/mstile-70x70.png differ diff --git a/gui/slick/images/poster.png b/gui/slick/images/poster.png index 906fb56..5f213b3 100644 Binary files a/gui/slick/images/poster.png and b/gui/slick/images/poster.png differ diff --git a/gui/slick/images/sickgear.png b/gui/slick/images/sickgear.png new file mode 100644 index 0000000..f6bd86e Binary files /dev/null and b/gui/slick/images/sickgear.png differ diff --git a/gui/slick/images/sickrage-shark-mascot.png b/gui/slick/images/sickrage-shark-mascot.png deleted file mode 100644 index af5337f..0000000 Binary files a/gui/slick/images/sickrage-shark-mascot.png and /dev/null differ diff --git a/gui/slick/images/sickrage.png b/gui/slick/images/sickrage.png deleted file mode 100644 index f531944..0000000 Binary files a/gui/slick/images/sickrage.png and /dev/null differ diff --git a/gui/slick/interfaces/default/config.tmpl b/gui/slick/interfaces/default/config.tmpl index af549e7..b1651ab 100644 --- a/gui/slick/interfaces/default/config.tmpl +++ b/gui/slick/interfaces/default/config.tmpl @@ -45,10 +45,9 @@ SR Arguments:$sickbeard.MY_ARGS SR Web Root:$sickbeard.WEB_ROOT Python Version:$sys.version[:120] - Homepagehttp://www.sickrage.tv/ - Forumshttp://sickrage.tv/forums/ - Sourcehttps://github.com/SickragePVR/SickRage/ - Internet Relay Chat#sickrage on irc.freenode.net + Homepagehttps://github.com/SickGear/SickGear/wiki + Sourcehttps://github.com/SickGear/SickGear/ + Internet Relay Chat#SickGear on irc.freenode.net diff --git a/gui/slick/interfaces/default/config_general.tmpl b/gui/slick/interfaces/default/config_general.tmpl index 7c3cd17..074e09a 100644 --- a/gui/slick/interfaces/default/config_general.tmpl +++ b/gui/slick/interfaces/default/config_general.tmpl @@ -58,7 +58,7 @@ Launch browser -

open the SickRage home page on startup

+

open the SickGear home page on startup

 @@ -180,7 +180,7 @@ Notify on software update -

send a message to all enabled notifiers when SickRage has been updated

+

send a message to all enabled notifiers when SickGear has been updated

 @@ -311,7 +311,7 @@

Web Interface

-

It is recommended that you enable a username and password to secure SickRage from being tampered with remotely.

+

It is recommended that you enable a username and password to secure SickGear from being tampered with remotely.

These options require a manual restart to take effect.

@@ -322,7 +322,7 @@ Enable API -

allow the use of the SickRage API

+

allow the use of the SickGear API

 @@ -333,7 +333,7 @@ -

used to give 3rd party programs limited access to SickRage

+

used to give 3rd party programs limited access to SickGear

 @@ -373,7 +373,7 @@ HTTP port -

web port to browse and access SickRage (default:8081)

+

web port to browse and access SickGear (default:8081)

 diff --git a/gui/slick/interfaces/default/config_notifications.tmpl b/gui/slick/interfaces/default/config_notifications.tmpl index acbf68b..750ae36 100644 --- a/gui/slick/interfaces/default/config_notifications.tmpl +++ b/gui/slick/interfaces/default/config_notifications.tmpl @@ -42,7 +42,7 @@ Enable -

should SickRage send XBMC commands ?

+

should SickGear send XBMC commands ?

@@ -168,7 +168,7 @@ Enable -

should SickRage send Plex commands ?

+

should SickGear send Plex commands ?

 @@ -275,7 +275,7 @@ Enable -

should SickRage send update commands to NMJ ?

+

should SickGear send update commands to NMJ ?

 @@ -341,7 +341,7 @@ Enable -

should SickRage send update commands to NMJv2 ?

+

should SickGear send update commands to NMJv2 ?

 @@ -431,12 +431,12 @@ Enable -

should SickRage send Synology notifications ?

+

should SickGear send Synology notifications ?

 @@ -461,12 +461,12 @@ Enable -

should SickRage send notifications to the Synology Notifier ?

+

should SickGear send notifications to the Synology Notifier ?
@@ -515,7 +515,7 @@ Enable -

should SickRage send notifications to pyTivo ?

+

should SickGear send notifications to pyTivo ?
@@ -627,7 +627,7 @@ @@ -711,7 +711,7 @@
Click below to test.
@@ -735,7 +735,7 @@ Enable -

should SickRage send Libnotify notifications ?

+

should SickGear send Libnotify notifications ?

 @@ -780,7 +780,7 @@
-

Pushover

+

Pushover

Pushover makes it easy to send real-time notifications to your Android and iOS devices.

@@ -789,7 +789,7 @@ Enable -

should SickRage send Pushover notifications ?

+

should SickGear send Pushover notifications ?
@@ -839,7 +839,7 @@
Click below to test.
@@ -862,7 +862,7 @@ Enable -

should SickRage send Boxcar notifications ?

+

should SickGear send Boxcar notifications ?

 @@ -925,7 +925,7 @@ Enable -

should SickRage send Boxcar2 notifications ?

+

should SickGear send Boxcar2 notifications ?

 @@ -988,7 +988,7 @@ Enable -

should SickRage send NMA notifications ?

+

should SickGear send NMA notifications ?

 @@ -1044,7 +1044,7 @@
Click below to test.
@@ -1067,7 +1067,7 @@ Enable -

should SickRage send Pushalot notifications ? +

should SickGear send Pushalot notifications ? @@ -1130,7 +1130,7 @@ Enable -

should SickRage send Pushbullet notifications ?

+

should SickGear send Pushbullet notifications ?

 @@ -1208,7 +1208,7 @@ Enable -

should SickRage post tweets on Twitter ?

+

should SickGear post tweets on Twitter ?

 @@ -1345,7 +1345,7 @@ Sync libraries: -

sync your SickRage show library with your trakt show library.

+

sync your SickGear show library with your trakt show library.

 @@ -1420,7 +1420,7 @@ Enable -

should SickRage send email notifications ?

+

should SickGear send email notifications ?

 diff --git a/gui/slick/interfaces/default/config_postProcessing.tmpl b/gui/slick/interfaces/default/config_postProcessing.tmpl index 43c0015..c9199aa 100644 --- a/gui/slick/interfaces/default/config_postProcessing.tmpl +++ b/gui/slick/interfaces/default/config_postProcessing.tmpl @@ -38,7 +38,7 @@

Post-Processing

-

Settings that dictate how SickRage should process completed downloads.

+

Settings that dictate how SickGear should process completed downloads.

@@ -57,7 +57,7 @@ @@ -91,7 +91,7 @@
@@ -105,7 +105,7 @@
@@ -228,7 +228,7 @@

Episode Naming

-

How SickRage will name and sort your episodes.

+

How SickGear will name and sort your episodes.

@@ -371,7 +371,7 @@ Show.Name.S02E03.HDTV.XviD-RLSGROUP - Release Group: + Release Group: %RG RLSGROUP @@ -579,7 +579,7 @@ Show.Name.2010.03.09.HDTV.XviD-RLSGROUP - Release Group: + Release Group: %RG RLSGROUP @@ -756,7 +756,7 @@ Show.Name.9th.Mar.2011.HDTV.XviD-RLSGROUP - Release Group: + Release Group: %RG RLSGROUP @@ -929,7 +929,7 @@ Show.Name.S02E03.HDTV.XviD-RLSGROUP - Release Group: + Release Group: %RG RLSGROUP diff --git a/gui/slick/interfaces/default/config_providers.tmpl b/gui/slick/interfaces/default/config_providers.tmpl index bf1074c..f97624e 100644 --- a/gui/slick/interfaces/default/config_providers.tmpl +++ b/gui/slick/interfaces/default/config_providers.tmpl @@ -392,7 +392,7 @@ var show_nzb_providers = #if $sickbeard.USE_NZBS then "true" else "false"#; diff --git a/gui/slick/interfaces/default/config_search.tmpl b/gui/slick/interfaces/default/config_search.tmpl index a023041..c1115ea 100755 --- a/gui/slick/interfaces/default/config_search.tmpl +++ b/gui/slick/interfaces/default/config_search.tmpl @@ -143,7 +143,7 @@ Daily search on startup /> -

start daily search on startup of SickRage

+

start daily search on startup of SickGear

 @@ -153,7 +153,7 @@ Run backlog on startup /> -

start processing backlogged episodes on startup of SickRage

+

start processing backlogged episodes on startup of SickGear

 diff --git a/gui/slick/interfaces/default/config_subtitles.tmpl b/gui/slick/interfaces/default/config_subtitles.tmpl index 420d3e5..f889020 100644 --- a/gui/slick/interfaces/default/config_subtitles.tmpl +++ b/gui/slick/interfaces/default/config_subtitles.tmpl @@ -58,7 +58,7 @@

Subtitles Search

-

Settings that dictate how SickRage handles subtitles search results.

+

Settings that dictate how SickGear handles subtitles search results.

@@ -82,7 +82,7 @@