[commits] Horde branch develop updated. e02a063bd8fb09e725bff3ad25286c5822921000

[Michael M Slusarz]

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

from: 4b38b03606870c8e3946289d3486fe831c90df03

69d5317 Don't add AJAX header to page if IMP::header() is called
93d602d ANOTHER part of the botched merge
0ab98bd Guess what? You guessed it. Another part of botched merge
ec68c59 Merge branch 'master' into develop
3afb13f Fix hiding header if all subprefs are hidden.
c730864 Fix viewable prefs when toggling from Hide->Show Advanced
e02a063 Merge branch 'master' into develop

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

commit 69d5317d528a693530d3d5508fa6ed691ed151d1
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Wed Feb 15 16:16:48 2012 -0700

    Don't add AJAX header to page if IMP::header() is called
    
    This indicates a traditional page being loaded in dynamic view (only one
    I can think of off top of my head is contacts - which doesn't need any
    of the AJAX stuff)

 imp/lib/IMP.php |    4 ----
 1 files changed, 0 insertions(+), 4 deletions(-)

http://git.horde.org/horde-git/-/commit/69d5317d528a693530d3d5508fa6ed691ed151d1

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

commit 93d602d22ffa644350991e83c6eaa96a831ebca8
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Wed Feb 15 17:24:01 2012 -0700

    ANOTHER part of the botched merge

 imp/lib/Compose.php |   14 ++++++++------
 1 files changed, 8 insertions(+), 6 deletions(-)

http://git.horde.org/horde-git/-/commit/93d602d22ffa644350991e83c6eaa96a831ebca8

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

commit 0ab98bdb2892361a71ff7e1d89f0fa6f526dfc9b
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Wed Feb 15 17:31:25 2012 -0700

    Guess what? You guessed it. Another part of botched merge

 imp/lib/Compose.php |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

http://git.horde.org/horde-git/-/commit/0ab98bdb2892361a71ff7e1d89f0fa6f526dfc9b

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

commit ec68c59ab418500351daf9ca23fdade9cabd1b21
Merge: 69d5317 0ab98bd
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Wed Feb 15 17:38:10 2012 -0700

    Merge branch 'master' into develop
    
    Conflicts:
    	imp/lib/Compose.php


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

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

commit 3afb13f3a404e713cb521110f0bba64b866f2c6b
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Wed Feb 15 18:07:32 2012 -0700

    Fix hiding header if all subprefs are hidden.

 imp/lib/Prefs/Ui.php |   17 ++++++++---------
 1 files changed, 8 insertions(+), 9 deletions(-)

http://git.horde.org/horde-git/-/commit/3afb13f3a404e713cb521110f0bba64b866f2c6b

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

commit c730864e893bd36b828d5e994abe0c1d078959be
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Wed Feb 15 18:08:11 2012 -0700

    Fix viewable prefs when toggling from Hide->Show Advanced

 framework/Core/lib/Horde/Core/Prefs/Ui.php |   26 +++++++++++---------------
 1 files changed, 11 insertions(+), 15 deletions(-)

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

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

commit e02a063bd8fb09e725bff3ad25286c5822921000
Merge: 3afb13f c730864
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Wed Feb 15 18:15:24 2012 -0700

    Merge branch 'master' into develop

 framework/Core/lib/Horde/Core/Prefs/Ui.php |   26 +++++++++++---------------
 1 files changed, 11 insertions(+), 15 deletions(-)

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