monkee.ch/SickGear
1
0
Fork 0
mirror of https://github.com/SickGear/SickGear.git synced 2024-12-03 01:43:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'release/0.5.0' into develop

Browse source
This commit is contained in:
JackDandy 2014-12-14 19:13:45 +00:00
commit 868c5b736d
3 changed files with 3 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
CHANGES.md
View file

@ -1,4 +1,4 @@
### 0.x.x (2014-12-xx xx:xx:xx UTC) ### 0.5.0 (2014-12-14 13:55:00 UTC)
* Fix searches freezing due to unescaped ignored or required words * Fix searches freezing due to unescaped ignored or required words
* Add failed database to unit tests tear down function * Add failed database to unit tests tear down function
@ -35,10 +35,7 @@
* Fix table alignment on homepage * Fix table alignment on homepage
* Fix duplicate entries in cache database * Fix duplicate entries in cache database
* Fix network sorting on home page * Fix network sorting on home page
* Fix restart issue
[develop changelog]
* Add TVRage network name standardization
* Remove TVRage network name standardization
### 0.4.0 (2014-12-04 10:50:00 UTC) ### 0.4.0 (2014-12-04 10:50:00 UTC)

1
SickBeard.py
View file

@ -25,7 +25,6 @@ import signal
import sys import sys
import shutil import shutil
import subprocess import subprocess
import socket
if sys.version_info < (2, 6): if sys.version_info < (2, 6):
print "Sorry, requires Python 2.6 or 2.7." print "Sorry, requires Python 2.6 or 2.7."

2
sickbeard/webserveInit.py
View file

@ -136,6 +136,4 @@ class WebServer(threading.Thread):
def shutDown(self): def shutDown(self):
self.alive = False self.alive = False
if self.server:
self.server.stop()
self.io_loop.stop() self.io_loop.stop()