[commits] Horde branch master updated. 0d3074deac715da0270637b4398536f6032e7024

[Michael M Slusarz]

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

from: 898c9178ce8a81ebff27112895734a1c479cbdb4

ec12e44 Don't display HTML image options if HTML inline viewing is disabled
a6d02a9 Fix typo.
0d3074d Request #9129: Allow admin to define list of safe e-mail addresses that will not experience HTML image blocking

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

commit ec12e44b9ddbe58bc23eeb9b305486eff75fde6f
Author: Michael M Slusarz <slusarz at curecanti.org>
Date:   Thu Jul 8 23:29:28 2010 -0600

    Don't display HTML image options if HTML inline viewing is disabled

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

http://git.horde.org/diff.php/imp/lib/Prefs/Ui.php?rt=horde-git&r1=4343b7a9079e436ff77770deb9adb6b1f38cc29c&r2=ec12e44b9ddbe58bc23eeb9b305486eff75fde6f

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

commit a6d02a936008e877e0a4d5f615f5349709005451
Author: Michael M Slusarz <slusarz at curecanti.org>
Date:   Thu Jul 8 23:33:50 2010 -0600

    Fix typo.

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

http://git.horde.org/diff.php/imp/lib/Mime/Viewer/Html.php?rt=horde-git&r1=2effd3ce519011db72737c32c437f9c6364a23f0&r2=a6d02a936008e877e0a4d5f615f5349709005451

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

commit 0d3074deac715da0270637b4398536f6032e7024
Author: Michael M Slusarz <slusarz at curecanti.org>
Date:   Thu Jul 8 23:47:41 2010 -0600

    Request #9129: Allow admin to define list of safe e-mail addresses that will not experience HTML image blocking

 imp/config/mime_drivers.php.dist |    5 ++++-
 imp/docs/CHANGES                 |    2 ++
 imp/lib/Mime/Viewer/Html.php     |   29 ++++++++++++++---------------
 3 files changed, 20 insertions(+), 16 deletions(-)

http://git.horde.org/diff.php/imp/config/mime_drivers.php.dist?rt=horde-git&r1=0106a25421134e74ab8cfc514492077d22c9dfc4&r2=0d3074deac715da0270637b4398536f6032e7024
http://git.horde.org/diff.php/imp/docs/CHANGES?rt=horde-git&r1=5a820898cfc8b88f235ae52cbc1de20081e04b52&r2=0d3074deac715da0270637b4398536f6032e7024
http://git.horde.org/diff.php/imp/lib/Mime/Viewer/Html.php?rt=horde-git&r1=a6d02a936008e877e0a4d5f615f5349709005451&r2=0d3074deac715da0270637b4398536f6032e7024