[commits] Horde branch develop updated. c5b94a3f7859c0d3a283fc1a8e158879c9c179d6

[Michael J. Rubinsky]

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

from: b009bbc6c3f8ade37c64179157a385b660f25c47

186826b Use built-in method to create addresses
f083713 Make sure that default values from IMP prefs are added to any identities created by Horde.
92760af Don't give up when we can't access one calendar, keep trying the others.
4a14f1d Hotfix to allow default values for HTML signatures.
16081c8 spacing
c5b94a3 Merge branch 'master' into develop

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

commit 186826b1ed4ea07d4975bcb58991febaef62107a
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Wed Feb 22 11:28:47 2012 -0700

    Use built-in method to create addresses

 framework/Mail/lib/Horde/Mail/Transport.php |    9 ++++-----
 1 files changed, 4 insertions(+), 5 deletions(-)

http://git.horde.org/horde-git/-/commit/186826b1ed4ea07d4975bcb58991febaef62107a

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

commit f083713a3032d180f149ce4522890f0447aeb152
Author: Jan Schneider <jan at horde.org>
Date:   Thu Feb 23 19:32:23 2012 +0100

    Make sure that default values from IMP prefs are added to any identities created by Horde.
    
    Conflicts:
    
    	imp/lib/Prefs/Identity.php

 imp/lib/Prefs/Identity.php |   32 +++++++++++++++++++++++---------
 1 files changed, 23 insertions(+), 9 deletions(-)

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

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

commit 92760afff766f341cea6d0ab28a60e7331f04668
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Thu Feb 23 14:00:08 2012 -0500

    Don't give up when we can't access one calendar, keep trying the others.

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

http://git.horde.org/horde-git/-/commit/92760afff766f341cea6d0ab28a60e7331f04668

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

commit 4a14f1dcc286da845cf14655ffa1d77e9e3dde0b
Author: Jan Schneider <jan at horde.org>
Date:   Sat Feb 25 14:30:03 2012 +0100

    Hotfix to allow default values for HTML signatures.
    
    This implements the same functionality like commit
    aaa905e5a75b37314e871783f8d9d594c92008ab. The some won't work in master
    though because it's a BC break.

 framework/Core/js/identityselect.js    |    5 +++++
 horde/docs/CHANGES                     |    1 +
 horde/package.xml                      |    2 ++
 imp/docs/CHANGES                       |    1 +
 imp/lib/Prefs/Ui.php                   |    1 +
 imp/package.xml                        |    2 ++
 imp/templates/prefs/signaturehtml.html |    2 +-
 7 files changed, 13 insertions(+), 1 deletions(-)

http://git.horde.org/horde-git/-/commit/4a14f1dcc286da845cf14655ffa1d77e9e3dde0b

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

commit 16081c80d633921f75a55667347634bc742e10cb
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Sat Feb 18 20:24:57 2012 -0500

    spacing

 kronolith/lib/Application.php |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

http://git.horde.org/horde-git/-/commit/16081c80d633921f75a55667347634bc742e10cb

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

commit c5b94a3f7859c0d3a283fc1a8e158879c9c179d6
Merge: b009bbc 16081c8
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Sat Feb 25 20:42:37 2012 -0500

    Merge branch 'master' into develop
    
    Conflicts:
    	framework/Core/js/identityselect.js
    	imp/lib/Prefs/Identity.php

 framework/Mail/lib/Horde/Mail/Transport.php |    9 ++++-----
 horde/docs/CHANGES                          |    1 +
 horde/package.xml                           |    2 ++
 imp/docs/CHANGES                            |    1 +
 imp/lib/Prefs/Ui.php                        |    1 +
 imp/package.xml                             |    2 ++
 imp/templates/prefs/signaturehtml.html      |    2 +-
 kronolith/lib/Api.php                       |    5 ++++-
 kronolith/lib/Application.php               |    2 +-
 9 files changed, 17 insertions(+), 8 deletions(-)

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