[commits] Horde branch master updated. 21330388d96f9da439fc6d009be8dc70b51025ec

Thu Sep 6 16:17:50 UTC 2012

The branch "master" has been updated.
The following is a summary of the commits.

from: 862a20747f33485e0366f8db62f9484d6cf4bd27

e8278fb This is removing, not deleting.
de27e43 Escape
fcfba00 Fix button.
d45b5d1 Fix extended exception.
6bcff21 [jan] Fix error handling in Fopen driver if a custom error handler is installed.
fe70f28 [jan] Add verifyPeer request option to disable verification of certification peers during SSL request.
9c63ac3 Don't verify SSL peers when retrieving FB data.
c8237f7 Remove label here too.
2c74dd9 [jan] Fix accidental deletion of all attachments (Bug #10875).
965fbd9 Don't return, actually delete the page (Bug #10875).
5de3688 Released wicked-1.0.2
2133038 Development mode for wicked-1.0.3

-----------------------------------------------------------------------

commit e8278fbb33a91d2cd01a76035441c0381f743df3
Author: Jan Schneider <jan at horde.org>
Date:   Tue Sep 4 18:02:55 2012 +0200

    This is removing, not deleting.

 imp/templates/imp/contacts/contacts.html |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

http://git.horde.org/horde-git/-/commit/e8278fbb33a91d2cd01a76035441c0381f743df3

-----------------------------------------------------------------------

commit de27e43c9bfa0f0ee18085eef73ac61d90159a39
Author: Jan Schneider <jan at horde.org>
Date:   Wed Sep 5 15:11:46 2012 +0200

    Escape

 imp/templates/itip/action.html.php |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

http://git.horde.org/horde-git/-/commit/de27e43c9bfa0f0ee18085eef73ac61d90159a39

-----------------------------------------------------------------------

commit fcfba0054d83c9b4451f9740b257b3d412616d92
Author: Jan Schneider <jan at horde.org>
Date:   Wed Sep 5 15:36:19 2012 +0200

    Fix button.

 kronolith/templates/edit/edit.inc |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

http://git.horde.org/horde-git/-/commit/fcfba0054d83c9b4451f9740b257b3d412616d92

-----------------------------------------------------------------------

commit d45b5d149ae4f277852b5c5bfb863cd3b7b9c93c
Author: Jan Schneider <jan at horde.org>
Date:   Wed Sep 5 18:34:18 2012 +0200

    Fix extended exception.

 framework/Http/lib/Horde/Http/Exception.php |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

http://git.horde.org/horde-git/-/commit/d45b5d149ae4f277852b5c5bfb863cd3b7b9c93c

-----------------------------------------------------------------------

commit 6bcff218c5ad99a5dbb75bf9cd479172df033bfd
Author: Jan Schneider <jan at horde.org>
Date:   Wed Sep 5 18:35:45 2012 +0200

    [jan] Fix error handling in Fopen driver if a custom error handler is installed.

 framework/Http/lib/Horde/Http/Request/Fopen.php |   31 ++++++++++++++++++++---
 framework/Http/package.xml                      |    8 +++---
 2 files changed, 31 insertions(+), 8 deletions(-)

http://git.horde.org/horde-git/-/commit/6bcff218c5ad99a5dbb75bf9cd479172df033bfd

-----------------------------------------------------------------------

commit fe70f285833a1f9586ac62d31b349642ad11ee90
Author: Jan Schneider <jan at horde.org>
Date:   Wed Sep 5 18:37:27 2012 +0200

    [jan] Add verifyPeer request option to disable verification of certification peers during SSL request.

 framework/Http/lib/Horde/Http/Client.php           |    2 ++
 framework/Http/lib/Horde/Http/Request/Base.php     |    3 ++-
 framework/Http/lib/Horde/Http/Request/Curl.php     |    1 +
 framework/Http/lib/Horde/Http/Request/Fopen.php    |    1 +
 framework/Http/lib/Horde/Http/Request/Peclhttp.php |   15 ++++++---------
 framework/Http/package.xml                         |    2 ++
 6 files changed, 14 insertions(+), 10 deletions(-)

http://git.horde.org/horde-git/-/commit/fe70f285833a1f9586ac62d31b349642ad11ee90

-----------------------------------------------------------------------

commit 9c63ac349c2f0f9e4e89488923f6c68fd26d5a8c
Author: Jan Schneider <jan at horde.org>
Date:   Wed Sep 5 18:39:47 2012 +0200

    Don't verify SSL peers when retrieving FB data.

 kronolith/lib/FreeBusy.php |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

http://git.horde.org/horde-git/-/commit/9c63ac349c2f0f9e4e89488923f6c68fd26d5a8c

-----------------------------------------------------------------------

commit c8237f76234d495be1fd21603c14ff2cd5344a84
Author: Jan Schneider <jan at horde.org>
Date:   Thu Sep 6 17:18:44 2012 +0200

    Remove label here too.

 imp/mailbox.php |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

http://git.horde.org/horde-git/-/commit/c8237f76234d495be1fd21603c14ff2cd5344a84

-----------------------------------------------------------------------

commit 2c74dd98bfa2d5723e90d606adccd5035535b37c
Author: Jan Schneider <jan at horde.org>
Date:   Thu Sep 6 18:00:17 2012 +0200

    [jan] Fix accidental deletion of all attachments (Bug #10875).

    Conflicts:

    	wicked/package.xml

 wicked/docs/CHANGES       |    1 +
 wicked/lib/Driver.php     |    4 ++++
 wicked/lib/Driver/Sql.php |    6 +++---
 wicked/package.xml        |    1 +
 4 files changed, 9 insertions(+), 3 deletions(-)

http://git.horde.org/horde-git/-/commit/2c74dd98bfa2d5723e90d606adccd5035535b37c

-----------------------------------------------------------------------

commit 965fbd91ade80ceaca14a4b80273a2a376ab4b78
Author: Jan Schneider <jan at horde.org>
Date:   Thu Sep 6 18:05:10 2012 +0200

    Don't return, actually delete the page (Bug #10875).

 wicked/lib/Driver/Sql.php |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

http://git.horde.org/horde-git/-/commit/965fbd91ade80ceaca14a4b80273a2a376ab4b78

-----------------------------------------------------------------------

commit 5de36884d8281a80ffee0929c14840981fef1de6
Author: Jan Schneider <jan at horde.org>
Date:   Thu Sep 6 18:10:33 2012 +0200

    Released wicked-1.0.2

    Conflicts:

    	wicked/docs/CHANGES
    	wicked/lib/Application.php
    	wicked/package.xml

 wicked/docs/CHANGES |    6 ++++++
 wicked/package.xml  |    6 +++---
 2 files changed, 9 insertions(+), 3 deletions(-)

http://git.horde.org/horde-git/-/commit/5de36884d8281a80ffee0929c14840981fef1de6

-----------------------------------------------------------------------

commit 21330388d96f9da439fc6d009be8dc70b51025ec
Author: Jan Schneider <jan at horde.org>
Date:   Thu Sep 6 18:10:49 2012 +0200

    Development mode for wicked-1.0.3

    Conflicts:

    	wicked/docs/CHANGES
    	wicked/lib/Application.php
    	wicked/package.xml

 wicked/package.xml |   15 ++++++++++++++-
 1 files changed, 14 insertions(+), 1 deletions(-)

http://git.horde.org/horde-git/-/commit/21330388d96f9da439fc6d009be8dc70b51025ec