The branch "imp_6_1" has been updated. The following is a summary of the commits.
from: 633620d014328b139282e38712cdfa02d8936be9 2086b9f Actually check the return value before adding the widget. d6f9eae Generic changelog entries. Mostly minor issues caught by improved logging. c107667 Released Horde_ActiveSync-2.3.2 67bd3d2 Development mode for Horde_ActiveSync-2.3.3 7399b2c This hasn't been used since Horde 4. Mark as deprecated. Remove in H6. 27463a8 Normalize device id. a2943c7 Fix scope. b1d7d89 Memcache is installed now by default. 1fef494 [jan] Fix updating existing rows with default values when adding columns in PostgreSQL (Bug #12101). 813ad65 [jan] Update broken rows due to migration bug in PostgreSQL (Bug #12101). b87d3ba Fix phpdoc d90470b Fix OPTIONS request failing on devices that don't send DevId with it. e4bb5a0 Dont' remove stream filters after the stream is closed. 9e004bb Let's see if the recent PHP updates fixed anything. ddb8342 Explicitly check if $injector exists (Bug #12103). 7927bb3 [jan] Fix error handler in some PHP versions (Bug #12103). 46e7b60 Nope, still segfaulting. 7c0ff0d Released Horde_Core-2.4.3 e606b19 Development mode for Horde_Core-2.4.4 5100dc6 We will already have the $memo['desc'] here. 46e543c Correct fix to translate rule name 5c49d4c Revert 6342fcaf742441469c6e0cb10e232c7aad34a5c4 cd52d6a Link database schema warning notification to configuration page 8e1a9e1 None of this is required anymore with the logging caching code fe485e0 Correctly send UID request when returning results as sequence d1fe98c Merge branch 'master' into imp_6_1 ----------------------------------------------------------------------- commit 2086b9f7039d299b0f925e3b16d7c672c6312b26 Author: Michael J Rubinsky <[email protected]> Date: Mon Mar 11 10:19:11 2013 -0400 Actually check the return value before adding the widget. ansel/lib/View/Ansel.php | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) http://git.horde.org/horde-git/-/commit/2086b9f7039d299b0f925e3b16d7c672c6312b26 ----------------------------------------------------------------------- commit d6f9eae6f37c489c8600d43cf8c771274520c695 Author: Michael J Rubinsky <[email protected]> Date: Mon Mar 11 10:25:52 2013 -0400 Generic changelog entries. Mostly minor issues caught by improved logging. framework/ActiveSync/package.xml | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) http://git.horde.org/horde-git/-/commit/d6f9eae6f37c489c8600d43cf8c771274520c695 ----------------------------------------------------------------------- commit c107667d1ed89a86c1395221f54dde49f3bcc1ab Author: Michael J Rubinsky <[email protected]> Date: Mon Mar 11 10:31:56 2013 -0400 Released Horde_ActiveSync-2.3.2 framework/ActiveSync/package.xml | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) http://git.horde.org/horde-git/-/commit/c107667d1ed89a86c1395221f54dde49f3bcc1ab ----------------------------------------------------------------------- commit 67bd3d249eee7ec41239e2842960d0df0eb34905 Author: Michael J Rubinsky <[email protected]> Date: Mon Mar 11 10:31:56 2013 -0400 Development mode for Horde_ActiveSync-2.3.3 framework/ActiveSync/package.xml | 21 ++++++++++++++++----- 1 files changed, 16 insertions(+), 5 deletions(-) http://git.horde.org/horde-git/-/commit/67bd3d249eee7ec41239e2842960d0df0eb34905 ----------------------------------------------------------------------- commit 7399b2c424e614923c013e453fe8f893c8c2bf9f Author: Michael J Rubinsky <[email protected]> Date: Mon Mar 11 10:45:58 2013 -0400 This hasn't been used since Horde 4. Mark as deprecated. Remove in H6. framework/ActiveSync/lib/Horde/ActiveSync.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) http://git.horde.org/horde-git/-/commit/7399b2c424e614923c013e453fe8f893c8c2bf9f ----------------------------------------------------------------------- commit 27463a8f530c7e4c08215e614ebad00109142f43 Author: Michael J Rubinsky <[email protected]> Date: Mon Mar 11 10:46:25 2013 -0400 Normalize device id. framework/ActiveSync/lib/Horde/ActiveSync.php | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) http://git.horde.org/horde-git/-/commit/27463a8f530c7e4c08215e614ebad00109142f43 ----------------------------------------------------------------------- commit a2943c7c75b493b505ad08d9d5fa4be273edfc14 Author: Jan Schneider <[email protected]> Date: Fri Mar 8 14:00:35 2013 +0100 Fix scope. hermes/lib/Form/Search.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) http://git.horde.org/horde-git/-/commit/a2943c7c75b493b505ad08d9d5fa4be273edfc14 ----------------------------------------------------------------------- commit b1d7d89767463919e70ca758e9c5d6944702efc9 Author: Jan Schneider <[email protected]> Date: Mon Mar 11 14:11:41 2013 +0100 Memcache is installed now by default. .travis.yml | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) http://git.horde.org/horde-git/-/commit/b1d7d89767463919e70ca758e9c5d6944702efc9 ----------------------------------------------------------------------- commit 1fef494ee185eff9c1d0900232173e616120895d Author: Jan Schneider <[email protected]> Date: Mon Mar 11 15:48:05 2013 +0100 [jan] Fix updating existing rows with default values when adding columns in PostgreSQL (Bug #12101). framework/Db/lib/Horde/Db/Adapter/Postgresql/Schema.php | 5 +++++ 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/PgsqlTest.php | 4 ++++ framework/Db/test/Horde/Db/Adapter/Pdo/SqliteTest.php | 4 ++++ 7 files changed, 27 insertions(+), 2 deletions(-) http://git.horde.org/horde-git/-/commit/1fef494ee185eff9c1d0900232173e616120895d ----------------------------------------------------------------------- commit 813ad65bee1954c1fc2ccb4da5ca421644811a10 Author: Jan Schneider <[email protected]> Date: Mon Mar 11 15:49:16 2013 +0100 [jan] Update broken rows due to migration bug in PostgreSQL (Bug #12101). nag/docs/CHANGES | 1 + nag/migration/12_nag_fix_smartlists.php | 32 +++++++++++++++++++++++++++++++ nag/package.xml | 10 ++++++-- 3 files changed, 40 insertions(+), 3 deletions(-) create mode 100644 nag/migration/12_nag_fix_smartlists.php http://git.horde.org/horde-git/-/commit/813ad65bee1954c1fc2ccb4da5ca421644811a10 ----------------------------------------------------------------------- commit b87d3ba22a42ea8720fad2d1f4532b5281d088b6 Author: Michael J Rubinsky <[email protected]> Date: Mon Mar 11 10:57:56 2013 -0400 Fix phpdoc framework/ActiveSync/lib/Horde/ActiveSync/State/Sql.php | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) http://git.horde.org/horde-git/-/commit/b87d3ba22a42ea8720fad2d1f4532b5281d088b6 ----------------------------------------------------------------------- commit d90470babf4ed738213073f32030514ade0af425 Author: Michael J Rubinsky <[email protected]> Date: Mon Mar 11 11:11:25 2013 -0400 Fix OPTIONS request failing on devices that don't send DevId with it. framework/ActiveSync/lib/Horde/ActiveSync.php | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) http://git.horde.org/horde-git/-/commit/d90470babf4ed738213073f32030514ade0af425 ----------------------------------------------------------------------- commit e4bb5a0234a6c7a1e08cbe01cbe2cb2ae0a8e863 Author: Michael J Rubinsky <[email protected]> Date: Mon Mar 11 11:59:31 2013 -0400 Dont' remove stream filters after the stream is closed. framework/ActiveSync/lib/Horde/ActiveSync/Wbxml/Encoder.php | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) http://git.horde.org/horde-git/-/commit/e4bb5a0234a6c7a1e08cbe01cbe2cb2ae0a8e863 ----------------------------------------------------------------------- commit 9e004bb000363d0412221a29e86ae9e484da8238 Author: Jan Schneider <[email protected]> Date: Mon Mar 11 16:33:56 2013 +0100 Let's see if the recent PHP updates fixed anything. .travis.yml | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) http://git.horde.org/horde-git/-/commit/9e004bb000363d0412221a29e86ae9e484da8238 ----------------------------------------------------------------------- commit ddb8342bb51c88af4cedce8b60857726c7671679 Author: Jan Schneider <[email protected]> Date: Mon Mar 11 17:59:17 2013 +0100 Explicitly check if $injector exists (Bug #12103). Since this code is called directly from PHP as an error handler, we have no control when the code is called, and whether the injector has already been created or has already been destructed. framework/Core/lib/Horde.php | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) http://git.horde.org/horde-git/-/commit/ddb8342bb51c88af4cedce8b60857726c7671679 ----------------------------------------------------------------------- commit 7927bb3ef72f8acd48398737814a379f03c59229 Author: Jan Schneider <[email protected]> Date: Mon Mar 11 18:01:23 2013 +0100 [jan] Fix error handler in some PHP versions (Bug #12103). framework/Core/package.xml | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) http://git.horde.org/horde-git/-/commit/7927bb3ef72f8acd48398737814a379f03c59229 ----------------------------------------------------------------------- commit 46e7b601500b7c00e9f61592abd17ad4a4e365d7 Author: Jan Schneider <[email protected]> Date: Mon Mar 11 18:13:36 2013 +0100 Nope, still segfaulting. .travis.yml | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) http://git.horde.org/horde-git/-/commit/46e7b601500b7c00e9f61592abd17ad4a4e365d7 ----------------------------------------------------------------------- commit 7c0ff0d18f576fe73306c79cebed31ae0de273a8 Author: Jan Schneider <[email protected]> Date: Mon Mar 11 19:22:24 2013 +0100 Released Horde_Core-2.4.3 framework/Core/package.xml | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) http://git.horde.org/horde-git/-/commit/7c0ff0d18f576fe73306c79cebed31ae0de273a8 ----------------------------------------------------------------------- commit e606b1955fce79b1f3adbd47fb2a4d249511777b Author: Jan Schneider <[email protected]> Date: Mon Mar 11 19:22:25 2013 +0100 Development mode for Horde_Core-2.4.4 framework/Core/package.xml | 19 ++++++++++++++++--- 1 files changed, 16 insertions(+), 3 deletions(-) http://git.horde.org/horde-git/-/commit/e606b1955fce79b1f3adbd47fb2a4d249511777b ----------------------------------------------------------------------- commit 5100dc672ab6c239e4c9f609d134c178f6e04fd9 Author: Michael J Rubinsky <[email protected]> Date: Mon Mar 11 14:25:46 2013 -0400 We will already have the $memo['desc'] here. mnemo/lib/Driver.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) http://git.horde.org/horde-git/-/commit/5100dc672ab6c239e4c9f609d134c178f6e04fd9 ----------------------------------------------------------------------- commit 46e543cc37c516f2220b52792b8c8b39a589e1d5 Author: Michael M Slusarz <[email protected]> Date: Mon Mar 11 13:39:13 2013 -0600 Correct fix to translate rule name ingo/lib/Ingo.php | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) http://git.horde.org/horde-git/-/commit/46e543cc37c516f2220b52792b8c8b39a589e1d5 ----------------------------------------------------------------------- commit 5c49d4c43548f4ac7422ef68663fb6ca882b714b Author: Michael M Slusarz <[email protected]> Date: Mon Mar 11 14:29:25 2013 -0600 Revert 6342fcaf742441469c6e0cb10e232c7aad34a5c4 Adding UID to the output is already handled by the parent fetch() method. framework/Imap_Client/lib/Horde/Imap/Client/Socket.php | 7 ++----- 1 files changed, 2 insertions(+), 5 deletions(-) http://git.horde.org/horde-git/-/commit/5c49d4c43548f4ac7422ef68663fb6ca882b714b ----------------------------------------------------------------------- commit cd52d6a76ded13fd64c520b56cf96c4e7d4b5c57 Author: Michael M Slusarz <[email protected]> Date: Mon Mar 11 15:21:34 2013 -0600 Link database schema warning notification to configuration page horde/lib/LoginTasks/Task/AdminCheck.php | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) http://git.horde.org/horde-git/-/commit/cd52d6a76ded13fd64c520b56cf96c4e7d4b5c57 ----------------------------------------------------------------------- commit 8e1a9e12c3e0a1ef0c6cd300718400cf1bc5e699 Author: Michael M Slusarz <[email protected]> Date: Mon Mar 11 15:22:04 2013 -0600 None of this is required anymore with the logging caching code horde/lib/LoginTasks/Task/AdminCheck.php | 9 --------- 1 files changed, 0 insertions(+), 9 deletions(-) http://git.horde.org/horde-git/-/commit/8e1a9e12c3e0a1ef0c6cd300718400cf1bc5e699 ----------------------------------------------------------------------- commit fe485e0927a1a04d9060c140a4222e0f3d546404 Author: Michael M Slusarz <[email protected]> Date: Mon Mar 11 15:33:32 2013 -0600 Correctly send UID request when returning results as sequence framework/Imap_Client/lib/Horde/Imap/Client/Base.php | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-) http://git.horde.org/horde-git/-/commit/fe485e0927a1a04d9060c140a4222e0f3d546404 ----------------------------------------------------------------------- commit d1fe98c16e9b1263acb6c4726c1562ec50c2776c Merge: 633620d fe485e0 Author: Michael M Slusarz <[email protected]> Date: Mon Mar 11 15:35:43 2013 -0600 Merge branch 'master' into imp_6_1 .travis.yml | 2 +- ansel/lib/View/Ansel.php | 5 +- framework/ActiveSync/lib/Horde/ActiveSync.php | 7 ++- framework/ActiveSync/lib/Horde/ActiveSync/State/Sql.php | 3 +- framework/ActiveSync/lib/Horde/ActiveSync/Wbxml/Encoder.php | 6 +- framework/ActiveSync/package.xml | 23 ++++++- framework/Core/lib/Horde.php | 3 +- framework/Core/package.xml | 21 ++++++- framework/Db/lib/Horde/Db/Adapter/Postgresql/Schema.php | 5 ++ 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/PgsqlTest.php | 4 + framework/Db/test/Horde/Db/Adapter/Pdo/SqliteTest.php | 4 + framework/Imap_Client/lib/Horde/Imap/Client/Base.php | 11 ++-- framework/Imap_Client/lib/Horde/Imap/Client/Socket.php | 7 +-- hermes/lib/Form/Search.php | 2 +- horde/lib/LoginTasks/Task/AdminCheck.php | 19 ++---- ingo/lib/Ingo.php | 9 ++- mnemo/lib/Driver.php | 2 +- nag/docs/CHANGES | 1 + nag/migration/12_nag_fix_smartlists.php | 32 +++++++++++ nag/package.xml | 10 ++- 24 files changed, 141 insertions(+), 51 deletions(-) http://git.horde.org/horde-git/-/commit/d1fe98c16e9b1263acb6c4726c1562ec50c2776c -- commits mailing list Frequently Asked Questions: http://wiki.horde.org/FAQ To unsubscribe, mail: [email protected]
