From b8804973ca1de9a12fdce68cb2aca748a550fc0f Mon Sep 17 00:00:00 2001 From: Adam Date: Mon, 29 Dec 2014 12:22:34 +0800 Subject: [PATCH] Add pull request checkout option to General Config/Advanced Settings --- CHANGES.md | 1 + .../interfaces/default/config_general.tmpl | 18 +++++++++++++ gui/slick/js/config.js | 4 +++ sickbeard/gh_api.py | 25 ++++++++++++++++++- sickbeard/versionChecker.py | 23 ++++++++++++++++- sickbeard/webserve.py | 11 ++++++++ 6 files changed, 80 insertions(+), 2 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index 09c4b64a..4ec76cfd 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -15,6 +15,7 @@ * Add anime unit test cases (port from lad1337/sickbeard) * Fix normal tv show regex (port from midgetspy/sickbeard) * Fix anime regex (port from lad1337/sickbeard) +* Add pull request checkout option to General Config/Advanced Settings [develop changelog] diff --git a/gui/slick/interfaces/default/config_general.tmpl b/gui/slick/interfaces/default/config_general.tmpl index 2817d0e0..410410c1 100644 --- a/gui/slick/interfaces/default/config_general.tmpl +++ b/gui/slick/interfaces/default/config_general.tmpl @@ -461,6 +461,24 @@ + #set pulls = sickbeard.versionCheckScheduler.action.list_remote_pulls() + #if len(pulls) > 0 and $sickbeard.BRANCH != 'master': +
+ +
+ #end if +