[koha-commits] main Koha release repository branch 18.05.x updated. v18.05.06-15-gdab7e22

Fri Dec 7 20:05:38 CET 2018

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, 18.05.x has been updated
       via  dab7e22c68dd9328bf2768e7e20e444f1311c875 (commit)
       via  7d7f110cefc3e1ee2260424bcd2a55f6fb9ce07d (commit)
       via  21536e3314091778c9baf2984097715e071abfbc (commit)
       via  320f9bf3d29b145eb2c6948ae517d0fe2e704f5f (commit)
       via  857b1524a9925ecbdd2839c33caee4ab1055f104 (commit)
       via  cdf27235f4e76962283fd63aaae68d87c396dfef (commit)
      from  1d797a8e5cf960dac27c1d0b47771bc379a1b239 (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 dab7e22c68dd9328bf2768e7e20e444f1311c875
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Mon Oct 22 17:52:46 2018 -0300

    Bug 21529: (bug 13618 follow-up) Display print notices with HTML tags

    Replace a wrong html filter with raw.

    Test plan:
    Define a HOLD or DISCHARGE notice template, with html tags.
    Generate them and confirm that html tags are displayed (which restore
    the existing behaviour prior to bug 13618)

    Signed-off-by: Andrew Isherwood <andrew.isherwood at ptfs-europe.com>
    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: Nick Clemens <nick at bywatersolutions.com>
    (cherry picked from commit b704a1adfc3fcee739194d7d6cb79800ba991e51)

    Signed-off-by: Jesse Maseto <jesse at bywatersolution.com>

commit 7d7f110cefc3e1ee2260424bcd2a55f6fb9ce07d
Author: Andrew Isherwood <andrew.isherwood at ptfs-europe.com>
Date:   Mon Oct 29 14:10:42 2018 +0000

    Bug 21529: (follow-up) USE raw filter

    In order to be able to make use of the $raw filter, we need to USE it
    first

    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: Nick Clemens <nick at bywatersolutions.com>
    (cherry picked from commit a1d24a2b61359552942fc2420fe18c093c169191)

    Signed-off-by: Jesse Maseto <jesse at bywatersolution.com>

commit 21536e3314091778c9baf2984097715e071abfbc
Author: Mark Tompsett <mtompset at hotmail.com>
Date:   Sun Nov 18 05:36:44 2018 +0000

    Bug 21853: (follow-up) to solve printpdf error

    Signed-off-by: Mark Tompsett <mtompset at hotmail.com>

    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    Theoretically this follow-up makes no difference. All modules only export
    printpdf and now we are just asking explicitly for printpdf. But if it
    resolves some exception on the rule..

    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
    (cherry picked from commit 5b62714e47d5acd0a4c371024edacc02cfe6f5b5)

    Signed-off-by: Jesse Maseto <jesse at bywatersolution.com>

commit 320f9bf3d29b145eb2c6948ae517d0fe2e704f5f
Author: Julian Maurice <julian.maurice at biblibre.com>
Date:   Sat Nov 17 11:58:02 2018 +0100

    Bug 21853: Fix PDF export of basketgroups

    In recent versions of Perl, '.' is not included by default in @INC. This
    breaks PDF export of basketgroups.

    This patch moves acqui/pdfformat/*.pm files in Koha namespace so that
    they can be 'require'd without manipulating @INC

    Test plan:
    1. Turn off Plack/Starman and test PDF export for every value of
       OrderPdfFormat system preference
    2. Turn on Plack/Starman and test PDF export for every value of
       OrderPdfFormat system preference
    3. Test on a dev install and a standard/package install

    Signed-off-by: Mark Tompsett <mtompset at hotmail.com>

    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>

    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
    (cherry picked from commit 3c18d4c18fad5a0d470c7bdf1ac746a640f25099)

    Signed-off-by: Jesse Maseto <jesse at bywatersolution.com>

commit 857b1524a9925ecbdd2839c33caee4ab1055f104
Author: Mirko Tietgen <mirko at abunchofthings.net>
Date:   Fri Nov 16 00:07:14 2018 +0100

    Bug 21567: Move Koha_ExternalContent_OverDrive.t to db_dependent

    This tests pass on the build step only because they are skipped, due to
    the absense of Test::DBIx::Class library.

    It makes sense for them to be in the db_dependent directory, as they are
    not completely mocked (re: external world interactions).

    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>

    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
    (cherry picked from commit 4e78070b80a24410de57e7b0c6da4db6bd2e3a7e)

    Signed-off-by: Jesse Maseto <jesse at bywatersolution.com>

commit cdf27235f4e76962283fd63aaae68d87c396dfef
Author: Katrin Fischer <katrin.fischer.83 at web.de>
Date:   Sat Nov 3 08:29:39 2018 +0000

    Bug 21815: Rephrase HidePersonalPatronDetailOnCirculation

    Makes it a little easier to translate, also fixes whitespace and capitalization.

    Signed-off-by: Devinim <kohadevinim at devinim.com.tr>

    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>

    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
    (cherry picked from commit 43d8946d5934151d38dc95b7162674dc7e95efb4)

    Signed-off-by: Jesse Maseto <jesse at bywatersolution.com>

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

Summary of changes:
 {acqui => Koha}/pdfformat/layout2pages.pm          |    3 +-
 {acqui => Koha}/pdfformat/layout2pagesde.pm        |    3 +-
 {acqui => Koha}/pdfformat/layout3pages.pm          |    3 +-
 {acqui => Koha}/pdfformat/layout3pagesfr.pm        |    2 +-
 acqui/basketgroup.pl                               |   31 ++++++++++----------
 .../en/modules/admin/preferences/circulation.pref  |    6 ++++
 .../prog/en/modules/batch/print-notices.tt         |    5 ++--
 .../Koha_ExternalContent_OverDrive.t               |    0
 8 files changed, 28 insertions(+), 25 deletions(-)
 rename {acqui => Koha}/pdfformat/layout2pages.pm (99%)
 rename {acqui => Koha}/pdfformat/layout2pagesde.pm (99%)
 rename {acqui => Koha}/pdfformat/layout3pages.pm (99%)
 rename {acqui => Koha}/pdfformat/layout3pagesfr.pm (99%)
 rename t/{ => db_dependent}/Koha_ExternalContent_OverDrive.t (100%)

hooks/post-receive
-- 
main Koha release repository