[commits] Horde branch develop updated. 7043335866102242812be49370c47a5eac264407
Michael M Slusarz
slusarz at horde.org
Wed Apr 4 03:53:46 UTC 2012
The branch "develop" has been updated.
The following is a summary of the commits.
from: 48281014084e6102b1b27f85c87744294543414c
a997c75 [mms] Fix preg backtrack issue in the Linkurls filter (Bug #11116).
8cb0263 Fix phpdoc.
090e710 [jan] Fix decode_attribute hook when exporting to vCard (kd at tu-cottbus.de, Bug #11123).
2a99ef9 Fix HTML tag typo
40190ff Sanity checking when deleting attachments
1bfa0f8 The 'uids' key might not exist here
c689a53 Sanity checking: indices could potentially be empty
89fbefe Merge branch 'master' into develop
d7fe4ef Fix view detection when creating page header
7043335 Fix body size in smartmobile view
-----------------------------------------------------------------------
commit a997c75171a90a1692216d4b635e5745fbd8c9a2
Author: Michael M Slusarz <slusarz at horde.org>
Date: Mon Apr 2 15:41:06 2012 -0600
[mms] Fix preg backtrack issue in the Linkurls filter (Bug #11116).
framework/Text_Filter/lib/Horde/Text/Filter/Linkurls.php | 3 +-
framework/Text_Filter/package.xml | 4 +-
framework/Text_Filter/test/Horde/Text/Filter/LinkurlsTest.php | 10 +
.../Text_Filter/test/Horde/Text/Filter/fixtures/bug_11116.txt | 61 +++++
4 files changed, 75 insertions(+), 3 deletions(-)
create mode 100644 framework/Text_Filter/test/Horde/Text/Filter/fixtures/bug_11116.txt
http://git.horde.org/horde-git/-/commit/a997c75171a90a1692216d4b635e5745fbd8c9a2
-----------------------------------------------------------------------
commit 8cb02630cc9572f214f23bbccdb168667e3be91e
Author: Jan Schneider <jan at horde.org>
Date: Mon Apr 2 23:50:57 2012 +0200
Fix phpdoc.
turba/config/hooks.php.dist | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
http://git.horde.org/horde-git/-/commit/8cb02630cc9572f214f23bbccdb168667e3be91e
-----------------------------------------------------------------------
commit 090e710fd048563cd4655dbd27cea8efde89ba6a
Author: Jan Schneider <jan at horde.org>
Date: Mon Apr 2 23:52:53 2012 +0200
[jan] Fix decode_attribute hook when exporting to vCard (kd at tu-cottbus.de, Bug #11123).
turba/docs/CHANGES | 2 ++
turba/lib/Driver.php | 2 +-
turba/package.xml | 2 ++
3 files changed, 5 insertions(+), 1 deletions(-)
http://git.horde.org/horde-git/-/commit/090e710fd048563cd4655dbd27cea8efde89ba6a
-----------------------------------------------------------------------
commit 2a99ef93a0091e67122579d60b6ba268f56a2da4
Author: Michael M Slusarz <slusarz at horde.org>
Date: Tue Apr 3 20:51:46 2012 -0600
Fix HTML tag typo
imp/templates/imp/mailbox/header.html | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
http://git.horde.org/horde-git/-/commit/2a99ef93a0091e67122579d60b6ba268f56a2da4
-----------------------------------------------------------------------
commit 40190ff3abd39247d1f43a4dbc8d0438a03dc313
Author: Michael M Slusarz <slusarz at horde.org>
Date: Tue Apr 3 21:01:36 2012 -0600
Sanity checking when deleting attachments
imp/lib/Ajax/Application.php | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
http://git.horde.org/horde-git/-/commit/40190ff3abd39247d1f43a4dbc8d0438a03dc313
-----------------------------------------------------------------------
commit 1bfa0f80044b470a00061891df0c766456fdcf45
Author: Michael M Slusarz <slusarz at horde.org>
Date: Tue Apr 3 21:36:53 2012 -0600
The 'uids' key might not exist here
framework/Imap_Client/lib/Horde/Imap/Client/Socket.php | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
http://git.horde.org/horde-git/-/commit/1bfa0f80044b470a00061891df0c766456fdcf45
-----------------------------------------------------------------------
commit c689a53509f767493afebf033ca983ba1e33207e
Author: Michael M Slusarz <slusarz at horde.org>
Date: Tue Apr 3 21:40:43 2012 -0600
Sanity checking: indices could potentially be empty
imp/lib/Indices.php | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
http://git.horde.org/horde-git/-/commit/c689a53509f767493afebf033ca983ba1e33207e
-----------------------------------------------------------------------
commit 89fbefe9570d1eceb10c5ba2febb54a9b8365a6a
Merge: 4828101 c689a53
Author: Michael M Slusarz <slusarz at horde.org>
Date: Tue Apr 3 21:44:55 2012 -0600
Merge branch 'master' into develop
Conflicts:
imp/lib/Ajax/Application.php
turba/package.xml
framework/Imap_Client/lib/Horde/Imap/Client/Socket.php | 2 +-
framework/Text_Filter/lib/Horde/Text/Filter/Linkurls.php | 3 +-
framework/Text_Filter/package.xml | 4 +-
framework/Text_Filter/test/Horde/Text/Filter/LinkurlsTest.php | 10 +
.../Text_Filter/test/Horde/Text/Filter/fixtures/bug_11116.txt | 61 +++++
imp/lib/Ajax/Application.php | 4 +-
imp/lib/Indices.php | 2 +-
imp/templates/imp/mailbox/header.html | 2 +-
turba/config/hooks.php.dist | 3 +-
turba/docs/CHANGES | 2 +
turba/lib/Driver.php | 2 +-
turba/package.xml | 1 +
12 files changed, 86 insertions(+), 10 deletions(-)
http://git.horde.org/horde-git/-/commit/89fbefe9570d1eceb10c5ba2febb54a9b8365a6a
-----------------------------------------------------------------------
commit d7fe4ef61ede0ed7e5dc28de45b36ff38692d210
Author: Michael M Slusarz <slusarz at horde.org>
Date: Tue Apr 3 21:49:03 2012 -0600
Fix view detection when creating page header
framework/Core/lib/Horde/PageOutput.php | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
http://git.horde.org/horde-git/-/commit/d7fe4ef61ede0ed7e5dc28de45b36ff38692d210
-----------------------------------------------------------------------
commit 7043335866102242812be49370c47a5eac264407
Author: Michael M Slusarz <slusarz at horde.org>
Date: Tue Apr 3 21:52:15 2012 -0600
Fix body size in smartmobile view
imp/themes/default/mobile.css | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
http://git.horde.org/horde-git/-/commit/7043335866102242812be49370c47a5eac264407
More information about the commits
mailing list