[commits] Horde branch imp_multiple_accounts updated. 529ccf99fd5e6b441daf888d0fe360c44b9fcd59
Michael M Slusarz
slusarz at horde.org
Thu Aug 29 23:33:35 UTC 2013
The branch "imp_multiple_accounts" has been updated.
The following is a summary of the commits.
from: 920e585d2d3547d0169e4a28e4cb8acf50e06f73
7efae84 Add Horde_Auth_X509
8373ab7 Fix setting credentials when using unified password.
684a62d changes
43d4890 If the collection wasn't synched, we won't have it in the cache.
71ee71e [mms] Fix storing password object in the Horde_Smtp object.
1bea97a Fix variable name
7c3a16a [mms] Change default security to use TLS, if available.
733cce5 Released Horde_Smtp-1.2.0
e7b1b0b Development mode for Horde_Smtp-1.2.1
8f5ba5a Optimization: if 530 code is seen, no need to send reset command
71b8178 [mms] Transparently handle required TLS connection when no security was configured.
919709e Fix view helper name (Bug #12631).
ee4e1c5 This needs to be 2.1.0.
ab944cb [rla] Add support for external links in topbar (Feature #11977).
2602823 Centralize auto-determination of port number
9342117 [mms] By default, use TLS if available and necessary to login to server.
3651ef9 tweaks
72a5bb6 Fix harmless array access error in Horde_Imap_Client_Socket
91bfd24 Better fix for #11425
6daa004 Revert "[mms] By default, use TLS if available and necessary to login to server."
e856fd8 [jan] Move attachments list to separate ticket tab.
1f6b0db Make table sortable.
9810113 screen size is static, so only need to compute once
c9c3234 Make clear that changing CSS when using static caching won't cause the CSS to be updated
bf66024 Revert "Revert "[mms] By default, use TLS if available and necessary to login to server.""
f494c36 Fix capitalization
c382e29 Once TLS is auto-determined, set parameter so we don't have to auto-detect again
5a4ccc3 [mms] Make addresses in smartmobile full message header display clickable to open a compose window.
7c4c3eb Once TLS is auto-determined, set parameter so we don't have to auto-detect again - POP3 version
81306e4 Merge branch 'master' into imp_6_2
7cb4849 Add __toString() method
529ccf9 Merge branch 'imp_6_2' into imp_multiple_accounts
-----------------------------------------------------------------------
commit 7efae8446ad2a0e0f5e398547020055d7b746b64
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date: Tue Aug 27 11:52:32 2013 -0400
Add Horde_Auth_X509
framework/Auth/lib/Horde/Auth/X509.php | 147 ++++++++++++++++++++++++++++++++
framework/Auth/package.xml | 8 +-
2 files changed, 152 insertions(+), 3 deletions(-)
create mode 100644 framework/Auth/lib/Horde/Auth/X509.php
http://git.horde.org/horde-git/-/commit/7efae8446ad2a0e0f5e398547020055d7b746b64
-----------------------------------------------------------------------
commit 8373ab7d892bc64ef339bc41dd59a3b6dca970e5
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date: Tue Aug 27 13:13:30 2013 -0400
Fix setting credentials when using unified password.
framework/Auth/lib/Horde/Auth/X509.php | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
http://git.horde.org/horde-git/-/commit/8373ab7d892bc64ef339bc41dd59a3b6dca970e5
-----------------------------------------------------------------------
commit 684a62dd1cd30881a9e5c08d692474f841a312c4
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date: Tue Aug 27 13:13:48 2013 -0400
changes
framework/Auth/lib/Horde/Auth/X509.php | 2 ++
framework/Auth/package.xml | 4 ++--
2 files changed, 4 insertions(+), 2 deletions(-)
http://git.horde.org/horde-git/-/commit/684a62dd1cd30881a9e5c08d692474f841a312c4
-----------------------------------------------------------------------
commit 43d489041ee279c3a7fda84d068c02f8dd33b330
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date: Wed Aug 28 00:33:07 2013 -0400
If the collection wasn't synched, we won't have it in the cache.
framework/ActiveSync/lib/Horde/ActiveSync/Collections.php | 6 ------
1 files changed, 0 insertions(+), 6 deletions(-)
http://git.horde.org/horde-git/-/commit/43d489041ee279c3a7fda84d068c02f8dd33b330
-----------------------------------------------------------------------
commit 71ee71e3b8670c0d58197ee6ef3f024886607d07
Author: Michael M Slusarz <slusarz at horde.org>
Date: Wed Aug 28 02:59:19 2013 -0600
[mms] Fix storing password object in the Horde_Smtp object.
framework/Smtp/lib/Horde/Smtp.php | 2 +-
framework/Smtp/package.xml | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
http://git.horde.org/horde-git/-/commit/71ee71e3b8670c0d58197ee6ef3f024886607d07
-----------------------------------------------------------------------
commit 1bea97acced9e8f4bc917ed9bfbb2e2ddb8e6a86
Author: Michael M Slusarz <slusarz at horde.org>
Date: Wed Aug 28 03:00:41 2013 -0600
Fix variable name
framework/Smtp/lib/Horde/Smtp/Connection.php | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
http://git.horde.org/horde-git/-/commit/1bea97acced9e8f4bc917ed9bfbb2e2ddb8e6a86
-----------------------------------------------------------------------
commit 7c3a16a90040a19eca47c4d81371eb63c83f7866
Author: Michael M Slusarz <slusarz at horde.org>
Date: Wed Aug 28 03:02:39 2013 -0600
[mms] Change default security to use TLS, if available.
This mirrors the default settings of Net_SMTP, which this library was
designed to be a drop-in replacemen of.
framework/Smtp/doc/Horde/Smtp/UPGRADING | 11 +++++++++++
framework/Smtp/lib/Horde/Smtp.php | 13 ++++++++++---
framework/Smtp/lib/Horde/Smtp/Connection.php | 11 ++++++++++-
framework/Smtp/package.xml | 10 ++++++----
4 files changed, 37 insertions(+), 8 deletions(-)
http://git.horde.org/horde-git/-/commit/7c3a16a90040a19eca47c4d81371eb63c83f7866
-----------------------------------------------------------------------
commit 733cce59006618e620b47e5abaf03ee70234d7b1
Author: Michael M Slusarz <slusarz at horde.org>
Date: Wed Aug 28 03:13:42 2013 -0600
Released Horde_Smtp-1.2.0
framework/Smtp/package.xml | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
http://git.horde.org/horde-git/-/commit/733cce59006618e620b47e5abaf03ee70234d7b1
-----------------------------------------------------------------------
commit e7b1b0bad0fb80c3a0dd4ecdb41dbe51b3f5890e
Author: Michael M Slusarz <slusarz at horde.org>
Date: Wed Aug 28 03:13:42 2013 -0600
Development mode for Horde_Smtp-1.2.1
framework/Smtp/package.xml | 18 +++++++++++++++---
1 files changed, 15 insertions(+), 3 deletions(-)
http://git.horde.org/horde-git/-/commit/e7b1b0bad0fb80c3a0dd4ecdb41dbe51b3f5890e
-----------------------------------------------------------------------
commit 8f5ba5a68cb1db13ce0441468c321621c187c660
Author: Michael M Slusarz <slusarz at horde.org>
Date: Wed Aug 28 03:14:58 2013 -0600
Optimization: if 530 code is seen, no need to send reset command
framework/Smtp/lib/Horde/Smtp.php | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
http://git.horde.org/horde-git/-/commit/8f5ba5a68cb1db13ce0441468c321621c187c660
-----------------------------------------------------------------------
commit 71b8178739193615ac26ff6c5db1370f09001ec6
Author: Michael M Slusarz <slusarz at horde.org>
Date: Wed Aug 28 03:19:14 2013 -0600
[mms] Transparently handle required TLS connection when no security was configured.
framework/Smtp/lib/Horde/Smtp.php | 13 +++++++++++++
framework/Smtp/package.xml | 4 ++--
2 files changed, 15 insertions(+), 2 deletions(-)
http://git.horde.org/horde-git/-/commit/71b8178739193615ac26ff6c5db1370f09001ec6
-----------------------------------------------------------------------
commit 919709edbb319f70b10e07247c986f5caaf9c40f
Author: Jan Schneider <jan at horde.org>
Date: Wed Aug 28 12:17:51 2013 +0200
Fix view helper name (Bug #12631).
Conflicts:
horde/docs/CHANGES
horde/package.xml
horde/docs/CHANGES | 1 +
horde/lib/Prefs/Special/Activesync.php | 2 +-
horde/package.xml | 4 ++--
3 files changed, 4 insertions(+), 3 deletions(-)
http://git.horde.org/horde-git/-/commit/919709edbb319f70b10e07247c986f5caaf9c40f
-----------------------------------------------------------------------
commit ee4e1c567a599833642e1a0a9e7e529084760e22
Author: Jan Schneider <jan at horde.org>
Date: Wed Aug 28 12:49:15 2013 +0200
This needs to be 2.1.0.
framework/Auth/package.xml | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
http://git.horde.org/horde-git/-/commit/ee4e1c567a599833642e1a0a9e7e529084760e22
-----------------------------------------------------------------------
commit ab944cb25976f3f86505694280bafc55e652417b
Author: Ralf Lang <lang at b1-systems.de>
Date: Mon Jun 24 12:57:04 2013 +0300
[rla] Add support for external links in topbar (Feature #11977).
Conflicts:
framework/Core/package.xml
framework/Core/lib/Horde/Core/Topbar.php | 3 ++-
framework/Core/lib/Horde/Registry.php | 3 ++-
framework/Core/package.xml | 16 +++++++++-------
3 files changed, 13 insertions(+), 9 deletions(-)
http://git.horde.org/horde-git/-/commit/ab944cb25976f3f86505694280bafc55e652417b
-----------------------------------------------------------------------
commit 26028234ad0da5b6499e6bb9a5415c40666d0220
Author: Michael M Slusarz <slusarz at horde.org>
Date: Wed Aug 28 12:34:37 2013 -0600
Centralize auto-determination of port number
framework/Imap_Client/lib/Horde/Imap/Client/Base.php | 12 ++++++-
framework/Imap_Client/lib/Horde/Imap/Client/Socket.php | 7 ++++
framework/Imap_Client/lib/Horde/Imap/Client/Socket/Pop3.php | 18 ++++------
3 files changed, 24 insertions(+), 13 deletions(-)
http://git.horde.org/horde-git/-/commit/26028234ad0da5b6499e6bb9a5415c40666d0220
-----------------------------------------------------------------------
commit 93421174c901ffbded46a35cc8e7ec3b60ea5769
Author: Michael M Slusarz <slusarz at horde.org>
Date: Wed Aug 28 14:06:19 2013 -0600
[mms] By default, use TLS if available and necessary to login to server.
framework/Imap_Client/doc/Horde/Imap/Client/UPGRADING | 11 ++
framework/Imap_Client/lib/Horde/Imap/Client/Base.php | 15 +-
framework/Imap_Client/lib/Horde/Imap/Client/Base/Connection.php | 9 +-
framework/Imap_Client/lib/Horde/Imap/Client/Socket.php | 11 +-
framework/Imap_Client/lib/Horde/Imap/Client/Socket/Connection.php | 2 +-
framework/Imap_Client/lib/Horde/Imap/Client/Socket/Pop3.php | 36 +++--
framework/Imap_Client/package.xml | 10 +-
7 files changed, 58 insertions(+), 36 deletions(-)
http://git.horde.org/horde-git/-/commit/93421174c901ffbded46a35cc8e7ec3b60ea5769
-----------------------------------------------------------------------
commit 3651ef9dd63eb4f948d099a1177142706343d331
Author: Michael M Slusarz <slusarz at horde.org>
Date: Wed Aug 28 14:54:15 2013 -0600
tweaks
framework/Smtp/lib/Horde/Smtp.php | 2 +-
framework/Smtp/lib/Horde/Smtp/Connection.php | 8 ++------
2 files changed, 3 insertions(+), 7 deletions(-)
http://git.horde.org/horde-git/-/commit/3651ef9dd63eb4f948d099a1177142706343d331
-----------------------------------------------------------------------
commit 72a5bb69d467a98475375812cc2594e7f7c9782b
Author: Michael M Slusarz <slusarz at horde.org>
Date: Wed Aug 28 17:57:32 2013 -0600
Fix harmless array access error in Horde_Imap_Client_Socket
framework/Imap_Client/lib/Horde/Imap/Client/Socket.php | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
http://git.horde.org/horde-git/-/commit/72a5bb69d467a98475375812cc2594e7f7c9782b
-----------------------------------------------------------------------
commit 91bfd242a5a3177cb07bb4bef966e4df99085bc0
Author: Michael M Slusarz <slusarz at horde.org>
Date: Wed Aug 28 18:05:04 2013 -0600
Better fix for #11425
Fixes sorting of special mailbox names
imp/lib/Ajax/Application/Handler/Dynamic.php | 3 +--
imp/lib/Ajax/Queue.php | 15 ++++++---------
2 files changed, 7 insertions(+), 11 deletions(-)
http://git.horde.org/horde-git/-/commit/91bfd242a5a3177cb07bb4bef966e4df99085bc0
-----------------------------------------------------------------------
commit 6daa00469d213bb4483af15b7512bb75a10f4ba0
Author: Jan Schneider <jan at horde.org>
Date: Thu Aug 29 10:15:05 2013 +0200
Revert "[mms] By default, use TLS if available and necessary to login to server."
This breaks logging in completely for me:
S: * OK [CAPABILITY IMAP4rev1 LITERAL+ ID ENABLE XIMAPPROXY] neo Cyrus IMAP v2.4.16-Debian-2.4.16-4 server ready
C: 1 STARTTLS
S: 1 BAD Please login first
C: 2 STARTTLS
S: 2 BAD Please login first
C: 3 STARTTLS
S: 3 BAD Please login first
C: 4 STARTTLS
S: 4 BAD Please login first
This reverts commit 93421174c901ffbded46a35cc8e7ec3b60ea5769.
framework/Imap_Client/doc/Horde/Imap/Client/UPGRADING | 11 --
framework/Imap_Client/lib/Horde/Imap/Client/Base.php | 15 +-
framework/Imap_Client/lib/Horde/Imap/Client/Base/Connection.php | 9 +-
framework/Imap_Client/lib/Horde/Imap/Client/Socket.php | 11 +-
framework/Imap_Client/lib/Horde/Imap/Client/Socket/Connection.php | 2 +-
framework/Imap_Client/lib/Horde/Imap/Client/Socket/Pop3.php | 36 ++---
framework/Imap_Client/package.xml | 10 +-
7 files changed, 36 insertions(+), 58 deletions(-)
http://git.horde.org/horde-git/-/commit/6daa00469d213bb4483af15b7512bb75a10f4ba0
-----------------------------------------------------------------------
commit e856fd8cb7e7f0665652dae31a2999de8cb4a613
Author: Jan Schneider <jan at horde.org>
Date: Thu Aug 29 14:39:57 2013 +0200
[jan] Move attachments list to separate ticket tab.
whups/docs/CHANGES | 1 +
whups/lib/Form/Renderer/Comment.php | 3 +-
whups/lib/Form/TicketDetails.php | 7 +---
whups/lib/Ticket.php | 33 +++++---------
whups/lib/Whups.php | 64 +++++++++++++++++++--------
whups/package.xml | 14 ++++--
whups/templates/ticket/attachments.html.php | 26 +++++++++++
whups/ticket/attachments.php | 60 +++++++++++++++++++++++++
8 files changed, 157 insertions(+), 51 deletions(-)
create mode 100644 whups/templates/ticket/attachments.html.php
create mode 100644 whups/ticket/attachments.php
http://git.horde.org/horde-git/-/commit/e856fd8cb7e7f0665652dae31a2999de8cb4a613
-----------------------------------------------------------------------
commit 1f6b0db7b02e8dab849c9ac29742608f156bc8f5
Author: Jan Schneider <jan at horde.org>
Date: Thu Aug 29 14:46:33 2013 +0200
Make table sortable.
whups/templates/ticket/attachments.html.php | 10 +++++-----
whups/ticket/attachments.php | 2 ++
2 files changed, 7 insertions(+), 5 deletions(-)
http://git.horde.org/horde-git/-/commit/1f6b0db7b02e8dab849c9ac29742608f156bc8f5
-----------------------------------------------------------------------
commit 981011323239dc79ade276a6583da079de744c71
Author: Michael M Slusarz <slusarz at horde.org>
Date: Thu Aug 29 16:09:08 2013 -0600
screen size is static, so only need to compute once
imp/js/compose-dimp.js | 3 ---
imp/js/dimpcore.js | 4 ++++
imp/js/message-dimp.js | 3 ---
3 files changed, 4 insertions(+), 6 deletions(-)
http://git.horde.org/horde-git/-/commit/981011323239dc79ade276a6583da079de744c71
-----------------------------------------------------------------------
commit c9c323418525bfa82ad20b1bbe413935da324511
Author: Michael M Slusarz <slusarz at horde.org>
Date: Thu Aug 29 16:11:39 2013 -0600
Make clear that changing CSS when using static caching won't cause the CSS to be updated
horde/config/conf.xml | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
http://git.horde.org/horde-git/-/commit/c9c323418525bfa82ad20b1bbe413935da324511
-----------------------------------------------------------------------
commit bf660243870932de6bcacd54f4dec6c376cc5226
Author: Michael M Slusarz <slusarz at horde.org>
Date: Thu Aug 29 16:12:13 2013 -0600
Revert "Revert "[mms] By default, use TLS if available and necessary to login to server.""
This reverts commit 6daa00469d213bb4483af15b7512bb75a10f4ba0.
Your IMAP server is totally hosed.
S: * OK [CAPABILITY IMAP4rev1 LITERAL+ ID ENABLE XIMAPPROXY] neo Cyrus IMAP v2.4.16-Debian-2.4.16-4 server ready
C: 1 STARTTLS
S: 1 BAD Please login first
Login before starting TLS? Nothing like sending your auth credentials
in plaintext before starting encryption.
But the main issue is instead that your server doesn't advertise/support
STARTTLS, which is MANDATORY under IMAPv4rev1 (RFC 3501 [6.1.1, 7.2.1, 9,
11.2, etc., etc.]). Not sure why it didn't throw an Exception a line
before the STARTTLS is issued, (although it won't throw an Exception if
this was an already existing Horde_Imap_Client and you upgraded in the
middle of a session, which obviously won't work).
framework/Imap_Client/doc/Horde/Imap/Client/UPGRADING | 11 ++
framework/Imap_Client/lib/Horde/Imap/Client/Base.php | 15 +-
framework/Imap_Client/lib/Horde/Imap/Client/Base/Connection.php | 9 +-
framework/Imap_Client/lib/Horde/Imap/Client/Socket.php | 11 +-
framework/Imap_Client/lib/Horde/Imap/Client/Socket/Connection.php | 2 +-
framework/Imap_Client/lib/Horde/Imap/Client/Socket/Pop3.php | 36 +++--
framework/Imap_Client/package.xml | 10 +-
7 files changed, 58 insertions(+), 36 deletions(-)
http://git.horde.org/horde-git/-/commit/bf660243870932de6bcacd54f4dec6c376cc5226
-----------------------------------------------------------------------
commit f494c3628019c2d3e00843ff4d959bb200c2ef00
Author: Michael M Slusarz <slusarz at horde.org>
Date: Thu Aug 29 16:28:44 2013 -0600
Fix capitalization
framework/Imap_Client/lib/Horde/Imap/Client/Socket.php | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
http://git.horde.org/horde-git/-/commit/f494c3628019c2d3e00843ff4d959bb200c2ef00
-----------------------------------------------------------------------
commit c382e29301b59ec3d577d408982a2d9237101090
Author: Michael M Slusarz <slusarz at horde.org>
Date: Thu Aug 29 16:48:46 2013 -0600
Once TLS is auto-determined, set parameter so we don't have to auto-detect again
framework/Imap_Client/lib/Horde/Imap/Client/Socket.php | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
http://git.horde.org/horde-git/-/commit/c382e29301b59ec3d577d408982a2d9237101090
-----------------------------------------------------------------------
commit 5a4ccc3e708d9487ae7f18d1195c01fb0be9bcce
Author: Michael M Slusarz <slusarz at horde.org>
Date: Thu Aug 29 17:27:42 2013 -0600
[mms] Make addresses in smartmobile full message header display clickable to open a compose window.
imp/docs/CHANGES | 2 +
imp/js/smartmobile.js | 47 ++++++++++++++++++++++++++--
imp/package.xml | 2 +
imp/themes/default/smartmobile/screen.css | 3 ++
4 files changed, 50 insertions(+), 4 deletions(-)
http://git.horde.org/horde-git/-/commit/5a4ccc3e708d9487ae7f18d1195c01fb0be9bcce
-----------------------------------------------------------------------
commit 7c4c3eb61194d60240e958304540b4e0a9375520
Author: Michael M Slusarz <slusarz at horde.org>
Date: Thu Aug 29 17:29:53 2013 -0600
Once TLS is auto-determined, set parameter so we don't have to auto-detect again - POP3 version
framework/Imap_Client/lib/Horde/Imap/Client/Socket/Pop3.php | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
http://git.horde.org/horde-git/-/commit/7c4c3eb61194d60240e958304540b4e0a9375520
-----------------------------------------------------------------------
commit 81306e492e9bd69d1b148100feb8c8299f8e6ff7
Merge: 7dbe827 7c4c3eb
Author: Michael M Slusarz <slusarz at horde.org>
Date: Thu Aug 29 17:30:26 2013 -0600
Merge branch 'master' into imp_6_2
framework/ActiveSync/lib/Horde/ActiveSync/Collections.php | 6 -
framework/Auth/lib/Horde/Auth/X509.php | 153 +++++
framework/Auth/package.xml | 20 +-
framework/Core/lib/Horde/Core/Topbar.php | 3 +-
framework/Core/lib/Horde/Registry.php | 3 +-
framework/Core/package.xml | 16 +-
framework/Imap_Client/doc/Horde/Imap/Client/UPGRADING | 11 +
framework/Imap_Client/lib/Horde/Imap/Client/Base.php | 27 +-
framework/Imap_Client/lib/Horde/Imap/Client/Base/Connection.php | 9 +-
framework/Imap_Client/lib/Horde/Imap/Client/Socket.php | 28 +-
framework/Imap_Client/lib/Horde/Imap/Client/Socket/Connection.php | 2 +-
framework/Imap_Client/lib/Horde/Imap/Client/Socket/Pop3.php | 52 +-
framework/Imap_Client/package.xml | 10 +-
framework/Smtp/doc/Horde/Smtp/UPGRADING | 11 +
framework/Smtp/lib/Horde/Smtp.php | 33 +-
framework/Smtp/lib/Horde/Smtp/Connection.php | 9 +-
framework/Smtp/package.xml | 30 +-
horde/config/conf.xml | 4 +-
horde/docs/CHANGES | 1 +
horde/lib/Prefs/Special/Activesync.php | 2 +-
horde/package.xml | 4 +-
imp/docs/CHANGES | 2 +
imp/js/compose-dimp.js | 3 -
imp/js/dimpcore.js | 4 +
imp/js/message-dimp.js | 3 -
imp/js/smartmobile.js | 47 ++-
imp/lib/Ajax/Application/Handler/Dynamic.php | 3 +-
imp/lib/Ajax/Queue.php | 15 +-
imp/package.xml | 2 +
imp/themes/default/smartmobile/screen.css | 3 +
whups/docs/CHANGES | 1 +
whups/lib/Form/Renderer/Comment.php | 3 +-
whups/lib/Form/TicketDetails.php | 7 +-
whups/lib/Ticket.php | 33 +-
whups/lib/Whups.php | 64 ++-
whups/package.xml | 14 +-
whups/templates/ticket/attachments.html.php | 26 +
whups/ticket/attachments.php | 62 ++
38 files changed, 560 insertions(+), 166 deletions(-)
http://git.horde.org/horde-git/-/commit/81306e492e9bd69d1b148100feb8c8299f8e6ff7
-----------------------------------------------------------------------
commit 7cb4849534d37ea0b9a0d0522ba95c834a31293f
Author: Michael M Slusarz <slusarz at horde.org>
Date: Thu Aug 29 17:32:05 2013 -0600
Add __toString() method
imp/lib/Imap/Tree/Remote.php | 7 +++++++
1 files changed, 7 insertions(+), 0 deletions(-)
http://git.horde.org/horde-git/-/commit/7cb4849534d37ea0b9a0d0522ba95c834a31293f
-----------------------------------------------------------------------
commit 529ccf99fd5e6b441daf888d0fe360c44b9fcd59
Merge: 7cb4849 81306e4
Author: Michael M Slusarz <slusarz at horde.org>
Date: Thu Aug 29 17:33:18 2013 -0600
Merge branch 'imp_6_2' into imp_multiple_accounts
Conflicts:
imp/lib/Ajax/Application/Handler/Dynamic.php
framework/ActiveSync/lib/Horde/ActiveSync/Collections.php | 6 -
framework/Auth/lib/Horde/Auth/X509.php | 153 +++++
framework/Auth/package.xml | 20 +-
framework/Core/lib/Horde/Core/Topbar.php | 3 +-
framework/Core/lib/Horde/Registry.php | 3 +-
framework/Core/package.xml | 16 +-
framework/Imap_Client/doc/Horde/Imap/Client/UPGRADING | 11 +
framework/Imap_Client/lib/Horde/Imap/Client/Base.php | 27 +-
framework/Imap_Client/lib/Horde/Imap/Client/Base/Connection.php | 9 +-
framework/Imap_Client/lib/Horde/Imap/Client/Socket.php | 28 +-
framework/Imap_Client/lib/Horde/Imap/Client/Socket/Connection.php | 2 +-
framework/Imap_Client/lib/Horde/Imap/Client/Socket/Pop3.php | 52 +-
framework/Imap_Client/package.xml | 10 +-
framework/Smtp/doc/Horde/Smtp/UPGRADING | 11 +
framework/Smtp/lib/Horde/Smtp.php | 33 +-
framework/Smtp/lib/Horde/Smtp/Connection.php | 9 +-
framework/Smtp/package.xml | 30 +-
horde/config/conf.xml | 4 +-
horde/docs/CHANGES | 1 +
horde/lib/Prefs/Special/Activesync.php | 2 +-
horde/package.xml | 4 +-
imp/docs/CHANGES | 2 +
imp/js/compose-dimp.js | 3 -
imp/js/dimpcore.js | 4 +
imp/js/message-dimp.js | 3 -
imp/js/smartmobile.js | 47 ++-
imp/lib/Ajax/Application/Handler/Dynamic.php | 3 +-
imp/lib/Ajax/Queue.php | 15 +-
imp/package.xml | 2 +
imp/themes/default/smartmobile/screen.css | 3 +
whups/docs/CHANGES | 1 +
whups/lib/Form/Renderer/Comment.php | 3 +-
whups/lib/Form/TicketDetails.php | 7 +-
whups/lib/Ticket.php | 33 +-
whups/lib/Whups.php | 64 ++-
whups/package.xml | 14 +-
whups/templates/ticket/attachments.html.php | 26 +
whups/ticket/attachments.php | 62 ++
38 files changed, 560 insertions(+), 166 deletions(-)
http://git.horde.org/horde-git/-/commit/529ccf99fd5e6b441daf888d0fe360c44b9fcd59
More information about the commits
mailing list