[commits] Horde branch master updated. e4782b55cd814c1539fb0954dbd4c8521d5bbfec

[Jan Schneider]

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

from: cc81f8d8919fc86597e843103504936752b686a5

50309c5 [jan] Fix setting active tabs in query editor.
84ded40 Fix attaching type name to attribute criteria.
273e8d7 Show correct error message.
e4782b5 [jan] Fix editing single attribute and text criteria in query editor.

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

commit 50309c5634ce15124ac872e7eacb4137ca1242eb
Author: Jan Schneider <jan at horde.org>
Date:   Tue Oct 16 14:07:50 2012 +0200

    [jan] Fix setting active tabs in query editor.
    
    Conflicts:
    
    	whups/package.xml

 whups/docs/CHANGES    |    1 +
 whups/package.xml     |    1 +
 whups/query/index.php |   22 +++++++---------------
 3 files changed, 9 insertions(+), 15 deletions(-)

http://git.horde.org/horde-git/-/commit/50309c5634ce15124ac872e7eacb4137ca1242eb

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

commit 84ded40063f88514729fb788d77118547708d0e3
Author: Jan Schneider <jan at horde.org>
Date:   Tue Oct 16 14:26:05 2012 +0200

    Fix attaching type name to attribute criteria.

 whups/lib/Driver/Sql.php                    |   15 +++++++--------
 whups/lib/Form/Query/AttributeCriterion.php |    2 +-
 whups/lib/Form/Renderer/Query.php           |   12 ++++++++----
 3 files changed, 16 insertions(+), 13 deletions(-)

http://git.horde.org/horde-git/-/commit/84ded40063f88514729fb788d77118547708d0e3

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

commit 273e8d79cfa3d74f84fea9bf11c6394511b5d034
Author: Jan Schneider <jan at horde.org>
Date:   Tue Oct 16 14:29:47 2012 +0200

    Show correct error message.

 whups/lib/Form/Query/AttributeCriterion.php |   33 +++++++++++++--------------
 1 files changed, 16 insertions(+), 17 deletions(-)

http://git.horde.org/horde-git/-/commit/273e8d79cfa3d74f84fea9bf11c6394511b5d034

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

commit e4782b55cd814c1539fb0954dbd4c8521d5bbfec
Author: Jan Schneider <jan at horde.org>
Date:   Tue Oct 16 15:52:20 2012 +0200

    [jan] Fix editing single attribute and text criteria in query editor.
    
    Conflicts:
    
    	whups/package.xml

 whups/docs/CHANGES  |    1 +
 whups/lib/Query.php |    6 ++++++
 whups/package.xml   |    1 +
 3 files changed, 8 insertions(+), 0 deletions(-)

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