[koha-commits] main Koha release repository branch, 3.2.x, updated. v3.02.00-129-g8dc027d

[Git repo owner]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "main Koha release repository".

The branch, 3.2.x has been updated
       via  8dc027db127e82b1230d7240fb1f24a92231c253 (commit)
       via  4fed97397a3986fbba4a5cddaf3bfaa38eb870cd (commit)
      from  8f2e2f07ac047908e614400ea944647b2e0378bf (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 8dc027db127e82b1230d7240fb1f24a92231c253
Author: Galen Charlton <gmcharlt at gmail.com>
Date:   Sat Nov 13 09:36:15 2010 -0500

    bug 5400: new test case to find files with merge conflict markers
    
    Signed-off-by: Galen Charlton <gmcharlt at gmail.com>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    (cherry picked from commit 4cef5ec9611cc2fbbd245472b60e1580f6f8b4b5)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit 4fed97397a3986fbba4a5cddaf3bfaa38eb870cd
Author: Owen Leonard <oleonard at myacpl.org>
Date:   Tue Sep 7 15:48:03 2010 +0200

    Fix for Bug 4498 - Acq always shows '1 suggestions waiting'
    
    - Removing 'suggestions waiting' link from left-hand menu. A plain
      'suggestions' link is still shown if suggestions are enabled.
    - Putting back the 'pending suggestions' box that used to appear
      on the Acquisitions home page. This will show, with a count
      of pending suggestions, only if suggestions are turned on and
      there are pending suggestions.
    
    Signed-off-by: Katrin Fischer <katrin.fischer at bsz-bw.de>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    (cherry picked from commit d9de6ebab3ecca5e967c658541c0ec62db0ae2e7)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

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

Summary of changes:
 acqui/acqui-home.pl                                |    6 +++-
 .../prog/en/includes/acquisitions-menu.inc         |    5 +--
 .../prog/en/modules/acqui/acqui-home.tmpl          |    9 +++++
 t/{00-valid-xml.t => 00-merge-conflict-markers.t}  |   35 ++++++++++++++------
 4 files changed, 40 insertions(+), 15 deletions(-)
 copy t/{00-valid-xml.t => 00-merge-conflict-markers.t} (53%)


hooks/post-receive
-- 
main Koha release repository