[commits] Horde branch FRAMEWORK_5_2 updated. 2e4020c70a086539f20202bb2f22fd4ee51dce2a

[Jan Schneider]

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

from: 34eb248261668ac281e356affc18b0f7ef132ad2

9ba45d3 Don't allow completion of tasks with incomplete sub-tasks and vice versa.
0faf58d Don't allow deletion of tasks with sub-tasks (Bug #13809).
9084c65 Use consistent checkbox.
2e4020c BFN

Summary: http://github.com/horde/horde/compare/34eb248261668ac281e356affc18b0f7ef132ad2...2e4020c70a086539f20202bb2f22fd4ee51dce2a

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

commit 9ba45d3812dd99a09f02b5f8ae3e17baa55c3e77
Author: Jan Schneider <jan at horde.org>
Date:   Fri Jan 16 17:35:11 2015 +0100

    Don't allow completion of tasks with incomplete sub-tasks and vice versa.

 nag/lib/CompleteTask.php    |   28 +++++++++++++++++++---------
 nag/templates/view/task.inc |    2 +-
 2 files changed, 20 insertions(+), 10 deletions(-)

http://github.com/horde/horde/commit/9ba45d3812dd99a09f02b5f8ae3e17baa55c3e77

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

commit 0faf58d81bee50cfe611c009866bf866cb8975eb
Author: Jan Schneider <jan at horde.org>
Date:   Fri Jan 16 17:36:07 2015 +0100

    Don't allow deletion of tasks with sub-tasks (Bug #13809).

 nag/task.php                |   21 +++++++++++++--------
 nag/templates/view/task.inc |    2 +-
 2 files changed, 14 insertions(+), 9 deletions(-)

http://github.com/horde/horde/commit/0faf58d81bee50cfe611c009866bf866cb8975eb

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

commit 9084c651c2b7524a843ce344bff03fb73f65f28d
Author: Jan Schneider <jan at horde.org>
Date:   Fri Jan 16 18:23:58 2015 +0100

    Use consistent checkbox.
    
    Conflicts:
    	nag/package.xml

 nag/package.xml                          |    6 ++----
 nag/templates/list/task_headers.html.php |    2 +-
 nag/themes/default/graphics/checkbox.png |  Bin 477 -> 0 bytes
 nag/themes/default/graphics/checked.png  |  Bin 258 -> 477 bytes
 4 files changed, 3 insertions(+), 5 deletions(-)
 delete mode 100644 nag/themes/default/graphics/checkbox.png

http://github.com/horde/horde/commit/9084c651c2b7524a843ce344bff03fb73f65f28d

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

commit 2e4020c70a086539f20202bb2f22fd4ee51dce2a
Author: Jan Schneider <jan at horde.org>
Date:   Fri Jan 16 18:30:27 2015 +0100

    BFN

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

http://github.com/horde/horde/commit/2e4020c70a086539f20202bb2f22fd4ee51dce2a