[commits] Horde branch master updated. 265496dc566071f6daf23ef593cd97028b935256

[Jan Schneider]

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

from: a897982ef9a17ac6ea49582b8f3c7c71c3292658

ef69474 Merge description.
d07d506 Re-import horde configuration too, applications are allowed to overwrite horde configurations.
abac668 Add logout().
78dd1b0 Don't try to decode if the result is empty.
ae35fe0 Attach error details.
273db85 Return address book permissions too, plus converted to Horde permissions.
c0501d9 phpdoc
b1e2382 Return more contact fields.
9b2a8b9 Avoid one configuration lookup.
98c1596 Add option to only return current user's shares.
265496d [jan] Add script to import contacts from Open-Xchange.

Summary: http://github.com/horde/horde/compare/a897982ef9a17ac6ea49582b8f3c7c71c3292658...265496dc566071f6daf23ef593cd97028b935256

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

commit ef694745d74f2ba4bfd9ccf170ab87114ddee6a4
Author: Jan Schneider <jan at horde.org>
Date:   Thu Mar 13 12:34:58 2014 +0100

    Merge description.

 imp/docs/RELEASE_NOTES |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

http://github.com/horde/horde/commit/ef694745d74f2ba4bfd9ccf170ab87114ddee6a4
http://git.horde.org/horde-git/-/commit/ef694745d74f2ba4bfd9ccf170ab87114ddee6a4

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

commit d07d50688ba22f82a21b72a7feef572f6c534d29
Author: Jan Schneider <jan at horde.org>
Date:   Fri Mar 14 15:40:35 2014 +0100

    Re-import horde configuration too, applications are allowed to overwrite horde configurations.

 framework/Core/lib/Horde/Registry.php |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

http://github.com/horde/horde/commit/d07d50688ba22f82a21b72a7feef572f6c534d29
http://git.horde.org/horde-git/-/commit/d07d50688ba22f82a21b72a7feef572f6c534d29

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

commit abac66842525cd8f14faa1a81526f77a1150830d
Author: Jan Schneider <jan at horde.org>
Date:   Fri Mar 14 15:41:23 2014 +0100

    Add logout().

 framework/OpenXchange/lib/Horde/OpenXchange/Base.php |   21 ++++++++++++++++++
 1 files changed, 21 insertions(+), 0 deletions(-)

http://github.com/horde/horde/commit/abac66842525cd8f14faa1a81526f77a1150830d
http://git.horde.org/horde-git/-/commit/abac66842525cd8f14faa1a81526f77a1150830d

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

commit 78dd1b0b78e6c4dab02a430c9e0080075a55122a
Author: Jan Schneider <jan at horde.org>
Date:   Fri Mar 14 15:41:50 2014 +0100

    Don't try to decode if the result is empty.

 framework/OpenXchange/lib/Horde/OpenXchange/Base.php |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

http://github.com/horde/horde/commit/78dd1b0b78e6c4dab02a430c9e0080075a55122a
http://git.horde.org/horde-git/-/commit/78dd1b0b78e6c4dab02a430c9e0080075a55122a

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

commit ae35fe0c43bfff35eb0d66e28da7b7f3b5273fbc
Author: Jan Schneider <jan at horde.org>
Date:   Fri Mar 14 15:42:04 2014 +0100

    Attach error details.

 framework/OpenXchange/lib/Horde/OpenXchange/Base.php |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

http://github.com/horde/horde/commit/ae35fe0c43bfff35eb0d66e28da7b7f3b5273fbc
http://git.horde.org/horde-git/-/commit/ae35fe0c43bfff35eb0d66e28da7b7f3b5273fbc

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

commit 273db8567375c3eb8d9e5f881fd35f44cb952d08
Author: Jan Schneider <jan at horde.org>
Date:   Fri Mar 14 15:43:30 2014 +0100

    Return address book permissions too, plus converted to Horde permissions.

 framework/OpenXchange/lib/Horde/OpenXchange/Contacts.php |   55 +++++++++++++-
 framework/OpenXchange/package.xml                        |    7 ++
 2 files changed, 59 insertions(+), 3 deletions(-)

http://github.com/horde/horde/commit/273db8567375c3eb8d9e5f881fd35f44cb952d08
http://git.horde.org/horde-git/-/commit/273db8567375c3eb8d9e5f881fd35f44cb952d08

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

commit c0501d930b565bfb291d2906457e56ab89317398
Author: Jan Schneider <jan at horde.org>
Date:   Fri Mar 14 15:44:23 2014 +0100

    phpdoc

 turba/lib/Turba.php |    9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

http://github.com/horde/horde/commit/c0501d930b565bfb291d2906457e56ab89317398
http://git.horde.org/horde-git/-/commit/c0501d930b565bfb291d2906457e56ab89317398

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

commit b1e2382b1bd426f7f9db3c42bafca779826cbd0f
Author: Jan Schneider <jan at horde.org>
Date:   Fri Mar 14 15:44:44 2014 +0100

    Return more contact fields.

 framework/OpenXchange/lib/Horde/OpenXchange/Contacts.php |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

http://github.com/horde/horde/commit/b1e2382b1bd426f7f9db3c42bafca779826cbd0f
http://git.horde.org/horde-git/-/commit/b1e2382b1bd426f7f9db3c42bafca779826cbd0f

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

commit 9b2a8b9bfe7363321902d0d5c771302707f0a146
Author: Jan Schneider <jan at horde.org>
Date:   Fri Mar 14 15:45:11 2014 +0100

    Avoid one configuration lookup.

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

http://github.com/horde/horde/commit/9b2a8b9bfe7363321902d0d5c771302707f0a146
http://git.horde.org/horde-git/-/commit/9b2a8b9bfe7363321902d0d5c771302707f0a146

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

commit 98c1596ce8927819c3946eefedf78e8304d6d017
Author: Jan Schneider <jan at horde.org>
Date:   Fri Mar 14 15:45:37 2014 +0100

    Add option to only return current user's shares.

 turba/lib/Turba.php |   12 +++++++-----
 1 files changed, 7 insertions(+), 5 deletions(-)

http://github.com/horde/horde/commit/98c1596ce8927819c3946eefedf78e8304d6d017
http://git.horde.org/horde-git/-/commit/98c1596ce8927819c3946eefedf78e8304d6d017

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

commit 265496dc566071f6daf23ef593cd97028b935256
Author: Jan Schneider <jan at horde.org>
Date:   Fri Mar 14 15:47:17 2014 +0100

    [jan] Add script to import contacts from Open-Xchange.

 turba/bin/turba-import-openxchange |  246 ++++++++++++++++++++++++++++++++++++
 turba/docs/CHANGES                 |    1 +
 turba/package.xml                  |   15 ++-
 3 files changed, 260 insertions(+), 2 deletions(-)
 create mode 100755 turba/bin/turba-import-openxchange

http://github.com/horde/horde/commit/265496dc566071f6daf23ef593cd97028b935256
http://git.horde.org/horde-git/-/commit/265496dc566071f6daf23ef593cd97028b935256