[koha-commits] main Koha release repository branch master updated. v3.22.00-485-ge140603

Git repo owner gitmaster at git.koha-community.org
Fri Jan 29 19:12:18 CET 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, master has been updated
       via  e140603a594576180b846cf9299bee4629442c84 (commit)
       via  06e4a50f00efc62bbeb54260350f6f402d2e5e98 (commit)
       via  d6475a111fb701df68862afc6b23a7bfc774787b (commit)
       via  dd98c9df92503885f4f88e4cb6ca4c555fb28ee8 (commit)
       via  a065b243feaef07586779d7943e00bbda6023db3 (commit)
       via  baeeaffbf894d6eb7d12666071d2d9b9ab66e874 (commit)
       via  a967a09261fb2eebf27cc4a2c523122432a37203 (commit)
       via  0e98662b10197b1d92f2fb8ad50206e598a571e6 (commit)
       via  fc2fb605e53d8c5774a952bcf620335fbf77c004 (commit)
       via  bc308fdd9c95b13810bac57a2da9514ff37f570d (commit)
       via  811c4e8402593127074ad47a81098f3aad389c94 (commit)
       via  ca8e8c397c8c2392b85d4c3232309ded66f3b8f1 (commit)
       via  bb417b256b319d8a99ea611b76bad80c4d47004c (commit)
       via  ae5b98020aeec7d56faa7170cbad3319a8245379 (commit)
       via  a7731ffe25e89d900d57e07f8e3de7b398090980 (commit)
       via  11fa38dc29e16d94a5ed81eb9e29b84f7e166d6c (commit)
       via  36c07ad6d3cf57c31bad4b11370b53aafd4d4806 (commit)
       via  e6ea281a3bcd2c3550578e8f2dd188a7701c77fb (commit)
       via  782487455770a59ab7b30b5e92a1a66c28d30b88 (commit)
       via  1834da3da367321771530331e7420ffa94d52979 (commit)
       via  21ae62b25310ea0876b087b729cf0b3a2ad7b1e6 (commit)
       via  602bdbab4c6f86aa136158e1459d800d9530e243 (commit)
       via  d254362435a9ada5dffa8b5ef1c2a19f5d525f5e (commit)
       via  8837a8ae68f8089777b824203f3878735ff96591 (commit)
       via  00eff140b3402a043e31915d1a7b29aec3605433 (commit)
       via  7db851ff03a168fa46d56bb0e472be249dbd5410 (commit)
       via  49a3738b8d54580e80e92e74fdba0483008b5cfd (commit)
       via  cedaa0e23e0927884f1c5ef2cafde4bcdd6d55ff (commit)
       via  01b38d3b13f09b927201cba5eb146b6597d4bfeb (commit)
      from  8dfebb140b9f4afebc278f1da415e29b090c331f (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 e140603a594576180b846cf9299bee4629442c84
Author: Brendan Gallagher <brendan at bywatersolutions.com>
Date:   Fri Jan 29 18:06:28 2016 +0000

    DBRev to make notes of the XSS patches and the new important dependency.
    
    Signed-off-by: Brendan Gallagher <brendan at bywatersolutions.com>

commit 06e4a50f00efc62bbeb54260350f6f402d2e5e98
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Mon Jan 18 11:18:11 2016 +0000

    Bug 13618: Specific for branches.opac_info
    
    Signed-off-by: Brendan Gallagher brendan at bywatersolutions.com

commit d6475a111fb701df68862afc6b23a7bfc774787b
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Thu Jan 7 09:34:52 2016 +0000

    Bug 13618: (follow-up) Specific for other prefs
    
    follow-up for SlipCSS and printslip
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    
    Signed-off-by: Brendan Gallagher brendan at bywatersolutions.com

commit dd98c9df92503885f4f88e4cb6ca4c555fb28ee8
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Thu Jan 7 09:32:28 2016 +0000

    Bug 13618: Fix for debarredcomment and patron messages
    
    At the OPAC and intranet.
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    
    Signed-off-by: Brendan Gallagher brendan at bywatersolutions.com

commit a065b243feaef07586779d7943e00bbda6023db3
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Thu Jan 7 09:31:11 2016 +0000

    Bug 13618: Do not display html tags in patron's notices
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    
    Signed-off-by: Brendan Gallagher brendan at bywatersolutions.com

commit baeeaffbf894d6eb7d12666071d2d9b9ab66e874
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Thu Jan 7 09:29:14 2016 +0000

    Bug 13618: Do not display   and html tags in item fields content
    
    Note that there might be other occurrences to fix!
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    
    Signed-off-by: Brendan Gallagher brendan at bywatersolutions.com

commit a967a09261fb2eebf27cc4a2c523122432a37203
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Thu Jan 7 09:28:26 2016 +0000

    Bug 13618: Fix for system preference description
    
    If a syspref description contains html tag, do not display them
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    
    Signed-off-by: Brendan Gallagher brendan at bywatersolutions.com

commit 0e98662b10197b1d92f2fb8ad50206e598a571e6
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Mon Jan 4 11:58:50 2016 +0000

    Bug 13618: Remove html filters for newly pushed code
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    
    Signed-off-by: Brendan Gallagher brendan at bywatersolutions.com

commit fc2fb605e53d8c5774a952bcf620335fbf77c004
Author: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
Date:   Thu Dec 17 19:48:32 2015 -0300

    Bug 13618: (follow-up) add missing lines for opac-shelves
    
    Proposed patch to fix opac-shelves
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    
    Signed-off-by: Brendan Gallagher brendan at bywatersolutions.com

commit bc308fdd9c95b13810bac57a2da9514ff37f570d
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Thu Dec 17 12:23:00 2015 +0000

    Bug 13618: (follow-up) Specific for ColumnsSettings
    
    Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    
    Signed-off-by: Brendan Gallagher brendan at bywatersolutions.com

commit 811c4e8402593127074ad47a81098f3aad389c94
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Tue Dec 1 12:56:56 2015 +0000

    Bug 13618: Fix for edit biblios and items
    
    On editing biblios or items, the marc_lib, marc_value and javascript
    values are often populated with html code which needs to be displayed
    raw.
    
    Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    
    Signed-off-by: Brendan Gallagher brendan at bywatersolutions.com

commit ca8e8c397c8c2392b85d4c3232309ded66f3b8f1
Author: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
Date:   Wed Nov 25 08:40:29 2015 -0300

    Bug 13618: followup to remove tabs
    
    Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
    This followup on top of remote branch
    Only remove tabs and trailing spaces to make koha-qa pass
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    
    Signed-off-by: Brendan Gallagher brendan at bywatersolutions.com

commit bb417b256b319d8a99ea611b76bad80c4d47004c
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Thu Oct 22 09:06:55 2015 +0100

    Bug 13618: Fix last occurrences recently introduced to master
    
    Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    
    Signed-off-by: Brendan Gallagher brendan at bywatersolutions.com

commit ae5b98020aeec7d56faa7170cbad3319a8245379
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Tue Sep 1 08:55:10 2015 +0100

    Bug 13618: Fix for news
    
    Signed-off-by: Signed-off-by: Joonas Kylmälä <j.kylmala at gmail.com>
    
    Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    
    Signed-off-by: Brendan Gallagher brendan at bywatersolutions.com

commit a7731ffe25e89d900d57e07f8e3de7b398090980
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Fri Aug 28 14:46:41 2015 +0100

    Bug 13618: Fix escape on sending baskets or shelves by email
    
    Test plan:
    Send baskets and shelves by email.
    With or without this patch, you should not see any changes.
    
    Signed-off-by: Signed-off-by: Joonas Kylmälä <j.kylmala at gmail.com>
    
    Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    
    Signed-off-by: Brendan Gallagher brendan at bywatersolutions.com

commit 11fa38dc29e16d94a5ed81eb9e29b84f7e166d6c
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Fri Aug 28 13:01:14 2015 +0100

    Bug 13618: Specific for XSLTBloc
    
    Signed-off-by: Signed-off-by: Joonas Kylmälä <j.kylmala at gmail.com>
    
    Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    
    Signed-off-by: Brendan Gallagher brendan at bywatersolutions.com

commit 36c07ad6d3cf57c31bad4b11370b53aafd4d4806
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Thu Aug 27 09:17:03 2015 +0100

    Bug 13618: Specific for Salutation on editing a patron
    
    Signed-off-by: Signed-off-by: Joonas Kylmälä <j.kylmala at gmail.com>
    
    Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    
    Signed-off-by: Brendan Gallagher brendan at bywatersolutions.com

commit e6ea281a3bcd2c3550578e8f2dd188a7701c77fb
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Fri Aug 21 12:05:01 2015 +0100

    Bug 13618: Specific for other prefs
    
    opacmainuserblock
    opacnav
    opacnavright
    opaccredits
    opacheader
    opaccustomsearch
    opacmysummaryhtml
    opacmysummarynote
    opacnavbottom
    opacnoresultsfound
    opacresultssidebar
    opacsearchfortitlein
    restrictedpagecontent
    PatronSelfRegistrationAdditionalInstructions
    intranetmainuserblock
    intranetnav
    intranetslipprinterjs
    OpacSuppressionMessage
    SCOUserCSS
    SCOUserJS
    SelfCheckHelpMessage
    NoLoginInstructions
    
    Signed-off-by: Signed-off-by: Joonas Kylmälä <j.kylmala at gmail.com>
    
    Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    
    Signed-off-by: Brendan Gallagher brendan at bywatersolutions.com

commit 782487455770a59ab7b30b5e92a1a66c28d30b88
Author: Liz Rea <liz at catalyst.net.nz>
Date:   Fri Aug 21 10:23:54 2015 +1200

    Bug 13618 - memberentrygen.tt errors Not a GLOB reference
    
    Like Jonathan said:
    The interpolation of a variable on including a file caused an unexpected
    error:
    Template process failed: undef error - Not a GLOB reference at
    /usr/lib/i386-linux-gnu/perl5/5.20/Template/Provider.pm line 619.
    
    Replaced it with a SWITCH, like the other patch for this similar error.
    
    Signed-off-by: Signed-off-by: Joonas Kylmälä <j.kylmala at gmail.com>
    
    Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    
    Signed-off-by: Brendan Gallagher brendan at bywatersolutions.com

commit 1834da3da367321771530331e7420ffa94d52979
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Tue Aug 4 16:11:34 2015 +0100

    Bug 13618: Specific for ColumnsSettings
    
    Signed-off-by: Signed-off-by: Joonas Kylmälä <j.kylmala at gmail.com>
    
    Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    
    Signed-off-by: Brendan Gallagher brendan at bywatersolutions.com

commit 21ae62b25310ea0876b087b729cf0b3a2ad7b1e6
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Tue Aug 4 16:08:32 2015 +0100

    Bug 13618: Specific for IntranetUser* and OPACUser* prefs
    
    Signed-off-by: Signed-off-by: Joonas Kylmälä <j.kylmala at gmail.com>
    
    Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    
    Signed-off-by: Brendan Gallagher brendan at bywatersolutions.com

commit 602bdbab4c6f86aa136158e1459d800d9530e243
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Tue Aug 4 15:51:55 2015 +0100

    Bug 13618: Fix error 'Not a GLOB reference'
    
    The interpolation of a variable on including a file caused an unexpected
    error:
    Template process failed: undef error - Not a GLOB reference at
    /usr/lib/i386-linux-gnu/perl5/5.20/Template/Provider.pm line 619.
    
    The easier fix is to replace it with a SWITCH.
    
    Signed-off-by: Signed-off-by: Joonas Kylmälä <j.kylmala at gmail.com>
    
    Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    
    Signed-off-by: Brendan Gallagher brendan at bywatersolutions.com

commit d254362435a9ada5dffa8b5ef1c2a19f5d525f5e
Author: Jonathan Druart <jonathan.druart at koha-community.org>
Date:   Mon Jun 22 17:29:10 2015 +0200

    Bug 13618: Specific for the ISBD view
    
    Signed-off-by: Signed-off-by: Joonas Kylmälä <j.kylmala at gmail.com>
    
    Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    
    Signed-off-by: Brendan Gallagher brendan at bywatersolutions.com

commit 8837a8ae68f8089777b824203f3878735ff96591
Author: Jonathan Druart <jonathan.druart at koha-community.org>
Date:   Mon Jun 22 17:23:52 2015 +0200

    Bug 13618: Specific for pagination_bar
    
    Signed-off-by: Signed-off-by: Joonas Kylmälä <j.kylmala at gmail.com>
    
    Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    
    Signed-off-by: Brendan Gallagher brendan at bywatersolutions.com

commit 00eff140b3402a043e31915d1a7b29aec3605433
Author: Jonathan Druart <jonathan.druart at koha-community.org>
Date:   Mon Jun 22 17:14:51 2015 +0200

    Bug 13618: Specific places where we don't need to escape variables - intra
    
    Signed-off-by: Signed-off-by: Joonas Kylmälä <j.kylmala at gmail.com>
    
    Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    
    Signed-off-by: Brendan Gallagher brendan at bywatersolutions.com

commit 7db851ff03a168fa46d56bb0e472be249dbd5410
Author: Jonathan Druart <jonathan.druart at koha-community.org>
Date:   Mon Jun 22 17:13:15 2015 +0200

    Bug 13618: Remove html filters at the intranet
    
    Signed-off-by: Signed-off-by: Joonas Kylmälä <j.kylmala at gmail.com>
    
    Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    
    Signed-off-by: Brendan Gallagher brendan at bywatersolutions.com

commit 49a3738b8d54580e80e92e74fdba0483008b5cfd
Author: Jonathan Druart <jonathan.druart at koha-community.org>
Date:   Mon Jun 22 16:44:34 2015 +0200

    Bug 13618: Specific places where we don't need to escape variables
    
    There is no need to escape the html generated by the XSLT.
    
    Signed-off-by: Signed-off-by: Joonas Kylmälä <j.kylmala at gmail.com>
    
    Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    
    Signed-off-by: Brendan Gallagher brendan at bywatersolutions.com

commit cedaa0e23e0927884f1c5ef2cafde4bcdd6d55ff
Author: Jonathan Druart <jonathan.druart at koha-community.org>
Date:   Mon Jun 22 16:44:05 2015 +0200

    Bug 13618: Remove html filters at the OPAC
    
    This patch removes the html filters at the OPAC, if necessary.
    
    Generated with:
      perl -p -i -e 's/\ ?\|\ ?html(\ ?)%/\1%/g' **/*.tt **/*.inc
    
    Signed-off-by: Signed-off-by: Joonas Kylmälä <j.kylmala at gmail.com>
    
    Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    
    Signed-off-by: Brendan Gallagher brendan at bywatersolutions.com

commit 01b38d3b13f09b927201cba5eb146b6597d4bfeb
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date:   Fri Jan 23 13:18:54 2015 +0100

    Bug 13618: Use Template::Stash::AutoEscaping to use the html filter
    
    Test plan:
    0/ sudo cpanm Template::Stash::AutoEscaping
    1/ Verify don't reproduce the XSS issue described on bug 13609 and other
    xss related bugs.
    2/ Try to find some encoding issues (detail page, search results,
    facets, etc.)
    
    Signed-off-by: Signed-off-by: Joonas Kylmälä <j.kylmala at gmail.com>
    
    Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    
    Signed-off-by: Brendan Gallagher brendan at bywatersolutions.com

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

Summary of changes:
 C4/Installer/PerlDependencies.pm                   |    5 ++
 C4/Templates.pm                                    |    2 +
 Koha.pm                                            |    2 +-
 installer/data/mysql/updatedatabase.pl             |    8 ++
 .../prog/en/includes/acquisitions-search.inc       |    2 +-
 .../prog/en/includes/auth-finder-search.inc        |    8 +-
 .../en/includes/authorities-search-results.inc     |   22 +++---
 .../prog/en/includes/authorities-search.inc        |    8 +-
 .../intranet-tmpl/prog/en/includes/authorities.inc |    4 +-
 .../prog/en/includes/borrower_debarments.inc       |    2 +-
 .../en/includes/catalogue/itemsearch_item.csv.inc  |    2 +-
 .../prog/en/includes/catalogue/itemsearch_item.inc |    2 +-
 .../en/includes/catalogue/itemsearch_item.json.inc |   24 +++---
 .../intranet-tmpl/prog/en/includes/circ-menu.inc   |    9 ++-
 .../prog/en/includes/doc-head-close.inc            |    4 +-
 .../intranet-tmpl/prog/en/includes/facets.inc      |    6 +-
 .../intranet-tmpl/prog/en/includes/header.inc      |    2 +-
 .../prog/en/includes/merge-record.inc              |    2 +-
 .../prog/en/includes/page-numbers.inc              |    6 +-
 .../prog/en/includes/prefs-admin-search.inc        |    2 +-
 .../intranet-tmpl/prog/en/includes/slip-print.inc  |    4 +-
 koha-tmpl/intranet-tmpl/prog/en/modules/about.tt   |   20 ++---
 .../prog/en/modules/acqui/addorder.tt              |    2 +-
 .../prog/en/modules/acqui/addorderiso2709.tt       |    4 +-
 .../intranet-tmpl/prog/en/modules/acqui/basket.tt  |   18 ++---
 .../prog/en/modules/acqui/basketgroup.tt           |   14 ++--
 .../prog/en/modules/acqui/histsearch.tt            |    4 +-
 .../prog/en/modules/acqui/invoice-files.tt         |    8 +-
 .../intranet-tmpl/prog/en/modules/acqui/invoice.tt |    6 +-
 .../prog/en/modules/acqui/lateorders.tt            |   10 +--
 .../prog/en/modules/acqui/modordernotes.tt         |    2 +-
 .../prog/en/modules/acqui/neworderbiblio.tt        |    4 +-
 .../prog/en/modules/acqui/neworderempty.tt         |    4 +-
 .../prog/en/modules/acqui/newordersubscription.tt  |    2 +-
 .../prog/en/modules/acqui/newordersuggestion.tt    |    2 +-
 .../prog/en/modules/acqui/orderreceive.tt          |    2 +-
 .../intranet-tmpl/prog/en/modules/acqui/parcel.tt  |    8 +-
 .../en/modules/acqui/tables/members_results.tt     |    6 +-
 .../prog/en/modules/acqui/transferorder.tt         |    2 +-
 .../prog/en/modules/acqui/z3950_search.tt          |    6 +-
 .../prog/en/modules/admin/aqbudgetperiods.tt       |    6 +-
 .../en/modules/admin/auth_subfields_structure.tt   |   24 +++---
 .../prog/en/modules/admin/auth_tag_structure.tt    |    4 +-
 .../prog/en/modules/admin/authtypes.tt             |    6 +-
 .../prog/en/modules/admin/biblio_framework.tt      |    6 +-
 .../prog/en/modules/admin/branches.tt              |   81 ++++++++++----------
 .../prog/en/modules/admin/categories.tt            |   30 ++++----
 .../intranet-tmpl/prog/en/modules/admin/cities.tt  |    6 +-
 .../prog/en/modules/admin/classsources.tt          |   16 ++--
 .../prog/en/modules/admin/currency.tt              |    6 +-
 .../prog/en/modules/admin/itemtypes.tt             |    8 +-
 .../en/modules/admin/marc_subfields_structure.tt   |   22 +++---
 .../prog/en/modules/admin/marctagstructure.tt      |    4 +-
 .../prog/en/modules/admin/matching-rules.tt        |   46 +++++------
 .../prog/en/modules/admin/patron-attr-types.tt     |   22 +++---
 .../prog/en/modules/admin/preferences.tt           |    4 +-
 .../prog/en/modules/admin/systempreferences.tt     |   22 +++---
 .../prog/en/modules/admin/z3950servers.tt          |    2 +-
 koha-tmpl/intranet-tmpl/prog/en/modules/auth.tt    |    2 +-
 .../prog/en/modules/authorities/authorities.tt     |    8 +-
 .../modules/authorities/searchresultlist-auth.tt   |    2 +-
 .../en/modules/authorities/searchresultlist.tt     |    4 +-
 .../intranet-tmpl/prog/en/modules/basket/basket.tt |    6 +-
 .../prog/en/modules/basket/sendbasket.tt           |   46 +++++------
 .../prog/en/modules/catalogue/ISBDdetail.tt        |    2 +-
 .../prog/en/modules/catalogue/MARCdetail.tt        |   10 +--
 .../prog/en/modules/catalogue/detail.tt            |   24 +++---
 .../prog/en/modules/catalogue/imageviewer.tt       |    6 +-
 .../prog/en/modules/catalogue/issuehistory.tt      |    8 +-
 .../prog/en/modules/catalogue/itemsearch.tt        |    2 +-
 .../prog/en/modules/catalogue/moredetail.tt        |    8 +-
 .../prog/en/modules/catalogue/results.tt           |   28 +++----
 .../prog/en/modules/catalogue/search-history.tt    |    8 +-
 .../prog/en/modules/catalogue/subject.tt           |    2 +-
 .../prog/en/modules/cataloguing/addbiblio.tt       |   16 ++--
 .../prog/en/modules/cataloguing/addbooks.tt        |    6 +-
 .../prog/en/modules/cataloguing/additem.tt         |   16 ++--
 .../prog/en/modules/cataloguing/linkitem.tt        |    6 +-
 .../prog/en/modules/cataloguing/moveitem.tt        |    8 +-
 .../en/modules/cataloguing/value_builder/macles.tt |   14 ++--
 .../value_builder/marc21_linking_section.tt        |    5 +-
 .../value_builder/unimarc_field_210c.tt            |    4 +-
 .../cataloguing/value_builder/unimarc_field_4XX.tt |   24 +++---
 .../value_builder/unimarc_field_686a.tt            |    6 +-
 .../en/modules/cataloguing/z3950_auth_search.tt    |   10 +--
 .../prog/en/modules/cataloguing/z3950_search.tt    |    4 +-
 .../prog/en/modules/circ/bookcount.tt              |    6 +-
 .../prog/en/modules/circ/branchoverdues.tt         |    8 +-
 .../prog/en/modules/circ/branchtransfers.tt        |    2 +-
 .../prog/en/modules/circ/circulation.tt            |   18 ++---
 .../en/modules/circ/circulation_batch_checkouts.tt |    4 +-
 .../prog/en/modules/circ/on-site_checkouts.tt      |    2 +-
 .../intranet-tmpl/prog/en/modules/circ/overdue.tt  |   38 ++++-----
 .../prog/en/modules/circ/pendingreserves.tt        |    2 +-
 .../prog/en/modules/circ/printslip.tt              |    4 +-
 .../intranet-tmpl/prog/en/modules/circ/renew.tt    |    2 +-
 .../prog/en/modules/circ/reserveratios.tt          |    2 +-
 .../intranet-tmpl/prog/en/modules/circ/returns.tt  |   22 +++---
 .../prog/en/modules/circ/selectbranchprinter.tt    |    8 +-
 .../prog/en/modules/circ/transfer-slip.tt          |    2 +-
 .../prog/en/modules/circ/transferstoreceive.tt     |    4 +-
 .../prog/en/modules/circ/view_holdsqueue.tt        |    2 +-
 .../prog/en/modules/circ/waitingreserves.tt        |    4 +-
 .../prog/en/modules/installer/auth.tt              |    2 +-
 .../prog/en/modules/installer/step3.tt             |    4 +-
 .../intranet-tmpl/prog/en/modules/intranet-main.tt |    4 +-
 .../prog/en/modules/labels/label-edit-layout.tt    |    4 +-
 .../intranet-tmpl/prog/en/modules/labels/result.tt |    2 +-
 .../prog/en/modules/labels/spinelabel-print.tt     |    4 +-
 .../prog/en/modules/members/boraccount.tt          |    2 +-
 .../prog/en/modules/members/member.tt              |    2 +-
 .../prog/en/modules/members/memberentrygen.tt      |   36 +++++----
 .../prog/en/modules/members/moremember-print.tt    |    4 +-
 .../prog/en/modules/members/moremember-receipt.tt  |    8 +-
 .../prog/en/modules/members/moremember.tt          |   13 ++--
 .../prog/en/modules/members/notices.tt             |    2 +-
 .../en/modules/members/purchase-suggestions.tt     |    4 +-
 .../prog/en/modules/members/readingrec.tt          |    2 +-
 .../en/modules/members/tables/guarantor_search.tt  |    4 +-
 .../en/modules/members/tables/members_results.tt   |    8 +-
 .../prog/en/modules/offline_circ/process_koc.tt    |    6 +-
 .../prog/en/modules/patron_lists/lists.tt          |    2 +-
 .../prog/en/modules/patroncards/edit-layout.tt     |   44 +++++------
 .../modules/patroncards/tables/members_results.tt  |    4 +-
 .../en/modules/reports/guided_reports_start.tt     |   12 +--
 .../prog/en/modules/reports/issues_stats.tt        |    4 +-
 .../prog/en/modules/reports/itemslost.tt           |    4 +-
 .../prog/en/modules/reports/reserves_stats.tt      |    4 +-
 .../prog/en/modules/reports/serials_stats.tt       |    2 +-
 .../prog/en/modules/reserve/request.tt             |   14 ++--
 .../prog/en/modules/reviews/reviewswaiting.tt      |    4 +-
 .../en/modules/rotating_collections/addItems.tt    |    2 +-
 .../prog/en/modules/serials/add_fields.tt          |    4 +-
 .../prog/en/modules/serials/checkexpiration.tt     |    2 +-
 .../prog/en/modules/serials/claims.tt              |    2 +-
 .../prog/en/modules/serials/result.tt              |   10 +--
 .../en/modules/serials/routing-preview-slip.tt     |    2 +-
 .../prog/en/modules/serials/routing-preview.tt     |    4 +-
 .../prog/en/modules/serials/routing.tt             |    8 +-
 .../prog/en/modules/serials/serials-collection.tt  |    2 +-
 .../prog/en/modules/serials/serials-edit.tt        |   12 +--
 .../prog/en/modules/serials/serials-search.tt      |   28 +++----
 .../prog/en/modules/serials/subscription-add.tt    |    6 +-
 .../en/modules/serials/subscription-bib-search.tt  |    4 +-
 .../en/modules/serials/tables/members_results.tt   |    2 +-
 .../prog/en/modules/services/itemrecorddisplay.tt  |    6 +-
 .../prog/en/modules/suggestion/suggestion.tt       |   50 ++++++------
 .../intranet-tmpl/prog/en/modules/tags/list.tt     |    8 +-
 .../intranet-tmpl/prog/en/modules/tags/review.tt   |    2 +-
 .../prog/en/modules/tools/batchMod-del.tt          |    2 +-
 .../prog/en/modules/tools/batchMod-edit.tt         |    6 +-
 .../prog/en/modules/tools/batch_delete_records.tt  |    2 +-
 .../prog/en/modules/tools/inventory.tt             |   16 ++--
 .../prog/en/modules/tools/koha-news.tt             |    4 +-
 .../intranet-tmpl/prog/en/modules/tools/viewlog.tt |    4 +-
 .../en/modules/virtualshelves/addbybiblionumber.tt |   12 +--
 .../prog/en/modules/virtualshelves/sendshelf.tt    |   50 ++++++------
 .../prog/en/modules/virtualshelves/shelves.tt      |   20 ++---
 .../virtualshelves/tables/shelves_results.tt       |    2 +-
 .../en/includes/authorities-search-results.inc     |   22 +++---
 .../opac-tmpl/bootstrap/en/includes/bodytag.inc    |   10 +--
 .../bootstrap/en/includes/doc-head-close.inc       |    2 +-
 .../bootstrap/en/includes/masthead-sco.inc         |    2 +-
 .../opac-tmpl/bootstrap/en/includes/masthead.inc   |   12 +--
 .../opac-tmpl/bootstrap/en/includes/navigation.inc |    4 +-
 .../bootstrap/en/includes/opac-authorities.inc     |    4 +-
 .../bootstrap/en/includes/opac-bottom.inc          |    6 +-
 .../bootstrap/en/includes/opac-detail-sidebar.inc  |    2 +-
 .../bootstrap/en/includes/opac-facets.inc          |    6 +-
 .../bootstrap/en/includes/page-numbers.inc         |    6 +-
 .../bootstrap/en/includes/shelfbrowser.inc         |    4 +-
 .../opac-tmpl/bootstrap/en/modules/maintenance.tt  |    2 +-
 .../bootstrap/en/modules/opac-ISBDdetail.tt        |    2 +-
 .../bootstrap/en/modules/opac-MARCdetail.tt        |   20 ++---
 .../bootstrap/en/modules/opac-addbybiblionumber.tt |   14 ++--
 .../bootstrap/en/modules/opac-auth-MARCdetail.tt   |    2 +-
 .../opac-tmpl/bootstrap/en/modules/opac-auth.tt    |    4 +-
 .../en/modules/opac-authoritiessearchresultlist.tt |   12 +--
 .../opac-tmpl/bootstrap/en/modules/opac-basket.tt  |   14 ++--
 .../opac-tmpl/bootstrap/en/modules/opac-blocked.tt |    2 +-
 .../opac-tmpl/bootstrap/en/modules/opac-browser.tt |    6 +-
 .../opac-tmpl/bootstrap/en/modules/opac-detail.tt  |   46 +++++------
 .../bootstrap/en/modules/opac-downloadcart.tt      |    2 +-
 .../bootstrap/en/modules/opac-downloadshelf.tt     |    6 +-
 .../bootstrap/en/modules/opac-imageviewer.tt       |    2 +-
 .../opac-tmpl/bootstrap/en/modules/opac-main.tt    |    8 +-
 .../bootstrap/en/modules/opac-mymessages.tt        |   10 +--
 .../bootstrap/en/modules/opac-news-rss.tt          |    6 +-
 .../bootstrap/en/modules/opac-opensearch.tt        |   52 ++++++-------
 .../bootstrap/en/modules/opac-overdrive-search.tt  |    8 +-
 .../bootstrap/en/modules/opac-readingrecord.tt     |   10 +--
 .../en/modules/opac-registration-confirmation.tt   |    4 +-
 .../opac-tmpl/bootstrap/en/modules/opac-reserve.tt |    2 +-
 .../bootstrap/en/modules/opac-restrictedpage.tt    |    2 +-
 .../bootstrap/en/modules/opac-results-grouped.tt   |   14 ++--
 .../opac-tmpl/bootstrap/en/modules/opac-results.tt |   40 +++++-----
 .../opac-tmpl/bootstrap/en/modules/opac-review.tt  |   10 +--
 .../bootstrap/en/modules/opac-search-history.tt    |    8 +-
 .../bootstrap/en/modules/opac-sendbasket.tt        |   52 ++++++-------
 .../bootstrap/en/modules/opac-sendshelf.tt         |   52 ++++++-------
 .../bootstrap/en/modules/opac-serial-issues.tt     |    4 +-
 .../bootstrap/en/modules/opac-shelves-rss.tt       |    6 +-
 .../opac-tmpl/bootstrap/en/modules/opac-shelves.tt |   71 +++++++++--------
 .../bootstrap/en/modules/opac-showreviews-rss.tt   |   20 ++---
 .../bootstrap/en/modules/opac-showreviews.tt       |    6 +-
 .../bootstrap/en/modules/opac-suggestions.tt       |   18 ++---
 .../opac-tmpl/bootstrap/en/modules/opac-tags.tt    |   13 ++--
 .../bootstrap/en/modules/opac-tags_subject.tt      |    2 +-
 .../bootstrap/en/modules/opac-topissues.tt         |    4 +-
 .../opac-tmpl/bootstrap/en/modules/opac-user.tt    |   17 ++--
 .../opac-tmpl/bootstrap/en/modules/sco/help.tt     |    8 +-
 .../opac-tmpl/bootstrap/en/modules/sco/sco-main.tt |   14 ++--
 .../bootstrap/en/modules/svc/suggestion.tt         |    2 +-
 213 files changed, 1076 insertions(+), 1058 deletions(-)


hooks/post-receive
-- 
main Koha release repository


More information about the koha-commits mailing list