[mythtv-commits] mythtv branch master updated by stuartm. v0.28-pre-595-ga0104e0
Git Repo Owner
noreply at mythtv.org
Thu Dec 5 20:46:11 UTC 2013
The branch, master has been updated on the
mythtv repository by gitolite user stuartm.
via a0104e0552ba69927457ef20678ddabfa4955487 (commit)
via 6e2d842d1a5c36a38ba915281a3758e30b4e753a (commit)
from 9f931f4f55438649994667cd1a923487e8528fc7 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit a0104e0552ba69927457ef20678ddabfa4955487
Author: Stuart Morgan <smorgan at mythtv.org> at Thu, 5 Dec 2013 20:36:29 +0000
Committer: Stuart Morgan <smorgan at mythtv.org> at Thu, 5 Dec 2013 20:36:39 +0000
URL: http://code.mythtv.org/cgit/mythtv/commit/?id=a0104e0552ba69927457ef20678ddabfa4955487
Services: Include conflicting recordings in the GetUpcomingList() output even when ShowAll isn't true.
I don't think this was the original intention, but if we are to mirror
the behaviour of the frontend, mythweb etc then this list should
include conflicts. This may yet evolve into a seperate ShowConflicts
argument so both the old and new behaviour are possible.
We already show aborted, failed and other 'bad' states in this list.
commit 6e2d842d1a5c36a38ba915281a3758e30b4e753a
Author: Stuart Morgan <smorgan at mythtv.org> at Thu, 5 Dec 2013 20:07:36 +0000
Committer: Stuart Morgan <smorgan at mythtv.org> at Thu, 5 Dec 2013 20:30:13 +0000
URL: http://code.mythtv.org/cgit/mythtv/commit/?id=6e2d842d1a5c36a38ba915281a3758e30b4e753a
Webfrontend: Show upcoming and conflicting recordings for the recording rule in the editor.
These are not yet updated automatically when the rule is saved
-----------------------------------------------------------------------
Summary of changes:
mythtv/html/tv/css/common.css | 2 +-
mythtv/html/tv/css/schedule.css | 130 +++++++++++++++++++++++++-
mythtv/html/tv/js/tvutil.qjs | 9 ++
mythtv/html/tv/recordings.qsp | 5 +-
mythtv/html/tv/schedule.qsp | 93 +++++++++++++++++--
mythtv/html/tv/upcoming.qsp | 6 +-
mythtv/programs/mythbackend/services/dvr.cpp | 3 +-
7 files changed, 229 insertions(+), 19 deletions(-)
create mode 100644 mythtv/html/tv/js/tvutil.qjs
--
More information about the mythtv-commits
mailing list