[commits] Horde branch imp_6_2 updated. 328cdb70ae7c4ea1f6c9461948a4168f70d0502f
Michael M Slusarz
slusarz at horde.org
Mon Nov 4 20:13:20 UTC 2013
The branch "imp_6_2" has been updated.
The following is a summary of the commits.
from: 95e333fca2e4a8e056deca20973a09cb7993f2c8
c8945fb phpdoc
4b9bf43 [mms] Fix regression in parsing permission values (Bug #12812).
ecab8de Add CVEs.
135bd33 [jan] Fix calculation of work week start if on a weekend.
4aad928 Fix spelling.
94d1bf6 Fix sending proper error codes when FOLDERCREATE command fails.
b94fa83 Filter out non-email collections when calling changeFolder.
21ceeb7 Pass the collection type to the driver as well.
60063a7 This should be removed in the future
9285d36 Return correct permission value
150ec62 Must pass the serverid, not the (EAS) id.
4c37be8 Add token protection info
1377d0c [mms] Add nonce generation/checking to Horde_Session.
8a3a324 spelling
1ad4e78 [mms] Need to expire SQL cache for all sub-permissions when deleting a parent permission.
1d6ae7f Better logging
4bdce15 [mms] Restore error reporting level after running tests via Horde_Test_AllTests#run().
1cec8e6 Released Horde_Perms-2.1.2
33db5ab Development mode for Horde_Perms-2.1.3
328cdb7 Merge branch 'master' into imp_6_2
Summary: http://github.com/horde/horde/compare/95e333fca2e4a8e056deca20973a09cb7993f2c8...328cdb70ae7c4ea1f6c9461948a4168f70d0502f
-----------------------------------------------------------------------
commit c8945fb86ec8044dd4d55ddca1c51f4b7f9f4878
Author: Michael M Slusarz <slusarz at horde.org>
Date: Sun Nov 3 22:32:10 2013 -0700
phpdoc
imp/lib/Perms.php | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
http://github.com/horde/horde/commit/c8945fb86ec8044dd4d55ddca1c51f4b7f9f4878
http://git.horde.org/horde-git/-/commit/c8945fb86ec8044dd4d55ddca1c51f4b7f9f4878
-----------------------------------------------------------------------
commit 4b9bf43153163e565b9f7201bb034d35feb6724d
Author: Michael M Slusarz <slusarz at horde.org>
Date: Sun Nov 3 23:18:57 2013 -0700
[mms] Fix regression in parsing permission values (Bug #12812).
imp/docs/CHANGES | 1 +
imp/lib/Imap.php | 2 +-
imp/lib/Perms.php | 10 +++++++---
imp/package.xml | 2 ++
4 files changed, 11 insertions(+), 4 deletions(-)
http://github.com/horde/horde/commit/4b9bf43153163e565b9f7201bb034d35feb6724d
http://git.horde.org/horde-git/-/commit/4b9bf43153163e565b9f7201bb034d35feb6724d
-----------------------------------------------------------------------
commit ecab8def76dfce2a503f56c88da511ab6de802ac
Author: Jan Schneider <jan at horde.org>
Date: Mon Nov 4 11:58:25 2013 +0100
Add CVEs.
horde/docs/CHANGES | 5 +++--
horde/package.xml | 4 ++--
kronolith/docs/CHANGES | 2 +-
kronolith/package.xml | 2 +-
4 files changed, 7 insertions(+), 6 deletions(-)
http://github.com/horde/horde/commit/ecab8def76dfce2a503f56c88da511ab6de802ac
http://git.horde.org/horde-git/-/commit/ecab8def76dfce2a503f56c88da511ab6de802ac
-----------------------------------------------------------------------
commit 135bd334928f0a12dc5b64255b1f552206dc4b20
Author: Jan Schneider <jan at horde.org>
Date: Mon Nov 4 15:27:29 2013 +0100
[jan] Fix calculation of work week start if on a weekend.
kronolith/docs/CHANGES | 1 +
kronolith/js/kronolith.js | 1 +
kronolith/package.xml | 2 ++
3 files changed, 4 insertions(+), 0 deletions(-)
http://github.com/horde/horde/commit/135bd334928f0a12dc5b64255b1f552206dc4b20
http://git.horde.org/horde-git/-/commit/135bd334928f0a12dc5b64255b1f552206dc4b20
-----------------------------------------------------------------------
commit 4aad92895b871add4a1fb14341b1f5063ed7512c
Author: Jan Schneider <jan at horde.org>
Date: Mon Nov 4 15:46:54 2013 +0100
Fix spelling.
ingo/locale/en/help.xml | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
http://github.com/horde/horde/commit/4aad92895b871add4a1fb14341b1f5063ed7512c
http://git.horde.org/horde-git/-/commit/4aad92895b871add4a1fb14341b1f5063ed7512c
-----------------------------------------------------------------------
commit 94d1bf6e630062d665ddd8c0023bb7622efce7d7
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date: Mon Nov 4 12:15:10 2013 -0500
Fix sending proper error codes when FOLDERCREATE command fails.
framework/ActiveSync/lib/Horde/ActiveSync/Connector/Importer.php | 6 +-
framework/ActiveSync/lib/Horde/ActiveSync/Exception.php | 7 +
.../ActiveSync/lib/Horde/ActiveSync/Request/FolderCreate.php | 41 +++--
3 files changed, 38 insertions(+), 16 deletions(-)
http://github.com/horde/horde/commit/94d1bf6e630062d665ddd8c0023bb7622efce7d7
http://git.horde.org/horde-git/-/commit/94d1bf6e630062d665ddd8c0023bb7622efce7d7
-----------------------------------------------------------------------
commit b94fa83457a844853cc57158d50c523f60287a3b
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date: Mon Nov 4 12:22:30 2013 -0500
Filter out non-email collections when calling changeFolder.
Creating new collections like this is not supported until Horde 5.2.
framework/Core/lib/Horde/Core/ActiveSync/Driver.php | 11 +++++++++++
1 files changed, 11 insertions(+), 0 deletions(-)
http://github.com/horde/horde/commit/b94fa83457a844853cc57158d50c523f60287a3b
http://git.horde.org/horde-git/-/commit/b94fa83457a844853cc57158d50c523f60287a3b
-----------------------------------------------------------------------
commit 21ceeb79653974df5dc2b56dad11ee4a9c9b04ec
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date: Mon Nov 4 12:24:27 2013 -0500
Pass the collection type to the driver as well.
framework/ActiveSync/lib/Horde/ActiveSync/Connector/Importer.php | 7 +++--
1 files changed, 4 insertions(+), 3 deletions(-)
http://github.com/horde/horde/commit/21ceeb79653974df5dc2b56dad11ee4a9c9b04ec
http://git.horde.org/horde-git/-/commit/21ceeb79653974df5dc2b56dad11ee4a9c9b04ec
-----------------------------------------------------------------------
commit 60063a7d509a55fb28989e48dc85fb2042e13f9c
Author: Michael M Slusarz <slusarz at horde.org>
Date: Mon Nov 4 10:52:02 2013 -0700
This should be removed in the future
framework/Core/lib/Horde/Registry.php | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
http://github.com/horde/horde/commit/60063a7d509a55fb28989e48dc85fb2042e13f9c
http://git.horde.org/horde-git/-/commit/60063a7d509a55fb28989e48dc85fb2042e13f9c
-----------------------------------------------------------------------
commit 9285d362355f03b40905b47ce0c38c1642c8e7ba
Author: Michael M Slusarz <slusarz at horde.org>
Date: Mon Nov 4 10:53:37 2013 -0700
Return correct permission value
imp/lib/Imap.php | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
http://github.com/horde/horde/commit/9285d362355f03b40905b47ce0c38c1642c8e7ba
http://git.horde.org/horde-git/-/commit/9285d362355f03b40905b47ce0c38c1642c8e7ba
-----------------------------------------------------------------------
commit 150ec624e786155bde5d0f50421a5cc038100ebd
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date: Mon Nov 4 14:36:48 2013 -0500
Must pass the serverid, not the (EAS) id.
framework/ActiveSync/lib/Horde/ActiveSync/State/Base.php | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
http://github.com/horde/horde/commit/150ec624e786155bde5d0f50421a5cc038100ebd
http://git.horde.org/horde-git/-/commit/150ec624e786155bde5d0f50421a5cc038100ebd
-----------------------------------------------------------------------
commit 4c37be8c246868b78d2d715f06b4c416224d3856
Author: Michael M Slusarz <slusarz at horde.org>
Date: Mon Nov 4 11:09:01 2013 -0700
Add token protection info
horde/docs/CODING_STANDARDS | 8 ++++++++
1 files changed, 8 insertions(+), 0 deletions(-)
http://github.com/horde/horde/commit/4c37be8c246868b78d2d715f06b4c416224d3856
http://git.horde.org/horde-git/-/commit/4c37be8c246868b78d2d715f06b4c416224d3856
-----------------------------------------------------------------------
commit 1377d0c3497d28696a8fcda6334d74ae624593cb
Author: Michael M Slusarz <slusarz at horde.org>
Date: Mon Nov 4 11:24:44 2013 -0700
[mms] Add nonce generation/checking to Horde_Session.
framework/Core/lib/Horde/Session.php | 41 ++++++++++++++++++++++++++++++++++
framework/Core/package.xml | 2 +
2 files changed, 43 insertions(+), 0 deletions(-)
http://github.com/horde/horde/commit/1377d0c3497d28696a8fcda6334d74ae624593cb
http://git.horde.org/horde-git/-/commit/1377d0c3497d28696a8fcda6334d74ae624593cb
-----------------------------------------------------------------------
commit 8a3a3242fc7dae8a4bc1a0c158d3c4cd0a2dc5d0
Author: Michael M Slusarz <slusarz at horde.org>
Date: Mon Nov 4 12:46:51 2013 -0700
spelling
framework/Perms/lib/Horde/Perms/Sql.php | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
http://github.com/horde/horde/commit/8a3a3242fc7dae8a4bc1a0c158d3c4cd0a2dc5d0
http://git.horde.org/horde-git/-/commit/8a3a3242fc7dae8a4bc1a0c158d3c4cd0a2dc5d0
-----------------------------------------------------------------------
commit 1ad4e781bf14f1b857a1be46abc2e0d8bdd4e532
Author: Michael M Slusarz <slusarz at horde.org>
Date: Mon Nov 4 12:54:39 2013 -0700
[mms] Need to expire SQL cache for all sub-permissions when deleting a parent permission.
framework/Perms/lib/Horde/Perms/Sql.php | 12 ++++++++++++
framework/Perms/package.xml | 4 ++--
2 files changed, 14 insertions(+), 2 deletions(-)
http://github.com/horde/horde/commit/1ad4e781bf14f1b857a1be46abc2e0d8bdd4e532
http://git.horde.org/horde-git/-/commit/1ad4e781bf14f1b857a1be46abc2e0d8bdd4e532
-----------------------------------------------------------------------
commit 1d6ae7fc3f5c99226ec02ef13439d6455ecff8e4
Author: Michael M Slusarz <slusarz at horde.org>
Date: Mon Nov 4 13:01:05 2013 -0700
Better logging
framework/Cache/lib/Horde/Cache/Storage/Mongo.php | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
http://github.com/horde/horde/commit/1d6ae7fc3f5c99226ec02ef13439d6455ecff8e4
http://git.horde.org/horde-git/-/commit/1d6ae7fc3f5c99226ec02ef13439d6455ecff8e4
-----------------------------------------------------------------------
commit 4bdce154b9a12e67a270d096bc57c4238ed7cc21
Author: Michael M Slusarz <slusarz at horde.org>
Date: Mon Nov 4 13:07:38 2013 -0700
[mms] Restore error reporting level after running tests via Horde_Test_AllTests#run().
framework/Test/lib/Horde/Test/AllTests.php | 2 ++
framework/Test/package.xml | 4 ++--
2 files changed, 4 insertions(+), 2 deletions(-)
http://github.com/horde/horde/commit/4bdce154b9a12e67a270d096bc57c4238ed7cc21
http://git.horde.org/horde-git/-/commit/4bdce154b9a12e67a270d096bc57c4238ed7cc21
-----------------------------------------------------------------------
commit 1cec8e6c6f885bb1e74e5d1a157b7cead7fe9ecc
Author: Michael M Slusarz <slusarz at horde.org>
Date: Mon Nov 4 13:08:32 2013 -0700
Released Horde_Perms-2.1.2
framework/Perms/composer.json | 2 +-
framework/Perms/package.xml | 5 ++---
2 files changed, 3 insertions(+), 4 deletions(-)
http://github.com/horde/horde/commit/1cec8e6c6f885bb1e74e5d1a157b7cead7fe9ecc
http://git.horde.org/horde-git/-/commit/1cec8e6c6f885bb1e74e5d1a157b7cead7fe9ecc
-----------------------------------------------------------------------
commit 33db5ab3457e72bfbd9f07edc91aa5210afc92f3
Author: Michael M Slusarz <slusarz at horde.org>
Date: Mon Nov 4 13:08:33 2013 -0700
Development mode for Horde_Perms-2.1.3
framework/Perms/package.xml | 17 +++++++++++++++--
1 files changed, 15 insertions(+), 2 deletions(-)
http://github.com/horde/horde/commit/33db5ab3457e72bfbd9f07edc91aa5210afc92f3
http://git.horde.org/horde-git/-/commit/33db5ab3457e72bfbd9f07edc91aa5210afc92f3
-----------------------------------------------------------------------
commit 328cdb70ae7c4ea1f6c9461948a4168f70d0502f
Merge: 95e333f 33db5ab
Author: Michael M Slusarz <slusarz at horde.org>
Date: Mon Nov 4 13:13:10 2013 -0700
Merge branch 'master' into imp_6_2
Conflicts:
imp/lib/Imap.php
imp/lib/Perms.php
imp/package.xml
framework/ActiveSync/lib/Horde/ActiveSync/Connector/Importer.php | 13 +-
framework/ActiveSync/lib/Horde/ActiveSync/Exception.php | 7 +
.../ActiveSync/lib/Horde/ActiveSync/Request/FolderCreate.php | 41 +++--
framework/ActiveSync/lib/Horde/ActiveSync/State/Base.php | 2 +-
framework/Cache/lib/Horde/Cache/Storage/Mongo.php | 6 +-
framework/Core/lib/Horde/Core/ActiveSync/Driver.php | 11 ++
framework/Core/lib/Horde/Registry.php | 1 +
framework/Core/lib/Horde/Session.php | 41 +++++
framework/Core/package.xml | 2 +
framework/Perms/composer.json | 2 +-
framework/Perms/lib/Horde/Perms/Sql.php | 14 ++-
framework/Perms/package.xml | 20 ++-
framework/Test/lib/Horde/Test/AllTests.php | 2 +
framework/Test/package.xml | 4 +-
horde/docs/CHANGES | 5 +-
horde/docs/CODING_STANDARDS | 8 +
horde/package.xml | 4 +-
imp/docs/CHANGES | 1 +
imp/lib/Imap.php | 8 +-
imp/lib/Perms.php | 12 +-
imp/package.xml | 1 +
ingo/locale/en/help.xml | 2 +-
kronolith/docs/CHANGES | 3 +-
kronolith/js/kronolith.js | 1 +
kronolith/package.xml | 4 +-
25 files changed, 172 insertions(+), 43 deletions(-)
http://github.com/horde/horde/commit/328cdb70ae7c4ea1f6c9461948a4168f70d0502f
http://git.horde.org/horde-git/-/commit/328cdb70ae7c4ea1f6c9461948a4168f70d0502f
More information about the commits
mailing list