[commits] Horde branch develop updated. 6c9dc69ebd73d8cf752ff782a5dd682da50a5b4e

[Michael M Slusarz]

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

from: 98c2e704adf5a6a1e08494bd97cda8f7ce3ebcdf

d7fa9be Better view of collapsed header when browser window is small
edf3dce Fix displaying all parts
083f611 [mms] Improved tree display when displaying all message parts.
c198aae Remove duplicate image
6c9dc69 Merge branch 'master' into develop

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

commit d7fa9be12737216ac96b7ec4ebc93dac32e7e0bd
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Fri Nov 18 23:08:26 2011 -0700

    Better view of collapsed header when browser window is small

 imp/themes/default/dimp/screen.css |   19 +++++++++----------
 1 files changed, 9 insertions(+), 10 deletions(-)

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

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

commit edf3dce469f5795c735c21fbcf074046a0d7ce78
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Fri Nov 18 23:19:45 2011 -0700

    Fix displaying all parts

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

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

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

commit 083f61124528aa541bbc1320ca692b2d3035f879
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Sat Nov 19 00:08:13 2011 -0700

    [mms] Improved tree display when displaying all message parts.

 imp/docs/CHANGES              |    1 +
 imp/lib/Contents.php          |   40 +++++++++++++++++++++++++++++-----------
 imp/message.php               |   35 +++++++++++++++++++----------------
 imp/package.xml               |    2 ++
 imp/themes/default/screen.css |    6 ++++++
 5 files changed, 57 insertions(+), 27 deletions(-)

http://git.horde.org/horde-git/-/commit/083f61124528aa541bbc1320ca692b2d3035f879

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

commit c198aaeb0b2a6d9f4df69ee496ccce71ecc5e935
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Sat Nov 19 00:45:59 2011 -0700

    Remove duplicate image

 imp/compose.php                                       |    2 +-
 imp/themes/default/graphics/manage_attachments.png    |  Bin 351 -> 0 bytes
 imp/themes/silver/graphics/manage_attachments.png     |  Bin 391 -> 0 bytes
 imp/themes/tango-blue/graphics/manage_attachments.png |  Bin 547 -> 0 bytes
 4 files changed, 1 insertions(+), 1 deletions(-)
 delete mode 100644 imp/themes/default/graphics/manage_attachments.png
 delete mode 100644 imp/themes/silver/graphics/manage_attachments.png
 delete mode 100644 imp/themes/tango-blue/graphics/manage_attachments.png

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

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

commit 6c9dc69ebd73d8cf752ff782a5dd682da50a5b4e
Merge: 98c2e70 c198aae
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Sat Nov 19 15:28:31 2011 -0700

    Merge branch 'master' into develop
    
    Conflicts:
    	imp/docs/CHANGES
    	imp/package.xml

 imp/compose.php                                       |    2 +-
 imp/docs/CHANGES                                      |    5 +-
 imp/lib/Contents.php                                  |   42 ++++++++++++-----
 imp/message.php                                       |   35 ++++++++------
 imp/package.xml                                       |    2 +-
 imp/themes/default/dimp/screen.css                    |   19 ++++----
 imp/themes/default/graphics/manage_attachments.png    |  Bin 351 -> 0 bytes
 imp/themes/default/screen.css                         |    6 ++
 imp/themes/silver/graphics/manage_attachments.png     |  Bin 391 -> 0 bytes
 imp/themes/tango-blue/graphics/manage_attachments.png |  Bin 547 -> 0 bytes
 10 files changed, 69 insertions(+), 42 deletions(-)

http://git.horde.org/horde-git/-/commit/6c9dc69ebd73d8cf752ff782a5dd682da50a5b4e