[commits] Horde branch FRAMEWORK_5_2 updated. 4c4157a068c78f7f6cbe823dcb7c75f12ee929d2

[Jan Schneider]

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

from: 26f6bf4de62a3f6be84b9a5a75fe2de8d8be665a

109fc94 Don't delete exceptions and completions when saving.
4c4157a BFN

Summary: http://github.com/horde/horde/compare/26f6bf4de62a3f6be84b9a5a75fe2de8d8be665a...4c4157a068c78f7f6cbe823dcb7c75f12ee929d2

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

commit 109fc9451ed847719b0e7414db4548d6f2fbd818
Author: Jan Schneider <jan at horde.org>
Date:   Mon Jun 1 17:24:00 2015 +0200

    Don't delete exceptions and completions when saving.
    
    Conflicts:
    	kronolith/templates/dynamic/edit.inc
    	kronolith/templates/dynamic/task.inc
    	nag/lib/Task.php

 kronolith/js/kronolith.js            |    4 ++++
 kronolith/lib/Event.php              |   19 +++++++++++++------
 kronolith/templates/dynamic/edit.inc |    1 +
 kronolith/templates/dynamic/task.inc |    2 ++
 nag/lib/Form/Type/NagRecurrence.php  |   16 ++++++++++------
 nag/lib/Task.php                     |   17 ++++++++---------
 nag/lib/Ui/VarRenderer/Nag.php       |   16 ++++++++++++++++
 7 files changed, 54 insertions(+), 21 deletions(-)

http://github.com/horde/horde/commit/109fc9451ed847719b0e7414db4548d6f2fbd818

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

commit 4c4157a068c78f7f6cbe823dcb7c75f12ee929d2
Author: Jan Schneider <jan at horde.org>
Date:   Mon Jun 1 17:33:51 2015 +0200

    BFN

 kronolith/docs/CHANGES |    2 ++
 kronolith/package.xml  |    4 ++--
 nag/docs/CHANGES       |    3 +++
 nag/package.xml        |    6 ++++--
 4 files changed, 11 insertions(+), 4 deletions(-)

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