[commits] Horde branch caldav updated. a6023f8f7b07f66d4707a12af9a4eb5426ec8f57
Jan Schneider
jan at horde.org
Fri Apr 5 14:00:01 UTC 2013
The branch "caldav" has been updated.
The following is a summary of the commits.
from: 720e19df1a02279eadc7f6f2f48bad14da4dbd15
ad6488d [mms] SECURITY: Fix XSS vulnerability on smartmobile message page (João Machado <geral at jpaulo.eu>).
8ae7574 [mms] SECURITY: Fix XSS vulnerability on smartmobile rule page (João Machado <geral at jpaulo.eu>).
0d66766 [mms] SECURITY: Fix XSS vulnerability on smartmobile contacts details page (João Machado <geral at jpaulo.eu>).
dc779cc [mms] Fix renaming mailboxes in dynamic view.
7c10b48 Add dependency on Horde_Ldap (Bug #12145).
8f52b6b User-Agent header is not required when SETTINGS command is used.
97ddd8c Work around broken HTC clients that send -1 in place of empty tags.
422d3b8 BFN
81aed1d Fix assumption that memcache is available for tests
c67e867 This needs both the public and private key
f0370e6 Revocation w/passphrases doesn't work in GPG2 due to the way pinentry works
cf52287 Not sure how this ever worked: mail messages absolutely must have a from address
876ed0d Yikes. phpunit silently dying because exif isn't available. Another reason why '@' function prefixes are bad
f262328 Fix broken tests
1672f7e [mms] Fix Horde_Crypt_Pgp#encryptedSymmetrically() rom entering an infinite loop when using GnuPg v2.
a5bc1cf I don't pretend to know why these ampersands are there, but adding the missing initial one fixes things for me
dcb2d11 Don't mangle the username if we are trying to strip the email.
74d9a55 sticky keys
6a4cfc9 Revert "I don't pretend to know why these ampersands are there, but adding the missing initial one fixes things for me"
985e26a Need to be much more vigilant when changing locale in unit tests
1e129d6 Button style.
43e4f44 Add line breaks after lists.
0c45a28 Workaround broken Heading parser.
7998831 [jan] Work around broken Text_Wiki header parser.
325cc59 Wrong version.
10b0bfc [jan] Fix documentation formatting.
2968270 Released Horde_Argv-2.0.6
17f0e71 Development mode for Horde_Argv-2.0.7
f13eeb8 Test for broken Archive_Tar before releasing.
6842947 Components updated the package.xml.
d60b409 Released Horde_Argv-2.0.7
00e0538 Development mode for Horde_Argv-2.0.8
b1b3e2d Check for --html-generator.
f246d64 Revert "User-Agent header is not required when SETTINGS command is used."
a32b5c0 Another attempt at working around broken HTC clients.
35ec5d6 Add unit test
a6023f8 Merge remote-tracking branch 'origin/master' into caldav
-----------------------------------------------------------------------
commit ad6488d4baab25b1b5b3f0d8c15dcdf26eb63d4c
Author: Michael M Slusarz <slusarz at horde.org>
Date: Tue Apr 2 10:41:21 2013 -0600
[mms] SECURITY: Fix XSS vulnerability on smartmobile message page (João Machado <geral at jpaulo.eu>).
imp/docs/CHANGES | 2 ++
imp/js/smartmobile.js | 2 +-
imp/package.xml | 2 ++
3 files changed, 5 insertions(+), 1 deletions(-)
http://git.horde.org/horde-git/-/commit/ad6488d4baab25b1b5b3f0d8c15dcdf26eb63d4c
-----------------------------------------------------------------------
commit 8ae757459fe7d8832cdd9064327718afded789cf
Author: João Machado <geral at jpaulo.eu>
Date: Tue Apr 2 15:01:33 2013 +0100
[mms] SECURITY: Fix XSS vulnerability on smartmobile rule page (João Machado <geral at jpaulo.eu>).
Signed-off-by: Michael M Slusarz <slusarz at horde.org>
ingo/docs/CHANGES | 2 ++
ingo/js/smartmobile.js | 4 ++--
ingo/package.xml | 2 ++
3 files changed, 6 insertions(+), 2 deletions(-)
http://git.horde.org/horde-git/-/commit/8ae757459fe7d8832cdd9064327718afded789cf
-----------------------------------------------------------------------
commit 0d66766e479a72aebb7ae994c01e0506090aa7e5
Author: Michael M Slusarz <slusarz at horde.org>
Date: Tue Apr 2 11:00:58 2013 -0600
[mms] SECURITY: Fix XSS vulnerability on smartmobile contacts details page (João Machado <geral at jpaulo.eu>).
turba/docs/CHANGES | 2 ++
turba/js/smartmobile.js | 35 ++++++++++++++++++++++++-----------
turba/package.xml | 2 ++
3 files changed, 28 insertions(+), 11 deletions(-)
http://git.horde.org/horde-git/-/commit/0d66766e479a72aebb7ae994c01e0506090aa7e5
-----------------------------------------------------------------------
commit dc779ccb8b0fedd82901edbd6c8c6de011dc44b5
Author: Michael M Slusarz <slusarz at horde.org>
Date: Tue Apr 2 23:32:42 2013 -0600
[mms] Fix renaming mailboxes in dynamic view.
imp/docs/CHANGES | 1 +
imp/js/dimpbase.js | 1 -
imp/lib/Ajax/Application/Handler/Dynamic.php | 7 ++++---
imp/package.xml | 2 ++
4 files changed, 7 insertions(+), 4 deletions(-)
http://git.horde.org/horde-git/-/commit/dc779ccb8b0fedd82901edbd6c8c6de011dc44b5
-----------------------------------------------------------------------
commit 7c10b489e81ee1554ac83560c7b316ad45d4e983
Author: Jan Schneider <jan at horde.org>
Date: Wed Apr 3 13:43:37 2013 +0200
Add dependency on Horde_Ldap (Bug #12145).
framework/Prefs/package.xml | 7 +++++++
1 files changed, 7 insertions(+), 0 deletions(-)
http://git.horde.org/horde-git/-/commit/7c10b489e81ee1554ac83560c7b316ad45d4e983
-----------------------------------------------------------------------
commit 8f52b6b106875d63235f6d06147e897a2a6c57f2
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date: Wed Apr 3 11:47:58 2013 -0400
User-Agent header is not required when SETTINGS command is used.
Add temporary value until the SETTINGS command populates it.
Bug: 12154
framework/ActiveSync/lib/Horde/ActiveSync.php | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
http://git.horde.org/horde-git/-/commit/8f52b6b106875d63235f6d06147e897a2a6c57f2
-----------------------------------------------------------------------
commit 97ddd8c9cb78e441999af22b3ec6cc72d47bb29b
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date: Wed Apr 3 12:09:06 2013 -0400
Work around broken HTC clients that send -1 in place of empty tags.
Bug: 12155
framework/ActiveSync/lib/Horde/ActiveSync/Message/Appointment.php | 9 ++++-
1 files changed, 7 insertions(+), 2 deletions(-)
http://git.horde.org/horde-git/-/commit/97ddd8c9cb78e441999af22b3ec6cc72d47bb29b
-----------------------------------------------------------------------
commit 422d3b893a6a87b264fd2f5ffe38c3104477cd59
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date: Wed Apr 3 12:40:15 2013 -0400
BFN
framework/ActiveSync/package.xml | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
http://git.horde.org/horde-git/-/commit/422d3b893a6a87b264fd2f5ffe38c3104477cd59
-----------------------------------------------------------------------
commit 81aed1de5440c416f366f346bf02b6d7982d43cb
Author: Michael M Slusarz <slusarz at horde.org>
Date: Wed Apr 3 11:04:07 2013 -0600
Fix assumption that memcache is available for tests
.../test/Horde/SessionHandler/Storage/MemcacheTest.php | 5 +-
.../test/Horde/SessionHandler/Storage/StackTest.php | 28 ++---
2 files changed, 13 insertions(+), 20 deletions(-)
http://git.horde.org/horde-git/-/commit/81aed1de5440c416f366f346bf02b6d7982d43cb
-----------------------------------------------------------------------
commit c67e8672fd1bca0a132dfca416835ee0f0dc00d0
Author: Michael M Slusarz <slusarz at horde.org>
Date: Wed Apr 3 11:40:32 2013 -0600
This needs both the public and private key
framework/Crypt/lib/Horde/Crypt/Pgp.php | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
http://git.horde.org/horde-git/-/commit/c67e8672fd1bca0a132dfca416835ee0f0dc00d0
-----------------------------------------------------------------------
commit f0370e6f7699ff4c5e03db4512867736914999d8
Author: Michael M Slusarz <slusarz at horde.org>
Date: Wed Apr 3 11:43:39 2013 -0600
Revocation w/passphrases doesn't work in GPG2 due to the way pinentry works
framework/Crypt/test/Horde/Crypt/PgpTest.php | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
http://git.horde.org/horde-git/-/commit/f0370e6f7699ff4c5e03db4512867736914999d8
-----------------------------------------------------------------------
commit cf5228728d8cc3d58afb2e09d9b2ebefaa885935
Author: Michael M Slusarz <slusarz at horde.org>
Date: Wed Apr 3 11:51:38 2013 -0600
Not sure how this ever worked: mail messages absolutely must have a from address
framework/Mime/test/Horde/Mime/MailTest.php | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
http://git.horde.org/horde-git/-/commit/cf5228728d8cc3d58afb2e09d9b2ebefaa885935
-----------------------------------------------------------------------
commit 876ed0d4577da248bd43e39182a0f73a476deae6
Author: Michael M Slusarz <slusarz at horde.org>
Date: Wed Apr 3 12:12:35 2013 -0600
Yikes. phpunit silently dying because exif isn't available. Another reason why '@' function prefixes are bad
framework/Image/test/Horde/Image/Exif/ExiftoolTest.php | 15 ++++-----------
framework/Image/test/Horde/Image/Exif/PhpTest.php | 12 +++++++++++-
framework/Image/test/Horde/Image/Exif/TestBase.php | 9 ++++++++-
3 files changed, 23 insertions(+), 13 deletions(-)
http://git.horde.org/horde-git/-/commit/876ed0d4577da248bd43e39182a0f73a476deae6
-----------------------------------------------------------------------
commit f262328f5362d238692df952feba7e7cc5975483
Author: Michael M Slusarz <slusarz at horde.org>
Date: Wed Apr 3 12:20:35 2013 -0600
Fix broken tests
Test was not correctly/inconsistently calling constructor.
framework/Push/test/Horde/Push/Unit/Push/Recipient/MailTest.php | 10 +++---
1 files changed, 5 insertions(+), 5 deletions(-)
http://git.horde.org/horde-git/-/commit/f262328f5362d238692df952feba7e7cc5975483
-----------------------------------------------------------------------
commit 1672f7e7af233cd9af5dbc467e5f6dcdbb0710c8
Author: Michael M Slusarz <slusarz at horde.org>
Date: Wed Apr 3 13:43:49 2013 -0600
[mms] Fix Horde_Crypt_Pgp#encryptedSymmetrically() rom entering an infinite loop when using GnuPg v2.
framework/Crypt/lib/Horde/Crypt/Pgp.php | 3 ++-
framework/Crypt/package.xml | 2 ++
2 files changed, 4 insertions(+), 1 deletions(-)
http://git.horde.org/horde-git/-/commit/1672f7e7af233cd9af5dbc467e5f6dcdbb0710c8
-----------------------------------------------------------------------
commit a5bc1cf8f0181462791e36a80de96a54e5a94bd6
Author: Michael M Slusarz <slusarz at horde.org>
Date: Wed Apr 3 13:54:23 2013 -0600
I don't pretend to know why these ampersands are there, but adding the missing initial one fixes things for me
All tests now pass fo me on my local machine.
framework/Vfs/test/Horde/Vfs/FileTest.php | 12 +-----------
1 files changed, 1 insertions(+), 11 deletions(-)
http://git.horde.org/horde-git/-/commit/a5bc1cf8f0181462791e36a80de96a54e5a94bd6
-----------------------------------------------------------------------
commit dcb2d1120fcb660a6854c174433c0ee04b524a54
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date: Wed Apr 3 16:05:55 2013 -0400
Don't mangle the username if we are trying to strip the email.
framework/Core/lib/Horde/Core/ActiveSync/Driver.php | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
http://git.horde.org/horde-git/-/commit/dcb2d1120fcb660a6854c174433c0ee04b524a54
-----------------------------------------------------------------------
commit 74d9a5507ed45a1eb08a31f7343deed1b3c221b0
Author: Michael M Slusarz <slusarz at horde.org>
Date: Wed Apr 3 14:14:45 2013 -0600
sticky keys
framework/Crypt/package.xml | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
http://git.horde.org/horde-git/-/commit/74d9a5507ed45a1eb08a31f7343deed1b3c221b0
-----------------------------------------------------------------------
commit 6a4cfc94bb11c1614d8026a2c886786b0cf018af
Author: Jan Schneider <jan at horde.org>
Date: Wed Apr 3 22:31:53 2013 +0200
Revert "I don't pretend to know why these ampersands are there, but adding the missing initial one fixes things for me"
This reverts commit a5bc1cf8f0181462791e36a80de96a54e5a94bd6.
The ampersands are part of the whacky filename that causes things to break, but
only on very few platforms. If this test fails for you too now, congrats, you
are the first developer to reproduce this and have the honor to fix the problem
(It's something about basename() being locale dependent. ;-)
framework/Vfs/test/Horde/Vfs/FileTest.php | 12 +++++++++++-
1 files changed, 11 insertions(+), 1 deletions(-)
http://git.horde.org/horde-git/-/commit/6a4cfc94bb11c1614d8026a2c886786b0cf018af
-----------------------------------------------------------------------
commit 985e26a0395d068033b081668ef545e06c36fa42
Author: Michael M Slusarz <slusarz at horde.org>
Date: Wed Apr 3 15:19:28 2013 -0600
Need to be much more vigilant when changing locale in unit tests
Especially across packages, this value is not reset automatically.
framework/Argv/test/Horde/Argv/TestCase.php | 7 ++-
framework/Itip/test/Horde/Itip/Integration/ItipTest.php | 11 ++++-
framework/Mime/test/Horde/Mime/MailTest.php | 4 +-
framework/Util/test/Horde/Util/StringTest.php | 5 ++
framework/Vfs/test/Horde/Vfs/FileTest.php | 39 ---------------
5 files changed, 23 insertions(+), 43 deletions(-)
http://git.horde.org/horde-git/-/commit/985e26a0395d068033b081668ef545e06c36fa42
-----------------------------------------------------------------------
commit 1e129d6c41f677c7172d96632b1c59f0ad11a650
Author: Jan Schneider <jan at horde.org>
Date: Thu Apr 4 11:07:25 2013 +0200
Button style.
mnemo/templates/memo/memo.inc | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
http://git.horde.org/horde-git/-/commit/1e129d6c41f677c7172d96632b1c59f0ad11a650
-----------------------------------------------------------------------
commit 43e4f44ba36d4bee2bcdf4fc49771a368de71fef
Author: Jan Schneider <jan at horde.org>
Date: Thu Apr 4 12:20:30 2013 +0200
Add line breaks after lists.
wicked/lib/Text_Wiki/Render/Rst/List.php | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
http://git.horde.org/horde-git/-/commit/43e4f44ba36d4bee2bcdf4fc49771a368de71fef
-----------------------------------------------------------------------
commit 0c45a28c3f4d9131daa28d594bddcd23b6324ac4
Author: Jan Schneider <jan at horde.org>
Date: Thu Apr 4 13:20:52 2013 +0200
Workaround broken Heading parser.
wicked/lib/Page.php | 34 ++++++--
wicked/lib/Text_Wiki/Parse/Default/Heading2.php | 16 ++++
wicked/lib/Text_Wiki/Render/Latex/Heading2.php | 7 ++
wicked/lib/Text_Wiki/Render/Plain/Heading2.php | 7 ++
wicked/lib/Text_Wiki/Render/Rst/Heading.php | 103 -----------------------
wicked/lib/Text_Wiki/Render/Rst/Heading2.php | 103 +++++++++++++++++++++++
wicked/lib/Text_Wiki/Render/Xhtml/Heading2.php | 7 ++
wicked/package.xml | 22 ++++-
8 files changed, 185 insertions(+), 114 deletions(-)
create mode 100644 wicked/lib/Text_Wiki/Parse/Default/Heading2.php
create mode 100644 wicked/lib/Text_Wiki/Render/Latex/Heading2.php
create mode 100644 wicked/lib/Text_Wiki/Render/Plain/Heading2.php
delete mode 100644 wicked/lib/Text_Wiki/Render/Rst/Heading.php
create mode 100644 wicked/lib/Text_Wiki/Render/Rst/Heading2.php
create mode 100644 wicked/lib/Text_Wiki/Render/Xhtml/Heading2.php
http://git.horde.org/horde-git/-/commit/0c45a28c3f4d9131daa28d594bddcd23b6324ac4
-----------------------------------------------------------------------
commit 79988310c0656982b7e05b275c6334a42ff99005
Author: Jan Schneider <jan at horde.org>
Date: Thu Apr 4 13:26:25 2013 +0200
[jan] Work around broken Text_Wiki header parser.
Conflicts:
wicked/package.xml
wicked/docs/CHANGES | 1 +
wicked/package.xml | 1 +
2 files changed, 2 insertions(+), 0 deletions(-)
http://git.horde.org/horde-git/-/commit/79988310c0656982b7e05b275c6334a42ff99005
-----------------------------------------------------------------------
commit 325cc596848431baa8e7709408ed0cbf6abf064d
Author: Jan Schneider <jan at horde.org>
Date: Thu Apr 4 13:29:03 2013 +0200
Wrong version.
wicked/docs/CHANGES | 3 ---
1 files changed, 0 insertions(+), 3 deletions(-)
http://git.horde.org/horde-git/-/commit/325cc596848431baa8e7709408ed0cbf6abf064d
-----------------------------------------------------------------------
commit 10b0bfcfb09c9d1e3bdcd7cbcf82dbbb87f5c826
Author: Jan Schneider <jan at horde.org>
Date: Thu Apr 4 13:53:15 2013 +0200
[jan] Fix documentation formatting.
framework/Argv/doc/Horde/Argv/ADVANCED | 46 +++++++++++++++++-----------
framework/Argv/doc/Horde/Argv/CALLBACKS | 38 ++++++++++++-----------
framework/Argv/doc/Horde/Argv/EXTEND | 26 ++++++++-------
framework/Argv/doc/Horde/Argv/README | 51 ++++++++++++++++--------------
framework/Argv/package.xml | 4 +-
5 files changed, 91 insertions(+), 74 deletions(-)
http://git.horde.org/horde-git/-/commit/10b0bfcfb09c9d1e3bdcd7cbcf82dbbb87f5c826
-----------------------------------------------------------------------
commit 296827008759b151357f52ca04ee872b7d3fef10
Author: Jan Schneider <jan at horde.org>
Date: Thu Apr 4 13:57:10 2013 +0200
Released Horde_Argv-2.0.6
framework/Argv/package.xml | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
http://git.horde.org/horde-git/-/commit/296827008759b151357f52ca04ee872b7d3fef10
-----------------------------------------------------------------------
commit 17f0e71bbf3f795faeca8a00ef667e61c90cc610
Author: Jan Schneider <jan at horde.org>
Date: Thu Apr 4 13:57:11 2013 +0200
Development mode for Horde_Argv-2.0.7
framework/Argv/package.xml | 19 ++++++++++++++++---
1 files changed, 16 insertions(+), 3 deletions(-)
http://git.horde.org/horde-git/-/commit/17f0e71bbf3f795faeca8a00ef667e61c90cc610
-----------------------------------------------------------------------
commit f13eeb88b5eb8424942b2430cafe60782cc386a8
Author: Jan Schneider <jan at horde.org>
Date: Thu Apr 4 15:29:49 2013 +0200
Test for broken Archive_Tar before releasing.
components/lib/Components/Release/Task/Package.php | 7 +++++++
1 files changed, 7 insertions(+), 0 deletions(-)
http://git.horde.org/horde-git/-/commit/f13eeb88b5eb8424942b2430cafe60782cc386a8
-----------------------------------------------------------------------
commit 684294716c0b5fa4e259a99cdd48e9b96c8b92bb
Author: Jan Schneider <jan at horde.org>
Date: Thu Apr 4 15:32:09 2013 +0200
Components updated the package.xml.
framework/Argv/package.xml | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
http://git.horde.org/horde-git/-/commit/684294716c0b5fa4e259a99cdd48e9b96c8b92bb
-----------------------------------------------------------------------
commit d60b4090d2b12bccb290601e1c8ff9351635d276
Author: Jan Schneider <jan at horde.org>
Date: Thu Apr 4 15:35:52 2013 +0200
Released Horde_Argv-2.0.7
framework/Argv/package.xml | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
http://git.horde.org/horde-git/-/commit/d60b4090d2b12bccb290601e1c8ff9351635d276
-----------------------------------------------------------------------
commit 00e0538accb58a92ef5922c1f664b886fadf566b
Author: Jan Schneider <jan at horde.org>
Date: Thu Apr 4 15:35:53 2013 +0200
Development mode for Horde_Argv-2.0.8
framework/Argv/package.xml | 17 +++++++++++++++--
1 files changed, 15 insertions(+), 2 deletions(-)
http://git.horde.org/horde-git/-/commit/00e0538accb58a92ef5922c1f664b886fadf566b
-----------------------------------------------------------------------
commit b1b3e2d32ed6b6011d69bc6b1714176a1e1582a3
Author: Jan Schneider <jan at horde.org>
Date: Thu Apr 4 15:41:02 2013 +0200
Check for --html-generator.
components/lib/Components/Helper/Website.php | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
http://git.horde.org/horde-git/-/commit/b1b3e2d32ed6b6011d69bc6b1714176a1e1582a3
-----------------------------------------------------------------------
commit f246d64b63d1ca9a7a3e0fa9eb0fbc6f0360b40c
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date: Thu Apr 4 10:37:58 2013 -0400
Revert "User-Agent header is not required when SETTINGS command is used."
This reverts commit 8f52b6b106875d63235f6d06147e897a2a6c57f2.
framework/ActiveSync/lib/Horde/ActiveSync.php | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
http://git.horde.org/horde-git/-/commit/f246d64b63d1ca9a7a3e0fa9eb0fbc6f0360b40c
-----------------------------------------------------------------------
commit a32b5c055d6b6670e3847f1340e1a87c6bf07860
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date: Thu Apr 4 10:40:06 2013 -0400
Another attempt at working around broken HTC clients.
Bug: 12154
framework/ActiveSync/lib/Horde/ActiveSync/State/Sql.php | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
http://git.horde.org/horde-git/-/commit/a32b5c055d6b6670e3847f1340e1a87c6bf07860
-----------------------------------------------------------------------
commit 35ec5d6f791279efee7ce9996ecc8f33dc0c636e
Author: Michael M Slusarz <slusarz at horde.org>
Date: Fri Apr 5 00:25:41 2013 -0600
Add unit test
framework/Imap_Client/test/Horde/Imap/Client/SocketTest.php | 10 ++++++++++
1 files changed, 10 insertions(+), 0 deletions(-)
http://git.horde.org/horde-git/-/commit/35ec5d6f791279efee7ce9996ecc8f33dc0c636e
-----------------------------------------------------------------------
commit a6023f8f7b07f66d4707a12af9a4eb5426ec8f57
Merge: 720e19d 35ec5d6
Author: Jan Schneider <jan at horde.org>
Date: Fri Apr 5 15:59:35 2013 +0200
Merge remote-tracking branch 'origin/master' into caldav
components/lib/Components/Helper/Website.php | 3 +
components/lib/Components/Release/Task/Package.php | 7 +
framework/ActiveSync/lib/Horde/ActiveSync/Message/Appointment.php | 9 +-
framework/ActiveSync/lib/Horde/ActiveSync/State/Sql.php | 2 +-
framework/ActiveSync/package.xml | 4 +
framework/Argv/doc/Horde/Argv/ADVANCED | 46 ++-
framework/Argv/doc/Horde/Argv/CALLBACKS | 38 +-
framework/Argv/doc/Horde/Argv/EXTEND | 26 +-
framework/Argv/doc/Horde/Argv/README | 51 ++-
framework/Argv/package.xml | 34 ++-
framework/Argv/test/Horde/Argv/TestCase.php | 7 +-
framework/Core/lib/Horde/Core/ActiveSync/Driver.php | 6 +-
framework/Crypt/lib/Horde/Crypt/Pgp.php | 11 +-
framework/Crypt/package.xml | 2 +
framework/Crypt/test/Horde/Crypt/PgpTest.php | 2 +
framework/Image/test/Horde/Image/Exif/ExiftoolTest.php | 15 +-
framework/Image/test/Horde/Image/Exif/PhpTest.php | 12 +-
framework/Image/test/Horde/Image/Exif/TestBase.php | 9 +-
framework/Imap_Client/test/Horde/Imap/Client/SocketTest.php | 10 +
framework/Itip/test/Horde/Itip/Integration/ItipTest.php | 11 +-
framework/Mime/test/Horde/Mime/MailTest.php | 6 +-
framework/Prefs/package.xml | 7 +
framework/Push/test/Horde/Push/Unit/Push/Recipient/MailTest.php | 10 +-
.../test/Horde/SessionHandler/Storage/MemcacheTest.php | 5 +-
.../test/Horde/SessionHandler/Storage/StackTest.php | 28 +-
framework/Util/test/Horde/Util/StringTest.php | 5 +
framework/Vfs/test/Horde/Vfs/FileTest.php | 39 --
imp/docs/CHANGES | 3 +
imp/js/dimpbase.js | 1 -
imp/js/smartmobile.js | 2 +-
imp/lib/Ajax/Application/Handler/Dynamic.php | 7 +-
imp/package.xml | 4 +
ingo/docs/CHANGES | 2 +
ingo/js/smartmobile.js | 4 +-
ingo/package.xml | 2 +
mnemo/templates/memo/memo.inc | 2 +-
turba/docs/CHANGES | 2 +
turba/js/smartmobile.js | 35 +-
turba/package.xml | 2 +
wicked/docs/CHANGES | 2 -
wicked/lib/Page.php | 34 ++-
wicked/lib/Text_Wiki/Parse/Default/Heading2.php | 16 +
wicked/lib/Text_Wiki/Render/Latex/Heading2.php | 7 +
wicked/lib/Text_Wiki/Render/Plain/Heading2.php | 7 +
wicked/lib/Text_Wiki/Render/Rst/Heading.php | 103 -----
wicked/lib/Text_Wiki/Render/Rst/Heading2.php | 103 +++++
wicked/lib/Text_Wiki/Render/Rst/List.php | 5 +-
wicked/lib/Text_Wiki/Render/Xhtml/Heading2.php | 7 +
wicked/package.xml | 23 +-
49 files changed, 476 insertions(+), 302 deletions(-)
http://git.horde.org/horde-git/-/commit/a6023f8f7b07f66d4707a12af9a4eb5426ec8f57
More information about the commits
mailing list