[commits] Horde branch master updated. 357dcb4d1ecb9adfe8513551928f23485dfe1497

[Michael M Slusarz]

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

from: fda1bfe7f1abcc401dfe96ada639c15b74765ea8

af64145 Add advanced preferences options screen
a67bfb1 Remove undefined variable
314be53 ws
b9376eb Remove implict parameter from getChangeablePrefs()
0bcfbb2 Better place for 'Clear Sort' in IMP
375ca93 Suppress trash preferences if use trash is off
357dcb4 Fix function location

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

commit af641454c185e75d46fa43da92ef16d0c29d6cb1
Author: Michael M Slusarz <slusarz at curecanti.org>
Date:   Mon Apr 12 23:25:52 2010 -0600

    Add advanced preferences options screen

 framework/Core/lib/Horde/Core/Prefs/Ui.php |   24 +++++++++++++
 horde/config/prefs.php.dist                |    7 ++++
 horde/docs/CHANGES                         |    1 +
 horde/templates/prefs/app.html             |    7 ++++
 horde/themes/screen.css                    |    4 ++
 imp/config/prefs.php.dist                  |   51 ++++++++++------------------
 6 files changed, 61 insertions(+), 33 deletions(-)

http://git.horde.org/diff.php/framework/Core/lib/Horde/Core/Prefs/Ui.php?rt=horde-git&r1=e8c0405c765bdefedc515dbff81a514a19437840&r2=af641454c185e75d46fa43da92ef16d0c29d6cb1
http://git.horde.org/diff.php/horde/config/prefs.php.dist?rt=horde-git&r1=8ac78937690abc8f17c0607bddc8ddaece297330&r2=af641454c185e75d46fa43da92ef16d0c29d6cb1
http://git.horde.org/diff.php/horde/docs/CHANGES?rt=horde-git&r1=e7607f6e50b6cc245ead9bd27d24abec185ae3d5&r2=af641454c185e75d46fa43da92ef16d0c29d6cb1
http://git.horde.org/diff.php/horde/templates/prefs/app.html?rt=horde-git&r1=6e6599dfe74533b868cb0aaa80eeb6a2d482ce92&r2=af641454c185e75d46fa43da92ef16d0c29d6cb1
http://git.horde.org/diff.php/horde/themes/screen.css?rt=horde-git&r1=6e6599dfe74533b868cb0aaa80eeb6a2d482ce92&r2=af641454c185e75d46fa43da92ef16d0c29d6cb1
http://git.horde.org/diff.php/imp/config/prefs.php.dist?rt=horde-git&r1=fda1bfe7f1abcc401dfe96ada639c15b74765ea8&r2=af641454c185e75d46fa43da92ef16d0c29d6cb1

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

commit a67bfb181367d4bbbfab4c40497eddb7c0dfbf01
Author: Michael M Slusarz <slusarz at curecanti.org>
Date:   Mon Apr 12 23:30:02 2010 -0600

    Remove undefined variable

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

http://git.horde.org/diff.php/imp/lib/Mime/Viewer/Plain.php?rt=horde-git&r1=de347bba139d81860155af2c4b215eeccc180746&r2=a67bfb181367d4bbbfab4c40497eddb7c0dfbf01

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

commit 314be53dee6250ab613e248c0317b87aeaa942c0
Author: Michael M Slusarz <slusarz at curecanti.org>
Date:   Mon Apr 12 23:19:59 2010 -0600

    ws

 horde/templates/prefs/alarm.html |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

http://git.horde.org/diff.php/horde/templates/prefs/alarm.html?rt=horde-git&r1=6e6599dfe74533b868cb0aaa80eeb6a2d482ce92&r2=314be53dee6250ab613e248c0317b87aeaa942c0

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

commit b9376eb4c2dd871ed1a214f0aacee515e182cc31
Author: Michael M Slusarz <slusarz at curecanti.org>
Date:   Mon Apr 12 23:43:01 2010 -0600

    Remove implict parameter from getChangeablePrefs()

 framework/Core/lib/Horde/Core/Prefs/Ui.php |   18 ++++++++----------
 1 files changed, 8 insertions(+), 10 deletions(-)

http://git.horde.org/diff.php/framework/Core/lib/Horde/Core/Prefs/Ui.php?rt=horde-git&r1=af641454c185e75d46fa43da92ef16d0c29d6cb1&r2=b9376eb4c2dd871ed1a214f0aacee515e182cc31

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

commit 0bcfbb2079388663de95f8dd6305539b328e779d
Author: Michael M Slusarz <slusarz at curecanti.org>
Date:   Tue Apr 13 00:00:02 2010 -0600

    Better place for 'Clear Sort' in IMP

 imp/js/mailbox.js                              |   15 ++++++++++---
 imp/mailbox.php                                |   25 ++++++++++++++++++-----
 imp/templates/imp/mailbox/actions.html         |   13 ++++++-----
 imp/templates/imp/mailbox/message_headers.html |    3 --
 imp/themes/screen.css                          |    5 ----
 5 files changed, 37 insertions(+), 24 deletions(-)

http://git.horde.org/diff.php/imp/js/mailbox.js?rt=horde-git&r1=f9d59c2e3d38ac2af064e1b9f422b8de8328c5bd&r2=0bcfbb2079388663de95f8dd6305539b328e779d
http://git.horde.org/diff.php/imp/mailbox.php?rt=horde-git&r1=8e662a4a7d28963cc28b2350fed6e873da5a9a57&r2=0bcfbb2079388663de95f8dd6305539b328e779d
http://git.horde.org/diff.php/imp/templates/imp/mailbox/actions.html?rt=horde-git&r1=5404700f4b97b554db35b74c3a3dd65afcab90fe&r2=0bcfbb2079388663de95f8dd6305539b328e779d
http://git.horde.org/diff.php/imp/templates/imp/mailbox/message_headers.html?rt=horde-git&r1=8e662a4a7d28963cc28b2350fed6e873da5a9a57&r2=0bcfbb2079388663de95f8dd6305539b328e779d
http://git.horde.org/diff.php/imp/themes/screen.css?rt=horde-git&r1=6e6599dfe74533b868cb0aaa80eeb6a2d482ce92&r2=0bcfbb2079388663de95f8dd6305539b328e779d

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

commit 375ca9376b445764324b61a623a9a4b2c9fac567
Author: Michael M Slusarz <slusarz at curecanti.org>
Date:   Tue Apr 13 00:10:47 2010 -0600

    Suppress trash preferences if use trash is off

 imp/config/prefs.php.dist |    3 +--
 imp/lib/Prefs/Ui.php      |    9 ++++++++-
 2 files changed, 9 insertions(+), 3 deletions(-)

http://git.horde.org/diff.php/imp/config/prefs.php.dist?rt=horde-git&r1=af641454c185e75d46fa43da92ef16d0c29d6cb1&r2=375ca9376b445764324b61a623a9a4b2c9fac567
http://git.horde.org/diff.php/imp/lib/Prefs/Ui.php?rt=horde-git&r1=fda1bfe7f1abcc401dfe96ada639c15b74765ea8&r2=375ca9376b445764324b61a623a9a4b2c9fac567

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

commit 357dcb4d1ecb9adfe8513551928f23485dfe1497
Author: Michael M Slusarz <slusarz at curecanti.org>
Date:   Tue Apr 13 00:13:19 2010 -0600

    Fix function location

 imp/lib/Crypt/Pgp.php   |    2 +-
 imp/lib/Crypt/Smime.php |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

http://git.horde.org/diff.php/imp/lib/Crypt/Pgp.php?rt=horde-git&r1=686d5ca6ac47356af4ec4620486adff71baecdce&r2=357dcb4d1ecb9adfe8513551928f23485dfe1497
http://git.horde.org/diff.php/imp/lib/Crypt/Smime.php?rt=horde-git&r1=686d5ca6ac47356af4ec4620486adff71baecdce&r2=357dcb4d1ecb9adfe8513551928f23485dfe1497