Merge branch 'hotfix/0.2.2' into develop

CHANGES.md

@@ -81,16 +81,24 @@
 * 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/SickragePVR/SickRage/compare/release_0.2.0...release_0.2.1)
+[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/SickragePVR/SickRage/compare/release_0.1.0...release_0.2.0)
+[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

contributing.md

@@ -89,7 +89,7 @@ Please follow this process; it's the best way to get your work included in the p
    # navigate to the newly cloned directory
    cd SickRage
    # assign the original repo to a remote called "upstream"
-   git remote add upstream https://github.com/SickragePVR/SickRage.git
+   git remote add upstream https://github.com/SickGear/SickGear.git
    ```
 
 - If you cloned a while ago, get the latest changes from upstream:

gui/slick/interfaces/default/config.tmpl

@@ -47,7 +47,7 @@
     <tr><td class="infoTableHeader">Python Version:</td><td class="infoTableCell">$sys.version[:120]</td></tr>
     <tr class="infoTableSeperator"><td class="infoTableHeader"><i class="icon16-sb"></i> Homepage</td><td class="infoTableCell"><a href="<%= anon_url('http://www.sickrage.tv/') %>" rel="noreferrer" onclick="window.open(this.href, '_blank'); return false;">http://www.sickrage.tv/</a></td></tr>
     <tr><td class="infoTableHeader"><i class="icon16-web"></i> Forums</td><td class="infoTableCell"><a href="<%= anon_url('http://sickrage.tv/forums/') %>" rel="noreferrer" onclick="window.open(this.href, '_blank'); return false;">http://sickrage.tv/forums/</a></td></tr>
-    <tr><td class="infoTableHeader"><i class="icon16-github"></i> Source</td><td class="infoTableCell"><a href="<%= anon_url('https://github.com/SickragePVR/SickRage/') %>" rel="noreferrer" onclick="window.open(this.href, '_blank'); return false;">https://github.com/SickragePVR/SickRage/</a></td></tr>
+    <tr><td class="infoTableHeader"><i class="icon16-github"></i> Source</td><td class="infoTableCell"><a href="<%= anon_url('https://github.com/SickGear/SickGear/') %>" rel="noreferrer" onclick="window.open(this.href, '_blank'); return false;">https://github.com/SickragePVR/SickRage/</a></td></tr>
     <tr><td class="infoTableHeader"><i class="icon16-mirc"></i> Internet Relay Chat</td><td class="infoTableCell"><a href="irc://irc.freenode.net/#sickrage" rel="noreferrer"><i>#sickrage</i> on <i>irc.freenode.net</i></a></td></tr>
 </table>
 </div>

sickbeard/notifiers/growl.py

@@ -70,7 +70,7 @@ class GrowlNotifier:
             notice.add_header('Notification-Priority', options['priority'])
         if options['icon']:
             notice.add_header('Notification-Icon',
-                              'https://raw.github.com/SickragePVR/SickRage/master/gui/slick/images/sickrage.png')
+                              'https://raw.github.com/SickGear/SickGear/master/gui/slick/images/sickrage.png')
 
         if message:
             notice.add_header('Notification-Text', message)
@@ -174,7 +174,7 @@ class GrowlNotifier:
         register = gntp.GNTPRegister()
         register.add_header('Application-Name', opts['app'])
         register.add_header('Application-Icon',
-                            'https://raw.githubusercontent.com/SickragePVR/SickRage/master/gui/slick/images/sickrage-shark-mascot.png')
+                            'https://raw.githubusercontent.com/SickGear/SickGear/master/gui/slick/images/sickrage-shark-mascot.png')
 
         register.add_notification('Test', True)
         register.add_notification(common.notifyStrings[common.NOTIFY_SNATCH], True)

sickbeard/notifiers/xbmc.py

@@ -41,7 +41,7 @@ except ImportError:
 
 
 class XBMCNotifier:
-    sb_logo_url = 'https://raw.githubusercontent.com/SickragePVR/SickRage/master/gui/slick/images/sickrage-shark-mascot.png'
+    sb_logo_url = 'https://raw.githubusercontent.com/SickGear/SickGear/master/gui/slick/images/sickrage-shark-mascot.png'
 
     def _get_xbmc_version(self, host, username, password):
         """Returns XBMC JSON-RPC API version (odd # = dev, even # = stable)

sickbeard/versionChecker.py

@@ -130,10 +130,10 @@ class CheckVersion():
 
 class UpdateManager():
     def get_github_repo_user(self):
-        return 'SickragePVR'
+        return 'SickGear'
 
     def get_github_repo(self):
-        return 'SickRage'
+        return 'SickGear'
 
     def get_update_url(self):
         return sickbeard.WEB_ROOT + "/home/update/?pid=" + str(sickbeard.PID)