[commits] Horde branch imp_6_1 updated. d135590ac5091e89de8ffecdebef8fcff0720e72
Michael M Slusarz
slusarz at horde.org
Wed Dec 12 06:07:31 UTC 2012
The branch "imp_6_1" has been updated.
The following is a summary of the commits.
from: 92b1182dcb38edcd8b73cbbf31d07f14e434b1a0
9b4378c Route setDefaultShare().
59de5fc [jan] Fix double owner name on shared calendars.
61a41dc [jan] Fix fatal error on recurring events with custom timezone (Bug #11587).
fbdf918 If SORT extension is not available, we are already doing client-side sorting so no penalty in doing display sort
99de1bd Revert "[mms] Optimizations to IMAP token parser."
6a4cc40 Revert "[mms] Add SORT_DISPLAYFROM_FALLBACK and SORT_DISPLAYTO_FALLBACK sorting criteria to Horde_Imap_Client_Base#search()."
8b47413 Released Horde_Imap_Client-2.3.2
9ff83bf Development mode for Horde_Imap_Client-2.3.3
9a70d4d Forgot to add changelog entry in my frustration
7419ed3 Re-add "Revert "[mms] Add SORT_DISPLAYFROM_FALLBACK and SORT_DISPLAYTO_FALLBACK sorting criteria to Horde_Imap_Client_Base#search().""
b64ed3b Second attempt at rewriting IMAP tokenization code
18ef8be Fixes
89ec3e2 phpdoc
7c06c49 More tokenizer fixes
f2267d9 [jan] Fix moving events between calendars (Bug #11830).
261221c Bug #11832: Fix tokenizing error
f5831dd Bug #11829: Parsing fixes
83e5f2b Remove commented out code.
4ed1a00 Bug: 11823 Fix initial pairing of empty folders.
cee9f2a BFN
5a7644c Fix inline caption editing in Ansel.
2472198 Evidently, opts isn't returned when 'cancel' is pressed.
4e8af17 At least one browser seems to need this
cff436e This value can be NIL
e8bd61b Add more unit tests
ca436c6 Fix errors discovered by new unit tests
5246dbd Released Horde_ActiveSync-2.0.8
808238d Development mode for Horde_ActiveSync-2.0.9
cd55612 Released Horde_Core-2.1.0
5ac818d Development mode for Horde_Core-2.1.1
84e2ae6 Revert "Inherit this from the Simplehtml class"
51b51f9 Cache the tagger locally instead of dereferencing it from the injector everytime.
d3c130f Set the codepage id property.
c272744 Load javascript with Horde_PageOutput so it can be properly deferred until after prototype is loaded
2dc29d5 Catch empty content types.
c5a9740 Define $_taskslists property.
5e0f10f Fix undefined variable.
c7621bc Catch exceptions from Horde_Db, log them and rethrow as AS Exceptions.
842b106 Tweak log output, phpdoc.
fc214ae Catch, log, rethrow exceptions to better track down folder polling issues.
d0f8941 Check for StateGone during incoming command parsing too.
2c63910 Go back to forcing charset conversion. Some broken emails are still breaking iOS devices.
9b2fe74 Cleanup some logging.
6398a01 More phpdoc fixes caught by phpdocumenter.
1a38db8 Smartmobile portal: Honor inital page of app
a684217 Smartmobile view: Honor config setting to hide/show logout link
2f7c3f5 Improve loop detection logic.
8dee272 Reduce the threshold for sync loop.
e02dff7 Need to perform this check after the collection has been validated.
b290f85 Remove stray character.
ca95ab0 CHANGES
d1f342d Fix changelogs.
ffae2e0 Prepare release.
a8a397a [jan] Fix share_id column if using old share backend (Bug #11833).
8db468d Queue blind effect (Bug #11835).
afed646 [jan] Change recursive deletion preference to ask by default.
6bbddc8 Another RC.
ad53aff Fix coding style.
bb5074c Released sesha-1.0.0RC2
7afd31a Development mode for sesha-1.0.0RC3
60acd20 WS
76a7730 [jan] Fix more strftime() formatting of certain locale-specific format specifiers (Bug #11831).
ea585e2 [jan] Fix editing tasks from the merged list view in smartmobile mode (Bug #11840).
a0ad45e [jan] Fix changing permissions for shared rulesets.
fb34bd1 Use base_address for levenshtein sorting, to avoid breaking up address groups.
9d73c96 [jan] Include address groups in auto-completion list if address book is below AJAX lookup threshold.
b6cf65c Solution (at least partial) for bug #11658 Fatal error editing date property.
0445f8f Bug #11862: Fix missing header text
54384a6 Move the search to topbar in list view and allow quicksearching by name and ID (Request #11657).
c8c3c73 Combine filters with OR to allow multi-field searches. Complicated searches with AND and OR may be added later.
8cd7e22 Move quicksearch to topbar and remove the "menu" template. Allow search by Name or Id (Request #11657).
b2eb383 [mms] Ensure that polled mailboxes in dynamic view continue to show unseen message count if its child status changes (Bug #11864).
98ca3a5 Strip corrected SPAN after spellcheck is complete
d135590 Merge branch 'master' into imp_6_1
-----------------------------------------------------------------------
commit 9b4378cc44cd0e71f4735af9fcd0d43d1a8fc0a5
Author: Jan Schneider <jan at horde.org>
Date: Thu Dec 6 12:12:18 2012 +0100
Route setDefaultShare().
turba/lib/Driver/Share.php | 10 ++++++++++
1 files changed, 10 insertions(+), 0 deletions(-)
http://git.horde.org/horde-git/-/commit/9b4378cc44cd0e71f4735af9fcd0d43d1a8fc0a5
-----------------------------------------------------------------------
commit 59de5fce0aab2bc5bf37b4cfdff8b231ca2f1702
Author: Jan Schneider <jan at horde.org>
Date: Thu Dec 6 12:37:54 2012 +0100
[jan] Fix double owner name on shared calendars.
kronolith/docs/CHANGES | 1 +
kronolith/lib/Calendar/Internal.php | 3 +--
kronolith/package.xml | 2 ++
3 files changed, 4 insertions(+), 2 deletions(-)
http://git.horde.org/horde-git/-/commit/59de5fce0aab2bc5bf37b4cfdff8b231ca2f1702
-----------------------------------------------------------------------
commit 61a41dc8b223adad38e6b733736e1ed8d8fc5eb0
Author: Jan Schneider <jan at horde.org>
Date: Thu Dec 6 17:21:05 2012 +0100
[jan] Fix fatal error on recurring events with custom timezone (Bug #11587).
kronolith/docs/CHANGES | 1 +
kronolith/lib/Kronolith.php | 4 ++--
kronolith/package.xml | 2 ++
3 files changed, 5 insertions(+), 2 deletions(-)
http://git.horde.org/horde-git/-/commit/61a41dc8b223adad38e6b733736e1ed8d8fc5eb0
-----------------------------------------------------------------------
commit fbdf9182c80ee72f38bc0ca4254d1b9d52895b7a
Author: Michael M Slusarz <slusarz at horde.org>
Date: Wed Dec 5 16:04:52 2012 -0700
If SORT extension is not available, we are already doing client-side sorting so no penalty in doing display sort
imp/lib/Imap.php | 6 ++----
1 files changed, 2 insertions(+), 4 deletions(-)
http://git.horde.org/horde-git/-/commit/fbdf9182c80ee72f38bc0ca4254d1b9d52895b7a
-----------------------------------------------------------------------
commit 99de1bd7923f1f23d1cfada7e8c29fdb579b0736
Author: Michael M Slusarz <slusarz at horde.org>
Date: Thu Dec 6 13:57:12 2012 -0700
Revert "[mms] Optimizations to IMAP token parser."
This reverts commit 86e3fb407f2a7c026a2b64f8b9608d1f8f855f0f.
This reverts commit b4ab39ac7a16e43a633bc85e35089bd872b908f3.
This reverts commit b7bbdb4e06c4be1cd594878ff641f25ad80d47b7.
This reverts commit 73653c0e373645c41ce667ace1682799f61a5bd0.
framework/Imap_Client/lib/Horde/Imap/Client/Socket.php | 2 +-
framework/Imap_Client/lib/Horde/Imap/Client/Tokenize.php | 211 +++++-
framework/Imap_Client/lib/Horde/Imap/Client/Tokenize/List.php | 106 ---
framework/Imap_Client/lib/Horde/Imap/Client/Tokenize/Master.php | 232 -------
framework/Imap_Client/package.xml | 6 -
framework/Imap_Client/test/Horde/Imap/Client/SocketTest.php | 8 -
framework/Imap_Client/test/Horde/Imap/Client/Stub/Socket.php | 10 +-
framework/Imap_Client/test/Horde/Imap/Client/TokenizeTest.php | 88 +--
8 files changed, 227 insertions(+), 436 deletions(-)
delete mode 100644 framework/Imap_Client/lib/Horde/Imap/Client/Tokenize/List.php
delete mode 100644 framework/Imap_Client/lib/Horde/Imap/Client/Tokenize/Master.php
http://git.horde.org/horde-git/-/commit/99de1bd7923f1f23d1cfada7e8c29fdb579b0736
-----------------------------------------------------------------------
commit 6a4cc40fe7447ec127f8fa0cc0622ee4f86d9020
Author: Michael M Slusarz <slusarz at horde.org>
Date: Thu Dec 6 14:01:38 2012 -0700
Revert "[mms] Add SORT_DISPLAYFROM_FALLBACK and SORT_DISPLAYTO_FALLBACK sorting criteria to Horde_Imap_Client_Base#search()."
This reverts commit 67ec37eaac7dfc0edd3d3adcf9517a4b42ba4b2e.
Temporary reversion to release 2.3.2
framework/Imap_Client/doc/Horde/Imap/Client/UPGRADING | 10 ---
framework/Imap_Client/lib/Horde/Imap/Client.php | 4 -
framework/Imap_Client/lib/Horde/Imap/Client/Base.php | 53 +++--------------
framework/Imap_Client/package.xml | 12 ++--
4 files changed, 14 insertions(+), 65 deletions(-)
http://git.horde.org/horde-git/-/commit/6a4cc40fe7447ec127f8fa0cc0622ee4f86d9020
-----------------------------------------------------------------------
commit 8b47413449be89ddfb7e3f26ba9e988ba1067989
Author: Michael M Slusarz <slusarz at horde.org>
Date: Thu Dec 6 14:05:37 2012 -0700
Released Horde_Imap_Client-2.3.2
framework/Imap_Client/package.xml | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
http://git.horde.org/horde-git/-/commit/8b47413449be89ddfb7e3f26ba9e988ba1067989
-----------------------------------------------------------------------
commit 9ff83bf17a02ac06b2c8a74df77f2795286711c1
Author: Michael M Slusarz <slusarz at horde.org>
Date: Thu Dec 6 14:05:37 2012 -0700
Development mode for Horde_Imap_Client-2.3.3
framework/Imap_Client/package.xml | 17 +++++++++++++++--
1 files changed, 15 insertions(+), 2 deletions(-)
http://git.horde.org/horde-git/-/commit/9ff83bf17a02ac06b2c8a74df77f2795286711c1
-----------------------------------------------------------------------
commit 9a70d4d90048e2fdaecc2d8fc8b0466ba9ab71ea
Author: Michael M Slusarz <slusarz at horde.org>
Date: Thu Dec 6 14:21:44 2012 -0700
Forgot to add changelog entry in my frustration
framework/Imap_Client/package.xml | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
http://git.horde.org/horde-git/-/commit/9a70d4d90048e2fdaecc2d8fc8b0466ba9ab71ea
-----------------------------------------------------------------------
commit 7419ed37a069f6b24e37ec27a5e8ea602bb4c8f8
Author: Michael M Slusarz <slusarz at horde.org>
Date: Thu Dec 6 14:22:35 2012 -0700
Re-add "Revert "[mms] Add SORT_DISPLAYFROM_FALLBACK and SORT_DISPLAYTO_FALLBACK sorting criteria to Horde_Imap_Client_Base#search().""
framework/Imap_Client/doc/Horde/Imap/Client/UPGRADING | 10 +++
framework/Imap_Client/lib/Horde/Imap/Client.php | 4 +
framework/Imap_Client/lib/Horde/Imap/Client/Base.php | 53 ++++++++++++++---
framework/Imap_Client/package.xml | 12 ++--
4 files changed, 65 insertions(+), 14 deletions(-)
http://git.horde.org/horde-git/-/commit/7419ed37a069f6b24e37ec27a5e8ea602bb4c8f8
-----------------------------------------------------------------------
commit b64ed3bb470eef943c73a6d7ec77fee0fe881739
Author: Michael M Slusarz <slusarz at horde.org>
Date: Thu Dec 6 21:27:52 2012 -0700
Second attempt at rewriting IMAP tokenization code
Hopefully this doesn't break any packaged PHP version.
I think this most frustrating of days is finally over.
.../Imap_Client/lib/Horde/Imap/Client/Interaction/Server.php | 3 +-
framework/Imap_Client/lib/Horde/Imap/Client/Socket.php | 286 ++---
framework/Imap_Client/lib/Horde/Imap/Client/Tokenize.php | 176 ++--
framework/Imap_Client/package.xml | 2 +-
framework/Imap_Client/test/Horde/Imap/Client/Stub/Socket.php | 4 +-
framework/Imap_Client/test/Horde/Imap/Client/TokenizeTest.php | 212 ++--
6 files changed, 320 insertions(+), 363 deletions(-)
http://git.horde.org/horde-git/-/commit/b64ed3bb470eef943c73a6d7ec77fee0fe881739
-----------------------------------------------------------------------
commit 18ef8be5e8df283c7a61e00ef4f34b66c4097872
Author: Michael M Slusarz <slusarz at horde.org>
Date: Fri Dec 7 00:49:29 2012 -0700
Fixes
.../Imap_Client/lib/Horde/Imap/Client/Interaction/Server.php | 2 +-
framework/Imap_Client/lib/Horde/Imap/Client/Socket.php | 4 ++--
framework/Imap_Client/lib/Horde/Imap/Client/Tokenize.php | 4 ++--
3 files changed, 5 insertions(+), 5 deletions(-)
http://git.horde.org/horde-git/-/commit/18ef8be5e8df283c7a61e00ef4f34b66c4097872
-----------------------------------------------------------------------
commit 89ec3e2ae1909bfba4b266be1dc8a5df8700b630
Author: Michael M Slusarz <slusarz at horde.org>
Date: Fri Dec 7 01:31:07 2012 -0700
phpdoc
framework/Imap_Client/lib/Horde/Imap/Client/Socket.php | 4 +---
1 files changed, 1 insertions(+), 3 deletions(-)
http://git.horde.org/horde-git/-/commit/89ec3e2ae1909bfba4b266be1dc8a5df8700b630
-----------------------------------------------------------------------
commit 7c06c49643875c91ea6513309382404846218c38
Author: Michael M Slusarz <slusarz at horde.org>
Date: Fri Dec 7 01:31:12 2012 -0700
More tokenizer fixes
framework/Imap_Client/lib/Horde/Imap/Client/Socket.php | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
http://git.horde.org/horde-git/-/commit/7c06c49643875c91ea6513309382404846218c38
-----------------------------------------------------------------------
commit f2267d983b3ca67737ae5da58fd18cc18e8adb34
Author: Jan Schneider <jan at horde.org>
Date: Fri Dec 7 18:26:50 2012 +0100
[jan] Fix moving events between calendars (Bug #11830).
kronolith/docs/CHANGES | 1 +
kronolith/lib/Driver/Kolab.php | 10 ++++++----
kronolith/package.xml | 2 ++
3 files changed, 9 insertions(+), 4 deletions(-)
http://git.horde.org/horde-git/-/commit/f2267d983b3ca67737ae5da58fd18cc18e8adb34
-----------------------------------------------------------------------
commit 261221cc879c80ea5eb05b093f7c2c2055c8d76b
Author: Michael M Slusarz <slusarz at horde.org>
Date: Fri Dec 7 11:25:00 2012 -0700
Bug #11832: Fix tokenizing error
framework/Imap_Client/lib/Horde/Imap/Client/Socket.php | 12 +++++-------
1 files changed, 5 insertions(+), 7 deletions(-)
http://git.horde.org/horde-git/-/commit/261221cc879c80ea5eb05b093f7c2c2055c8d76b
-----------------------------------------------------------------------
commit f5831ddea9969c61b7d52a986d15811971326ba7
Author: Michael M Slusarz <slusarz at horde.org>
Date: Fri Dec 7 12:07:13 2012 -0700
Bug #11829: Parsing fixes
framework/Imap_Client/lib/Horde/Imap/Client/Socket.php | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
http://git.horde.org/horde-git/-/commit/f5831ddea9969c61b7d52a986d15811971326ba7
-----------------------------------------------------------------------
commit 83e5f2bfdf7912a002223623e57a82049b1b2615
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date: Fri Dec 7 12:27:19 2012 -0500
Remove commented out code.
framework/Core/lib/Horde/Core/ActiveSync/Logger/Factory.php | 16 -----------
1 files changed, 0 insertions(+), 16 deletions(-)
http://git.horde.org/horde-git/-/commit/83e5f2bfdf7912a002223623e57a82049b1b2615
-----------------------------------------------------------------------
commit 4ed1a003f5b113c2f87f92df53bcc781fb33d821
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date: Fri Dec 7 14:36:56 2012 -0500
Bug: 11823 Fix initial pairing of empty folders.
framework/ActiveSync/lib/Horde/ActiveSync/Request/Sync.php | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
http://git.horde.org/horde-git/-/commit/4ed1a003f5b113c2f87f92df53bcc781fb33d821
-----------------------------------------------------------------------
commit cee9f2a4a87083d31c03fa0cafbc35df03ace065
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date: Fri Dec 7 14:43:40 2012 -0500
BFN
framework/ActiveSync/package.xml | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
http://git.horde.org/horde-git/-/commit/cee9f2a4a87083d31c03fa0cafbc35df03ace065
-----------------------------------------------------------------------
commit 5a7644ccba9c589df12a9068a3ea354ba30af7cf
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date: Fri Dec 7 16:52:48 2012 -0500
Fix inline caption editing in Ansel.
ansel/lib/Ajax/Imple/EditCaption.php | 11 ++++++++---
ansel/lib/Tile/Image.php | 2 +-
2 files changed, 9 insertions(+), 4 deletions(-)
http://git.horde.org/horde-git/-/commit/5a7644ccba9c589df12a9068a3ea354ba30af7cf
-----------------------------------------------------------------------
commit 247219894c8004cab9af90d0e531bc4f46992266
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date: Fri Dec 7 16:59:05 2012 -0500
Evidently, opts isn't returned when 'cancel' is pressed.
framework/Core/lib/Horde/Core/Ajax/Imple/InPlaceEditor.php | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
http://git.horde.org/horde-git/-/commit/247219894c8004cab9af90d0e531bc4f46992266
-----------------------------------------------------------------------
commit 4e8af1768c8effd65ed38b13e1467382d2401b7a
Author: Michael M Slusarz <slusarz at horde.org>
Date: Fri Dec 7 12:23:57 2012 -0700
At least one browser seems to need this
framework/Core/lib/Horde/PageOutput.php | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
http://git.horde.org/horde-git/-/commit/4e8af1768c8effd65ed38b13e1467382d2401b7a
-----------------------------------------------------------------------
commit cff436e0c3f32b86430211c30499009ffff3d0eb
Author: Michael M Slusarz <slusarz at horde.org>
Date: Fri Dec 7 14:54:42 2012 -0700
This value can be NIL
framework/Imap_Client/lib/Horde/Imap/Client/Socket.php | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
http://git.horde.org/horde-git/-/commit/cff436e0c3f32b86430211c30499009ffff3d0eb
-----------------------------------------------------------------------
commit e8bd61b2e236f470acf45aaee6b361c8c8662480
Author: Michael M Slusarz <slusarz at horde.org>
Date: Fri Dec 7 15:46:30 2012 -0700
Add more unit tests
framework/Imap_Client/test/Horde/Imap/Client/TokenizeTest.php | 72 +++++++++
1 files changed, 72 insertions(+), 0 deletions(-)
http://git.horde.org/horde-git/-/commit/e8bd61b2e236f470acf45aaee6b361c8c8662480
-----------------------------------------------------------------------
commit ca436c69c62d7b6e59878f0d650f8de0ab6423ef
Author: Michael M Slusarz <slusarz at horde.org>
Date: Fri Dec 7 15:46:38 2012 -0700
Fix errors discovered by new unit tests
framework/Imap_Client/lib/Horde/Imap/Client/Tokenize.php | 15 ++++++++++---
1 files changed, 11 insertions(+), 4 deletions(-)
http://git.horde.org/horde-git/-/commit/ca436c69c62d7b6e59878f0d650f8de0ab6423ef
-----------------------------------------------------------------------
commit 5246dbd43a9599a8fb71175b3d91480f71059100
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date: Fri Dec 7 18:20:02 2012 -0500
Released Horde_ActiveSync-2.0.8
framework/ActiveSync/package.xml | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
http://git.horde.org/horde-git/-/commit/5246dbd43a9599a8fb71175b3d91480f71059100
-----------------------------------------------------------------------
commit 808238d2b57cfbc45ba1499feff387aaf5ebdafa
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date: Fri Dec 7 18:20:06 2012 -0500
Development mode for Horde_ActiveSync-2.0.9
framework/ActiveSync/package.xml | 22 ++++++++++++++++------
1 files changed, 16 insertions(+), 6 deletions(-)
http://git.horde.org/horde-git/-/commit/808238d2b57cfbc45ba1499feff387aaf5ebdafa
-----------------------------------------------------------------------
commit cd55612237fb069846914293d2587c6da1e79745
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date: Fri Dec 7 18:23:00 2012 -0500
Released Horde_Core-2.1.0
framework/Core/package.xml | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
http://git.horde.org/horde-git/-/commit/cd55612237fb069846914293d2587c6da1e79745
-----------------------------------------------------------------------
commit 5ac818d2ac503261e057872343dd889b254076f5
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date: Fri Dec 7 18:23:01 2012 -0500
Development mode for Horde_Core-2.1.1
framework/Core/package.xml | 26 ++++++++++++++++----------
1 files changed, 16 insertions(+), 10 deletions(-)
http://git.horde.org/horde-git/-/commit/5ac818d2ac503261e057872343dd889b254076f5
-----------------------------------------------------------------------
commit 84e2ae6670a8dde8a9c57ab303aab9641e20b737
Author: Michael M Slusarz <slusarz at horde.org>
Date: Fri Dec 7 16:06:23 2012 -0700
Revert "Inherit this from the Simplehtml class"
This reverts commit 11bdcd408b8e8ea7b65a5c1d66e865298761a06d.
This broke display of (at least) the all parts listing in IMP
framework/Core/lib/Horde/Core/Tree/Renderer/Html.php | 16 +++++++++++++++-
1 files changed, 15 insertions(+), 1 deletions(-)
http://git.horde.org/horde-git/-/commit/84e2ae6670a8dde8a9c57ab303aab9641e20b737
-----------------------------------------------------------------------
commit 51b51f9e7a40d2c20c478e5bc36b16f3df6ec6c9
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date: Fri Dec 7 21:20:48 2012 -0500
Cache the tagger locally instead of dereferencing it from the injector everytime.
framework/Core/lib/Horde/Core/Tagger.php | 63 +++++++++++++++---------------
1 files changed, 31 insertions(+), 32 deletions(-)
http://git.horde.org/horde-git/-/commit/51b51f9e7a40d2c20c478e5bc36b16f3df6ec6c9
-----------------------------------------------------------------------
commit d3c130fe45a85c67a216676fd0fe43c7e2727d6a
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date: Fri Dec 7 21:37:39 2012 -0500
Set the codepage id property.
framework/ActiveSync/lib/Horde/ActiveSync/Imap/Adapter.php | 4 ++++
framework/ActiveSync/lib/Horde/ActiveSync/Message/Mail.php | 6 ++++++
2 files changed, 10 insertions(+), 0 deletions(-)
http://git.horde.org/horde-git/-/commit/d3c130fe45a85c67a216676fd0fe43c7e2727d6a
-----------------------------------------------------------------------
commit c272744ee57ee06bd314fa296359320ffd49b8a6
Author: Chuck Hagenbuch <chuck at horde.org>
Date: Sat Dec 8 00:20:08 2012 -0500
Load javascript with Horde_PageOutput so it can be properly deferred until after prototype is loaded
ansel/lib/View/Image.php | 56 ++++++++++++++++++++++++++++++++++++++-
ansel/templates/view/image.inc | 49 -----------------------------------
2 files changed, 54 insertions(+), 51 deletions(-)
http://git.horde.org/horde-git/-/commit/c272744ee57ee06bd314fa296359320ffd49b8a6
-----------------------------------------------------------------------
commit 2dc29d5c5c8ecbcd33173135e393735f63fbb94d
Author: Jan Schneider <jan at horde.org>
Date: Fri Dec 7 11:18:41 2012 +0100
Catch empty content types.
imp/lib/Contents.php | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
http://git.horde.org/horde-git/-/commit/2dc29d5c5c8ecbcd33173135e393735f63fbb94d
-----------------------------------------------------------------------
commit c5a9740c72d0f07eecb7ed13068bc6ad1c729917
Author: Jan Schneider <jan at horde.org>
Date: Sat Dec 8 12:04:59 2012 +0100
Define $_taskslists property.
nag/lib/Search.php | 9 ++++++++-
1 files changed, 8 insertions(+), 1 deletions(-)
http://git.horde.org/horde-git/-/commit/c5a9740c72d0f07eecb7ed13068bc6ad1c729917
-----------------------------------------------------------------------
commit 5e0f10ff54c3dff3ea0192a45184f269ccf73bd1
Author: Jan Schneider <jan at horde.org>
Date: Sat Dec 8 12:09:54 2012 +0100
Fix undefined variable.
mnemo/lib/Driver/Sql.php | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
http://git.horde.org/horde-git/-/commit/5e0f10ff54c3dff3ea0192a45184f269ccf73bd1
-----------------------------------------------------------------------
commit c7621bc5099f398888e298469773abd6b001f717
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date: Sat Dec 8 10:59:36 2012 -0500
Catch exceptions from Horde_Db, log them and rethrow as AS Exceptions.
framework/ActiveSync/lib/Horde/ActiveSync/State/Sql.php | 43 +++++++++++----
1 files changed, 32 insertions(+), 11 deletions(-)
http://git.horde.org/horde-git/-/commit/c7621bc5099f398888e298469773abd6b001f717
-----------------------------------------------------------------------
commit 842b106a6ceebc8330895c3bfc1e32bb784dec72
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date: Sat Dec 8 12:29:12 2012 -0500
Tweak log output, phpdoc.
framework/ActiveSync/lib/Horde/ActiveSync/Wbxml/Decoder.php | 15 +++++------
1 files changed, 7 insertions(+), 8 deletions(-)
http://git.horde.org/horde-git/-/commit/842b106a6ceebc8330895c3bfc1e32bb784dec72
-----------------------------------------------------------------------
commit fc214aedf298bc49d3ea8a8e5a76eaed9fca45d6
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date: Sat Dec 8 13:06:00 2012 -0500
Catch, log, rethrow exceptions to better track down folder polling issues.
framework/Core/lib/Horde/Core/ActiveSync/Driver.php | 28 ++++++++++++++++---
1 files changed, 24 insertions(+), 4 deletions(-)
http://git.horde.org/horde-git/-/commit/fc214aedf298bc49d3ea8a8e5a76eaed9fca45d6
-----------------------------------------------------------------------
commit d0f8941b2d17aa651fe4b733eb0a8e7ae3b2d1cc
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date: Sat Dec 8 13:29:07 2012 -0500
Check for StateGone during incoming command parsing too.
framework/ActiveSync/lib/Horde/ActiveSync/Request/Sync.php | 14 +++++++++++-
1 files changed, 13 insertions(+), 1 deletions(-)
http://git.horde.org/horde-git/-/commit/d0f8941b2d17aa651fe4b733eb0a8e7ae3b2d1cc
-----------------------------------------------------------------------
commit 2c63910801098160f7ca072b898006bef4c5744e
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date: Sat Dec 8 14:48:07 2012 -0500
Go back to forcing charset conversion. Some broken emails are still breaking iOS devices.
framework/ActiveSync/lib/Horde/ActiveSync/Imap/Adapter.php | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
http://git.horde.org/horde-git/-/commit/2c63910801098160f7ca072b898006bef4c5744e
-----------------------------------------------------------------------
commit 9b2fe74922fca59db5129de9b5c790ff0de06e06
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date: Sun Dec 9 16:34:19 2012 -0500
Cleanup some logging.
framework/ActiveSync/lib/Horde/ActiveSync/Request/FolderSync.php | 4 +-
.../ActiveSync/lib/Horde/ActiveSync/Request/GetItemEstimate.php | 2 +-
framework/ActiveSync/lib/Horde/ActiveSync/Request/Ping.php | 12 ++---
.../ActiveSync/lib/Horde/ActiveSync/Request/ResolveRecipients.php | 2 +-
framework/ActiveSync/lib/Horde/ActiveSync/Request/Search.php | 2 +-
framework/ActiveSync/lib/Horde/ActiveSync/Request/SendMail.php | 4 +-
framework/Core/lib/Horde/Core/ActiveSync/Driver.php | 2 +-
7 files changed, 14 insertions(+), 14 deletions(-)
http://git.horde.org/horde-git/-/commit/9b2fe74922fca59db5129de9b5c790ff0de06e06
-----------------------------------------------------------------------
commit 6398a0140deea78d563deb8b4aef0c251307c082
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date: Sun Dec 9 16:42:24 2012 -0500
More phpdoc fixes caught by phpdocumenter.
framework/ActiveSync/lib/Horde/ActiveSync/Folder/Base.php | 21 ++-
framework/ActiveSync/lib/Horde/ActiveSync/Folder/Imap.php | 11 +-
framework/ActiveSync/lib/Horde/ActiveSync/Imap/Message.php | 14 +-
framework/ActiveSync/lib/Horde/ActiveSync/Message/Folder.php | 6 +
framework/ActiveSync/lib/Horde/ActiveSync/Request/Base.php | 10 +
framework/ActiveSync/lib/Horde/ActiveSync/State/Base.php | 28 ++--
framework/ActiveSync/lib/Horde/ActiveSync/State/Sql.php | 92 ++++++++--
7 files changed, 141 insertions(+), 41 deletions(-)
http://git.horde.org/horde-git/-/commit/6398a0140deea78d563deb8b4aef0c251307c082
-----------------------------------------------------------------------
commit 1a38db8933225985437247cd1a6c6e93a21b4227
Author: Thomas Jarosch <thomas.jarosch at intra2net.com>
Date: Sun Dec 9 19:54:01 2012 +0100
Smartmobile portal: Honor inital page of app
Custom apps that register themselves at runtime via horde/config/registry.d/
might need to keep additional URL parameters.
Signed-off-by: Michael M Slusarz <slusarz at horde.org>
Bug #11839
horde/services/portal/smartmobile.php | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
http://git.horde.org/horde-git/-/commit/1a38db8933225985437247cd1a6c6e93a21b4227
-----------------------------------------------------------------------
commit a684217450dd96260094549f1a3e6671d457de78
Author: Thomas Jarosch <thomas.jarosch at intra2net.com>
Date: Sun Dec 9 21:40:52 2012 +0100
Smartmobile view: Honor config setting to hide/show logout link
Signed-off-by: Michael M Slusarz <slusarz at horde.org>
Bug #11842
framework/Core/lib/Horde/Core/Smartmobile/View/Helper.php | 1 +
horde/templates/portal/smartmobile.inc | 2 +-
2 files changed, 2 insertions(+), 1 deletions(-)
http://git.horde.org/horde-git/-/commit/a684217450dd96260094549f1a3e6671d457de78
-----------------------------------------------------------------------
commit 2f7c3f527ad12912b7cd362645c9d0b00f6d8af1
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date: Sun Dec 9 18:06:40 2012 -0500
Improve loop detection logic.
Only increase the counter if we actually have changes. This
prevents user initiated sync requests that result in no changes
from increasing the counter avoiding unnecessary state resets.
framework/ActiveSync/lib/Horde/ActiveSync/Request/Sync.php | 62 ++++++------
1 files changed, 32 insertions(+), 30 deletions(-)
http://git.horde.org/horde-git/-/commit/2f7c3f527ad12912b7cd362645c9d0b00f6d8af1
-----------------------------------------------------------------------
commit 8dee2721e988f51a9b1ec881ca02f1bf7291f192
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date: Sun Dec 9 18:21:30 2012 -0500
Reduce the threshold for sync loop.
framework/ActiveSync/lib/Horde/ActiveSync.php | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
http://git.horde.org/horde-git/-/commit/8dee2721e988f51a9b1ec881ca02f1bf7291f192
-----------------------------------------------------------------------
commit e02dff74df23d616e85f81865a7ce2b4edc8ba0d
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date: Sun Dec 9 18:21:51 2012 -0500
Need to perform this check after the collection has been validated.
Otherwise, some information might be missing.
framework/ActiveSync/lib/Horde/ActiveSync/Request/Sync.php | 46 ++++++------
1 files changed, 24 insertions(+), 22 deletions(-)
http://git.horde.org/horde-git/-/commit/e02dff74df23d616e85f81865a7ce2b4edc8ba0d
-----------------------------------------------------------------------
commit b290f85bbbc9cd45944693a5fbb4adf1016415d1
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date: Sun Dec 9 18:22:15 2012 -0500
Remove stray character.
framework/ActiveSync/lib/Horde/ActiveSync/Wbxml/Decoder.php | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
http://git.horde.org/horde-git/-/commit/b290f85bbbc9cd45944693a5fbb4adf1016415d1
-----------------------------------------------------------------------
commit ca95ab0b3bcadc061414b4836c34cce8e3b52b47
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date: Sun Dec 9 18:30:22 2012 -0500
CHANGES
framework/ActiveSync/package.xml | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
http://git.horde.org/horde-git/-/commit/ca95ab0b3bcadc061414b4836c34cce8e3b52b47
-----------------------------------------------------------------------
commit d1f342d427b1a13311cea9583d6ab5bcc35dc0b2
Author: Jan Schneider <jan at horde.org>
Date: Mon Dec 10 10:58:23 2012 +0100
Fix changelogs.
sesha/docs/CHANGES | 7 ++++++-
sesha/package.xml | 2 --
2 files changed, 6 insertions(+), 3 deletions(-)
http://git.horde.org/horde-git/-/commit/d1f342d427b1a13311cea9583d6ab5bcc35dc0b2
-----------------------------------------------------------------------
commit ffae2e055a1b9bb433d7d3d5dc05fbf626f37a26
Author: Jan Schneider <jan at horde.org>
Date: Mon Dec 10 10:59:33 2012 +0100
Prepare release.
sesha/docs/RELEASE_NOTES | 10 ++++------
1 files changed, 4 insertions(+), 6 deletions(-)
http://git.horde.org/horde-git/-/commit/ffae2e055a1b9bb433d7d3d5dc05fbf626f37a26
-----------------------------------------------------------------------
commit a8a397a64726ca013d5eebeae2e6478b68bb47cf
Author: Jan Schneider <jan at horde.org>
Date: Mon Dec 10 15:16:35 2012 +0100
[jan] Fix share_id column if using old share backend (Bug #11833).
gollem/docs/CHANGES | 1 +
gollem/migration/2_gollem_upgrade_autoincrement.php | 37 +++++++++++++++++++
gollem/package.xml | 10 ++++--
3 files changed, 45 insertions(+), 3 deletions(-)
create mode 100644 gollem/migration/2_gollem_upgrade_autoincrement.php
http://git.horde.org/horde-git/-/commit/a8a397a64726ca013d5eebeae2e6478b68bb47cf
-----------------------------------------------------------------------
commit 8db468dfd9b6ffd6819fc430f33b9b318923e865
Author: Jan Schneider <jan at horde.org>
Date: Mon Dec 10 15:20:05 2012 +0100
Queue blind effect (Bug #11835).
horde/js/sidebar.js | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
http://git.horde.org/horde-git/-/commit/8db468dfd9b6ffd6819fc430f33b9b318923e865
-----------------------------------------------------------------------
commit afed646cf7d5226aa4172b90344a3ebd3b01a4e7
Author: Jan Schneider <jan at horde.org>
Date: Mon Dec 10 15:33:07 2012 +0100
[jan] Change recursive deletion preference to ask by default.
gollem/config/prefs.php | 2 +-
gollem/docs/CHANGES | 1 +
gollem/package.xml | 2 ++
3 files changed, 4 insertions(+), 1 deletions(-)
http://git.horde.org/horde-git/-/commit/afed646cf7d5226aa4172b90344a3ebd3b01a4e7
-----------------------------------------------------------------------
commit 6bbddc80ab2cec7f0ef828ad6c3cb095e3af49d2
Author: Jan Schneider <jan at horde.org>
Date: Mon Dec 10 15:43:18 2012 +0100
Another RC.
sesha/package.xml | 20 ++++++++++++--------
1 files changed, 12 insertions(+), 8 deletions(-)
http://git.horde.org/horde-git/-/commit/6bbddc80ab2cec7f0ef828ad6c3cb095e3af49d2
-----------------------------------------------------------------------
commit ad53affa6b0d2a82cf3cf2996525f3a9a862950f
Author: Jan Schneider <jan at horde.org>
Date: Mon Dec 10 15:43:28 2012 +0100
Fix coding style.
sesha/lib/Driver/Rdo.php | 6 +++---
sesha/lib/Entity/PropertyMapper.php | 4 ++--
2 files changed, 5 insertions(+), 5 deletions(-)
http://git.horde.org/horde-git/-/commit/ad53affa6b0d2a82cf3cf2996525f3a9a862950f
-----------------------------------------------------------------------
commit bb5074c0b748bec74a194cfa4a3ec05071802ce7
Author: Jan Schneider <jan at horde.org>
Date: Mon Dec 10 15:48:37 2012 +0100
Released sesha-1.0.0RC2
sesha/docs/CHANGES | 6 +++---
sesha/lib/Application.php | 2 +-
sesha/package.xml | 6 +++---
3 files changed, 7 insertions(+), 7 deletions(-)
http://git.horde.org/horde-git/-/commit/bb5074c0b748bec74a194cfa4a3ec05071802ce7
-----------------------------------------------------------------------
commit 7afd31a7988465b1d73187e25b5a57d19875f0b6
Author: Jan Schneider <jan at horde.org>
Date: Mon Dec 10 15:48:43 2012 +0100
Development mode for sesha-1.0.0RC3
sesha/docs/CHANGES | 6 ++++++
sesha/lib/Application.php | 2 +-
sesha/package.xml | 20 ++++++++++++++++----
3 files changed, 23 insertions(+), 5 deletions(-)
http://git.horde.org/horde-git/-/commit/7afd31a7988465b1d73187e25b5a57d19875f0b6
-----------------------------------------------------------------------
commit 60acd2038f71cf2f796b00d1989d4ee6bbed0443
Author: Jan Schneider <jan at horde.org>
Date: Mon Dec 10 17:42:30 2012 +0100
WS
horde/config/prefs.php | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
http://git.horde.org/horde-git/-/commit/60acd2038f71cf2f796b00d1989d4ee6bbed0443
-----------------------------------------------------------------------
commit 76a7730948c6b22b79da0a88865f3bebf5d12d96
Author: Jan Schneider <jan at horde.org>
Date: Mon Dec 10 17:57:27 2012 +0100
[jan] Fix more strftime() formatting of certain locale-specific format specifiers (Bug #11831).
framework/Date/lib/Horde/Date.php | 2 +-
framework/Date/package.xml | 4 ++--
framework/Date/test/Horde/Date/DateTest.php | 16 ++++++++++++++--
3 files changed, 17 insertions(+), 5 deletions(-)
http://git.horde.org/horde-git/-/commit/76a7730948c6b22b79da0a88865f3bebf5d12d96
-----------------------------------------------------------------------
commit ea585e2f991a5d6fc31b39e2af914e27c041a74c
Author: Jan Schneider <jan at horde.org>
Date: Mon Dec 10 18:14:42 2012 +0100
[jan] Fix editing tasks from the merged list view in smartmobile mode (Bug #11840).
nag/docs/CHANGES | 2 ++
nag/js/smartmobile.js | 1 -
nag/package.xml | 2 ++
3 files changed, 4 insertions(+), 1 deletions(-)
http://git.horde.org/horde-git/-/commit/ea585e2f991a5d6fc31b39e2af914e27c041a74c
-----------------------------------------------------------------------
commit a0ad45ee92cda44de58c8e73e10c05485819ad56
Author: Jan Schneider <jan at horde.org>
Date: Tue Dec 11 09:36:23 2012 +0100
[jan] Fix changing permissions for shared rulesets.
ingo/docs/CHANGES | 1 +
ingo/lib/Ingo.php | 2 +-
ingo/package.xml | 4 ++--
3 files changed, 4 insertions(+), 3 deletions(-)
http://git.horde.org/horde-git/-/commit/a0ad45ee92cda44de58c8e73e10c05485819ad56
-----------------------------------------------------------------------
commit fb34bd1fe94aa1c37772466c8795fd2fc18ca3b1
Author: Jan Schneider <jan at horde.org>
Date: Tue Dec 11 17:05:35 2012 +0100
Use base_address for levenshtein sorting, to avoid breaking up address groups.
framework/Core/lib/Horde/Core/Ajax/Imple/ContactAutoCompleter.php | 4 ++--
framework/Core/package.xml | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
http://git.horde.org/horde-git/-/commit/fb34bd1fe94aa1c37772466c8795fd2fc18ca3b1
-----------------------------------------------------------------------
commit 9d73c96e131c657c7648641ef9ae012a62f54959
Author: Jan Schneider <jan at horde.org>
Date: Tue Dec 11 17:13:15 2012 +0100
[jan] Include address groups in auto-completion list if address book is below AJAX lookup threshold.
imp/docs/CHANGES | 2 ++
imp/lib/Ajax/Imple/ContactAutoCompleter.php | 7 +++++--
imp/package.xml | 2 ++
3 files changed, 9 insertions(+), 2 deletions(-)
http://git.horde.org/horde-git/-/commit/9d73c96e131c657c7648641ef9ae012a62f54959
-----------------------------------------------------------------------
commit b6cf65c8803c39414f9f2295c9baa8d3392feaa8
Author: Ralf Lang <lang at b1-systems.de>
Date: Tue Dec 11 21:39:04 2012 +0200
Solution (at least partial) for bug #11658 Fatal error editing date property.
sesha/lib/Entity/Value.php | 38 +++++++++++++++++++++++++++++++++++---
1 files changed, 35 insertions(+), 3 deletions(-)
http://git.horde.org/horde-git/-/commit/b6cf65c8803c39414f9f2295c9baa8d3392feaa8
-----------------------------------------------------------------------
commit 0445f8fa0acff6c2c9f75f9e071800629a8d2e9f
Author: Michael M Slusarz <slusarz at horde.org>
Date: Tue Dec 11 12:45:47 2012 -0700
Bug #11862: Fix missing header text
imp/lib/Ui/Compose.php | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
http://git.horde.org/horde-git/-/commit/0445f8fa0acff6c2c9f75f9e071800629a8d2e9f
-----------------------------------------------------------------------
commit 54384a6632d34ac7cf915e3da9a339127bde27ae
Author: Ralf Lang <lang at b1-systems.de>
Date: Tue Dec 11 22:56:44 2012 +0200
Move the search to topbar in list view and allow quicksearching by name and ID (Request #11657).
sesha/list.php | 22 +++++++++++++++++++---
1 files changed, 19 insertions(+), 3 deletions(-)
http://git.horde.org/horde-git/-/commit/54384a6632d34ac7cf915e3da9a339127bde27ae
-----------------------------------------------------------------------
commit c8c3c737c57bd279572ec9c9f2cfdcbdaf960915
Author: Ralf Lang <lang at b1-systems.de>
Date: Tue Dec 11 22:58:12 2012 +0200
Combine filters with OR to allow multi-field searches. Complicated searches with AND and OR may be added later.
sesha/lib/Driver/Rdo.php | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
http://git.horde.org/horde-git/-/commit/c8c3c737c57bd279572ec9c9f2cfdcbdaf960915
-----------------------------------------------------------------------
commit 8cd7e224f306d53be62d428f8ad45e5dbeef2bbf
Author: Ralf Lang <lang at b1-systems.de>
Date: Tue Dec 11 23:07:06 2012 +0200
Move quicksearch to topbar and remove the "menu" template. Allow search by Name or Id (Request #11657).
sesha/admin.php | 7 ++++++-
sesha/docs/CHANGES | 1 +
sesha/list.php | 1 -
sesha/package.xml | 12 +++++-------
sesha/search.php | 7 ++++++-
sesha/stock.php | 8 ++++++--
sesha/templates/menu.inc | 9 ---------
7 files changed, 24 insertions(+), 21 deletions(-)
delete mode 100644 sesha/templates/menu.inc
http://git.horde.org/horde-git/-/commit/8cd7e224f306d53be62d428f8ad45e5dbeef2bbf
-----------------------------------------------------------------------
commit b2eb38378e4afbb07de6d6a3c626192ef1f553d7
Author: Michael M Slusarz <slusarz at horde.org>
Date: Tue Dec 11 16:44:58 2012 -0700
[mms] Ensure that polled mailboxes in dynamic view continue to show unseen message count if its child status changes (Bug #11864).
imp/docs/CHANGES | 2 ++
imp/lib/Ajax/Application/Handler/Dynamic.php | 1 -
imp/lib/Imap/Tree.php | 6 +++++-
imp/package.xml | 2 ++
4 files changed, 9 insertions(+), 2 deletions(-)
http://git.horde.org/horde-git/-/commit/b2eb38378e4afbb07de6d6a3c626192ef1f553d7
-----------------------------------------------------------------------
commit 98ca3a566581bc9cdc42caeaf5fd0ef998fe9707
Author: Michael M Slusarz <slusarz at horde.org>
Date: Tue Dec 11 18:45:00 2012 -0700
Strip corrected SPAN after spellcheck is complete
framework/Core/js/spellchecker.js | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
http://git.horde.org/horde-git/-/commit/98ca3a566581bc9cdc42caeaf5fd0ef998fe9707
-----------------------------------------------------------------------
commit d135590ac5091e89de8ffecdebef8fcff0720e72
Merge: 92b1182 98ca3a5
Author: Michael M Slusarz <slusarz at horde.org>
Date: Tue Dec 11 23:02:46 2012 -0700
Merge branch 'master' into imp_6_1
Conflicts:
imp/lib/Imap.php
imp/package.xml
ingo/docs/CHANGES
ingo/package.xml
ansel/lib/Ajax/Imple/EditCaption.php | 11 +-
ansel/lib/Tile/Image.php | 2 +-
ansel/lib/View/Image.php | 56 +-
ansel/templates/view/image.inc | 49 -
framework/ActiveSync/lib/Horde/ActiveSync.php | 2 +-
framework/ActiveSync/lib/Horde/ActiveSync/Folder/Base.php | 21 +-
framework/ActiveSync/lib/Horde/ActiveSync/Folder/Imap.php | 11 +-
framework/ActiveSync/lib/Horde/ActiveSync/Imap/Adapter.php | 11 +-
framework/ActiveSync/lib/Horde/ActiveSync/Imap/Message.php | 14 +-
framework/ActiveSync/lib/Horde/ActiveSync/Message/Folder.php | 6 +
framework/ActiveSync/lib/Horde/ActiveSync/Message/Mail.php | 6 +
framework/ActiveSync/lib/Horde/ActiveSync/Request/Base.php | 10 +
framework/ActiveSync/lib/Horde/ActiveSync/Request/FolderSync.php | 4 +-
.../ActiveSync/lib/Horde/ActiveSync/Request/GetItemEstimate.php | 2 +-
framework/ActiveSync/lib/Horde/ActiveSync/Request/Ping.php | 12 +-
.../ActiveSync/lib/Horde/ActiveSync/Request/ResolveRecipients.php | 2 +-
framework/ActiveSync/lib/Horde/ActiveSync/Request/Search.php | 2 +-
framework/ActiveSync/lib/Horde/ActiveSync/Request/SendMail.php | 4 +-
framework/ActiveSync/lib/Horde/ActiveSync/Request/Sync.php | 111 +-
framework/ActiveSync/lib/Horde/ActiveSync/State/Base.php | 28 +-
framework/ActiveSync/lib/Horde/ActiveSync/State/Sql.php | 135 ++-
framework/ActiveSync/lib/Horde/ActiveSync/Wbxml/Decoder.php | 15 +-
framework/ActiveSync/package.xml | 30 +-
framework/Core/js/spellchecker.js | 8 +-
framework/Core/lib/Horde/Core/ActiveSync/Driver.php | 30 +-
framework/Core/lib/Horde/Core/ActiveSync/Logger/Factory.php | 16 -
framework/Core/lib/Horde/Core/Ajax/Imple/ContactAutoCompleter.php | 4 +-
framework/Core/lib/Horde/Core/Ajax/Imple/InPlaceEditor.php | 4 +-
framework/Core/lib/Horde/Core/Smartmobile/View/Helper.php | 1 +
framework/Core/lib/Horde/Core/Tagger.php | 63 +-
framework/Core/lib/Horde/Core/Tree/Renderer/Html.php | 16 +-
framework/Core/lib/Horde/PageOutput.php | 2 +-
framework/Core/package.xml | 30 +-
framework/Date/lib/Horde/Date.php | 2 +-
framework/Date/package.xml | 4 +-
framework/Date/test/Horde/Date/DateTest.php | 16 +-
.../Imap_Client/lib/Horde/Imap/Client/Interaction/Server.php | 5 +-
framework/Imap_Client/lib/Horde/Imap/Client/Socket.php | 308 ++---
framework/Imap_Client/lib/Horde/Imap/Client/Tokenize.php | 234 +++-
framework/Imap_Client/lib/Horde/Imap/Client/Tokenize/List.php | 106 --
framework/Imap_Client/lib/Horde/Imap/Client/Tokenize/Master.php | 232 ----
framework/Imap_Client/package.xml | 25 +-
framework/Imap_Client/test/Horde/Imap/Client/SocketTest.php | 8 -
framework/Imap_Client/test/Horde/Imap/Client/Stub/Socket.php | 14 +-
framework/Imap_Client/test/Horde/Imap/Client/TokenizeTest.php | 306 +++--
gollem/config/prefs.php | 2 +-
gollem/docs/CHANGES | 2 +
gollem/migration/2_gollem_upgrade_autoincrement.php | 37 +
gollem/package.xml | 12 +-
horde/config/prefs.php | 6 +-
horde/js/sidebar.js | 4 +-
horde/services/portal/smartmobile.php | 2 +-
horde/templates/portal/smartmobile.inc | 2 +-
imp/docs/CHANGES | 4 +
imp/lib/Ajax/Application/Handler/Dynamic.php | 1 -
imp/lib/Ajax/Imple/ContactAutoCompleter.php | 7 +-
imp/lib/Contents.php | 1 +
imp/lib/Imap/Tree.php | 6 +-
imp/lib/Ui/Compose.php | 2 +-
imp/package.xml | 2 +
ingo/docs/CHANGES | 1 +
ingo/lib/Ingo.php | 2 +-
ingo/package.xml | 2 +
kronolith/docs/CHANGES | 3 +
kronolith/lib/Calendar/Internal.php | 3 +-
kronolith/lib/Driver/Kolab.php | 10 +-
kronolith/lib/Kronolith.php | 4 +-
kronolith/package.xml | 6 +
mnemo/lib/Driver/Sql.php | 1 +
nag/docs/CHANGES | 2 +
nag/js/smartmobile.js | 1 -
nag/lib/Search.php | 9 +-
nag/package.xml | 2 +
sesha/admin.php | 7 +-
sesha/docs/CHANGES | 12 +
sesha/docs/RELEASE_NOTES | 10 +-
sesha/lib/Driver/Rdo.php | 7 +-
sesha/lib/Entity/PropertyMapper.php | 4 +-
sesha/lib/Entity/Value.php | 38 +-
sesha/list.php | 21 +-
sesha/package.xml | 44 +-
sesha/search.php | 7 +-
sesha/stock.php | 8 +-
sesha/templates/menu.inc | 9 -
turba/lib/Driver/Share.php | 10 +
85 files changed, 1256 insertions(+), 1035 deletions(-)
http://git.horde.org/horde-git/-/commit/d135590ac5091e89de8ffecdebef8fcff0720e72
More information about the commits
mailing list