[commits] Horde branch imp_6_1 updated. b1e4cd48cfeb2c76c76e2699a0c3afb692ee3858

[Michael M Slusarz]

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

from: 34a95a617541fd755fb1a63c6772c8fa39c3ae53

7c7ea99 [mms] More compact internal/serialized representation of data in Horde_Prefs_Scope.
5023660 Bug #12096: make sure data is string before doing JSON check
f64963d Bug #12095: Hotfix to allow for Y-scrolling in search page in dynamic view
683b9f5 Bug #12095: Fix setting initial height of search IFRAME
8f83331 Adjust search IFRAME height when resizing window
b1e4cd4 Merge branch 'master' into imp_6_1

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

commit 7c7ea99288d7645eacad1a8fbb11f91d43ecbead
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Wed Mar 6 18:06:48 2013 -0700

    [mms] More compact internal/serialized representation of data in Horde_Prefs_Scope.

 framework/Prefs/lib/Horde/Prefs/Scope.php |  148 ++++++++++++++++++----------
 framework/Prefs/package.xml               |    4 +-
 2 files changed, 97 insertions(+), 55 deletions(-)

http://git.horde.org/horde-git/-/commit/7c7ea99288d7645eacad1a8fbb11f91d43ecbead

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

commit 5023660e5051406a9fa57f97039f448ba955eb81
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Wed Mar 6 19:15:28 2013 -0700

    Bug #12096: make sure data is string before doing JSON check

 imp/js/dimpbase.js |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

http://git.horde.org/horde-git/-/commit/5023660e5051406a9fa57f97039f448ba955eb81

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

commit f64963de143dc52df6cd4ff8a64363cb5113e204
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Wed Mar 6 19:24:27 2013 -0700

    Bug #12095: Hotfix to allow for Y-scrolling in search page in dynamic view

 imp/lib/IMP.php                       |    6 +++---
 imp/search.php                        |    2 +-
 imp/themes/default/dynamic/screen.css |    3 +++
 3 files changed, 7 insertions(+), 4 deletions(-)

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

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

commit 683b9f56d0079bd53960dbf54b82d4a7669c812b
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Wed Mar 6 19:32:40 2013 -0700

    Bug #12095: Fix setting initial height of search IFRAME

 imp/js/dimpbase.js |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

http://git.horde.org/horde-git/-/commit/683b9f56d0079bd53960dbf54b82d4a7669c812b

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

commit 8f83331826c692cf4a0f0379a71115bf7675f995
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Wed Mar 6 19:32:53 2013 -0700

    Adjust search IFRAME height when resizing window

 imp/js/dimpbase.js |    9 ++++++++-
 1 files changed, 8 insertions(+), 1 deletions(-)

http://git.horde.org/horde-git/-/commit/8f83331826c692cf4a0f0379a71115bf7675f995

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

commit b1e4cd48cfeb2c76c76e2699a0c3afb692ee3858
Merge: 34a95a6 8f83331
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Thu Mar 7 15:52:59 2013 -0700

    Merge branch 'master' into imp_6_1
    
    Conflicts:
    	imp/lib/IMP.php
    	imp/search.php
    	imp/themes/default/dynamic/screen.css

 framework/Prefs/lib/Horde/Prefs/Scope.php |  148 ++++++++++++++++++----------
 framework/Prefs/package.xml               |    4 +-
 imp/js/dimpbase.js                        |   13 ++-
 imp/lib/Basic/Search.php                  |    3 +
 imp/themes/default/dynamic/screen.css     |    2 +-
 5 files changed, 111 insertions(+), 59 deletions(-)

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