[commits] Horde branch develop updated. 185dc8ebeef08938980188bdb3ba84574e31838a

[Jan Schneider]

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

from: 02e8e51c7e9707c201df0e71a92ae225573ffdfb

de51d1c Fix parse error.
150373b Use changePage after reporting/deleting messages.
75aa9bb [jan] Add parameters to specify field size of phone and email fields.
316836b Merge branch 'master' into develop
185dc8e [jan] Add parameters to specify field size of phone and email fields.

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

commit de51d1c310ef510984451f209fa8221a19938c60
Author: Jan Schneider <jan at horde.org>
Date:   Sun Apr 1 14:20:46 2012 +0200

    Fix parse error.

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

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

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

commit 150373b70c7c27608ffb367b387cc23c44656c9d
Author: Jan Schneider <jan at horde.org>
Date:   Sun Apr 1 16:50:56 2012 +0200

    Use changePage after reporting/deleting messages.

 imp/js/mobile.js |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

http://git.horde.org/horde-git/-/commit/150373b70c7c27608ffb367b387cc23c44656c9d

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

commit 75aa9bb2258573e44cb2adf3f831b0d04caccfc6
Author: Jan Schneider <jan at horde.org>
Date:   Sun Apr 1 16:53:57 2012 +0200

    [jan] Add parameters to specify field size of phone and email fields.

 framework/Core/lib/Horde/Core/Ui/VarRenderer/Html.php |    6 ++-
 framework/Core/package.xml                            |   12 +++--
 framework/Form/lib/Horde/Form/Type.php                |   47 ++++++++++++++++-
 framework/Form/package.xml                            |   12 ++--
 4 files changed, 62 insertions(+), 15 deletions(-)

http://git.horde.org/horde-git/-/commit/75aa9bb2258573e44cb2adf3f831b0d04caccfc6

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

commit 316836b22638155977d1597b9ba598ebadd79deb
Merge: 150373b 75aa9bb
Author: Jan Schneider <jan at horde.org>
Date:   Sun Apr 1 16:55:19 2012 +0200

    Merge branch 'master' into develop
    
    Conflicts:
    	framework/Core/package.xml

 framework/Core/lib/Horde/Core/Ui/VarRenderer/Html.php |    6 ++-
 framework/Core/package.xml                            |    7 ++-
 framework/Form/lib/Horde/Form/Type.php                |   47 ++++++++++++++++-
 framework/Form/package.xml                            |   12 ++--
 4 files changed, 59 insertions(+), 13 deletions(-)

http://git.horde.org/horde-git/-/commit/316836b22638155977d1597b9ba598ebadd79deb

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

commit 185dc8ebeef08938980188bdb3ba84574e31838a
Author: Jan Schneider <jan at horde.org>
Date:   Sun Apr 1 16:56:55 2012 +0200

    [jan] Add parameters to specify field size of phone and email fields.

 turba/config/attributes.php |   67 +++++++++++++++++++++++++++---------------
 turba/docs/CHANGES          |    1 +
 turba/package.xml           |    6 ++--
 3 files changed, 47 insertions(+), 27 deletions(-)

http://git.horde.org/horde-git/-/commit/185dc8ebeef08938980188bdb3ba84574e31838a