Merge branch 'refs/heads/develop' into tv

Conflicts: couchpotato/core/media/movie/_base/main.py couchpotato/core/media/movie/library/movie/main.py couchpotato/core/plugins/dashboard/main.py couchpotato/core/plugins/profile/main.py couchpotato/core/plugins/release/main.py couchpotato/core/plugins/suggestion/main.py
2013-09-11 23:13:28 +02:00
parent d02e62f89f 19c50f728e
commit cce0a8ec62
120 changed files with 4428 additions and 1660 deletions
@@ -36,13 +36,12 @@ class Subtitle(Plugin):

                    files = []
                    for file in release.files.filter(FileType.status.has(identifier = 'movie')).all():
-                        files.append(file.path);
+                        files.append(file.path)

                    # get subtitles for those files
                    subliminal.list_subtitles(files, cache_dir = Env.get('cache_dir'), multi = True, languages = self.getLanguages(), services = self.services)

    def searchSingle(self, group):
-
        if self.isDisabled(): return

        try: