The branch "imp_6_2" has been updated. The following is a summary of the commits.
from: 9ba701ac518ce026c901fdadeb10e7a2ef3a265e 4b25faf Don't define abstract methods that are defined in the interface (Bug #12681). 0b72ae6 Override Horde_Auth_Base::authenticate() 12d4361 phpdoc. This always returns a Horde_Core_Auth_Application object. acdaae1 Add support for storing SOFTDELETE related state in the folder object. a4e2c92 CHANGES bb4d7a8 Implement SOFTDELETE for calendar collections. eae9f0f Bump min required version for Horde_ActiveSync. 0bb0b49 Use Horde_String. d414d75 No need for static here. 815f581 Unused b3b5285 Use base class for column test. 97a8fff Fix method comment to reflect what it actually does. 27e4e30 Better method names. 5cc16ad Implement SOFTDELETE for Email collections. 8447980 Remove debug assignment. 56af07f Remove TODO, yay! 099af5a CHANGES 3756369 Actually return the value here. 10471a4 Avoid undefined index, not all collections have 'soft'. e14c59e Ensure logfile is always named the same. 2de6c01 Ensure $kronolith_driver is defined. 7364a7e BFN 31c9224 phpdoc 7e2d1df [mms] Ensure Horde_Imap_Client_Base#search() always returns the 'count' value (Bug #12682). 36ec6b7 Released Horde_Imap_Client-2.15.1 09d04ff Development mode for Horde_Imap_Client-2.15.2 1fa80b1 Released Horde_Stream_Filter-2.0.2 c5016de Development mode for Horde_Stream_Filter-2.0.3 9fe5195 [mms] Use strict RFC-compliant workaround for servers that don't support the UNSELECT IMAP extension. c12bc13 Better mailbox name - this is valid, but since it contains control characters it is extremely unlikely to exist on a server 532d18d [mms] Handle case-insensitive INBOX return from the server. 3de279d Slightly faster equality comparison e682aa7 Mailbox object does this for us now 105251c Add unit test db600bd Released Horde_Imap_Client-2.15.2 fd28c75 Development mode for Horde_Imap_Client-2.15.3 3e394d4 Bug: 12668 Ensure protected images don't leak into gallery thumbnails. b7bc7af Clean up some exception handling. d5c6ce1 Fix scope 47a304c Fix variable name. 7ac019f ws, cs e996187 Bug: 12667 Fix report form button behavior. aba26ef Scope b89da87 BFN a303fc6 Add report icon cccab44 Fix output of has_edit and has_delete values in javascript. 665e67c Add support for nginx sendfile headers. cd3204f CHANGES 7ca0898 global variable f5c41a4 [mms] Don't initialize unnecessary prefs object when creating the topbar. 1b85f1e Catch errors when uploading attachments in dynamic view 80aa3e6 Merge branch 'master' into imp_6_2 ----------------------------------------------------------------------- commit 4b25faf13d753d5bc70846234d87683b895f8942 Author: Jan Schneider <[email protected]> Date: Fri Sep 13 14:09:20 2013 +0200 Don't define abstract methods that are defined in the interface (Bug #12681). framework/Db/lib/Horde/Db/Adapter.php | 18 +++++--- framework/Db/lib/Horde/Db/Adapter/Base.php | 67 ---------------------------- 2 files changed, 11 insertions(+), 74 deletions(-) http://git.horde.org/horde-git/-/commit/4b25faf13d753d5bc70846234d87683b895f8942 ----------------------------------------------------------------------- commit 0b72ae6541e7e7646d2146146d75bb3732bb3240 Author: Michael J Rubinsky <[email protected]> Date: Fri Sep 13 09:44:41 2013 -0400 Override Horde_Auth_Base::authenticate() Avoids having the code in Horde_Auth_Base::authenticate run twice since the base driver will always be a Horde_Auth_Applciation object. framework/Core/lib/Horde/Core/ActiveSync/Auth.php | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-) http://git.horde.org/horde-git/-/commit/0b72ae6541e7e7646d2146146d75bb3732bb3240 ----------------------------------------------------------------------- commit 12d4361af4948a1f369e41dcab04e769ca4f3442 Author: Michael J Rubinsky <[email protected]> Date: Fri Sep 13 09:46:29 2013 -0400 phpdoc. This always returns a Horde_Core_Auth_Application object. framework/Core/lib/Horde/Core/Factory/Auth.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) http://git.horde.org/horde-git/-/commit/12d4361af4948a1f369e41dcab04e769ca4f3442 ----------------------------------------------------------------------- commit acdaae1349dc72bfd9cbf2f3e3769fb976930b97 Author: Michael J Rubinsky <[email protected]> Date: Fri Sep 13 10:07:34 2013 -0400 Add support for storing SOFTDELETE related state in the folder object. framework/ActiveSync/lib/Horde/ActiveSync/Folder/Base.php | 14 +++++++++++++ framework/ActiveSync/package.xml | 12 +++++----- 2 files changed, 20 insertions(+), 6 deletions(-) http://git.horde.org/horde-git/-/commit/acdaae1349dc72bfd9cbf2f3e3769fb976930b97 ----------------------------------------------------------------------- commit a4e2c92448035c88c136333934a36e14017f0c15 Author: Michael J Rubinsky <[email protected]> Date: Fri Sep 13 10:09:11 2013 -0400 CHANGES framework/ActiveSync/package.xml | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) http://git.horde.org/horde-git/-/commit/a4e2c92448035c88c136333934a36e14017f0c15 ----------------------------------------------------------------------- commit bb4d7a8f9aa10db68cee68a24cb3ec7d2f9c1647 Author: Michael J Rubinsky <[email protected]> Date: Fri Sep 13 10:15:12 2013 -0400 Implement SOFTDELETE for calendar collections. framework/Core/lib/Horde/Core/ActiveSync/Connector.php | 41 ++++++++++++++++ framework/Core/lib/Horde/Core/ActiveSync/Driver.php | 31 +++++++++++- 2 files changed, 69 insertions(+), 3 deletions(-) http://git.horde.org/horde-git/-/commit/bb4d7a8f9aa10db68cee68a24cb3ec7d2f9c1647 ----------------------------------------------------------------------- commit eae9f0ffb1dc7406618b90f9ddc7357d6484b2f2 Author: Michael J Rubinsky <[email protected]> Date: Fri Sep 13 10:15:32 2013 -0400 Bump min required version for Horde_ActiveSync. framework/Core/package.xml | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) http://git.horde.org/horde-git/-/commit/eae9f0ffb1dc7406618b90f9ddc7357d6484b2f2 ----------------------------------------------------------------------- commit 0bb0b490c81b9ff889055fc0e69f6ef09c9f13ef Author: Jan Schneider <[email protected]> Date: Fri Sep 13 16:09:52 2013 +0200 Use Horde_String. framework/Db/bin/horde-db-migrate-component | 2 +- framework/Db/lib/Horde/Db/Adapter/Base/Column.php | 2 +- framework/Db/lib/Horde/Db/Adapter/Mysql/Column.php | 2 +- framework/Db/lib/Horde/Db/SearchParser.php | 4 ++-- framework/Db/package.xml | 9 +++++++++ framework/Db/test/Horde/Db/Adapter/MysqlBase.php | 2 +- 6 files changed, 15 insertions(+), 6 deletions(-) http://git.horde.org/horde-git/-/commit/0bb0b490c81b9ff889055fc0e69f6ef09c9f13ef ----------------------------------------------------------------------- commit d414d759ace8fa972fdc47b69aea37d7301af88c Author: Jan Schneider <[email protected]> Date: Fri Sep 13 16:10:18 2013 +0200 No need for static here. framework/Db/lib/Horde/Db/Adapter/Mysql/Column.php | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) http://git.horde.org/horde-git/-/commit/d414d759ace8fa972fdc47b69aea37d7301af88c ----------------------------------------------------------------------- commit 815f58171f2a80084cdeee709144adbee52cec9a Author: Jan Schneider <[email protected]> Date: Fri Sep 13 16:10:45 2013 +0200 Unused framework/Db/lib/Horde/Db/Adapter/Postgresql/Column.php | 5 ----- framework/Db/lib/Horde/Db/Adapter/Sqlite/Column.php | 6 ------ 2 files changed, 0 insertions(+), 11 deletions(-) http://git.horde.org/horde-git/-/commit/815f58171f2a80084cdeee709144adbee52cec9a ----------------------------------------------------------------------- commit b3b528543d6e193513059453de5264a4564cf287 Author: Jan Schneider <[email protected]> Date: Fri Sep 13 16:15:24 2013 +0200 Use base class for column test. framework/Db/test/Horde/Db/Adapter/ColumnBase.php | 264 ++++++++++ framework/Db/test/Horde/Db/Adapter/Mysql/ColumnTest.php | 217 +-------- framework/Db/test/Horde/Db/Adapter/Postgresql/ColumnTest.php | 137 +----- framework/Db/test/Horde/Db/Adapter/Sqlite/ColumnTest.php | 227 +-------- 4 files changed, 273 insertions(+), 572 deletions(-) create mode 100644 framework/Db/test/Horde/Db/Adapter/ColumnBase.php http://git.horde.org/horde-git/-/commit/b3b528543d6e193513059453de5264a4564cf287 ----------------------------------------------------------------------- commit 97a8fffe5c9114140cd625112da49ab155cfc3a5 Author: Michael J Rubinsky <[email protected]> Date: Fri Sep 13 10:24:24 2013 -0400 Fix method comment to reflect what it actually does. framework/ActiveSync/lib/Horde/ActiveSync/Imap/Adapter.php | 5 +---- 1 files changed, 1 insertions(+), 4 deletions(-) http://git.horde.org/horde-git/-/commit/97a8fffe5c9114140cd625112da49ab155cfc3a5 ----------------------------------------------------------------------- commit 27e4e30bfee35c7d911494a0310e76852c1b9d01 Author: Michael J Rubinsky <[email protected]> Date: Fri Sep 13 11:16:14 2013 -0400 Better method names. framework/ActiveSync/lib/Horde/ActiveSync/Folder/Base.php | 16 +++++++++++- framework/Core/lib/Horde/Core/ActiveSync/Driver.php | 6 ++-- 2 files changed, 17 insertions(+), 5 deletions(-) http://git.horde.org/horde-git/-/commit/27e4e30bfee35c7d911494a0310e76852c1b9d01 ----------------------------------------------------------------------- commit 5cc16ad22e1cb75e13691f5d239a457eeb383e78 Author: Michael J Rubinsky <[email protected]> Date: Fri Sep 13 13:15:36 2013 -0400 Implement SOFTDELETE for Email collections. framework/ActiveSync/lib/Horde/ActiveSync/Folder/Base.php | 17 +++- framework/ActiveSync/lib/Horde/ActiveSync/Folder/Imap.php | 54 ++++++++++++ framework/ActiveSync/lib/Horde/ActiveSync/Imap/Adapter.php | 30 ++++++- framework/Core/lib/Horde/Core/ActiveSync/Driver.php | 15 +++- 4 files changed, 109 insertions(+), 7 deletions(-) http://git.horde.org/horde-git/-/commit/5cc16ad22e1cb75e13691f5d239a457eeb383e78 ----------------------------------------------------------------------- commit 8447980e12624243ae3624398838ef488f62a51e Author: Michael J Rubinsky <[email protected]> Date: Fri Sep 13 13:16:59 2013 -0400 Remove debug assignment. framework/Core/lib/Horde/Core/ActiveSync/Driver.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) http://git.horde.org/horde-git/-/commit/8447980e12624243ae3624398838ef488f62a51e ----------------------------------------------------------------------- commit 56af07f9f685763887f8d5f156d1ef500b98137d Author: Michael J Rubinsky <[email protected]> Date: Fri Sep 13 13:21:41 2013 -0400 Remove TODO, yay! framework/ActiveSync/doc/Horde/ActiveSync/TODO | 5 ----- 1 files changed, 0 insertions(+), 5 deletions(-) http://git.horde.org/horde-git/-/commit/56af07f9f685763887f8d5f156d1ef500b98137d ----------------------------------------------------------------------- commit 099af5a58dd2b3056e5ee134dc58a44fe4e79758 Author: Michael J Rubinsky <[email protected]> Date: Fri Sep 13 13:24:39 2013 -0400 CHANGES framework/Core/package.xml | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) http://git.horde.org/horde-git/-/commit/099af5a58dd2b3056e5ee134dc58a44fe4e79758 ----------------------------------------------------------------------- commit 375636904f477aaff3b6052898761bea4a7e27dc Author: Michael J Rubinsky <[email protected]> Date: Fri Sep 13 13:53:52 2013 -0400 Actually return the value here. framework/ActiveSync/lib/Horde/ActiveSync/Folder/Imap.php | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) http://git.horde.org/horde-git/-/commit/375636904f477aaff3b6052898761bea4a7e27dc ----------------------------------------------------------------------- commit 10471a4fd196de6a55cf47bda7d579a7dc90801d Author: Michael J Rubinsky <[email protected]> Date: Fri Sep 13 13:54:04 2013 -0400 Avoid undefined index, not all collections have 'soft'. framework/Core/lib/Horde/Core/ActiveSync/Driver.php | 12 +++++++----- 1 files changed, 7 insertions(+), 5 deletions(-) http://git.horde.org/horde-git/-/commit/10471a4fd196de6a55cf47bda7d579a7dc90801d ----------------------------------------------------------------------- commit e14c59e883943e68604eb7a629d8dfa421a75281 Author: Michael J Rubinsky <[email protected]> Date: Fri Sep 13 14:00:31 2013 -0400 Ensure logfile is always named the same. framework/Core/lib/Horde/Core/ActiveSync/Logger/Factory.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) http://git.horde.org/horde-git/-/commit/e14c59e883943e68604eb7a629d8dfa421a75281 ----------------------------------------------------------------------- commit 2de6c011226bb14e43cc58ed2a11ced5a7413f9c Author: Michael J Rubinsky <[email protected]> Date: Fri Sep 13 14:04:03 2013 -0400 Ensure $kronolith_driver is defined. Fixes importing some activesync events with recurrence. kronolith/lib/Event.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) http://git.horde.org/horde-git/-/commit/2de6c011226bb14e43cc58ed2a11ced5a7413f9c ----------------------------------------------------------------------- commit 7364a7e5872e9ee247367ddbe709bafc613579c6 Author: Michael J Rubinsky <[email protected]> Date: Fri Sep 13 14:15:43 2013 -0400 BFN kronolith/docs/CHANGES | 2 ++ kronolith/package.xml | 2 ++ 2 files changed, 4 insertions(+), 0 deletions(-) http://git.horde.org/horde-git/-/commit/7364a7e5872e9ee247367ddbe709bafc613579c6 ----------------------------------------------------------------------- commit 31c9224e2d55c3eeac1d0c57ae8b0ab9f7662b7c Author: Michael M Slusarz <[email protected]> Date: Thu Sep 12 23:45:36 2013 -0600 phpdoc imp/lib/Search.php | 21 ++++++++++++++------- imp/lib/Search/Element.php | 20 ++++++++++++++------ imp/lib/Search/Element/Attachment.php | 26 +++++++++++++++++--------- imp/lib/Search/Element/Autogenerated.php | 28 ++++++++++++++++++---------- imp/lib/Search/Element/Bulk.php | 28 ++++++++++++++++++---------- imp/lib/Search/Element/Contacts.php | 22 +++++++++++++++------- imp/lib/Search/Element/Date.php | 23 +++++++++++++++-------- imp/lib/Search/Element/Daterange.php | 20 ++++++++++++++------ imp/lib/Search/Element/Flag.php | 20 ++++++++++++++------ imp/lib/Search/Element/Header.php | 20 ++++++++++++++------ imp/lib/Search/Element/Mailinglist.php | 26 +++++++++++++++++--------- imp/lib/Search/Element/Or.php | 20 ++++++++++++++------ imp/lib/Search/Element/Personal.php | 26 +++++++++++++++++--------- imp/lib/Search/Element/Recipient.php | 20 ++++++++++++++------ imp/lib/Search/Element/Size.php | 20 ++++++++++++++------ imp/lib/Search/Element/Text.php | 20 ++++++++++++++------ imp/lib/Search/Element/Within.php | 20 ++++++++++++++------ imp/lib/Search/Filter.php | 20 ++++++++++++++------ imp/lib/Search/Filter/Attachment.php | 20 ++++++++++++++------ imp/lib/Search/Filter/Autogenerated.php | 20 ++++++++++++++------ imp/lib/Search/Filter/Builtin.php | 20 ++++++++++++++------ imp/lib/Search/Filter/Bulk.php | 20 ++++++++++++++------ imp/lib/Search/Filter/Contacts.php | 22 +++++++++++++++------- imp/lib/Search/Filter/Mailinglist.php | 20 ++++++++++++++------ imp/lib/Search/Filter/Personal.php | 20 ++++++++++++++------ imp/lib/Search/Query.php | 20 ++++++++++++++------ imp/lib/Search/Vfolder.php | 20 ++++++++++++++------ imp/lib/Search/Vfolder/Builtin.php | 20 ++++++++++++++------ imp/lib/Search/Vfolder/Vinbox.php | 20 ++++++++++++++------ imp/lib/Search/Vfolder/Vtrash.php | 20 ++++++++++++++------ 30 files changed, 440 insertions(+), 202 deletions(-) http://git.horde.org/horde-git/-/commit/31c9224e2d55c3eeac1d0c57ae8b0ab9f7662b7c ----------------------------------------------------------------------- commit 7e2d1dfc69c9199bcdcf2d62d11edaded3c52fb2 Author: Michael M Slusarz <[email protected]> Date: Fri Sep 13 15:03:28 2013 -0600 [mms] Ensure Horde_Imap_Client_Base#search() always returns the 'count' value (Bug #12682). framework/Imap_Client/lib/Horde/Imap/Client/Base.php | 10 +++++++--- framework/Imap_Client/package.xml | 2 ++ 2 files changed, 9 insertions(+), 3 deletions(-) http://git.horde.org/horde-git/-/commit/7e2d1dfc69c9199bcdcf2d62d11edaded3c52fb2 ----------------------------------------------------------------------- commit 36ec6b7dd3c448500b2c6bca796fbb57ba672bf8 Author: Michael M Slusarz <[email protected]> Date: Fri Sep 13 15:18:17 2013 -0600 Released Horde_Imap_Client-2.15.1 framework/Imap_Client/package.xml | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) http://git.horde.org/horde-git/-/commit/36ec6b7dd3c448500b2c6bca796fbb57ba672bf8 ----------------------------------------------------------------------- commit 09d04ffa243d25fc8418671dc810ed02fcc6f2eb Author: Michael M Slusarz <[email protected]> Date: Fri Sep 13 15:18:18 2013 -0600 Development mode for Horde_Imap_Client-2.15.2 framework/Imap_Client/package.xml | 18 +++++++++++++++--- 1 files changed, 15 insertions(+), 3 deletions(-) http://git.horde.org/horde-git/-/commit/09d04ffa243d25fc8418671dc810ed02fcc6f2eb ----------------------------------------------------------------------- commit 1fa80b1a70ee16b713af5de69ef5189226171925 Author: Michael M Slusarz <[email protected]> Date: Fri Sep 13 15:32:15 2013 -0600 Released Horde_Stream_Filter-2.0.2 framework/Stream_Filter/package.xml | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) http://git.horde.org/horde-git/-/commit/1fa80b1a70ee16b713af5de69ef5189226171925 ----------------------------------------------------------------------- commit c5016de6b1c153ff74aca0b4eccf5086cdd2ef0c Author: Michael M Slusarz <[email protected]> Date: Fri Sep 13 15:32:15 2013 -0600 Development mode for Horde_Stream_Filter-2.0.3 framework/Stream_Filter/package.xml | 17 +++++++++++++++-- 1 files changed, 15 insertions(+), 2 deletions(-) http://git.horde.org/horde-git/-/commit/c5016de6b1c153ff74aca0b4eccf5086cdd2ef0c ----------------------------------------------------------------------- commit 9fe51956267e0109c097a2a804f87fd790e4c88b Author: Michael M Slusarz <[email protected]> Date: Fri Sep 13 16:05:12 2013 -0600 [mms] Use strict RFC-compliant workaround for servers that don't support the UNSELECT IMAP extension. framework/Imap_Client/lib/Horde/Imap/Client/Socket.php | 12 ++++++++---- framework/Imap_Client/package.xml | 4 ++-- 2 files changed, 10 insertions(+), 6 deletions(-) http://git.horde.org/horde-git/-/commit/9fe51956267e0109c097a2a804f87fd790e4c88b ----------------------------------------------------------------------- commit c12bc135d5a34e308b24545787f32d6c6eeeb70a Author: Michael M Slusarz <[email protected]> Date: Fri Sep 13 23:26:20 2013 -0600 Better mailbox name - this is valid, but since it contains control characters it is extremely unlikely to exist on a server Use \24 as control character, since it shouldn't cause any sort of behavior when viewing in a terminal if the raw character is output framework/Imap_Client/lib/Horde/Imap/Client/Socket.php | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) http://git.horde.org/horde-git/-/commit/c12bc135d5a34e308b24545787f32d6c6eeeb70a ----------------------------------------------------------------------- commit 532d18d3740d041af41c086f3d9183ca85e496bf Author: Michael M Slusarz <[email protected]> Date: Sat Sep 14 00:07:49 2013 -0600 [mms] Handle case-insensitive INBOX return from the server. framework/Imap_Client/lib/Horde/Imap/Client/Mailbox.php | 4 ++++ framework/Imap_Client/package.xml | 2 ++ 2 files changed, 6 insertions(+), 0 deletions(-) http://git.horde.org/horde-git/-/commit/532d18d3740d041af41c086f3d9183ca85e496bf ----------------------------------------------------------------------- commit 3de279d066687bdc6e38fec9766cbb8614c91e2a Author: Michael M Slusarz <[email protected]> Date: Sat Sep 14 00:16:38 2013 -0600 Slightly faster equality comparison framework/Imap_Client/lib/Horde/Imap/Client/Mailbox/List.php | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) http://git.horde.org/horde-git/-/commit/3de279d066687bdc6e38fec9766cbb8614c91e2a ----------------------------------------------------------------------- commit e682aa74db6aee6b3d6242ca2d324771c06df894 Author: Michael M Slusarz <[email protected]> Date: Sat Sep 14 00:16:47 2013 -0600 Mailbox object does this for us now framework/Imap_Client/lib/Horde/Imap/Client/Socket/Pop3.php | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) http://git.horde.org/horde-git/-/commit/e682aa74db6aee6b3d6242ca2d324771c06df894 ----------------------------------------------------------------------- commit 105251cdd57df47b8d6b48b6d8456e587579f181 Author: Michael M Slusarz <[email protected]> Date: Sat Sep 14 00:18:15 2013 -0600 Add unit test framework/Imap_Client/test/Horde/Imap/Client/MailboxTest.php | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) http://git.horde.org/horde-git/-/commit/105251cdd57df47b8d6b48b6d8456e587579f181 ----------------------------------------------------------------------- commit db600bd3bc64566f7de32125a15d33051c80f046 Author: Michael M Slusarz <[email protected]> Date: Sat Sep 14 00:29:23 2013 -0600 Released Horde_Imap_Client-2.15.2 framework/Imap_Client/package.xml | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) http://git.horde.org/horde-git/-/commit/db600bd3bc64566f7de32125a15d33051c80f046 ----------------------------------------------------------------------- commit fd28c75c675a5d42e88e8b2ae638b6e4a67981d8 Author: Michael M Slusarz <[email protected]> Date: Sat Sep 14 00:29:23 2013 -0600 Development mode for Horde_Imap_Client-2.15.3 framework/Imap_Client/package.xml | 18 +++++++++++++++--- 1 files changed, 15 insertions(+), 3 deletions(-) http://git.horde.org/horde-git/-/commit/fd28c75c675a5d42e88e8b2ae638b6e4a67981d8 ----------------------------------------------------------------------- commit 3e394d4cd21ef015106ef36c365128d8b736a1f7 Author: Michael J Rubinsky <[email protected]> Date: Sat Sep 14 10:38:46 2013 -0400 Bug: 12668 Ensure protected images don't leak into gallery thumbnails. ansel/lib/ImageGenerator.php | 34 +++++----------------------------- ansel/lib/Tile/Gallery.php | 41 ++++++++++++++++++++++++++++++++++------- 2 files changed, 39 insertions(+), 36 deletions(-) http://git.horde.org/horde-git/-/commit/3e394d4cd21ef015106ef36c365128d8b736a1f7 ----------------------------------------------------------------------- commit b7bc7afeb87071e6216d61a6dce3611ae28ab634 Author: Michael J Rubinsky <[email protected]> Date: Sat Sep 14 11:09:52 2013 -0400 Clean up some exception handling. ansel/bin/ansel | 2 +- ansel/faces/claim.php | 2 +- ansel/faces/custom.php | 2 +- ansel/faces/face.php | 2 +- ansel/faces/image.php | 2 +- ansel/faces/name.php | 2 +- ansel/faces/report.php | 2 +- ansel/faces/savecustom.php | 2 +- ansel/img/mini.php | 2 +- ansel/img/screen.php | 2 +- ansel/img/thumb.php | 2 +- ansel/lib/Ajax/Application/Handler.php | 2 +- ansel/lib/Ajax/Imple/EditCaption.php | 2 +- ansel/lib/Api.php | 2 +- ansel/lib/Application.php | 4 +- ansel/lib/Block/Gallery.php | 4 +- ansel/lib/Block/RecentComments.php | 6 ++-- ansel/lib/Faces/Base.php | 6 ++-- ansel/lib/Faces/Facedetect.php | 2 +- ansel/lib/Gallery.php | 6 ++-- ansel/lib/Image.php | 28 ++++++-------------- ansel/lib/ImageGenerator.php | 4 +- ansel/lib/Storage.php | 4 +- ansel/lib/View/Base.php | 2 +- ansel/lib/View/EmbeddedRenderer/GalleryLink.php | 2 +- ansel/lib/View/List.php | 2 +- ansel/lib/View/Upload.php | 4 +- ansel/lib/Widget/OwnerFaces.php | 2 +- ansel/migration/4_ansel_upgrade_tagstocontent.php | 2 +- ansel/view.php | 2 +- 30 files changed, 49 insertions(+), 59 deletions(-) http://git.horde.org/horde-git/-/commit/b7bc7afeb87071e6216d61a6dce3611ae28ab634 ----------------------------------------------------------------------- commit d5c6ce192d2e9f89b55051cb2d1a3ca25155989e Author: Michael J Rubinsky <[email protected]> Date: Sat Sep 14 12:01:04 2013 -0400 Fix scope ansel/lib/View/GalleryRenderer/Base.php | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) http://git.horde.org/horde-git/-/commit/d5c6ce192d2e9f89b55051cb2d1a3ca25155989e ----------------------------------------------------------------------- commit 47a304cbc380913c96a026690e9abdb82f02ae6d Author: Michael J Rubinsky <[email protected]> Date: Sat Sep 14 12:02:11 2013 -0400 Fix variable name. ansel/report.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) http://git.horde.org/horde-git/-/commit/47a304cbc380913c96a026690e9abdb82f02ae6d ----------------------------------------------------------------------- commit 7ac019ff0edb3427452c1c8b1e30c24f57ee268b Author: Michael J Rubinsky <[email protected]> Date: Sat Sep 14 12:07:13 2013 -0400 ws, cs ansel/report.php | 24 ++++++++++++++---------- 1 files changed, 14 insertions(+), 10 deletions(-) http://git.horde.org/horde-git/-/commit/7ac019ff0edb3427452c1c8b1e30c24f57ee268b ----------------------------------------------------------------------- commit e99618710b3fd52a68eda85d522d85992026360a Author: Michael J Rubinsky <[email protected]> Date: Sat Sep 14 12:21:52 2013 -0400 Bug: 12667 Fix report form button behavior. ansel/report.php | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) http://git.horde.org/horde-git/-/commit/e99618710b3fd52a68eda85d522d85992026360a ----------------------------------------------------------------------- commit aba26ef9bad6e1660c1dc2503a0912ab3f2ae103 Author: Michael J Rubinsky <[email protected]> Date: Sat Sep 14 12:40:55 2013 -0400 Scope ansel/lib/Widget/Actions.php | 16 +++++++++------- 1 files changed, 9 insertions(+), 7 deletions(-) http://git.horde.org/horde-git/-/commit/aba26ef9bad6e1660c1dc2503a0912ab3f2ae103 ----------------------------------------------------------------------- commit b89da8786191358b15289d570a1f189c032a8874 Author: Michael J Rubinsky <[email protected]> Date: Sat Sep 14 12:42:20 2013 -0400 BFN ansel/docs/CHANGES | 3 +++ ansel/package.xml | 4 ++++ 2 files changed, 7 insertions(+), 0 deletions(-) http://git.horde.org/horde-git/-/commit/b89da8786191358b15289d570a1f189c032a8874 ----------------------------------------------------------------------- commit a303fc6c2a3d0eae642e9431314b8a0a4d14a8f9 Author: Michael J Rubinsky <[email protected]> Date: Sat Sep 14 12:43:56 2013 -0400 Add report icon ansel/templates/widgets/actions.html.php | 2 +- ansel/themes/default/graphics/report.png | Bin 0 -> 538 bytes 2 files changed, 1 insertions(+), 1 deletions(-) create mode 100644 ansel/themes/default/graphics/report.png http://git.horde.org/horde-git/-/commit/a303fc6c2a3d0eae642e9431314b8a0a4d14a8f9 ----------------------------------------------------------------------- commit cccab448ad23a600399118456d2a9658fd0cff56 Author: Michael J Rubinsky <[email protected]> Date: Sat Sep 14 12:46:14 2013 -0400 Fix output of has_edit and has_delete values in javascript. ansel/lib/View/GalleryRenderer/Base.php | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) http://git.horde.org/horde-git/-/commit/cccab448ad23a600399118456d2a9658fd0cff56 ----------------------------------------------------------------------- commit 665e67cb528fb185d87d1349c5b9b1125f29b596 Author: Michael J Rubinsky <[email protected]> Date: Sat Sep 14 13:32:12 2013 -0400 Add support for nginx sendfile headers. Bug: 12661 ansel/img/download.php | 4 +--- ansel/img/full.php | 4 +--- ansel/img/index.php | 4 +--- ansel/img/mini.php | 4 +--- ansel/img/screen.php | 4 +--- ansel/img/thumb.php | 5 +---- ansel/lib/Ansel.php | 20 ++++++++++++++++++++ 7 files changed, 26 insertions(+), 19 deletions(-) http://git.horde.org/horde-git/-/commit/665e67cb528fb185d87d1349c5b9b1125f29b596 ----------------------------------------------------------------------- commit cd3204f5eb99c1879eca2bedead68259c4568577 Author: Michael J Rubinsky <[email protected]> Date: Sat Sep 14 13:33:23 2013 -0400 CHANGES ansel/docs/CHANGES | 1 + ansel/package.xml | 2 ++ 2 files changed, 3 insertions(+), 0 deletions(-) http://git.horde.org/horde-git/-/commit/cd3204f5eb99c1879eca2bedead68259c4568577 ----------------------------------------------------------------------- commit 7ca08981a55e06892d3b3e35decb1f8cb73d859a Author: Michael M Slusarz <[email protected]> Date: Sat Sep 14 17:21:27 2013 -0600 global variable horde/lib/View/Topbar.php | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) http://git.horde.org/horde-git/-/commit/7ca08981a55e06892d3b3e35decb1f8cb73d859a ----------------------------------------------------------------------- commit f5c41a4c0aeb6fdd631c63687dfba15da4c5125a Author: Michael M Slusarz <[email protected]> Date: Sat Sep 14 17:49:25 2013 -0600 [mms] Don't initialize unnecessary prefs object when creating the topbar. framework/Core/lib/Horde/Core/Topbar.php | 2 +- framework/Core/package.xml | 2 ++ 2 files changed, 3 insertions(+), 1 deletions(-) http://git.horde.org/horde-git/-/commit/f5c41a4c0aeb6fdd631c63687dfba15da4c5125a ----------------------------------------------------------------------- commit 1b85f1e6ed953009d216122f3782239b727ec431 Author: Michael M Slusarz <[email protected]> Date: Sun Sep 15 15:41:18 2013 -0600 Catch errors when uploading attachments in dynamic view imp/js/compose-dimp.js | 18 +++++++++++++++--- 1 files changed, 15 insertions(+), 3 deletions(-) http://git.horde.org/horde-git/-/commit/1b85f1e6ed953009d216122f3782239b727ec431 ----------------------------------------------------------------------- commit 80aa3e6272dbd0a7c24fdf10635af196b0029769 Merge: 9ba701a 1b85f1e Author: Michael M Slusarz <[email protected]> Date: Sun Sep 15 18:14:59 2013 -0600 Merge branch 'master' into imp_6_2 Conflicts: imp/lib/Search.php ansel/bin/ansel | 2 +- ansel/docs/CHANGES | 4 + ansel/faces/claim.php | 2 +- ansel/faces/custom.php | 2 +- ansel/faces/face.php | 2 +- ansel/faces/image.php | 2 +- ansel/faces/name.php | 2 +- ansel/faces/report.php | 2 +- ansel/faces/savecustom.php | 2 +- ansel/img/download.php | 4 +- ansel/img/full.php | 4 +- ansel/img/index.php | 4 +- ansel/img/mini.php | 6 +- ansel/img/screen.php | 6 +- ansel/img/thumb.php | 7 +- ansel/lib/Ajax/Application/Handler.php | 2 +- ansel/lib/Ajax/Imple/EditCaption.php | 2 +- ansel/lib/Ansel.php | 20 + ansel/lib/Api.php | 2 +- ansel/lib/Application.php | 4 +- ansel/lib/Block/Gallery.php | 4 +- ansel/lib/Block/RecentComments.php | 6 +- ansel/lib/Faces/Base.php | 6 +- ansel/lib/Faces/Facedetect.php | 2 +- ansel/lib/Gallery.php | 6 +- ansel/lib/Image.php | 28 +- ansel/lib/ImageGenerator.php | 38 +-- ansel/lib/Storage.php | 4 +- ansel/lib/Tile/Gallery.php | 41 ++- ansel/lib/View/Base.php | 2 +- ansel/lib/View/EmbeddedRenderer/GalleryLink.php | 2 +- ansel/lib/View/GalleryRenderer/Base.php | 8 +- ansel/lib/View/List.php | 2 +- ansel/lib/View/Upload.php | 4 +- ansel/lib/Widget/Actions.php | 16 +- ansel/lib/Widget/OwnerFaces.php | 2 +- ansel/migration/4_ansel_upgrade_tagstocontent.php | 2 +- ansel/package.xml | 6 + ansel/report.php | 35 +- ansel/templates/widgets/actions.html.php | 2 +- ansel/themes/default/graphics/report.png | Bin 0 -> 538 bytes ansel/view.php | 2 +- framework/ActiveSync/doc/Horde/ActiveSync/TODO | 5 - framework/ActiveSync/lib/Horde/ActiveSync/Folder/Base.php | 37 ++ framework/ActiveSync/lib/Horde/ActiveSync/Folder/Imap.php | 56 ++ framework/ActiveSync/lib/Horde/ActiveSync/Imap/Adapter.php | 35 +- framework/ActiveSync/package.xml | 12 +- framework/Core/lib/Horde/Core/ActiveSync/Auth.php | 15 + framework/Core/lib/Horde/Core/ActiveSync/Connector.php | 41 ++ framework/Core/lib/Horde/Core/ActiveSync/Driver.php | 48 ++- framework/Core/lib/Horde/Core/ActiveSync/Logger/Factory.php | 2 +- framework/Core/lib/Horde/Core/Factory/Auth.php | 2 +- framework/Core/lib/Horde/Core/Topbar.php | 2 +- framework/Core/package.xml | 6 +- framework/Db/bin/horde-db-migrate-component | 2 +- framework/Db/lib/Horde/Db/Adapter.php | 18 +- framework/Db/lib/Horde/Db/Adapter/Base.php | 67 --- framework/Db/lib/Horde/Db/Adapter/Base/Column.php | 2 +- framework/Db/lib/Horde/Db/Adapter/Mysql/Column.php | 6 +- framework/Db/lib/Horde/Db/Adapter/Postgresql/Column.php | 5 - framework/Db/lib/Horde/Db/Adapter/Sqlite/Column.php | 6 - framework/Db/lib/Horde/Db/SearchParser.php | 4 +- framework/Db/package.xml | 9 + framework/Db/test/Horde/Db/Adapter/ColumnBase.php | 264 ++++++++++ framework/Db/test/Horde/Db/Adapter/Mysql/ColumnTest.php | 217 +-------- framework/Db/test/Horde/Db/Adapter/MysqlBase.php | 2 +- framework/Db/test/Horde/Db/Adapter/Postgresql/ColumnTest.php | 137 +----- framework/Db/test/Horde/Db/Adapter/Sqlite/ColumnTest.php | 227 +-------- framework/Imap_Client/lib/Horde/Imap/Client/Base.php | 10 +- framework/Imap_Client/lib/Horde/Imap/Client/Mailbox.php | 4 + framework/Imap_Client/lib/Horde/Imap/Client/Mailbox/List.php | 8 +- framework/Imap_Client/lib/Horde/Imap/Client/Socket.php | 14 +- framework/Imap_Client/lib/Horde/Imap/Client/Socket/Pop3.php | 5 +- framework/Imap_Client/package.xml | 36 ++- framework/Imap_Client/test/Horde/Imap/Client/MailboxTest.php | 10 + framework/Stream_Filter/package.xml | 22 +- horde/lib/View/Topbar.php | 16 +- imp/js/compose-dimp.js | 18 +- kronolith/docs/CHANGES | 2 + kronolith/lib/Event.php | 2 +- kronolith/package.xml | 2 + 81 files changed, 811 insertions(+), 864 deletions(-) http://git.horde.org/horde-git/-/commit/80aa3e6272dbd0a7c24fdf10635af196b0029769 -- commits mailing list Frequently Asked Questions: http://wiki.horde.org/FAQ To unsubscribe, mail: [email protected]
