[commits] Horde branch master updated. 26a744711628a2b882d8ed6d1b37d7e15d000e6e

[Michael M Slusarz]

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

from: 81e0af335ba134b6ef1afc42fb7a7753bb1364c4

1703ac2 This error message can leak to user notifications, so translate it
c7bc361 Image deletion in HTML compose mode no longer requires polling
2a507d6 Fix undo/redo when adding/removing an image from the HTML compose editor
361851b Better changelog entry
6c08a9f Fix logic
3514914 Released Horde_Mime-2.6.0
26a7447 Development mode for Horde_Mime-2.6.1

Summary: http://github.com/horde/horde/compare/81e0af335ba134b6ef1afc42fb7a7753bb1364c4...26a744711628a2b882d8ed6d1b37d7e15d000e6e

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

commit 1703ac20a08cad0486c5e206de00848c8309b2a2
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Thu Dec 4 17:40:29 2014 -0700

    This error message can leak to user notifications, so translate it

 framework/Core/lib/Horde/Registry.php |    9 ++++++++-
 1 files changed, 8 insertions(+), 1 deletions(-)

http://github.com/horde/horde/commit/1703ac20a08cad0486c5e206de00848c8309b2a2

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

commit c7bc3615594099ea64e647401e97fb370846cc0f
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Thu Dec 4 19:22:11 2014 -0700

    Image deletion in HTML compose mode no longer requires polling

 imp/js/ckeditor/imagepoll.js       |   62 -------------------------------
 imp/js/ckeditor/images.js          |   70 ++++++++++++++++++++++++++++++++++++
 imp/js/ckeditor/imageupload.js     |    4 +-
 imp/js/ckeditor/pasteattachment.js |    4 +-
 imp/lib/Script/Package/Compose.php |    4 +-
 imp/package.xml                    |    6 ++--
 6 files changed, 79 insertions(+), 71 deletions(-)
 delete mode 100644 imp/js/ckeditor/imagepoll.js
 create mode 100644 imp/js/ckeditor/images.js

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

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

commit 2a507d687fe86a08eece0899be3b65fc86fd2927
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Thu Dec 4 19:23:34 2014 -0700

    Fix undo/redo when adding/removing an image from the HTML compose editor
    
    Can't allow this, since the image data no longer exists on server when
    undoing a delete, and the attachment numbering is incorrect on undoing
    an add.
    
    Unfortunately, there is no way of disabling/removing the last action so
    the only option given to us by the ckeditor API is to clear the undo
    stack completely.

 imp/js/ckeditor/images.js |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

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

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

commit 361851bb26cd172d9acfe07b3dfa9328e63e9bce
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Thu Dec 4 19:30:21 2014 -0700

    Better changelog entry

 framework/Mime/package.xml |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

http://github.com/horde/horde/commit/361851bb26cd172d9acfe07b3dfa9328e63e9bce

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

commit 6c08a9f39af043bbe9fb130c81a43955ddab57fc
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Thu Dec 4 19:32:23 2014 -0700

    Fix logic

 framework/Http/lib/Horde/Http/Response/Base.php |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

http://github.com/horde/horde/commit/6c08a9f39af043bbe9fb130c81a43955ddab57fc

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

commit 3514914477673925e1825ffddcd7bbe98b32a570
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Thu Dec 4 19:35:01 2014 -0700

    Released Horde_Mime-2.6.0

 framework/Mime/composer.json |    4 ++--
 framework/Mime/package.xml   |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

http://github.com/horde/horde/commit/3514914477673925e1825ffddcd7bbe98b32a570

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

commit 26a744711628a2b882d8ed6d1b37d7e15d000e6e
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Thu Dec 4 19:35:02 2014 -0700

    Development mode for Horde_Mime-2.6.1

 framework/Mime/package.xml |   19 +++++++++++++++----
 1 files changed, 15 insertions(+), 4 deletions(-)

http://github.com/horde/horde/commit/26a744711628a2b882d8ed6d1b37d7e15d000e6e