Ruud
96089074ce
Merge branch 'refs/heads/develop' into tv
...
Conflicts:
couchpotato/core/loader.py
2013-08-24 20:22:55 +02:00
Ruud
65896497fb
Return true for loader
2013-08-24 20:22:31 +02:00
Ruud
54a37b577d
Import cleanup
...
Conflicts:
couchpotato/core/providers/torrent/sceneaccess/main.py
2013-08-24 20:15:54 +02:00
Ruud
f1948ffb6a
Just load media recursively
2013-08-24 20:12:59 +02:00
Jason Mehring and Ruud
7dd3b0ed15
fix loader error messages for modules that are selected recursively but are not really modules
2013-08-24 20:07:32 +02:00
Jason Mehring and Ruud
11fcfa8202
Moved library and refactored to its now location. Modified anything firing libray.add/update/_release date to now fire library.add.movie...
...
Conflicts:
couchpotato/core/loader.py
couchpotato/core/media/show/_base/main.py
couchpotato/core/media/show/library/season/main.py
2013-08-24 20:04:27 +02:00
Ruud
2ed53df008
Import cleanup
2013-08-24 19:14:09 +02:00
Ruud
060859483a
Delete show provider
2013-08-24 18:36:44 +02:00
Ruud
eced476eaf
Merge branch 'refs/heads/develop' into tv
...
Conflicts:
couchpotato/core/loader.py
couchpotato/core/providers/info/_modifier/__init__.py
couchpotato/core/providers/info/_modifier/main.py
couchpotato/core/providers/movie/_modifier/main.py
couchpotato/core/providers/show/_modifier/main.py
2013-08-24 18:30:00 +02:00
Ruud
199e61ea14
Fallback on type for current downloads
2013-08-24 16:37:16 +02:00
Ruud
0daa6c8eff
Merge branch 'develop_unrar_fixes' of git://github.com/mano3m/CouchPotatoServer into mano3m-develop_unrar_fixes
2013-08-24 16:16:48 +02:00
Ruud
b1b5f97f03
Deluge fixes
2013-08-24 16:14:18 +02:00
Ruud
32d5587669
Don't load modules without __init__.py
2013-08-24 16:06:17 +02:00
mano3m
c13c0f24e5
Change type to protocol in release and renamer
2013-08-24 15:50:19 +02:00
mano3m
7eb1d72333
remove move exception from unrar PR
2013-08-24 15:50:19 +02:00
Ruud
3d6ec1feba
Move info providers to proper folder
2013-08-24 15:31:30 +02:00
Ruud
8d5b55a753
Make info modifier multiprovider
2013-08-24 15:30:17 +02:00
Ruud
7296dc54d0
Move thetvdb to info providers
2013-08-24 15:29:57 +02:00
Ruud
e5e9cf7d5f
Move info providers to proper folder
2013-08-24 15:20:00 +02:00
Ruud
b106229a78
Merge branch 'refs/heads/develop' into tv
2013-08-24 15:07:21 +02:00
Ruud
c267232160
Add unrar support
...
Thanks @mano3m
2013-08-24 15:04:56 +02:00
Ruud
48f4b008df
Move deluge lib to libs folder
2013-08-24 14:46:46 +02:00
Ruud
ae1f181fbf
Merge branch 'deluge' of git://github.com/techmunk/CouchPotatoServer into techmunk-deluge
...
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
2013-08-24 14:42:17 +02:00
Ruud
cbfee72d51
rTorrent make pause advanced setting
2013-08-24 14:38:57 +02:00
Ruud
ee709054f2
rTorrent rename type to protocol
...
code styling
2013-08-24 14:35:57 +02:00
Ruud
ee60ec962b
Merge branch 'feature/dev_rtorrent' of git://github.com/fuzeman/CouchPotatoServer into fuzeman-feature/dev_rtorrent
2013-08-24 14:33:17 +02:00
Ruud
73efd5549f
Merge branch 'refs/heads/develop' into tv
2013-08-24 14:30:09 +02:00
Ruud
e013e38c5e
Update ubuntu.init
...
Thanks @moriame
2013-08-24 14:26:16 +02:00
Ruud
20aa78105f
Do window size check inside load event
2013-08-24 14:22:15 +02:00
Ruud
770590e4f2
Match default ports
...
Thanks @cpg
2013-08-24 14:08:05 +02:00
Ruud
8e9e7b49ea
Simplify linking
...
Thanks @mano3m
2013-08-24 14:03:17 +02:00
Ruud
08554889fd
Add the old rottentomatoes to default enabled list
2013-08-24 13:34:45 +02:00
Ruud
8ac2869de3
Merge branch 'rotten_tomatoes_custom_urls' of git://github.com/Lordcrash/CouchPotatoServer into Lordcrash-rotten_tomatoes_custom_urls
2013-08-24 13:28:10 +02:00
Ruud
bb8e8a0df5
Merge branch 'develop_seed_fixes' of git://github.com/mano3m/CouchPotatoServer into mano3m-develop_seed_fixes
2013-08-24 13:22:29 +02:00
Ruud
e2bd6a91cd
MPAA rating for renamer
2013-08-24 13:21:39 +02:00
Ruud
ed0e5ef497
XMBC notification, better remote folder description
2013-08-24 12:24:15 +02:00
Ruud
e1e475e605
Merge branch 'develop_XBMC' of git://github.com/mano3m/CouchPotatoServer into mano3m-develop_XBMC
2013-08-24 12:19:32 +02:00
Ruud
cef5b04eb1
Return unique imdb list
2013-08-24 12:14:15 +02:00
Ruud
7e44af936d
Watch shutdown when adding automation movies
2013-08-24 12:14:02 +02:00
Ruud
6aec5a9a60
Cleanup IMDB provider
2013-08-24 12:13:45 +02:00
Ruud
79c75c886b
Merge branch 'develop_automationIMDB' of git://github.com/dkboy/CouchPotatoServer into dkboy-develop_automationIMDB
2013-08-24 10:59:32 +02:00
Joel Kåberg
8139016636
Merge pull request #2061 from nrgaway/tv_loader
...
fix loader error messages for modules that are selected recursively but ...
2013-08-23 12:51:34 -07:00
Jason Mehring
59c0d0416e
fix loader error messages for modules that are selected recursively but are not really modules
2013-08-23 15:32:47 -04:00
Joel Kåberg
cd559ece04
Merge pull request #2058 from nrgaway/tv_refactored
...
Tv refactored
2013-08-23 07:47:29 -07:00
Joel Kåberg
120a4ad1ed
Merge pull request #2057 from nrgaway/tv_development
...
Completed tvshow model
2013-08-23 07:47:14 -07:00
Jason Mehring
3363e164fd
refactored Movie model to Media
2013-08-23 01:37:00 -04:00
Jason Mehring
6d6d5caeb6
Completed tvshow model
2013-08-23 00:53:34 -04:00
Joel Kåberg
21030e7cb4
Merge pull request #2052 from nrgaway/tv_database_2
...
Added Seasons
2013-08-22 12:40:20 -07:00
mano3m
bf6bcaed72
provide more info in case no movie is found
...
Several users reported an issue with "more than one group found (0)",
and it was unclear to them what it meant. This might help.
2013-08-22 21:20:02 +02:00
Jason Mehring
9b238ba712
Added Seasons. Show is the parent to Seasons and Episodes are the children if Season
2013-08-22 02:47:41 -04:00
Ruud