[commits] Horde branch imp_6_1 updated. 212909ea01bb7bdd09de66c16b2a094dbb5f28c5
Michael M Slusarz
slusarz at horde.org
Fri Jan 18 20:15:12 UTC 2013
The branch "imp_6_1" has been updated.
The following is a summary of the commits.
from: 357fb9007dc33a8e2e365fe8ba674f2318bd9f9f
93d6f6b [jan] Fix importing of LDIF data (Bug #11972).
8f71305 [jan] Fix some issues with workweek views if first day of week is Sunday (Bug #11973).
053fe68 Fix disappeared upload link
46022e6 Fix unsetting storage key (Bug #11972).
8f4449d Use UTF-8.
193f86e Log the process id in the wbxml [de|en]coder as well.
9bfd019 " -> ', some other logging fixes.
2c85fc4 More logging changes
ac112b5 Fix variable name
3e32f93 Comments
72bf720 Need to limit by username here. Remove the mailMap table as well.
6f39507 Logging
7b5c802 [mms] Fix saving mailbox expansion state in basic folders view (Bug #11979).
80d75c9 Better display in basic subinfo bar when no messages in a mailbox (Bug #11980)
efeb04c [mms] Fix deleting virtual folders/filters from preferences page (Bug #11982).
212909e Merge branch 'master' into imp_6_1
-----------------------------------------------------------------------
commit 93d6f6b98034a29a18c38875ed926b3fc59c1adc
Author: Jan Schneider <jan at horde.org>
Date: Thu Jan 17 14:18:51 2013 +0100
[jan] Fix importing of LDIF data (Bug #11972).
turba/data.php | 13 ++++++++-----
turba/docs/CHANGES | 1 +
turba/package.xml | 4 ++--
3 files changed, 11 insertions(+), 7 deletions(-)
http://git.horde.org/horde-git/-/commit/93d6f6b98034a29a18c38875ed926b3fc59c1adc
-----------------------------------------------------------------------
commit 8f71305d3245054158ea05f54d1bd057639c9939
Author: Jan Schneider <jan at horde.org>
Date: Thu Jan 17 15:43:34 2013 +0100
[jan] Fix some issues with workweek views if first day of week is Sunday (Bug #11973).
kronolith/docs/CHANGES | 2 ++
kronolith/js/kronolith.js | 5 ++++-
kronolith/package.xml | 2 ++
3 files changed, 8 insertions(+), 1 deletions(-)
http://git.horde.org/horde-git/-/commit/8f71305d3245054158ea05f54d1bd057639c9939
-----------------------------------------------------------------------
commit 053fe6838ed9800adf87b01677e9cfef4713e1c5
Author: Chuck Hagenbuch <chuck at horde.org>
Date: Thu Jan 17 11:04:15 2013 -0500
Fix disappeared upload link
ansel/lib/Widget/Actions.php | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
http://git.horde.org/horde-git/-/commit/053fe6838ed9800adf87b01677e9cfef4713e1c5
-----------------------------------------------------------------------
commit 46022e68b0bec5be01c7e84c67feb512fe1ea01c
Author: Jan Schneider <jan at horde.org>
Date: Thu Jan 17 22:58:18 2013 +0100
Fix unsetting storage key (Bug #11972).
turba/lib/Data/Ldif.php | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
http://git.horde.org/horde-git/-/commit/46022e68b0bec5be01c7e84c67feb512fe1ea01c
-----------------------------------------------------------------------
commit 8f4449dbdc68c164bb13e4d10a427a96c7e78c40
Author: Jan Schneider <jan at horde.org>
Date: Fri Jan 18 11:27:18 2013 +0100
Use UTF-8.
framework/Ldap/test/Horde/Ldap/LdifTest.php | 8 ++++----
framework/Ldap/test/Horde/Ldap/fixtures/changes.ldif | 2 +-
framework/Ldap/test/Horde/Ldap/fixtures/sorted_w40.ldif | 8 ++++----
framework/Ldap/test/Horde/Ldap/fixtures/sorted_w50.ldif | 8 ++++----
framework/Ldap/test/Horde/Ldap/fixtures/unsorted_w30.ldif | 8 ++++----
framework/Ldap/test/Horde/Ldap/fixtures/unsorted_w50.ldif | 8 ++++----
framework/Ldap/test/Horde/Ldap/fixtures/unsorted_w50_WIN.ldif | 8 ++++----
7 files changed, 25 insertions(+), 25 deletions(-)
http://git.horde.org/horde-git/-/commit/8f4449dbdc68c164bb13e4d10a427a96c7e78c40
-----------------------------------------------------------------------
commit 193f86ec496cd065bea3c9b9b5c504c180df68fa
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date: Fri Jan 18 09:41:52 2013 -0500
Log the process id in the wbxml [de|en]coder as well.
framework/ActiveSync/lib/Horde/ActiveSync/Wbxml.php | 11 ++++-
framework/ActiveSync/lib/Horde/ActiveSync/Wbxml/Decoder.php | 28 +++++++++--
framework/ActiveSync/lib/Horde/ActiveSync/Wbxml/Encoder.php | 24 ++++++++--
3 files changed, 53 insertions(+), 10 deletions(-)
http://git.horde.org/horde-git/-/commit/193f86ec496cd065bea3c9b9b5c504c180df68fa
-----------------------------------------------------------------------
commit 9bfd019c77371b44f4f9e7f03ef22cccab841680
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date: Fri Jan 18 10:11:07 2013 -0500
" -> ', some other logging fixes.
framework/ActiveSync/lib/Horde/ActiveSync.php | 2 +-
framework/ActiveSync/lib/Horde/ActiveSync/Folder/Collection.php | 2 +-
framework/ActiveSync/lib/Horde/ActiveSync/Folder/Imap.php | 2 +-
framework/ActiveSync/lib/Horde/ActiveSync/Imap/Adapter.php | 2 +-
framework/ActiveSync/lib/Horde/ActiveSync/Message/Attachment.php | 12 +-
framework/ActiveSync/lib/Horde/ActiveSync/Message/Contact.php | 132 ++--
framework/ActiveSync/lib/Horde/ActiveSync/Request/Base.php | 4 +-
.../ActiveSync/lib/Horde/ActiveSync/Request/FolderCreate.php | 6 +-
framework/ActiveSync/lib/Horde/ActiveSync/Request/FolderSync.php | 6 +-
.../ActiveSync/lib/Horde/ActiveSync/Request/GetAttachment.php | 4 +-
.../ActiveSync/lib/Horde/ActiveSync/Request/GetItemEstimate.php | 2 +-
.../ActiveSync/lib/Horde/ActiveSync/Request/ItemOperations.php | 4 +-
framework/ActiveSync/lib/Horde/ActiveSync/Request/MoveItems.php | 2 +-
framework/ActiveSync/lib/Horde/ActiveSync/Request/Ping.php | 18 +-
.../ActiveSync/lib/Horde/ActiveSync/Request/ResolveRecipients.php | 2 +-
framework/ActiveSync/lib/Horde/ActiveSync/Request/Sync.php | 28 +-
.../ActiveSync/lib/Horde/ActiveSync/Request/ValidateCert.php | 2 +-
framework/ActiveSync/lib/Horde/ActiveSync/State/Sql.php | 28 +-
framework/ActiveSync/lib/Horde/ActiveSync/Utils.php | 4 +-
19 files changed, 131 insertions(+), 131 deletions(-)
http://git.horde.org/horde-git/-/commit/9bfd019c77371b44f4f9e7f03ef22cccab841680
-----------------------------------------------------------------------
commit 2c85fc44bb38b39811787a721184fba40492207c
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date: Fri Jan 18 12:44:19 2013 -0500
More logging changes
framework/ActiveSync/lib/Horde/ActiveSync.php | 2 +-
framework/ActiveSync/lib/Horde/ActiveSync/Request/Sync.php | 56 +++++++-----
2 files changed, 32 insertions(+), 26 deletions(-)
http://git.horde.org/horde-git/-/commit/2c85fc44bb38b39811787a721184fba40492207c
-----------------------------------------------------------------------
commit ac112b5575fe367eaa2758367a5a70d9d23cda41
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date: Fri Jan 18 12:44:42 2013 -0500
Fix variable name
framework/ActiveSync/lib/Horde/ActiveSync.php | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
http://git.horde.org/horde-git/-/commit/ac112b5575fe367eaa2758367a5a70d9d23cda41
-----------------------------------------------------------------------
commit 3e32f93ebf8fc1ef75c93ebea21ae35490372a34
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date: Fri Jan 18 12:53:11 2013 -0500
Comments
framework/ActiveSync/lib/Horde/ActiveSync/State/Sql.php | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
http://git.horde.org/horde-git/-/commit/3e32f93ebf8fc1ef75c93ebea21ae35490372a34
-----------------------------------------------------------------------
commit 72bf7209544e0ad5e4fc959343758962a2a6d63d
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date: Fri Jan 18 12:53:30 2013 -0500
Need to limit by username here. Remove the mailMap table as well.
Bug: 11963
framework/ActiveSync/lib/Horde/ActiveSync/State/Sql.php | 17 ++++++++++----
1 files changed, 12 insertions(+), 5 deletions(-)
http://git.horde.org/horde-git/-/commit/72bf7209544e0ad5e4fc959343758962a2a6d63d
-----------------------------------------------------------------------
commit 6f39507532ef9e321c6a767cfb9ae338123cc571
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date: Fri Jan 18 13:53:31 2013 -0500
Logging
framework/ActiveSync/lib/Horde/ActiveSync/Request/FolderSync.php | 8 +++---
1 files changed, 4 insertions(+), 4 deletions(-)
http://git.horde.org/horde-git/-/commit/6f39507532ef9e321c6a767cfb9ae338123cc571
-----------------------------------------------------------------------
commit 7b5c80229adf498b2d8a1f62374ffd7adca563c2
Author: Michael M Slusarz <slusarz at horde.org>
Date: Fri Jan 18 12:44:06 2013 -0700
[mms] Fix saving mailbox expansion state in basic folders view (Bug #11979).
imp/docs/CHANGES | 1 +
imp/lib/Ajax/Application.php | 2 +
imp/lib/Ajax/Application/Handler/Dynamic.php | 47 ---------------
imp/lib/Ajax/Application/Handler/Mboxtoggle.php | 72 +++++++++++++++++++++++
imp/package.xml | 10 ++-
5 files changed, 82 insertions(+), 50 deletions(-)
create mode 100644 imp/lib/Ajax/Application/Handler/Mboxtoggle.php
http://git.horde.org/horde-git/-/commit/7b5c80229adf498b2d8a1f62374ffd7adca563c2
-----------------------------------------------------------------------
commit 80d75c9b0c58be1dcfbfddc994c4bfe564568b8f
Author: Michael M Slusarz <slusarz at horde.org>
Date: Fri Jan 18 12:47:10 2013 -0700
Better display in basic subinfo bar when no messages in a mailbox (Bug #11980)
imp/mailbox.php | 16 +++++-----------
1 files changed, 5 insertions(+), 11 deletions(-)
http://git.horde.org/horde-git/-/commit/80d75c9b0c58be1dcfbfddc994c4bfe564568b8f
-----------------------------------------------------------------------
commit efeb04c32e10341851d80017904735e41c96f9f4
Author: Michael M Slusarz <slusarz at horde.org>
Date: Fri Jan 18 12:54:40 2013 -0700
[mms] Fix deleting virtual folders/filters from preferences page (Bug #11982).
imp/docs/CHANGES | 1 +
imp/lib/Prefs/Special/Searches.php | 1 +
imp/package.xml | 2 ++
3 files changed, 4 insertions(+), 0 deletions(-)
http://git.horde.org/horde-git/-/commit/efeb04c32e10341851d80017904735e41c96f9f4
-----------------------------------------------------------------------
commit 212909ea01bb7bdd09de66c16b2a094dbb5f28c5
Merge: 357fb90 efeb04c
Author: Michael M Slusarz <slusarz at horde.org>
Date: Fri Jan 18 13:14:56 2013 -0700
Merge branch 'master' into imp_6_1
Conflicts:
imp/docs/CHANGES
imp/lib/Ajax/Application/Handler/Dynamic.php
imp/mailbox.php
imp/package.xml
ansel/lib/Widget/Actions.php | 2 +-
framework/ActiveSync/lib/Horde/ActiveSync.php | 6 +-
framework/ActiveSync/lib/Horde/ActiveSync/Folder/Collection.php | 2 +-
framework/ActiveSync/lib/Horde/ActiveSync/Folder/Imap.php | 2 +-
framework/ActiveSync/lib/Horde/ActiveSync/Imap/Adapter.php | 2 +-
framework/ActiveSync/lib/Horde/ActiveSync/Message/Attachment.php | 12 +-
framework/ActiveSync/lib/Horde/ActiveSync/Message/Contact.php | 132 ++--
framework/ActiveSync/lib/Horde/ActiveSync/Request/Base.php | 4 +-
.../ActiveSync/lib/Horde/ActiveSync/Request/FolderCreate.php | 6 +-
framework/ActiveSync/lib/Horde/ActiveSync/Request/FolderSync.php | 14 +-
.../ActiveSync/lib/Horde/ActiveSync/Request/GetAttachment.php | 4 +-
.../ActiveSync/lib/Horde/ActiveSync/Request/GetItemEstimate.php | 2 +-
.../ActiveSync/lib/Horde/ActiveSync/Request/ItemOperations.php | 4 +-
framework/ActiveSync/lib/Horde/ActiveSync/Request/MoveItems.php | 2 +-
framework/ActiveSync/lib/Horde/ActiveSync/Request/Ping.php | 18 +-
.../ActiveSync/lib/Horde/ActiveSync/Request/ResolveRecipients.php | 2 +-
framework/ActiveSync/lib/Horde/ActiveSync/Request/Sync.php | 84 ++--
.../ActiveSync/lib/Horde/ActiveSync/Request/ValidateCert.php | 2 +-
framework/ActiveSync/lib/Horde/ActiveSync/State/Sql.php | 48 +-
framework/ActiveSync/lib/Horde/ActiveSync/Utils.php | 4 +-
framework/ActiveSync/lib/Horde/ActiveSync/Wbxml.php | 11 +-
framework/ActiveSync/lib/Horde/ActiveSync/Wbxml/Decoder.php | 28 +-
framework/ActiveSync/lib/Horde/ActiveSync/Wbxml/Encoder.php | 24 +-
framework/Ldap/test/Horde/Ldap/LdifTest.php | 8 +-
framework/Ldap/test/Horde/Ldap/fixtures/changes.ldif | 2 +-
framework/Ldap/test/Horde/Ldap/fixtures/sorted_w40.ldif | 8 +-
framework/Ldap/test/Horde/Ldap/fixtures/sorted_w50.ldif | 8 +-
framework/Ldap/test/Horde/Ldap/fixtures/unsorted_w30.ldif | 8 +-
framework/Ldap/test/Horde/Ldap/fixtures/unsorted_w50.ldif | 8 +-
framework/Ldap/test/Horde/Ldap/fixtures/unsorted_w50_WIN.ldif | 8 +-
imp/docs/CHANGES | 2 +
imp/lib/Ajax/Application.php | 2 +
imp/lib/Ajax/Application/Handler/Dynamic.php | 47 --
imp/lib/Ajax/Application/Handler/Mboxtoggle.php | 72 +++
imp/lib/Prefs/Special/Searches.php | 1 +
imp/mailbox.php | 16 +-
imp/package.xml | 8 +-
kronolith/docs/CHANGES | 2 +
kronolith/js/kronolith.js | 5 +-
kronolith/package.xml | 2 +
turba/data.php | 13 +-
turba/docs/CHANGES | 1 +
turba/lib/Data/Ldif.php | 2 +-
turba/package.xml | 4 +-
44 files changed, 370 insertions(+), 272 deletions(-)
http://git.horde.org/horde-git/-/commit/212909ea01bb7bdd09de66c16b2a094dbb5f28c5
More information about the commits
mailing list