[commits] Horde branch develop updated. 6f7ced547a4cad2c14a58a9b321f6bdb896bd596
Michael M Slusarz
slusarz at horde.org
Fri Jan 13 07:31:18 UTC 2012
The branch "develop" has been updated.
The following is a summary of the commits.
from: e24e6c5829b75fa1df2c2a3cad229c1ba90ce8ce
c3389e9 Temporarily make methods public that are used in Horde_SyncMl (Bug #10908).
3c517c8 [jan] Fix compatibility with Horde_SyncMl (Bug #10908).
c6dba20 [jan] Fix undefined method while synchronizing events with Funambol (Bug #10908).
313c70e ValEnum tags in DevInf may contain comma separated values (Bug #10912).
34512c8 [mms] Fix regression preventing sending of MDNs.
e2625bd Attempt to translate search header, if possible
62dd9aa Revert "Bug #10901: Fix signature positioning in mobile view."
8e0ce4b Simplify
c4f1048 Bug #10918: target can be document if clickup after drag occurs outside of window
428cc41 Bug #10920: icon may be a string, in which case we do not have access to application information
db4445f Merge branch 'master' into develop
8294b5f Fix HTML part detection when resuming compositon
da793a3 Merge branch 'develop' of ssh://dev.horde.org/horde/git/horde into develop
6f7ced5 Merge branch 'master' into develop
-----------------------------------------------------------------------
commit c3389e9f2c43a88b4a47b58f2d97a00366123a7e
Author: Jan Schneider <jan at horde.org>
Date: Thu Jan 12 14:48:48 2012 +0100
Temporarily make methods public that are used in Horde_SyncMl (Bug #10908).
framework/Icalendar/lib/Horde/Icalendar.php | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
http://git.horde.org/horde-git/-/commit/c3389e9f2c43a88b4a47b58f2d97a00366123a7e
-----------------------------------------------------------------------
commit 3c517c8ba18158170709e2f73be9ca49ab813dbd
Author: Jan Schneider <jan at horde.org>
Date: Thu Jan 12 14:49:21 2012 +0100
[jan] Fix compatibility with Horde_SyncMl (Bug #10908).
framework/Icalendar/package.xml | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
http://git.horde.org/horde-git/-/commit/3c517c8ba18158170709e2f73be9ca49ab813dbd
-----------------------------------------------------------------------
commit c6dba20d8e8f1942d98b434a55fcfbc09c3efaa0
Author: Jan Schneider <jan at horde.org>
Date: Thu Jan 12 14:53:18 2012 +0100
[jan] Fix undefined method while synchronizing events with Funambol (Bug #10908).
framework/SyncMl/lib/Horde/SyncMl/Device/Sync4j.php | 2 --
framework/SyncMl/package.xml | 4 ++--
jonah/dispatcher.php | 1 -
3 files changed, 2 insertions(+), 5 deletions(-)
http://git.horde.org/horde-git/-/commit/c6dba20d8e8f1942d98b434a55fcfbc09c3efaa0
-----------------------------------------------------------------------
commit 313c70e851125e74d99959565e252dd8eb85f0f4
Author: Jan Schneider <jan at horde.org>
Date: Thu Jan 12 15:09:50 2012 +0100
ValEnum tags in DevInf may contain comma separated values (Bug #10912).
turba/lib/Driver.php | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
http://git.horde.org/horde-git/-/commit/313c70e851125e74d99959565e252dd8eb85f0f4
-----------------------------------------------------------------------
commit 34512c82cca2679b4e5381a0aad4a57e45a77b58
Author: Michael M Slusarz <slusarz at horde.org>
Date: Thu Jan 12 12:50:12 2012 -0700
[mms] Fix regression preventing sending of MDNs.
imp/docs/CHANGES | 1 +
imp/lib/Views/ShowMessage.php | 5 ++++-
imp/message.php | 5 ++++-
imp/package.xml | 2 ++
4 files changed, 11 insertions(+), 2 deletions(-)
http://git.horde.org/horde-git/-/commit/34512c82cca2679b4e5381a0aad4a57e45a77b58
-----------------------------------------------------------------------
commit e2625bdf7ce3f71281646039ec5530eeaf66c63c
Author: Michael M Slusarz <slusarz at horde.org>
Date: Thu Jan 12 13:02:56 2012 -0700
Attempt to translate search header, if possible
imp/lib/Search/Element/Header.php | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
http://git.horde.org/horde-git/-/commit/e2625bdf7ce3f71281646039ec5530eeaf66c63c
-----------------------------------------------------------------------
commit 62dd9aac4c1f9e93e3d1efc80bae95d11b0a667f
Author: Michael M Slusarz <slusarz at horde.org>
Date: Thu Jan 12 13:27:17 2012 -0700
Revert "Bug #10901: Fix signature positioning in mobile view."
This reverts commit 2c81a7bd95e597d7fcbf96fed5bd00ea0dc0dd3c.
imp/compose-mimp.php | 6 +-----
1 files changed, 1 insertions(+), 5 deletions(-)
http://git.horde.org/horde-git/-/commit/62dd9aac4c1f9e93e3d1efc80bae95d11b0a667f
-----------------------------------------------------------------------
commit 8e0ce4bfb509f559b9deda1425fb61b9b29702ad
Author: Michael M Slusarz <slusarz at horde.org>
Date: Thu Jan 12 13:28:44 2012 -0700
Simplify
imp/compose-mimp.php | 7 +------
1 files changed, 1 insertions(+), 6 deletions(-)
http://git.horde.org/horde-git/-/commit/8e0ce4bfb509f559b9deda1425fb61b9b29702ad
-----------------------------------------------------------------------
commit c4f1048b47aff58405518beabdd46484f7e189ce
Author: Michael M Slusarz <slusarz at horde.org>
Date: Thu Jan 12 13:34:17 2012 -0700
Bug #10918: target can be document if clickup after drag occurs outside of window
horde/js/contextsensitive.js | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
http://git.horde.org/horde-git/-/commit/c4f1048b47aff58405518beabdd46484f7e189ce
-----------------------------------------------------------------------
commit 428cc41fe02b82e10ac7d86b6ee1964563e32911
Author: Michael M Slusarz <slusarz at horde.org>
Date: Thu Jan 12 13:46:40 2012 -0700
Bug #10920: icon may be a string, in which case we do not have access to application information
Hackish, but the ajax view detection will hopefully be going away soon
with the interface design revision
imp/lib/Menu/Dimp.php | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
http://git.horde.org/horde-git/-/commit/428cc41fe02b82e10ac7d86b6ee1964563e32911
-----------------------------------------------------------------------
commit db4445fba0ec74851fd9a0253c510e4cd2bad179
Merge: 180ac13 428cc41
Author: Michael M Slusarz <slusarz at horde.org>
Date: Thu Jan 12 13:49:51 2012 -0700
Merge branch 'master' into develop
Conflicts:
imp/package.xml
framework/Icalendar/lib/Horde/Icalendar.php | 4 ++--
framework/Icalendar/package.xml | 4 ++--
framework/SyncMl/lib/Horde/SyncMl/Device/Sync4j.php | 2 --
framework/SyncMl/package.xml | 4 ++--
horde/js/contextsensitive.js | 4 ++++
imp/compose-mimp.php | 2 +-
imp/docs/CHANGES | 1 +
imp/lib/Menu/Dimp.php | 3 ++-
imp/lib/Search/Element/Header.php | 2 +-
imp/lib/Views/ShowMessage.php | 5 ++++-
imp/message.php | 5 ++++-
imp/package.xml | 1 +
jonah/dispatcher.php | 1 -
turba/lib/Driver.php | 12 ++++++------
14 files changed, 30 insertions(+), 20 deletions(-)
http://git.horde.org/horde-git/-/commit/db4445fba0ec74851fd9a0253c510e4cd2bad179
-----------------------------------------------------------------------
commit 8294b5f38c75a4ae227937be23448ce6f0b9c9a6
Author: Michael M Slusarz <slusarz at horde.org>
Date: Thu Jan 12 22:32:25 2012 -0700
Fix HTML part detection when resuming compositon
imp/lib/Compose.php | 33 +++++++++++++--------------------
1 files changed, 13 insertions(+), 20 deletions(-)
http://git.horde.org/horde-git/-/commit/8294b5f38c75a4ae227937be23448ce6f0b9c9a6
-----------------------------------------------------------------------
commit da793a3b74791e0b1679ab78e52322e2494b7971
Merge: db4445f e24e6c5
Author: Michael M Slusarz <slusarz at horde.org>
Date: Fri Jan 13 00:30:41 2012 -0700
Merge branch 'develop' of ssh://dev.horde.org/horde/git/horde into develop
kronolith/js/kronolith.js | 27 +++++++++++++++++----------
1 files changed, 17 insertions(+), 10 deletions(-)
http://git.horde.org/horde-git/-/commit/da793a3b74791e0b1679ab78e52322e2494b7971
-----------------------------------------------------------------------
commit 6f7ced547a4cad2c14a58a9b321f6bdb896bd596
Merge: da793a3 8294b5f
Author: Michael M Slusarz <slusarz at horde.org>
Date: Fri Jan 13 00:30:57 2012 -0700
Merge branch 'master' into develop
imp/lib/Compose.php | 33 +++++++++++++--------------------
1 files changed, 13 insertions(+), 20 deletions(-)
http://git.horde.org/horde-git/-/commit/6f7ced547a4cad2c14a58a9b321f6bdb896bd596
More information about the commits
mailing list