[commits] Horde branch imp_6_2 updated. a741e489cc8b99e18d95ee8502557d374cd84b08
Michael M Slusarz
slusarz at horde.org
Mon Nov 11 20:26:23 UTC 2013
The branch "imp_6_2" has been updated.
The following is a summary of the commits.
from: 13267071770d6600a5decb4013e69c8e7117f8fa
99bb942 [mms] Fix hiding preferences if they are contained within a prefs container.
d58e1c6 Not needed.
0060996 Fix accessing results of aggregation.
8f24be7 Need to use the serverid, not id here.
6da6024 Cleanup, refactor new folder creation/editing.
d7d8dcf Update abstract class.
141ce74 Fix mock method signature.
bff47ce Fix display of billed hours on graph when overage exists.
f91c6e9 typo
3902b43 Revert this, it's a BC break.
5ac0bc5 Get the serverid from the folder object, where it will always be.
3e0f96f Logging.
c01cbaa Fix detecting mirrored email changes.
28ea190 Port a fix from the mongo driver.
f1c5058 [mms] Correct fix for iteration of Horde_Prefs_Scope object.
80f36ad not used
bd054df Migrator needs to be cleared if running from AllTests
2107192 Released Horde_Prefs-2.5.2
ffa2324 Development mode for Horde_Prefs-2.5.3
a741e48 Merge branch 'master' into imp_6_2
Summary: http://github.com/horde/horde/compare/13267071770d6600a5decb4013e69c8e7117f8fa...a741e489cc8b99e18d95ee8502557d374cd84b08
-----------------------------------------------------------------------
commit 99bb94209becf7272fa7397e3db62938a45a48ec
Author: Michael M Slusarz <slusarz at horde.org>
Date: Thu Nov 7 02:30:42 2013 -0700
[mms] Fix hiding preferences if they are contained within a prefs container.
framework/Core/lib/Horde/Core/Prefs/Ui.php | 20 ++++++++++++++------
framework/Core/package.xml | 2 ++
2 files changed, 16 insertions(+), 6 deletions(-)
http://github.com/horde/horde/commit/99bb94209becf7272fa7397e3db62938a45a48ec
http://git.horde.org/horde-git/-/commit/99bb94209becf7272fa7397e3db62938a45a48ec
-----------------------------------------------------------------------
commit d58e1c60ff45e886ca81a328f226ffcb42e6389a
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date: Fri Nov 8 13:50:00 2013 -0500
Not needed.
framework/ActiveSync/lib/Horde/ActiveSync/Connector/Importer.php | 3 ---
1 files changed, 0 insertions(+), 3 deletions(-)
http://github.com/horde/horde/commit/d58e1c60ff45e886ca81a328f226ffcb42e6389a
http://git.horde.org/horde-git/-/commit/d58e1c60ff45e886ca81a328f226ffcb42e6389a
-----------------------------------------------------------------------
commit 00609967f63c670c26775fe6404cc6999e477062
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date: Fri Nov 8 20:40:14 2013 -0500
Fix accessing results of aggregation.
framework/ActiveSync/lib/Horde/ActiveSync/State/Mongo.php | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
http://github.com/horde/horde/commit/00609967f63c670c26775fe6404cc6999e477062
http://git.horde.org/horde-git/-/commit/00609967f63c670c26775fe6404cc6999e477062
-----------------------------------------------------------------------
commit 8f24be7b5645e67c1100797be4de533781afbec6
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date: Fri Nov 8 20:40:43 2013 -0500
Need to use the serverid, not id here.
framework/ActiveSync/lib/Horde/ActiveSync/State/Mongo.php | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
http://github.com/horde/horde/commit/8f24be7b5645e67c1100797be4de533781afbec6
http://git.horde.org/horde-git/-/commit/8f24be7b5645e67c1100797be4de533781afbec6
-----------------------------------------------------------------------
commit 6da6024c54a1e722a1bed574c836c846e5499ee6
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date: Sun Nov 10 01:10:35 2013 -0500
Cleanup, refactor new folder creation/editing.
Necessary for supporting multiple non-email collection folders in
the same class. Add notes/todos for where this needs to be cleaned up
further in H6.
framework/ActiveSync/doc/Horde/ActiveSync/TODO | 3 +
framework/ActiveSync/lib/Horde/ActiveSync/Connector/Importer.php | 31 +++-
framework/ActiveSync/lib/Horde/ActiveSync/Imap/Adapter.php | 13 ++-
.../ActiveSync/lib/Horde/ActiveSync/Request/FolderCreate.php | 41 ++---
framework/ActiveSync/lib/Horde/ActiveSync/Request/FolderSync.php | 3 +-
5 files changed, 58 insertions(+), 33 deletions(-)
http://github.com/horde/horde/commit/6da6024c54a1e722a1bed574c836c846e5499ee6
http://git.horde.org/horde-git/-/commit/6da6024c54a1e722a1bed574c836c846e5499ee6
-----------------------------------------------------------------------
commit d7d8dcf4b5c21d7e9a0ec3bc767f76cb2011fde0
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date: Sun Nov 10 01:53:19 2013 -0500
Update abstract class.
framework/ActiveSync/lib/Horde/ActiveSync/Driver/Base.php | 10 +++++++++-
1 files changed, 9 insertions(+), 1 deletions(-)
http://github.com/horde/horde/commit/d7d8dcf4b5c21d7e9a0ec3bc767f76cb2011fde0
http://git.horde.org/horde-git/-/commit/d7d8dcf4b5c21d7e9a0ec3bc767f76cb2011fde0
-----------------------------------------------------------------------
commit 141ce74b2d005f3c53edc07dfbebd2d2c258ba00
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date: Sun Nov 10 02:12:18 2013 -0500
Fix mock method signature.
framework/ActiveSync/lib/Horde/ActiveSync/Driver/Mock.php | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
http://github.com/horde/horde/commit/141ce74b2d005f3c53edc07dfbebd2d2c258ba00
http://git.horde.org/horde-git/-/commit/141ce74b2d005f3c53edc07dfbebd2d2c258ba00
-----------------------------------------------------------------------
commit bff47ce675a1bc476897039e1f278e597ec44508
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date: Sun Nov 10 02:22:27 2013 -0500
Fix display of billed hours on graph when overage exists.
hermes/js/hermes.js | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
http://github.com/horde/horde/commit/bff47ce675a1bc476897039e1f278e597ec44508
http://git.horde.org/horde-git/-/commit/bff47ce675a1bc476897039e1f278e597ec44508
-----------------------------------------------------------------------
commit f91c6e9df977f5a6e258ada21d30d0dd472077ba
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date: Sun Nov 10 02:23:23 2013 -0500
typo
hermes/js/hermes.js | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
http://github.com/horde/horde/commit/f91c6e9df977f5a6e258ada21d30d0dd472077ba
http://git.horde.org/horde-git/-/commit/f91c6e9df977f5a6e258ada21d30d0dd472077ba
-----------------------------------------------------------------------
commit 3902b43c2ad06a7a0889f5e1a86a7a434a6fc574
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date: Sun Nov 10 10:54:01 2013 -0500
Revert this, it's a BC break.
framework/ActiveSync/lib/Horde/ActiveSync/Driver/Base.php | 3 +--
framework/ActiveSync/lib/Horde/ActiveSync/Driver/Mock.php | 2 +-
2 files changed, 2 insertions(+), 3 deletions(-)
http://github.com/horde/horde/commit/3902b43c2ad06a7a0889f5e1a86a7a434a6fc574
http://git.horde.org/horde-git/-/commit/3902b43c2ad06a7a0889f5e1a86a7a434a6fc574
-----------------------------------------------------------------------
commit 5ac0bc57b0f5109fa29ef9a04c8ce5bc860f2315
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date: Sun Nov 10 14:32:27 2013 -0500
Get the serverid from the folder object, where it will always be.
framework/ActiveSync/lib/Horde/ActiveSync/State/Base.php | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
http://github.com/horde/horde/commit/5ac0bc57b0f5109fa29ef9a04c8ce5bc860f2315
http://git.horde.org/horde-git/-/commit/5ac0bc57b0f5109fa29ef9a04c8ce5bc860f2315
-----------------------------------------------------------------------
commit 3e0f96fe62cace09a9fd5e579a2c50f182ed332f
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date: Sun Nov 10 14:34:38 2013 -0500
Logging.
framework/ActiveSync/lib/Horde/ActiveSync/State/Mongo.php | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
http://github.com/horde/horde/commit/3e0f96fe62cace09a9fd5e579a2c50f182ed332f
http://git.horde.org/horde-git/-/commit/3e0f96fe62cace09a9fd5e579a2c50f182ed332f
-----------------------------------------------------------------------
commit c01cbaa88c91e81dc812e25032b3d26252495a4d
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date: Sun Nov 10 16:36:49 2013 -0500
Fix detecting mirrored email changes.
framework/ActiveSync/lib/Horde/ActiveSync/State/Mongo.php | 4 ++--
framework/ActiveSync/lib/Horde/ActiveSync/State/Sql.php | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
http://github.com/horde/horde/commit/c01cbaa88c91e81dc812e25032b3d26252495a4d
http://git.horde.org/horde-git/-/commit/c01cbaa88c91e81dc812e25032b3d26252495a4d
-----------------------------------------------------------------------
commit 28ea190bd9facb01d5d4c50fccb87f05090d8508
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date: Sun Nov 10 22:35:56 2013 -0500
Port a fix from the mongo driver.
framework/ActiveSync/lib/Horde/ActiveSync/State/Sql.php | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
http://github.com/horde/horde/commit/28ea190bd9facb01d5d4c50fccb87f05090d8508
http://git.horde.org/horde-git/-/commit/28ea190bd9facb01d5d4c50fccb87f05090d8508
-----------------------------------------------------------------------
commit f1c50582610224f54e26d2a5af7865ddfcc31411
Author: Michael M Slusarz <slusarz at horde.org>
Date: Mon Nov 11 11:07:56 2013 -0700
[mms] Correct fix for iteration of Horde_Prefs_Scope object.
framework/Prefs/lib/Horde/Prefs/Scope.php | 2 +-
framework/Prefs/package.xml | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
http://github.com/horde/horde/commit/f1c50582610224f54e26d2a5af7865ddfcc31411
http://git.horde.org/horde-git/-/commit/f1c50582610224f54e26d2a5af7865ddfcc31411
-----------------------------------------------------------------------
commit 80f36ad3e56e91994ccad330fdbf9c7f60574843
Author: Michael M Slusarz <slusarz at horde.org>
Date: Mon Nov 11 11:19:40 2013 -0700
not used
framework/Prefs/test/Horde/Prefs/Unit/Storage/Sql/Base.php | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
http://github.com/horde/horde/commit/80f36ad3e56e91994ccad330fdbf9c7f60574843
http://git.horde.org/horde-git/-/commit/80f36ad3e56e91994ccad330fdbf9c7f60574843
-----------------------------------------------------------------------
commit bd054dfa2c10b0d6c1f51d8a849fbe3fb0ac43b9
Author: Michael M Slusarz <slusarz at horde.org>
Date: Mon Nov 11 11:19:56 2013 -0700
Migrator needs to be cleared if running from AllTests
framework/Prefs/test/Horde/Prefs/Unit/Storage/Sql/Base.php | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
http://github.com/horde/horde/commit/bd054dfa2c10b0d6c1f51d8a849fbe3fb0ac43b9
http://git.horde.org/horde-git/-/commit/bd054dfa2c10b0d6c1f51d8a849fbe3fb0ac43b9
-----------------------------------------------------------------------
commit 2107192525dfc50e451643777e95d31dc811f36d
Author: Michael M Slusarz <slusarz at horde.org>
Date: Mon Nov 11 11:20:58 2013 -0700
Released Horde_Prefs-2.5.2
framework/Prefs/composer.json | 4 ++--
framework/Prefs/package.xml | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
http://github.com/horde/horde/commit/2107192525dfc50e451643777e95d31dc811f36d
http://git.horde.org/horde-git/-/commit/2107192525dfc50e451643777e95d31dc811f36d
-----------------------------------------------------------------------
commit ffa23242a79a871c42cf5a80bab8199fd6edeb74
Author: Michael M Slusarz <slusarz at horde.org>
Date: Mon Nov 11 11:20:58 2013 -0700
Development mode for Horde_Prefs-2.5.3
framework/Prefs/package.xml | 17 +++++++++++++++--
1 files changed, 15 insertions(+), 2 deletions(-)
http://github.com/horde/horde/commit/ffa23242a79a871c42cf5a80bab8199fd6edeb74
http://git.horde.org/horde-git/-/commit/ffa23242a79a871c42cf5a80bab8199fd6edeb74
-----------------------------------------------------------------------
commit a741e489cc8b99e18d95ee8502557d374cd84b08
Merge: 1326707 ffa2324
Author: Michael M Slusarz <slusarz at horde.org>
Date: Mon Nov 11 13:26:14 2013 -0700
Merge branch 'master' into imp_6_2
framework/ActiveSync/doc/Horde/ActiveSync/TODO | 3 +
framework/ActiveSync/lib/Horde/ActiveSync/Connector/Importer.php | 34 +++-
framework/ActiveSync/lib/Horde/ActiveSync/Driver/Base.php | 9 +-
framework/ActiveSync/lib/Horde/ActiveSync/Imap/Adapter.php | 13 ++-
.../ActiveSync/lib/Horde/ActiveSync/Request/FolderCreate.php | 41 ++---
framework/ActiveSync/lib/Horde/ActiveSync/Request/FolderSync.php | 3 +-
framework/ActiveSync/lib/Horde/ActiveSync/State/Base.php | 2 +-
framework/ActiveSync/lib/Horde/ActiveSync/State/Mongo.php | 19 ++-
framework/ActiveSync/lib/Horde/ActiveSync/State/Sql.php | 6 +-
framework/Core/lib/Horde/Core/Prefs/Ui.php | 20 ++-
framework/Core/package.xml | 2 +
framework/Prefs/composer.json | 4 +-
framework/Prefs/lib/Horde/Prefs/Scope.php | 2 +-
framework/Prefs/package.xml | 19 ++-
framework/Prefs/test/Horde/Prefs/Unit/Storage/Sql/Base.php | 3 +-
hermes/js/hermes.js | 4 +-
16 files changed, 122 insertions(+), 62 deletions(-)
http://github.com/horde/horde/commit/a741e489cc8b99e18d95ee8502557d374cd84b08
http://git.horde.org/horde-git/-/commit/a741e489cc8b99e18d95ee8502557d374cd84b08
More information about the commits
mailing list