[commits] Horde branch FRAMEWORK_5_2 updated. 6dc6687488285f8ba276781493dafc30dafab424

[Jan Schneider]

On 30. August 2014 05:47:52 MESZ, "Michael J. Rubinsky" <mrubinsk at horde.org> wrote:
>The branch "FRAMEWORK_5_2" has been updated.
>The following is a summary of the commits.
>
>from: 8fa8909fd651adefaf7f3202a73ca6a809eec8b0
>
>0b4e8c2 Bug #13524 Also move the event's bound exceptions.
>40b8c27 Fix removing exception event from UI.
>6dc6687 BFN
>
>Summary:
>http://github.com/horde/horde/compare/8fa8909fd651adefaf7f3202a73ca6a809eec8b0...6dc6687488285f8ba276781493dafc30dafab424
>
>-----------------------------------------------------------------------
>
>commit 0b4e8c2e3a1bb8d34dafb4c35581bd442fd4e7ad
>Author: Michael J Rubinsky <mrubinsk at horde.org>
>Date:   Fri Aug 29 21:10:47 2014 -0400
>
>    Bug #13524 Also move the event's bound exceptions.
>
> kronolith/lib/Driver.php |    5 +++++
> 1 files changed, 5 insertions(+), 0 deletions(-)
>
>http://github.com/horde/horde/commit/0b4e8c2e3a1bb8d34dafb4c35581bd442fd4e7ad
>
>-----------------------------------------------------------------------
>
>commit 40b8c277843be0b76ed2121bb33faa3591412291
>Author: Michael J Rubinsky <mrubinsk at horde.org>
>Date:   Fri Aug 29 23:37:33 2014 -0400
>
>    Fix removing exception event from UI.
>    
>Properly refreshes view when moving a recurring event with exceptions
>from
>    one calendar to another. Related to Bug: 13524
>    
>    Conflicts:
>    	kronolith/lib/Event.php
>
> kronolith/js/kronolith.js                  |   12 ++++++++
> kronolith/lib/Ajax/Application/Handler.php |   12 ++++++++
>kronolith/lib/Event.php                    |   40
>++++++++++++++++++++++++++++
> 3 files changed, 64 insertions(+), 0 deletions(-)
>
>http://github.com/horde/horde/commit/40b8c277843be0b76ed2121bb33faa3591412291
>
>-----------------------------------------------------------------------
>
>commit 6dc6687488285f8ba276781493dafc30dafab424
>Author: Michael J Rubinsky <mrubinsk at horde.org>
>Date:   Fri Aug 29 23:47:40 2014 -0400
>
>    BFN
>
> kronolith/docs/CHANGES |    2 ++
> kronolith/package.xml  |    2 ++
> 2 files changed, 4 insertions(+), 0 deletions(-)
>
>http://github.com/horde/horde/commit/6dc6687488285f8ba276781493dafc30dafab424
>
>
>-- 
>commits mailing list
>Frequently Asked Questions: http://wiki.horde.org/FAQ
>To unsubscribe, mail: commits-unsubscribe at lists.horde.org

Looks like you forgot to merge the boundException commit? 
-- 
Diese Nachricht wurde von meinem Android-Mobiltelefon mit K-9 Mail gesendet.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.horde.org/archives/commits/attachments/20140830/4795b546/attachment.html>