[commits] Horde branch imp_6_1 updated. 3246291480078667a87d0764b371d4bea5ca477c

[Michael M Slusarz]

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

from: 84a280da972726b5cc286b0b7231d33548a25906

397d982 Add padding for user flags in topbar
d77cfcc [mms] Fix encoding of JSON parameters to Horde::popupJs() (Bug #12037).
cf12001 [mms] Fix replacing spellchecker elements within tables (Bug #12028).
a76ff76 [mms] Can't add charset directly to HTML document or else DOM will alter document when generating HTML.
3246291 Merge branch 'master' into imp_6_1

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

commit 397d982bcc178711970b810e4c58fa182640d51f
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Tue Feb 12 13:53:12 2013 -0700

    Add padding for user flags in topbar

 imp/themes/default/basic/screen.css |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

http://git.horde.org/horde-git/-/commit/397d982bcc178711970b810e4c58fa182640d51f

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

commit d77cfccfe0e6e3065038fdc9bafee3317bf6912c
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Tue Feb 12 14:34:43 2013 -0700

    [mms] Fix encoding of JSON parameters to Horde::popupJs() (Bug #12037).
    
    Need to double encode the data so that the JSON is properly parsed on
    the browser.

 framework/Core/lib/Horde.php |    4 +++-
 framework/Core/package.xml   |    2 ++
 2 files changed, 5 insertions(+), 1 deletions(-)

http://git.horde.org/horde-git/-/commit/d77cfccfe0e6e3065038fdc9bafee3317bf6912c

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

commit cf12001260d81c20bdb89b7e6cd5fe69a371b998
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Tue Feb 12 16:26:08 2013 -0700

    [mms] Fix replacing spellchecker elements within tables (Bug #12028).
    
    Looks like something wonky with prototypejs' update() method.

 framework/Core/js/spellchecker.js |    2 +-
 framework/Core/package.xml        |    2 ++
 2 files changed, 3 insertions(+), 1 deletions(-)

http://git.horde.org/horde-git/-/commit/cf12001260d81c20bdb89b7e6cd5fe69a371b998

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

commit a76ff76723596900e55b7098d9e5236da0c23944
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Tue Feb 12 15:24:47 2013 -0700

    [mms] Can't add charset directly to HTML document or else DOM will alter document when generating HTML.

 framework/Util/lib/Horde/Domhtml.php           |   15 ++++++++++++---
 framework/Util/package.xml                     |    2 ++
 framework/Util/test/Horde/Util/DomhtmlTest.php |    2 +-
 3 files changed, 15 insertions(+), 4 deletions(-)

http://git.horde.org/horde-git/-/commit/a76ff76723596900e55b7098d9e5236da0c23944

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

commit 3246291480078667a87d0764b371d4bea5ca477c
Merge: 84a280d a76ff76
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Tue Feb 12 23:02:16 2013 -0700

    Merge branch 'master' into imp_6_1
    
    Conflicts:
    	framework/Core/package.xml

 framework/Core/lib/Horde.php        |    4 +++-
 framework/Core/package.xml          |    2 ++
 imp/themes/default/basic/screen.css |    3 +++
 3 files changed, 8 insertions(+), 1 deletions(-)

http://git.horde.org/horde-git/-/commit/3246291480078667a87d0764b371d4bea5ca477c