[mythtv-commits] mythtv branch master updated by stuartm. v0.28-pre-615-g8d0967c

[Git Repo Owner]

The branch, master has been updated on the
mythtv repository by gitolite user stuartm.
       via  8d0967ccd427bcb2f8a9351c0a27a9803fbd8442 (commit)
       via  df21ef7debf105fa052df31f8aae8caeb88ffe8a (commit)
       via  b2f08263ee6a44a6b3400f65b7f12a550289dc0b (commit)
       via  498cf2417cbe6ea346ed72d2495ec9d713a3c435 (commit)
       via  4860aa9189534e59260acecbff41b4b0e3a20c44 (commit)
      from  3ca4a90b33b464c7d3b63d4541af17d3a1c241b4 (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 8d0967ccd427bcb2f8a9351c0a27a9803fbd8442
Author:    Stuart Morgan <smorgan at mythtv.org> at Sun, 8 Dec 2013 20:13:38 +0000
Committer: Stuart Morgan <smorgan at mythtv.org> at Sun, 8 Dec 2013 20:13:38 +0000
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=8d0967ccd427bcb2f8a9351c0a27a9803fbd8442

Webfrontend: Remove stray comma in css that broken status colour coding of in-progress recordings



commit df21ef7debf105fa052df31f8aae8caeb88ffe8a
Author:    Stuart Morgan <smorgan at mythtv.org> at Sun, 8 Dec 2013 19:49:38 +0000
Committer: Stuart Morgan <smorgan at mythtv.org> at Sun, 8 Dec 2013 19:49:38 +0000
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=df21ef7debf105fa052df31f8aae8caeb88ffe8a

Match on callsign instead of channum when marking rsOtherShowing. We merge channels with the same callsign in the guide _not_ channels with the same channum.



commit b2f08263ee6a44a6b3400f65b7f12a550289dc0b
Author:    Stuart Morgan <smorgan at mythtv.org> at Sun, 8 Dec 2013 11:29:30 +0000
Committer: Stuart Morgan <smorgan at mythtv.org> at Sun, 8 Dec 2013 11:29:30 +0000
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=b2f08263ee6a44a6b3400f65b7f12a550289dc0b

Webfrontend: Disable a debugging error popup



commit 498cf2417cbe6ea346ed72d2495ec9d713a3c435
Author:    Stuart Morgan <smorgan at mythtv.org> at Sun, 8 Dec 2013 11:26:26 +0000
Committer: Stuart Morgan <smorgan at mythtv.org> at Sun, 8 Dec 2013 11:26:26 +0000
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=498cf2417cbe6ea346ed72d2495ec9d713a3c435

Webfrontend: Fix a possible invalid page request when scrolling down Recording/Upcoming lists



commit 4860aa9189534e59260acecbff41b4b0e3a20c44
Author:    Stuart Morgan <smorgan at mythtv.org> at Sun, 8 Dec 2013 11:24:00 +0000
Committer: Stuart Morgan <smorgan at mythtv.org> at Sun, 8 Dec 2013 11:24:00 +0000
URL:       http://code.mythtv.org/cgit/mythtv/commit/?id=4860aa9189534e59260acecbff41b4b0e3a20c44

Webfrontend: Show detail popup on upcoming/conflicting showings in Scheduling page.



-----------------------------------------------------------------------

Summary of changes:
 mythtv/html/tv/css/common.css       |    2 +-
 mythtv/html/tv/js/common.js         |    2 +-
 mythtv/html/tv/recordings.qsp       |    2 +-
 mythtv/html/tv/schedule.qsp         |   12 +++++++++---
 mythtv/html/tv/upcoming.qsp         |    2 +-
 mythtv/libs/libmyth/programinfo.cpp |    2 +-
 mythtv/libs/libmyth/programinfo.h   |    2 +-
 7 files changed, 15 insertions(+), 9 deletions(-)

--