[commits] Horde branch develop updated. 6f69ab0dd7e9008c5f7566f4347395a3cb848bdb
Michael M Slusarz
slusarz at horde.org
Fri Jun 8 20:50:55 UTC 2012
The branch "develop" has been updated.
The following is a summary of the commits.
from: 741c4c4bbd56181890a9d2dbc58260a352d9090c
e57837a This seems to be an extra closing </span> tag
cbfd6c0 [jan] Improve error reporting in whups-mail-filter.
c8fb2d0 This is not the Webmail Edition.
1c59a00 Fix links (Bug #11214).
4bd44eb Amend fileinfo docs for PHP 5.3 (Request #11213).
9f26db4 [mms] Actually delete the cookie key from the browser when clearKey() is called.
bc78a24 Remove in H4, since it may break authentication.
b891c88 [mms] Add DEFAULT_KEY constant.
99c0297 [mms] Secret keys should always be session expiration cookies.
6f69ab0 Merge branch 'master' into develop
-----------------------------------------------------------------------
commit e57837af12fa12ac31e0b9efd77e590bd0238bb0
Author: Chuck Hagenbuch <chuck at horde.org>
Date: Thu Jun 7 21:44:20 2012 -0400
This seems to be an extra closing </span> tag
ansel/lib/Ansel.php | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
http://git.horde.org/horde-git/-/commit/e57837af12fa12ac31e0b9efd77e590bd0238bb0
-----------------------------------------------------------------------
commit cbfd6c00fa742e1b10b27b23d919d40216c21354
Author: Jan Schneider <jan at horde.org>
Date: Fri Jun 8 13:38:32 2012 +0200
[jan] Improve error reporting in whups-mail-filter.
whups/bin/whups-mail-filter | 13 +++++++++++--
whups/docs/CHANGES | 1 +
whups/package.xml | 4 ++--
3 files changed, 14 insertions(+), 4 deletions(-)
http://git.horde.org/horde-git/-/commit/cbfd6c00fa742e1b10b27b23d919d40216c21354
-----------------------------------------------------------------------
commit c8fb2d00e5180d17f435c65b466113a20f2d9c79
Author: Jan Schneider <jan at horde.org>
Date: Fri Jun 8 16:00:50 2012 +0200
This is not the Webmail Edition.
bundles/groupware/docs/INSTALL | 69 ++++++++++------------------------------
1 files changed, 17 insertions(+), 52 deletions(-)
http://git.horde.org/horde-git/-/commit/c8fb2d00e5180d17f435c65b466113a20f2d9c79
-----------------------------------------------------------------------
commit 1c59a00a24f02ffce3e3589ec67216bf7ce64901
Author: Jan Schneider <jan at horde.org>
Date: Fri Jun 8 16:02:10 2012 +0200
Fix links (Bug #11214).
bundles/webmail/docs/INSTALL | 2 +-
imp/docs/INSTALL | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
http://git.horde.org/horde-git/-/commit/1c59a00a24f02ffce3e3589ec67216bf7ce64901
-----------------------------------------------------------------------
commit 4bd44ebf11f2be944c1876f97a09f36dbb7cd11e
Author: Jan Schneider <jan at horde.org>
Date: Fri Jun 8 16:05:49 2012 +0200
Amend fileinfo docs for PHP 5.3 (Request #11213).
bundles/groupware/docs/INSTALL | 2 ++
bundles/webmail/docs/INSTALL | 2 ++
horde/docs/INSTALL | 2 +-
3 files changed, 5 insertions(+), 1 deletions(-)
http://git.horde.org/horde-git/-/commit/4bd44ebf11f2be944c1876f97a09f36dbb7cd11e
-----------------------------------------------------------------------
commit 9f26db4e50bc8087735a26d8aa2ab5e99090ae65
Author: Michael M Slusarz <slusarz at horde.org>
Date: Fri Jun 8 14:25:18 2012 -0600
[mms] Actually delete the cookie key from the browser when clearKey() is called.
framework/Secret/lib/Horde/Secret.php | 1 +
framework/Secret/package.xml | 4 ++--
2 files changed, 3 insertions(+), 2 deletions(-)
http://git.horde.org/horde-git/-/commit/9f26db4e50bc8087735a26d8aa2ab5e99090ae65
-----------------------------------------------------------------------
commit bc78a240087b9514d4305788e66723e14e2ce222
Author: Michael M Slusarz <slusarz at horde.org>
Date: Fri Jun 8 14:30:00 2012 -0600
Remove in H4, since it may break authentication.
We can't change secret keys on login, since we may lose access to
encrypted authentication information. This will be fixed properly in H5.
framework/Core/lib/Horde/Registry.php | 4 ----
1 files changed, 0 insertions(+), 4 deletions(-)
http://git.horde.org/horde-git/-/commit/bc78a240087b9514d4305788e66723e14e2ce222
-----------------------------------------------------------------------
commit b891c889f636e1112bab52c081f296dbbcd1b04f
Author: Michael M Slusarz <slusarz at horde.org>
Date: Fri Jun 8 14:41:36 2012 -0600
[mms] Add DEFAULT_KEY constant.
framework/Secret/lib/Horde/Secret.php | 14 +++++++++-----
framework/Secret/package.xml | 2 ++
2 files changed, 11 insertions(+), 5 deletions(-)
http://git.horde.org/horde-git/-/commit/b891c889f636e1112bab52c081f296dbbcd1b04f
-----------------------------------------------------------------------
commit 99c02971886fd4e7ca1a06ba5411765febac6363
Author: Michael M Slusarz <slusarz at horde.org>
Date: Fri Jun 8 14:40:34 2012 -0600
[mms] Secret keys should always be session expiration cookies.
framework/Core/lib/Horde/Core/Factory/Secret.php | 1 -
framework/Secret/lib/Horde/Secret.php | 14 +++++---------
framework/Secret/package.xml | 2 ++
3 files changed, 7 insertions(+), 10 deletions(-)
http://git.horde.org/horde-git/-/commit/99c02971886fd4e7ca1a06ba5411765febac6363
-----------------------------------------------------------------------
commit 6f69ab0dd7e9008c5f7566f4347395a3cb848bdb
Merge: 741c4c4 99c0297
Author: Michael M Slusarz <slusarz at horde.org>
Date: Fri Jun 8 14:45:28 2012 -0600
Merge branch 'master' into develop
Conflicts:
framework/Core/lib/Horde/Registry.php
framework/Secret/lib/Horde/Secret.php
horde/docs/INSTALL
whups/bin/whups-mail-filter
whups/package.xml
ansel/lib/Ansel.php | 2 +-
bundles/groupware/docs/INSTALL | 71 ++++++----------------
bundles/webmail/docs/INSTALL | 4 +-
framework/Core/lib/Horde/Core/Factory/Secret.php | 1 -
framework/Secret/lib/Horde/Secret.php | 19 ++++---
framework/Secret/package.xml | 8 ++-
imp/docs/INSTALL | 2 +-
whups/bin/whups-mail-filter | 6 +-
whups/docs/CHANGES | 1 +
whups/package.xml | 13 ++++
10 files changed, 59 insertions(+), 68 deletions(-)
http://git.horde.org/horde-git/-/commit/6f69ab0dd7e9008c5f7566f4347395a3cb848bdb
More information about the commits
mailing list