[commits] Horde branch master updated. f36c560f862a333616031f6b0a57fca5c011a60d

[Michael M Slusarz]

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

from: 3956997dc49724bbb04a449a89b22136a20c77b1

c521c26 [mms] Rate-limit filters drag/drop changes to prevent race conditions (Bug #13819).
f36c560 Better loading overlay for HTML editor

Summary: http://github.com/horde/horde/compare/3956997dc49724bbb04a449a89b22136a20c77b1...f36c560f862a333616031f6b0a57fca5c011a60d

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

commit c521c26a78f9d75d45a07a4069edb67843a5408a
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Thu Jan 22 22:29:40 2015 -0700

    [mms] Rate-limit filters drag/drop changes to prevent race conditions (Bug #13819).
    
    Conflicts:
    	ingo/docs/CHANGES
    	ingo/package.xml

 ingo/docs/CHANGES                             |    2 ++
 ingo/js/filters.js                            |    6 ++++++
 ingo/package.xml                              |    5 ++++-
 ingo/templates/basic/filters/filters.html.php |    4 ++++
 ingo/themes/default/screen.css                |   13 +++++++++++++
 5 files changed, 29 insertions(+), 1 deletions(-)

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

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

commit f36c560f862a333616031f6b0a57fca5c011a60d
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Thu Jan 22 22:36:05 2015 -0700

    Better loading overlay for HTML editor

 imp/js/compose.js                      |   13 +++++--------
 imp/templates/dynamic/compose.html.php |    7 +++----
 imp/themes/default/dynamic/compose.css |   13 ++++++-------
 3 files changed, 14 insertions(+), 19 deletions(-)

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