[koha-commits] main Koha release repository branch 17.05.x updated. v17.05.06-12-g3789dd1

[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, 17.05.x has been updated
       via  3789dd122c57d660cdac39e14ab774eb7fd2a444 (commit)
       via  6c2b701b7b856a2db91ad07d6fe845598eeb1e98 (commit)
       via  0b8790dc91e04fc5933babaec91789fe37499d60 (commit)
      from  642355033e38bfb60144c4384f08e7a4b01b3e23 (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 3789dd122c57d660cdac39e14ab774eb7fd2a444
Author: David Bourgault <david.bourgault at inlibro.com>
Date:   Wed Nov 22 13:58:21 2017 -0500

    Bug 19681: Correct result count formatting
    
    This simply passes the missing information to the template.
    
    Test plan:
    0) Apply patch
    1) Go to Tools > Label creator > New > Label batch
    2) Press 'Add items'
    3) Do a search that will return few items
    4) The result count will read "Results 1 through X of X"
    
    Signed-off-by: Owen Leonard <oleonard at myacpl.org>
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    
    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
    (cherry picked from commit ef8c92ce21e1ea983da3445045236939b1de90fe)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

commit 6c2b701b7b856a2db91ad07d6fe845598eeb1e98
Author: Simon Pouchol <simon.pouchol at biblibre.com>
Date:   Fri Nov 24 16:53:49 2017 +0100

    Bug 19692: fix unclosed div in opac-shelves.tt
    
    Test plan:
    1. set syspref OpacKohaUrl to "Show"
    2. Log into the OPAC
    3. /cgi-bin/koha/opac-shelves.pl
    4. Notice that "Powered by Koha" is not in the footer in this page.
      When on the other tabs it's in the footer (out of .main)
    5. Apply this patch
    6. Notice that "Powered by Koha" now in the footer in the "your lists" page
    
    Signed-off-by: Dominic Pichette <dominic at inlibro.com>
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    
    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
    (cherry picked from commit 30f2b40f3c408a1f81eae57c5012e6283eccb3d0)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

commit 0b8790dc91e04fc5933babaec91789fe37499d60
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date:   Thu Oct 26 07:35:53 2017 -0400

    Bug 19533: Hold pulldown for itemtype is empty if hold placement needs override
    
    Test Plan:
    1) Enable AllowHoldPolicyOverride
    2) Enable AllowHoldItemTypeSelection
    3) Create a situation where adding a hold for a patron would trigger a tooManyReserves
       warning.
    4) Note the itemtype pulldown is empty
    5) Apply this patch
    6) Reload the page
    7) Itemtype pulldown should have values
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    
    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
    (cherry picked from commit e2d05f3fdfde20977ca5525510e8f4c0daa964f1)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

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

Summary of changes:
 koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shelves.tt |    2 +-
 labels/label-item-search.pl                              |    2 ++
 reserve/request.pl                                       |    2 ++
 3 files changed, 5 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
main Koha release repository