[koha-commits] main Koha release repository branch 17.11.x updated. v17.11.11-33-gc2ba4a0

[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.11.x has been updated
       via  c2ba4a05fde5a9db976a6e871adac78f0b57f5ca (commit)
       via  2e897ba4f4f537b3a8c53c88885baab29684efe1 (commit)
       via  41872e1ac25e7c7494e02d5bb6d376f8b2b37e3e (commit)
       via  bc171c0649dbd410fd30c0d002ab05fada2ee85c (commit)
      from  ca2f8738ce72a66061cb8911c77c47ffc4ee104d (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 c2ba4a05fde5a9db976a6e871adac78f0b57f5ca
Author: Fridolin Somers <fridolin.somers at biblibre.com>
Date:   Fri Nov 9 15:47:30 2018 +0100

    Bug 19181: [17.11.x] pick opac_base_url

commit 2e897ba4f4f537b3a8c53c88885baab29684efe1
Author: Caroline Cyr La Rose <caroline.cyr-la-rose at inlibro.com>
Date:   Thu Oct 4 14:52:53 2018 -0400

    Bug 21490: Disambiguation of 'Order' part 2
    
    This patch changes the 'Order' term in neworderbiblio.tt,
    newordersubscription.tt, newordersuggestion.tt, and
    z3950_search.tt for 'Place order'.
    
    Signed-off-by: Owen Leonard <oleonard at myacpl.org>
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    
    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
    (cherry picked from commit 706d21ee53dd5072eec2234415fc5c8ff4b1ea17)
    Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
    (cherry picked from commit 50166e670b38f40ae0503c4c6eb6f95fd2ce0d16)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

commit 41872e1ac25e7c7494e02d5bb6d376f8b2b37e3e
Author: Caroline Cyr La Rose <caroline.cyr-la-rose at inlibro.com>
Date:   Thu Oct 4 14:38:25 2018 -0400

    Bug 21490: Disambiguation of 'Order'
    
    This patch changes the 'Order' term in marc_modification_template.tt
    for 'Rank'.
    
    Signed-off-by: Owen Leonard <oleonard at myacpl.org>
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    
    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
    (cherry picked from commit 5ca776d6e171de1b093163ab83ba589d5ae4d7cc)
    Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
    (cherry picked from commit b3f1bb0693ba9ac6a5e5f6143558505ddd00d586)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

commit bc171c0649dbd410fd30c0d002ab05fada2ee85c
Author: Nick Clemens <nick at bywatersolutions.com>
Date:   Tue Oct 16 14:00:59 2018 +0000

    Bug 21579: Make showdiffmarc.pl work for authorities and biblios
    
    To test:
     1 - Have or make some authority records
     2 - Have or make an authority matching rule
     3 - Export your authrotities
     4 - Import them using the matching rule
     5 - On the 'Manage staged records' page view some diffs
     6 - The import record is correct, but the existing records pull form
     bibs
     7 - Apply patch
     8 - Repeat
     9 - Confirm you see the expected authority matches
    
    Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
    
    Signed-off-by: Marjorie Vila <marjorie.barry-vila at collecto.ca>
    
    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 7f0207d2ad162a86cf5e09e437565b66b91c5004)
    Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
    (cherry picked from commit ab630ab84f2f40145c24664a72da8bc0817cac66)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

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

Summary of changes:
 .../prog/en/modules/acqui/neworderbiblio.tt        |    4 +--
 .../prog/en/modules/acqui/newordersubscription.tt  |    9 +++---
 .../prog/en/modules/acqui/newordersuggestion.tt    |    4 +--
 .../prog/en/modules/acqui/z3950_search.tt          |   14 ++++----
 .../modules/tools/marc_modification_templates.tt   |    2 +-
 .../prog/en/modules/tools/showdiffmarc.tt          |    6 ++--
 t/lib/Selenium.pm                                  |    4 ++-
 tools/batch_records_ajax.pl                        |    2 +-
 tools/showdiffmarc.pl                              |   34 ++++++++++++--------
 9 files changed, 45 insertions(+), 34 deletions(-)


hooks/post-receive
-- 
main Koha release repository