[commits] Horde branch master updated. 552023e20071a4c8584fa57d37b8c86e1b32209c

[Michael J. Rubinsky]

The branch "master" has been updated.
The following is a summary of the commits.

from: 5afffb003ab7294f2c27d319e7527a7751c090d6

af26251 Revert "Revert "Display the exceptions in the viewer.""
3a6bce6 ws
4a84f4a Catch exception. Fixes displaying iTip viewer for non-recurring events.
488d87b Move exceptions to end of page.
5f1dc9b Another place to revert for Bug: 13400
552023e Don't show exceptions in the iTip viewer that are in the past.

Summary: http://github.com/horde/horde/compare/5afffb003ab7294f2c27d319e7527a7751c090d6...552023e20071a4c8584fa57d37b8c86e1b32209c

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

commit af26251839e7515cce49478df0d7eb88172a3f02
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Tue Jul 29 11:23:01 2014 -0400

    Revert "Revert "Display the exceptions in the viewer.""
    
    This reverts commit 5afffb003ab7294f2c27d319e7527a7751c090d6.

 imp/lib/Mime/Viewer/Itip.php       |  184 +++++++++++++++++++++++++++++++-----
 imp/templates/itip/action.html.php |   11 ++-
 2 files changed, 167 insertions(+), 28 deletions(-)

http://github.com/horde/horde/commit/af26251839e7515cce49478df0d7eb88172a3f02

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

commit 3a6bce650e285e389435b748f786348794b79c2f
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Tue Jul 29 11:32:29 2014 -0400

    ws

 imp/lib/Mime/Viewer/Itip.php |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

http://github.com/horde/horde/commit/3a6bce650e285e389435b748f786348794b79c2f

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

commit 4a84f4a305018e4d09f924bc0ee7b33f87929ebc
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Tue Jul 29 11:32:37 2014 -0400

    Catch exception. Fixes displaying iTip viewer for non-recurring events.

 imp/lib/Mime/Viewer/Itip.php |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

http://github.com/horde/horde/commit/4a84f4a305018e4d09f924bc0ee7b33f87929ebc

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

commit 488d87b62f53796bf3522fef7150485e836b4b6d
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Tue Jul 29 11:41:29 2014 -0400

    Move exceptions to end of page.

 imp/templates/itip/action.html.php |   14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)

http://github.com/horde/horde/commit/488d87b62f53796bf3522fef7150485e836b4b6d

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

commit 5f1dc9bd7c85212a5ef509c09c8f17f1789a0f56
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Tue Jul 29 11:42:22 2014 -0400

    Another place to revert for Bug: 13400

 imp/lib/Mime/Viewer/Itip.php |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

http://github.com/horde/horde/commit/5f1dc9bd7c85212a5ef509c09c8f17f1789a0f56

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

commit 552023e20071a4c8584fa57d37b8c86e1b32209c
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Tue Jul 29 11:48:49 2014 -0400

    Don't show exceptions in the iTip viewer that are in the past.

 imp/lib/Mime/Viewer/Itip.php |    9 ++++++++-
 1 files changed, 8 insertions(+), 1 deletions(-)

http://github.com/horde/horde/commit/552023e20071a4c8584fa57d37b8c86e1b32209c