[commits] Horde branch develop updated. dbe1f7771dc1ca5785cc677bf184e6018cdeba3c

[Michael J. Rubinsky]

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

from: 95c6678a3181196508a6b99469f5632d776e9916

c8c24ac Fix duplicate entry
c762653 Ticket #10681: Only return field names that are searchable
6d70e21 INSTALL tweaks
bc5b08b Ticket #10681: Fix hook
e0db574 Close permission edit screen if ask it to.
4ebecf4 Horde_Share no longer returns PEAR_Errors
bb2a0c9 Expire the gallery's cache entry when permissions are updated.
d86367b Only show delete geotag link if we have EDIT perms on the gallery
d669721 Fix showing ansel map when user does not have Horde_PERMS::EDIT
dbe1f77 Merge branch 'master' into develop

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

commit c8c24accdfd7109bf9890f047010ff27b88bafe2
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Tue Nov 15 19:42:23 2011 -0700

    Fix duplicate entry

 ingo/docs/CHANGES |    2 --
 ingo/package.xml  |    2 --
 2 files changed, 0 insertions(+), 4 deletions(-)

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

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

commit c762653d6c9fd2206f7817d10105bebc4a10efde
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Tue Nov 15 20:11:54 2011 -0700

    Ticket #10681: Only return field names that are searchable

 imp/config/hooks.php.dist |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

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

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

commit 6d70e212f68f71369c6d04baa6ee106207aa287d
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Tue Nov 15 20:18:23 2011 -0700

    INSTALL tweaks

 horde/docs/INSTALL |   29 ++++++++++++++---------------
 1 files changed, 14 insertions(+), 15 deletions(-)

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

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

commit bc5b08ba9bd5b3a0f85bb81687c44c14deee3e89
Author: Michael M Slusarz <slusarz at horde.org>
Date:   Tue Nov 15 20:23:12 2011 -0700

    Ticket #10681: Fix hook

 imp/config/hooks.php.dist |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

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

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

commit e0db5744ce873fc39415615a6469da4723e84536
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Tue Nov 15 20:14:23 2011 -0500

    Close permission edit screen if ask it to.

 ansel/perms.php |   34 ++++++++++++++++++++--------------
 1 files changed, 20 insertions(+), 14 deletions(-)

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

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

commit 4ebecf43b343b041e13f13626ef495367a89e9f8
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Tue Nov 15 20:17:29 2011 -0500

    Horde_Share no longer returns PEAR_Errors

 horde/services/shares/edit.php |   25 +++++++++++--------------
 1 files changed, 11 insertions(+), 14 deletions(-)

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

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

commit bb2a0c9e6f91aafeacddef22f9444db81ae292f9
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Tue Nov 15 20:22:51 2011 -0500

    Expire the gallery's cache entry when permissions are updated.

 ansel/perms.php |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

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

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

commit d86367b500c8d43eb0308dc1c825b721eac51487
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Tue Nov 15 23:58:14 2011 -0500

    Only show delete geotag link if we have EDIT perms on the gallery

 ansel/js/widgets/geotag.js |   21 +++++++++++++--------
 1 files changed, 13 insertions(+), 8 deletions(-)

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

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

commit d669721e43fef86cae840c08fa36221c51bf82ab
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Tue Nov 15 23:58:42 2011 -0500

    Fix showing ansel map when user does not have Horde_PERMS::EDIT
    
    Bug: 10762

 ansel/docs/CHANGES          |    2 ++
 ansel/lib/Widget/Geotag.php |    2 +-
 ansel/package.xml           |    4 ++--
 3 files changed, 5 insertions(+), 3 deletions(-)

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

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

commit dbe1f7771dc1ca5785cc677bf184e6018cdeba3c
Merge: 95c6678 d669721
Author: Michael J Rubinsky <mrubinsk at horde.org>
Date:   Wed Nov 16 00:12:53 2011 -0500

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

 ansel/docs/CHANGES             |    2 ++
 ansel/js/widgets/geotag.js     |   21 +++++++++++++--------
 ansel/lib/Widget/Geotag.php    |    2 +-
 ansel/package.xml              |    4 ++--
 ansel/perms.php                |   38 ++++++++++++++++++++++++--------------
 horde/docs/INSTALL             |   29 ++++++++++++++---------------
 horde/services/shares/edit.php |   25 +++++++++++--------------
 imp/config/hooks.php.dist      |    7 ++++++-
 ingo/package.xml               |    2 +-
 9 files changed, 74 insertions(+), 56 deletions(-)

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