Ruud 2a2fe448e7 Merge branch 'refs/heads/develop' into tv ...

Conflicts:
	couchpotato/core/media/movie/_base/main.py
	couchpotato/core/providers/torrent/bitsoup/main.py
	couchpotato/core/providers/torrent/iptorrents/main.py
	couchpotato/core/providers/torrent/sceneaccess/main.py
	couchpotato/core/providers/torrent/torrentleech/main.py
	couchpotato/core/providers/torrent/torrentshack/main.py

2014-01-11 13:55:12 +01:00

..

automation

Move movie listing to media

2013-11-30 12:23:53 +01:00

browser

Code cleanup

2013-09-02 21:59:06 +02:00

category

Use Media for all Movie db actions

2013-10-08 09:57:36 +02:00

custom

Custom plugin folder outside source. fix #2076

2013-09-29 13:25:10 +02:00

dashboard

Use Media for all Movie db actions

2013-10-08 09:57:36 +02:00

file

Image download wasn't working anymore

2014-01-11 00:05:02 +01:00

log

Code cleanup

2013-09-02 21:59:06 +02:00

manage

Dont remove historic data when doing a full scan.

2013-12-07 22:33:34 +01:00

profile

Use Media for all Movie db actions

2013-10-08 09:57:36 +02:00

quality

Merge branch 'refs/heads/develop' into tv

2014-01-11 13:55:12 +01:00

release

Merge branch 'refs/heads/develop' into tv

2014-01-11 13:55:12 +01:00

renamer

Merge branch 'refs/heads/develop' into tv

2014-01-11 13:55:12 +01:00

scanner

Clean tags from beginning of string. fix #2654

2014-01-06 22:24:34 +01:00

score

Revert "Merge branches 'develop' and 'tv' of https://github.com/RuudBurger/CouchPotatoServer into tv"

2013-12-20 02:29:15 +01:00

status

Add missing status

2013-09-30 19:15:51 +02:00

subtitle

Merge branch 'refs/heads/develop' into tv

2013-11-30 12:44:13 +01:00

trailer

Remove mutable objects from function args

2013-09-02 22:44:44 +02:00

userscript

Userscript styling fixes

2013-10-08 21:53:03 +02:00

wizard

Userscript image didn't show

2013-09-22 00:43:50 +02:00

__init__.py

Settings, directory browser

2011-09-05 22:09:54 +02:00

base.py

Remove path on fail

2014-01-11 00:05:24 +01:00