The branch "develop" has been updated. The following is a summary of the commits.
from: 9db2d5123dfa906bb595325df37f1e22c3a0d938 fe3a07e Workaround broken IMAP server that might send STATUS return without corresponding LIST entry. ed115a2 [jan] Fix escaping of binary values in SQLite. bfae2e3 The default quotaroot should be the base directory, not the root directory. 349d34e [jan] Fix calculating folder sizes with similar folder names in SQL driver. 66442cf [mms] Clear imapproxy status when logging out. 3606f34 Merge branch 'master' into develop ----------------------------------------------------------------------- commit fe3a07ee7842839d6f0cd4f0ef5e7d045026d27f Author: Michael M Slusarz <[email protected]> Date: Thu Mar 1 01:20:23 2012 -0700 Workaround broken IMAP server that might send STATUS return without corresponding LIST entry. framework/Imap_Client/lib/Horde/Imap/Client/Socket.php | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) http://git.horde.org/horde-git/-/commit/fe3a07ee7842839d6f0cd4f0ef5e7d045026d27f ----------------------------------------------------------------------- commit ed115a23b6d244a1247ed735cec20f9dd8066e44 Author: Jan Schneider <[email protected]> Date: Thu Mar 1 17:03:30 2012 +0100 [jan] Fix escaping of binary values in SQLite. framework/Db/lib/Horde/Db/Adapter/Sqlite/Schema.php | 2 +- framework/Db/package.xml | 4 ++-- framework/Db/test/Horde/Db/Adapter/MysqlTest.php | 4 ++-- framework/Db/test/Horde/Db/Adapter/MysqliTest.php | 4 ++-- framework/Db/test/Horde/Db/Adapter/Pdo/MysqlTest.php | 4 ++-- framework/Db/test/Horde/Db/Adapter/Pdo/SqliteTest.php | 4 ++-- 6 files changed, 11 insertions(+), 11 deletions(-) http://git.horde.org/horde-git/-/commit/ed115a23b6d244a1247ed735cec20f9dd8066e44 ----------------------------------------------------------------------- commit bfae2e380f712389292eab4529235a559484e290 Author: Jan Schneider <[email protected]> Date: Thu Mar 1 19:24:29 2012 +0100 The default quotaroot should be the base directory, not the root directory. framework/Vfs/lib/Horde/Vfs/Base.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) http://git.horde.org/horde-git/-/commit/bfae2e380f712389292eab4529235a559484e290 ----------------------------------------------------------------------- commit 349d34eefdee16e678b3ef35b552734ada71a719 Author: Jan Schneider <[email protected]> Date: Thu Mar 1 19:25:53 2012 +0100 [jan] Fix calculating folder sizes with similar folder names in SQL driver. Conflicts: framework/Vfs/package.xml framework/Vfs/lib/Horde/Vfs/Sql.php | 15 +++++++++------ framework/Vfs/package.xml | 4 ++-- 2 files changed, 11 insertions(+), 8 deletions(-) http://git.horde.org/horde-git/-/commit/349d34eefdee16e678b3ef35b552734ada71a719 ----------------------------------------------------------------------- commit 66442cfc3014eaf70120c0ef77b859e70c1aa1c1 Author: Michael M Slusarz <[email protected]> Date: Thu Mar 1 21:43:33 2012 -0700 [mms] Clear imapproxy status when logging out. framework/Imap_Client/lib/Horde/Imap/Client/Socket.php | 2 ++ framework/Imap_Client/package.xml | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) http://git.horde.org/horde-git/-/commit/66442cfc3014eaf70120c0ef77b859e70c1aa1c1 ----------------------------------------------------------------------- commit 3606f341dc608a332a7e285cd6055ee01ae68a25 Merge: 9db2d51 66442cf Author: Michael M Slusarz <[email protected]> Date: Thu Mar 1 21:46:01 2012 -0700 Merge branch 'master' into develop Conflicts: framework/Vfs/package.xml framework/Imap_Client/lib/Horde/Imap/Client/Socket.php | 5 ++++- framework/Imap_Client/package.xml | 4 ++-- framework/Vfs/package.xml | 2 -- 3 files changed, 6 insertions(+), 5 deletions(-) http://git.horde.org/horde-git/-/commit/3606f341dc608a332a7e285cd6055ee01ae68a25 __ commits mailing list Frequently Asked Questions: http://horde.org/faq/ To unsubscribe, mail: [email protected]
