[commits] Horde branch master updated. 5ec7a194a5c6a161a83b4276291fd925b2165994

[Michael M Slusarz]

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

from: 2d52cecd7031d4cc7cbadbd6b0e7014bf324c354

cf905fe Move flag hook into IMP_Flags
2ec7c13 Add ability to replace current mesage flag information via AJAX imp:flag task
5ec7a19 Reset flag changes after unsuccessful delete/move

Summary: http://github.com/horde/horde/compare/2d52cecd7031d4cc7cbadbd6b0e7014bf324c354...5ec7a194a5c6a161a83b4276291fd925b2165994

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

commit cf905fe548c9a8ee8758e902bdbaeaebaeb92076
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Thu Oct 10 17:53:27 2013 -0600

    Move flag hook into IMP_Flags

 imp/lib/Ajax/Application/ListMessages.php |   44 ++++++++--------------------
 imp/lib/Basic/Mailbox.php                 |    5 +--
 imp/lib/Flags.php                         |   19 ++++++++++++
 3 files changed, 33 insertions(+), 35 deletions(-)

http://github.com/horde/horde/commit/cf905fe548c9a8ee8758e902bdbaeaebaeb92076
http://git.horde.org/horde-git/-/commit/cf905fe548c9a8ee8758e902bdbaeaebaeb92076

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

commit 2ec7c13e24d798d5a6e43f0fd6d693178b1c8750
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Thu Oct 10 17:53:54 2013 -0600

    Add ability to replace current mesage flag information via AJAX imp:flag task
    
    Conflicts:
    	imp/lib/Ajax/Queue.php

 imp/js/dimpbase.js     |    8 ++++++++
 imp/lib/Ajax/Queue.php |   44 ++++++++++++++++++++++++++++++++++++++++++--
 2 files changed, 50 insertions(+), 2 deletions(-)

http://github.com/horde/horde/commit/2ec7c13e24d798d5a6e43f0fd6d693178b1c8750
http://git.horde.org/horde-git/-/commit/2ec7c13e24d798d5a6e43f0fd6d693178b1c8750

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

commit 5ec7a194a5c6a161a83b4276291fd925b2165994
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Thu Oct 10 17:56:10 2013 -0600

    Reset flag changes after unsuccessful delete/move

 imp/lib/Ajax/Application/Handler/Common.php |   23 +++++++++++++----------
 1 files changed, 13 insertions(+), 10 deletions(-)

http://github.com/horde/horde/commit/5ec7a194a5c6a161a83b4276291fd925b2165994
http://git.horde.org/horde-git/-/commit/5ec7a194a5c6a161a83b4276291fd925b2165994