2d8aad80cd
Merge branch 'abeloin-hotfix-nzb_api_key'
2015-02-23 13:46:23 -05:00
274b2718c6
Added apikey to censoredformatter
...
This is needed because Newznab apikey isn't stored as key=value in a
section in config.ini.
2015-02-23 13:41:09 -05:00
c0eafa169f
Merge branch 'abeloin-hotfixes-t411_address'
2015-02-23 11:21:51 -05:00
5d6c62417c
T411: Change addresse from t411.me to t411.io
2015-02-23 11:17:31 -05:00
ac153cf232
Update readme.md
2015-02-19 12:38:25 -02:00
93f0f0ad1f
Merge branch 'develop'
...
Conflicts:
sickbeard/providers/kat.py
2015-02-16 00:39:09 -05:00
431d04de4a
Merge pull request #1324 from abeloin/patch-displayshow
...
Fix if in wrong position
2015-02-15 21:17:14 -05:00
82fa72ec5c
Fix if in wrong position
2015-02-15 21:16:02 -05:00
72060fe6a8
Merge pull request #1323 from abeloin/patch-anime_sanitize
...
Modified sanitizeSceneName() for anime exception.
2015-02-15 20:10:04 -05:00
945e2b58db
Merge pull request #1322 from abeloin/patch-subtitle_flags
...
Fix subtitles display issues.
2015-02-15 20:08:03 -05:00
a64bed1257
Typo from rebase
2015-02-15 19:46:03 -05:00
3e1e3e61ff
Fix subtitles display issues.
...
When multiSubtitles is not activated:
-Download history show flag of the last 2 chars before ext.
-Subtitle lang was always und.
-Keep lang value between refresh
2015-02-15 19:41:07 -05:00
5d9115d471
Merge pull request #1154 from ecnahc515/patch-1
...
Fix travis build status image in readme
2015-02-15 19:11:07 -05:00
20a56d6edf
Merge pull request #1321 from abeloin/patch-typo_us_us
...
Fix typo for locale from us_US to en_US Part 2
2015-02-15 19:03:54 -05:00
b37d79be39
Fix typo for locale from us_US to en_US Part 2
2015-02-15 19:03:13 -05:00
f9a27013be
Merge pull request #1270 from mwarnaar/develop
...
Separate providers for oldpiratebay and thepiratebay
2015-02-15 18:42:50 -05:00
240b438a73
Merge branch 'TagForce-eclipse_ignore_settings' into develop
2015-02-15 18:40:07 -05:00
d3375e005b
Merge branch 'eclipse_ignore_settings' of https://github.com/TagForce/SickRage into TagForce-eclipse_ignore_settings
...
Conflicts:
.gitignore
2015-02-15 18:39:14 -05:00
eaca966feb
Merge pull request #1318 from abeloin/patch-root_dir
...
Revert commit 32da0199f2
2015-02-15 18:29:49 -05:00
5477df5073
Merge pull request #1317 from lsborg/torrentbytes
...
Updated login param value for torrentBytes provider
2015-02-15 18:29:37 -05:00
daf1c12c1a
Merge pull request #1315 from abeloin/patch-fix_misc_issues
...
Fix misc issues
2015-02-15 18:29:24 -05:00
78aaa21732
Merge pull request #1312 from alaorath/patch-1
...
Update init.debian to exit instead of return when 'restarted'
2015-02-15 18:29:02 -05:00
d75af4d018
Merge pull request #1307 from abeloin/patch-typo_displayshow
...
Fix typo in displayShow.tmpl
2015-02-15 18:28:17 -05:00
c7e721effc
Merge pull request #1306 from abeloin/patch-progress_bar
...
Fix progress bar vanishing when shows table empty.
2015-02-15 18:28:08 -05:00
8846a60552
Merge pull request #1303 from abeloin/patch-quality_low_backlog
...
Fix unknown quality
2015-02-15 18:27:46 -05:00
4cf2e45544
Merge pull request #1302 from abeloin/patch-torrent_host_info
...
Added default host:port for each torrent clients.
2015-02-15 18:27:14 -05:00
65c41bb54c
Merge pull request #1295 from abeloin/patch-touchfile
...
Modified touchfile() to detect ENOSYS and EACCES.
2015-02-15 18:26:49 -05:00
73dc968e2d
Merge pull request #1293 from abeloin/patch_dailysearcher
...
Fix incorrect operator in dailysearcher.py
2015-02-15 18:26:35 -05:00
98fec41e22
Merge pull request #1292 from TagForce/partial_revert_1253
...
Partial Revert 1258
2015-02-15 18:26:10 -05:00
37ab5bb45b
Merge pull request #1289 from abeloin/patch-synology_ssl
...
Disable ssl checking in synology client
2015-02-15 18:26:00 -05:00
a086193fe2
Merge pull request #1287 from abeloin/patch-unraid_link
...
Added detection of fs not implemented link creation
2015-02-15 18:25:13 -05:00
aa29e25aa3
Merge pull request #1285 from abeloin/patch-tvrage_no_episodes
...
TVRage, TVdb: Check if show has episodes
2015-02-15 18:24:52 -05:00
152b4cf26e
Merge pull request #1284 from Arcanemagus/patch-2
...
Set the default Pushbullet target to all devices
2015-02-15 18:24:36 -05:00
509158cc70
Merge pull request #1283 from abeloin/patch-proper_pubdate
...
Fix issues with newznab provider
2015-02-15 18:24:09 -05:00
5dfff06417
Merge pull request #1282 from abeloin/patch-utorrent_token
...
Fix for uTorrent 2.2.1 token order.
2015-02-15 18:23:41 -05:00
a3fe42d8a5
Merge pull request #1279 from coolius/develop
...
Corrected aspect ratio of Sky Atlantic network logo
2015-02-15 18:22:36 -05:00
ffdb127f18
Merge pull request #1278 from joshjowen/joshjowen-kat-verified-fix
...
Fix verified status of torrents from KAT
2015-02-15 18:22:18 -05:00
4eafcd4462
Merge pull request #1277 from djoole/patch-2
...
changed subcategories order
2015-02-15 18:22:02 -05:00
983fb5846f
Merge pull request #1276 from abeloin/patch-home_sort
...
Always sort last by asc name in shows table.
2015-02-15 18:21:44 -05:00
9321b71ac1
Merge pull request #1275 from Captsha/patch-2
...
Improve code check for list comprehensions on subtitle
2015-02-15 18:21:11 -05:00
a78344b609
Merge pull request #1274 from Benouch/develop
...
Newznab Categories not beeing saved
2015-02-15 18:20:54 -05:00
225b1171da
Merge pull request #1269 from LinuxBozo/trakt-fixes
...
Trakt 2.0 API fixes
2015-02-15 18:20:23 -05:00
bc603f28e6
Merge pull request #1268 from abeloin/patch-boxcar2
...
Fix case issue for accesstoken
2015-02-15 18:19:20 -05:00
14e76946c7
Merge pull request #1267 from abeloin/patch-iptorrent
...
Fix IPTorrents url.
2015-02-15 18:19:00 -05:00
bab2d4d09b
Merge pull request #1264 from d1b/use_https_for_kat
...
Use https://kickass.to/ instead of http://kickass.so/ .
2015-02-15 18:18:31 -05:00
23f3185e61
Merge pull request #1262 from eli-jordan/develop
...
use subprocess instead of os.system
2015-02-15 18:17:54 -05:00
a3607bad5b
Merge pull request #1261 from Phantazm/patch-IntelliJ_IDEA_specific_gitignores
...
Added IntelliJ IDEA specific gitignores
2015-02-15 18:17:44 -05:00
6cbc7ea978
Merge pull request #1260 from fernandog/patch-17
...
Improve code check for list comprehensions
2015-02-15 18:17:20 -05:00
a8de735cdd
Merge pull request #1233 from abeloin/patch-github_submit
...
Fix GitHub submit error
2015-02-15 18:16:45 -05:00
d71d580030
Merge pull request #1231 from TagForce/Fix#358
...
Fix for issue 358 (filename-thumb.jpg not renaming)
2015-02-15 18:16:17 -05:00
Alexandre Beloin