[koha-commits] main Koha release repository branch 16.05.x updated. v16.05.03-90-g78ab481

Thu Sep 15 17:15:07 CEST 2016

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, 16.05.x has been updated
       via  78ab4814f040dccca2b6db7da2cab7164b49ff90 (commit)
       via  0b4d68f0601a494c00b19d14c5af970ff04a0122 (commit)
       via  26ccb6a4809154368e02e5c147414fc7a19d31be (commit)
       via  d9006fd602a8ac472bd9ce38422d82e2b65dd7ec (commit)
       via  40e667cd210b57061ca771caa38a4f6a14c22268 (commit)
       via  0fba9c17c9154379430119646c3571f09d986948 (commit)
       via  f1fa01d7acbb8efd995409b91f07078940d4a4df (commit)
       via  f37cbb96f2a24cc90619089033e7ec4074856a3d (commit)
       via  6e4dbd3f9bf5dde4e700909a258d372ed008cb78 (commit)
       via  25e314bee58af8f0f3fdc4dcd2137378241545d2 (commit)
       via  9d11edefeabbe509e45d8fac7064f5e106533c50 (commit)
       via  a05c4d11de6cf8532ff926873ce84c94cba58019 (commit)
       via  fd02ef7fc26945d0ffd3ed01ff3b716ebaa79270 (commit)
       via  884e877be398cf684988f90ea9fb42639fadcc0e (commit)
       via  ad9d0a3beb612cf69bf80d4ca5f1cbbd05641efd (commit)
      from  cdf0c5dc16de28d9b8df1858aa0d0139a425b86f (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 78ab4814f040dccca2b6db7da2cab7164b49ff90
Author: Magnus Enger <magnus at libriotech.no>
Date:   Thu Sep 8 15:10:33 2016 +0200

    Bug 17266 - Update man page for koha-remove with -p

    Bug 9754 added the -p|--purge-all option to koha-remove, but this
    was not documented in the man page. This patch fixes that.

    To test:
    Run these commands and look at the formatted man page:
    $ xsltproc /usr/share/xml/docbook/stylesheet/docbook-xsl/manpages/docbook.xsl \
      debian/docs/koha-remove.xml
    $ man -l koha-remove.8

    Make sure this test passes:
    $ prove -v xt/verify-debian-docbook.t

    Signed-off-by: Liz Rea <liz at catalyst.net.nz>

    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    (cherry picked from commit a5806c21d0ab58cf2879cb26b1fe52ba4e4c2139)
    Signed-off-by: Frédéric Demians <f.demians at tamil.fr>

commit 0b4d68f0601a494c00b19d14c5af970ff04a0122
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date:   Wed Jul 23 12:43:54 2014 -0400

    Bug 12629 - Software error when trying to merge records from different frameworks

    Test Plan:
    1) Choose a bib record that has the default framework.
    2) Add a second record using that fast add framework.
    3) Merge the records; switch to "Using framework: Default", and choose the original record (i.e. the one that had the default framework) as the merge reference. Clicking 'Next' will trigger the error.
    4) Apply this patch
    5) Repeat steps 1 - 3, no error should occur

    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    (cherry picked from commit e8fcc651a3aa9af9d1a49a6cec64fc9bde737a86)
    Signed-off-by: Frédéric Demians <f.demians at tamil.fr>

commit 26ccb6a4809154368e02e5c147414fc7a19d31be
Author: Olli-Antti Kivilahti <olli-antti.kivilahti at jns.fi>
Date:   Thu May 19 17:12:06 2016 +0300

    Bug 16556 - KohaToMarcMapped columns sharing same field with biblio(item)number are removed.

    REPLICATE ISSUE:

    1. Map biblio.frameworkcode to 999$b
    2. Map biblio.biblionumber to 999$c
    3. Add a record with something in 999$b
    4. 999$b is removed by C4::Biblio::AddBiblio()

    After this patch, the field used by biblio.biblionumber or biblioitems.biblioitemnumber
    is not removed and created anew, thus dropping all existing additions.

    There is no point in dropping the field in any case, since we can just replace
    the existing subfields in-place with no need to recreate the whole field.

    UNIT TESTS INCLUDED

    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>

    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    (cherry picked from commit a9eb4005811882da0eb5e20b52861a3c85556dff)

commit d9006fd602a8ac472bd9ce38422d82e2b65dd7ec
Author: Owen Leonard <oleonard at myacpl.org>
Date:   Tue Aug 9 12:56:46 2016 -0400

    Bug 17010 [Follow-up] Canceling a hold awaiting pickup no longer alerts librarian about next hold

    This patch makes a minor change to the markup to make the button in the
    confirmation dialog conform to the appearance of similar buttons.

    To test, follow the original test plan for this bug and verify that the
    "OK" button in the dialog looks correct.

    Signed-off-by: Liz Rea <liz at catalyst.net.nz>

    Signed-off-by: Katrin Fischer  <katrin.fischer at bsz-bw.de>

    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    (cherry picked from commit 2e79c211db318969b7c9d5ff538dfd54ba1aaed2)
    Signed-off-by: Frédéric Demians <f.demians at tamil.fr>

commit 40e667cd210b57061ca771caa38a4f6a14c22268
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date:   Mon Aug 1 07:17:04 2016 -0700

    Bug 17010 - Canceling a hold awaiting pickup no longer alerts librarian about next hold

    In previous versions of Koha, if a hold canceled from the "Holds over" tab had other holds on it,
    the librarian would be alerted with the message "This item is on hold for pick-up at your library"
    and directed to check it in to fill the next hold. This no longer happens.

    Test Plan:
    1) Apply this patch
    2) Find a hold that has been waiting too long
    3) Cancel that hold via waitingreserves.pl
    4) Note you get the message "This item is on hold for pick-up at your library"
    5) Confirm the ok button redirects you to the correct tab

    Signed-off-by: Owen Leonard <oleonard at myacpl.org>

    Signed-off-by: Katrin Fischer  <katrin.fischer at bsz-bw.de>

    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    (cherry picked from commit b80a18ee2f059309a78087e48b9464d2352d444f)
    Signed-off-by: Frédéric Demians <f.demians at tamil.fr>

commit 0fba9c17c9154379430119646c3571f09d986948
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Fri Aug 12 10:42:28 2016 +0100

    Bug 17114: Fix XSS in picture-upload.pl

    To reproduce:
    1/ cp your_image.jpg 'test<svg onload=alert(1)>.jpg'
    2/ Use the upload picture tool to upload this file
    => Without this patch, the alert is show
    => With this patch, the filename is correctly displayed and no alert

    Note that the cardnumber var was not escaped neither, it's now.

    Signed-off-by: Colin Campbell <colin.campbell at ptfs-europe.com>

    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>

    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    (cherry picked from commit da03dbd458c59da0b9213efacd3425e89b453332)
    Signed-off-by: Frédéric Demians <f.demians at tamil.fr>

commit f1fa01d7acbb8efd995409b91f07078940d4a4df
Author: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
Date:   Fri Aug 12 16:28:41 2016 -0300

    Bug 16554: Fix encoding on it-IT file

    This patch only fixes encoding of file
    installer/data/mysql/it-IT/necessari/sample_numberpatterns.sql

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

    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    (cherry picked from commit a9caebc288463689d6c2a732ee8b900a3ab34a21)
    Signed-off-by: Frédéric Demians <f.demians at tamil.fr>

commit f37cbb96f2a24cc90619089033e7ec4074856a3d
Author: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
Date:   Tue May 24 22:14:13 2016 -0300

    Bug 16554: rewrite mandatory and sample data - de-DE

    More changes to de-DE files

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

    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    (cherry picked from commit 9261fb4f5bd6fd4b25ce97de7be9262b3719544a)
    Signed-off-by: Frédéric Demians <f.demians at tamil.fr>

commit 6e4dbd3f9bf5dde4e700909a258d372ed008cb78
Author: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
Date:   Tue May 24 22:25:56 2016 -0300

    Bug 16554: rewrite mandatory and sample data - it-IT

    More changes to it-IT files

    Checked marc21 and unimarc files
    unimarc_relatorterms.sql had bad encoding, others minor
    errors

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

    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    (cherry picked from commit be4cd79aea6908e0c3bb13b032edaf7a15d2e66e)
    Signed-off-by: Frédéric Demians <f.demians at tamil.fr>

commit 25e314bee58af8f0f3fdc4dcd2137378241545d2
Author: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
Date:   Sat May 28 12:54:30 2016 -0300

    Bug 16554: More i18n changes - en, es, nb and pl files

    Mostly fixes bad values in auth files ( '' -> 0 )

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

    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    (cherry picked from commit 6dc2f1ae7c8e60534b4d6dec979c96034aa17f5d)
    Signed-off-by: Frédéric Demians <f.demians at tamil.fr>

commit 9d11edefeabbe509e45d8fac7064f5e106533c50
Author: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
Date:   Tue May 24 23:31:25 2016 -0300

    Bug 16554: rewrite mandatory and sample data - pl-PL

    More changes to pl-PL files

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

    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    (cherry picked from commit 28191a538b8f3bed698f1e67acca156c5b64ebea)
    Signed-off-by: Frédéric Demians <f.demians at tamil.fr>

commit a05c4d11de6cf8532ff926873ce84c94cba58019
Author: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
Date:   Tue May 24 23:30:14 2016 -0300

    Bug 16554: rewrite mandatory and sample data - nb-NO

    More changes to nb-NO files

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

    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    (cherry picked from commit 4742f1035b9748dd869653f1c608fff1408353f9)
    Signed-off-by: Frédéric Demians <f.demians at tamil.fr>

commit fd02ef7fc26945d0ffd3ed01ff3b716ebaa79270
Author: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
Date:   Tue May 24 22:22:24 2016 -0300

    Bug 16554: rewrite mandatory and sample data - es-ES

    More changes to es-ES files

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

    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    (cherry picked from commit 8cfa6f633a1be9a12a3a98524b05fae47fb4aa02)
    Signed-off-by: Frédéric Demians <f.demians at tamil.fr>

commit 884e877be398cf684988f90ea9fb42639fadcc0e
Author: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
Date:   Wed May 18 22:59:27 2016 -0300

    Bug 16554: Fix I18N sample files

    Needs Bug 13669

    This patch fix web installer for
    de-DE, es-ES, fr-CA, nb-NO and pl-PL

    To test:
    1) Apply patch
    2) Try web installer for any/all listed languages.
    a) de-DE, es-ES, fr-CA and pl-PL
    There must be no problems for marc21 + all sample files
    b) nb-NO
    There must be no problems for normarc + all sample files

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

    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    (cherry picked from commit e38cad45e8ef2df88dc4a2c8345ac1d92f8dd8e8)
    Signed-off-by: Frédéric Demians <f.demians at tamil.fr>

commit ad9d0a3beb612cf69bf80d4ca5f1cbbd05641efd
Author: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
Date:   Wed May 18 23:55:41 2016 -0300

    Bug 16554: Fix fr-FR sample files

    Needs Bug 13669

    Rewrite autorites_norme_unimarc.sql to
    use only one INSERT IGNORE.

    New load method complains about duplicate keys,
    and both auth files are mandatory!

    Also removed blank space from sample_labels.sql

    Tested with unimarc_complet and all sample files.

    To test
    1) Apply the patch
    2) Try fr-FR web installer, unimarc_complet + all sample files
    There must be no errors

    Don't know if fr-FR marc21 and unimarc_lecture_pub are used,
    need a look from french users.

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

    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    (cherry picked from commit b5ae31e7fdcdd932d1475e30fa73fba15c2b2815)
    Signed-off-by: Frédéric Demians <f.demians at tamil.fr>

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

Summary of changes:
 C4/Biblio.pm                                       |   91 +-
 Koha/Util/MARC.pm                                  |    7 +-
 circ/waitingreserves.pl                            |    3 +-
 debian/docs/koha-remove.xml                        |   10 +
 .../marc21/mandatory/authorities_normal_marc21.sql | 3366 ++---
 .../optional/marc21_holdings_coded_values.sql      |    3 +-
 .../data/mysql/de-DE/optional/sample_patrons.sql   |    2 +-
 .../mandatory/authorities_normal_unimarc.sql       | 1368 +-
 .../marc21/mandatory/authorities_normal_marc21.sql | 3366 ++---
 .../mandatory/authorities_normal_unimarc.sql       | 1368 +-
 .../optional/marc21_holdings_coded_values.sql      |    3 +-
 .../data/mysql/es-ES/optional/sample_patrons.sql   |    3 +-
 .../facultatif/marc21_holdings_coded_values.sql    |    3 +-
 .../data/mysql/fr-FR/2-Optionel/sample_labels.sql  |    2 +-
 .../Obligatoire/autorites_norme_unimarc.sql        | 6213 ++++----
 .../marc21/mandatory/authorities_normal_marc21.sql | 3366 ++---
 .../unimarc/necessari/unimarc_framework.sql        |    2 +-
 .../unimarc/opzionali/unimarc_relatorterms.sql     |    4 +-
 .../it-IT/necessari/sample_numberpatterns.sql      |   14 +-
 .../data/mysql/it-IT/necessari/sample_quotes.sql   |   12 +-
 .../2-Valgfritt/marc21_holdings_coded_values.sql   |    3 +-
 .../mysql/nb-NO/2-Valgfritt/sample_patrons.sql     |    2 +-
 .../marc21/mandatory/authorities_normal_marc21.sql |15332 ++++++++++----------
 .../marc21/mandatory/authorities_normal_marc21.sql |15332 ++++++++++----------
 .../mandatory/authorities_normal_unimarc.sql       | 1368 +-
 .../optional/marc21_holdings_coded_values.sql      |    3 +-
 .../data/mysql/pl-PL/optional/sample_patrons.sql   |    2 +-
 .../prog/en/modules/circ/waitingreserves.tt        |    8 +-
 .../prog/en/modules/tools/picture-upload.tt        |    4 +-
 t/Biblio2.t                                        |   55 +
 30 files changed, 25697 insertions(+), 25618 deletions(-)
 create mode 100644 t/Biblio2.t

hooks/post-receive
-- 
main Koha release repository