From gitmaster at git.koha-community.org  Fri Jul  3 18:02:25 2015
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Fri, 03 Jul 2015 16:02:25 +0000
Subject: [koha-commits] main Koha release repository branch master updated.
	v3.20.00-259-gd12b4e0
Message-ID: <E1ZB3Q0-00070x-T2@git.koha-community.org>

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  d12b4e0b19d43e10a06a934689b9001bdd9049f4 (commit)
      from  936d452ffaedb1405d15b503ef2454decb91d77f (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 d12b4e0b19d43e10a06a934689b9001bdd9049f4
Author: Samanta Tello <samantatellob at yahoo.com.ar>
Date:   Fri Jul 3 11:12:05 2015 -0300

    Bug 14490: Duplicate armenian translator
    
    This patch fix trivial duplicate
    in about page.
    
    To test:
    1) Go to about page > translations
    2) Check duplicate entry for Armenian
    first in 4th line, second before indonesian
    3) Apply patch
    4) Reload page and check again
    
    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
    Trivial string patch. The restults are the expected.
    
    Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
    Double checked :-P

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

Summary of changes:
 koha-tmpl/intranet-tmpl/prog/en/modules/about.tt |    1 -
 1 file changed, 1 deletion(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Mon Jul  6 23:25:53 2015
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Mon, 06 Jul 2015 21:25:53 +0000
Subject: [koha-commits] main Koha release repository branch 3.20.x updated.
	v3.20.01-23-gfe6ee44
Message-ID: <E1ZCDth-0005aE-AE@git.koha-community.org>

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, 3.20.x has been updated
       via  fe6ee44cab4c5513b9097cee4e6e13f6c4d09a91 (commit)
       via  eb162e9027d36c9e8fc610e847d0818809ab3f2e (commit)
       via  f665211a67cde09a66b32eaf5a362c36dba7f39b (commit)
      from  75b5f804155ccb1af4e0b185e4742e414c61f2d9 (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 fe6ee44cab4c5513b9097cee4e6e13f6c4d09a91
Author: Jonathan Druart <jonathan.druart at koha-community.org>
Date:   Fri Jun 19 15:47:58 2015 +0200

    Bug 10063: Remove outdated FIXME
    
    Signed-off-by: Jonathan Druart <jonathan.druart at koha-community.org>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>
    (cherry picked from commit 9ed3d83dcbc609e9d658d965257b87bdc42e0606)
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

commit eb162e9027d36c9e8fc610e847d0818809ab3f2e
Author: Katrin Fischer <Katrin.Fischer.83 at web.de>
Date:   Mon Jun 8 04:17:53 2015 +0200

    Bug 10063: Correct documentation of C4::Members::IsMemberBlocked
    
    Rephrased documentation a bit, replacing fine days with the
    more general term restriction. As IsDebarred checks for existing
    active restrictions.
    
    TEST PLAN
    ---------
    1) apply patch
    2) git diff origin/master
       -- do the changes make sense
    3) perldoc C4::Members
       -- look for the IsMemberBlocked.
       -- Does it reflect current state
    4) koha qa test tools
    
    Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at koha-community.org>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>
    (cherry picked from commit 307f7a064cdaf16bca5a762344563b87651a1664)
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

commit f665211a67cde09a66b32eaf5a362c36dba7f39b
Author: Katrin Fischer <Katrin.Fischer.83 at web.de>
Date:   Mon Jun 8 02:58:53 2015 +0200

    Bug 10119: Add note about CalculateFinesOnReturn to description of finesmode
    
    This adds a note to the descrpition of the finesmode system
    preference mentioning that CalculateFinesOnReturn is another
    option for charging fines:
    
    Note: Fines can also be charged by the CalculateFinesOnReturn system preference.
    
    To test:
    - Search for the finesmode system preference
    - Verify the new text shows and is correct
    
    NOTE: New text appears as expected. You can also just scroll for
          it on the Circulation preferences tab.
    
    Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at koha-community.org>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>
    (cherry picked from commit 45c1b8f7b261493c27aa4d734e9795be619c1c70)
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

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

Summary of changes:
 C4/Members.pm                                            |   14 ++++----------
 .../prog/en/modules/admin/preferences/circulation.pref   |    1 +
 2 files changed, 5 insertions(+), 10 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Tue Jul  7 20:27:31 2015
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Tue, 07 Jul 2015 18:27:31 +0000
Subject: [koha-commits] main Koha release repository branch master updated.
	v3.20.00-270-g52814a9
Message-ID: <E1ZCXad-000678-Jz@git.koha-community.org>

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  52814a9fa0e061e5d8a669ea1895474e01216cfd (commit)
       via  9f008a102415c8b71a1f4a976bc15691c2663b5c (commit)
       via  bfea40b6e8161629c11d97be5eeba56fb6d59ba3 (commit)
       via  c3fea53039a6c53c766b0403eedd57f644c6f772 (commit)
       via  5f3ec7109321f8e928371880e473e84d8db39f8d (commit)
       via  ee30fb90048358829dc39906ef033f7dd74207e5 (commit)
       via  efedadebf233cf7f2b8c1eb64d1687b282d94474 (commit)
       via  94315f663b8a582fb7ef68de2bd9c3933901cd7f (commit)
       via  ffedc98577f4967181e9a17886483c6ac5a1d140 (commit)
       via  e0d2bc669e385cfd1c42c1e83aaff3495a75a822 (commit)
       via  c95e794bd458377d742280ae8fff281ddf395e04 (commit)
      from  d12b4e0b19d43e10a06a934689b9001bdd9049f4 (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 52814a9fa0e061e5d8a669ea1895474e01216cfd
Author: Julian FIOL <julian.fiol at biblibre.com>
Date:   Tue May 26 14:49:20 2015 +0200

    Bug 14207: Improving circulation performance
    
    by caching yaml file This patch improve circulation performance by caching yaml file With this patch we saved between 300ms and 500ms on circulation page.
    
    Following Comment #3 :
    No useless warn
    No tidy
    
    Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
    Less lines, same result.
    Comments were useful on testing :)
    No errors
    
    Signed-off-by: Jonathan Druart <jonathan.druart at koha-community.org>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>

commit 9f008a102415c8b71a1f4a976bc15691c2663b5c
Author: Indranil Das Gupta <indradg at l2c2.co.in>
Date:   Mon May 4 18:55:15 2015 +0530

    Bug 14135: Adds 'Free' to variabletypes in systempreferences.tt
    
    The 'Local Use' system preference addition/modification template provides the following options against "Variable Type" - Choice, YesNo, Integer, Textarea, Float, Themes, Languages, Upload or ClassSource.
    
    There is no option presented for "Free" which seems to be the most
    used variable type out-of-the-box (i.e. INTRAdidyoumean,
    OPACdidyoumean, UsageStatsID and UsageStatsLastUpdateTime)
    
    This trivial patch proposes to modify the systempreferences.tt
    and add the option 'Free' to the list offered to users.
    
    Test Plan
    =========
    
    1/ Go to Home > Administration > System preferences > Local use
    2/ Click on 'New preference'.
    3/ In the fieldset 'Koha Internal', the variable types offered
       are Choice, YesNo, Integer, Textarea, Float, Themes,
       Languages, Upload or ClassSources.
    4/ Clicking on 'Choice' should set the 'preftype' field as
       'Choice'.
    5/ Apply this patch.
    6/ Refresh the page.
    7/ The variable types list should read - "Free, Choice, YesNo,
       Integer, Textarea, Float, Themes, Languages, Upload or
       ClassSources".
    8/ Clicking on 'Free' should set the 'preftype' field as 'Free'.
    
    Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
    
    NOTE: Discovered that there is no validation on the type field.
          However, that is beyond the scope of this bug.
    
    Signed-off-by: Amit Gupta <amit.gupta at informaticsglobal.com>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at koha-community.org>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>

commit bfea40b6e8161629c11d97be5eeba56fb6d59ba3
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date:   Fri Jul 3 11:02:22 2015 +0200

    Bug 14382: [QA Follow-up] Bad regex alarm
    
    The regex /|date>>/ will match much more than you like :)
    The unescaped pipe is bad, but you also need to remove the >> because
    the split a few lines above it removes them already.
    
    This allows you to recover from an error like this one, running another
    report with a string parameter:
    The given date (india%) does not match the date format (us) at
    Koha/DateUtils.pm line 144.
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    Amended for possible spaces around the word date.
    Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>

commit c3fea53039a6c53c766b0403eedd57f644c6f772
Author: Mark Tompsett <mtompset at hotmail.com>
Date:   Wed Jun 24 12:13:46 2015 -0400

    Bug 14382: Non-ISO Date parameters generate empty reports.
    
    The issue is that SQL expects ISO dates, but the user may wish to view dates according to the dateformat system preference.
    
    By detecting a date preference, the non-ISO dates can be converted to ISO dates before being stuffed back into the SQL query to be executed.
    
    TEST PLAN
    ---------
    1) Add a report with date parameters.
       -- I used 'Holds placed in date range' from
          http://wiki.koha-community.org/wiki/SQL_Reports_Library
    2) Set your dateformat to YYYY-MM-DD
    3) Run the report
       -- Note the SQL reads
          "... BETWEEN '{date formatted in YYYY-MM-DD}'..."
       -- If there is supposed to be data, there is some.
    4) Set your dateformat to MM/DD/YYYY
    5) Run the report
       -- Note the SQL reads
          "... BETWEEN '{date formatted in MM/DD/YYYY}'..."
       -- If there is supposed to be data, there is none.
    6) Apply patch
    7) Repeat steps 2-5
       -- The SQL will always read YYYY-MM-DD (ISO) format.
       -- The report will have data, if there is some.
    8) koha qa test tools.
    
    Signed-off-by: Amit Gupta <amit.gupta at informaticsglobal.com>
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    Adding a QA follow-up.
    Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>

commit 5f3ec7109321f8e928371880e473e84d8db39f8d
Author: Mark Tompsett <mtompset at hotmail.com>
Date:   Fri Jun 19 14:00:13 2015 -0400

    Bug 14427: Use Koha::version instead of C4::Context->KOHAVERSION
    
    While testing bug 9006, I discovered this gem in
    installer/install.pl
    
    TEST PLAN
    ---------
     1) back up DB
     2) drop db and create db
     3) git reset --hard origin/3.20.x
     4) run web installer and all sample data
     5) git reset --hard origin/master
     6) empty your koha intranet error log
     7) run web installer to upgrade
        -- there will be warnings regarding regex around
           installer/install.pl line 328 or so.
           grep "\$kohaversion" ~/koha-dev/var/logs/koha-error_log
     8) repeat steps 2-6
     9) apply this patch
    10) run web installer to upgrade
        -- no regex warnings.
           grep "\$kohaversion" ~/koha-dev/var/logs/koha-error_log
    11) koha qa test tools
    
    Signed-off-by: Jonathan Druart <jonathan.druart at koha-community.org>
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>

commit ee30fb90048358829dc39906ef033f7dd74207e5
Author: Tomas Cohen Arazi <tomascohen at unc.edu.ar>
Date:   Tue Jul 7 15:15:01 2015 -0300

    Bug 9942: DBRev 3.21.00.013
    
    Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>

commit efedadebf233cf7f2b8c1eb64d1687b282d94474
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date:   Thu Jun 25 17:22:25 2015 -0400

    Bug 9942: [QA Followup] - Add test and alert to returns.pl
    
    Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>

commit 94315f663b8a582fb7ef68de2bd9c3933901cd7f
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date:   Thu Apr 9 13:07:05 2015 +0200

    Bug 9942: Make Koha fails if privacy is not respected
    
    If a patron has requested anonymity on returning items and the system is
    not correctly configured (AnonymousPatron no set or set to an inexistent
    patron), the application should take it into account and not fail
    quietly.
    
    This patch is quite radical: the script will die loudly if the privacy
    is not respected.
    
    To be care of the bad "Software error", some checks are done in the
    updatedatabase to be sure the admin will be warned is something is wrong
    in the configuration.
    
    Test plan:
    1/ Test the updatedatabase entry:
    a. Turn on OPACPrivacy and set AnonymousPatron to an existing patron
    => You will get a warning
    b. Turn on OPACPrivacy and set AnonymousPatron to 0 or ''
    => You will get a warning
    c. Turn on OPACPrivacy and set the privacy to 2 (Never) for at least 1 patron
    Turn off OPACPrivacy
    => You will get a warning
    d. In all other cases you will get no error
    
    2/ Test the interface
    a. Turn on OPACPrivacy and set the privacy to 2 (Never) for a patron
    b. Now you can turn off OPACPrivacy or keep it on, behavior should be
    the same
    c. check an item out the patron
    d. Check the item in using the check out table
    => fail
    e. Check the item in using the Check in tab
    => fail (not gracefully).
    
    Note that the software error could appear on other pages too.
    
    Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
    
    Updatedatabase works as described
    On staff, if don't have correct settings for anonymity it's
    impossible to check-in (with OPACPrivacy on)
    No errors
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>

commit ffedc98577f4967181e9a17886483c6ac5a1d140
Author: Jonathan Druart <jonathan.druart at koha-community.org>
Date:   Mon Jun 22 12:45:50 2015 +0200

    Bug 14431: FIX encoding issues in search (staff client)
    
    Note that this does not appears at the OPAC.
    
    We will need 2 different testers here, the results seem to depend on the
    Encode version.
    
    0/ Determine your Encode version (`pmvers Encode`).
    If you have 2.60:
    1) /cgi-bin/koha/catalogue/search.pl?q=???&op=Submit
    You should get
    " No results match your search for 'kw,wrdl: ???' in my library Catalog."
    2) /cgi-bin/koha/catalogue/search.pl?q=?
    You should get
    Cannot decode string with wide characters at
    /usr/lib/i386-linux-gnu/perl/5.20/Encode.pm line 215.
    
    If you have <2.60 (? not sure here):
    1) /cgi-bin/koha/catalogue/search.pl?q=???&op=Submit
    You should not get encoding problems.
    2) /cgi-bin/koha/catalogue/search.pl?q=?
    You should not get encoding problems.
    
    Apply this patch, try again 1 and 2.
    If the Encode version is >=2.60, the encoding issues should be fixed.
    If not, please detail if there are any regression.
    
    NOTE: Tested on Ubuntu 14.04, Debian 8, and Debian 7. See comment #3.
    
    Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>

commit e0d2bc669e385cfd1c42c1e83aaff3495a75a822
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date:   Thu Jun 25 16:41:23 2015 -0400

    Bug 14467: Security updates break some Koha plugins
    
    The new security updates break previously functioning plugins, most
    notably the cover flow plugin and the Ebsco EDS plugin.
    
    Test Plan:
    1) Install and configure the cover flow plugin ( http://bywatersolutions.com/koha-plugins/ )
    2) Note that attempting to access coverflow.pl from the OPAC results in an error
    3) Apply this patch
    4) Note that coverflow.pl now output html again
    
    Signed-off-by: Nick Clemens <nick at quecheelibrary.org>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at koha-community.org>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>

commit c95e794bd458377d742280ae8fff281ddf395e04
Author: Liz Rea <liz at catalyst.net.nz>
Date:   Tue Jun 16 16:12:57 2015 +1200

    Bug 14389: Editing a syspref in a textarea does not enable the Save button
    
    Test plan:
      1. Navigate to the "opaccredits" syspref (or any other textarea, i.e.,
         "Click to Edit", syspref) in the system preferences editor.
      2. Change its contents, by either pasting or typing. The field may not
         be marked as modified, even after you click outside the box.
      3. Apply the patch.
      4. Reload the page and try again; either pasting or typing should mark
         the field as changed and allow you to save.
    
    Signed-off-by: Jesse Weaver <pianohacker at gmail.com>
    Confirmed working for normal input, paste and middle-click paste in
    Chrome and Firefox in Linux.
    
    Signed-off-by: Jonathan Druart <jonathan.druart at koha-community.org>
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>

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

Summary of changes:
 C4/Circulation.pm                                  |   28 +++++++---
 C4/Utils/DataTables/ColumnsSettings.pm             |   18 ++++---
 Koha.pm                                            |    2 +-
 Koha/Plugins/Base.pm                               |    3 +-
 catalogue/search.pl                                |    2 +-
 installer/data/mysql/updatedatabase.pl             |   33 ++++++++++++
 installer/install.pl                               |    2 +-
 .../intranet-tmpl/prog/en/js/pages/preferences.js  |    2 +-
 .../prog/en/modules/admin/systempreferences.tt     |    2 +-
 .../intranet-tmpl/prog/en/modules/circ/returns.tt  |    5 ++
 reports/guided_reports.pl                          |    7 ++-
 t/db_dependent/Circulation/MarkIssueReturned.t     |   55 ++++++++++++++++++++
 12 files changed, 140 insertions(+), 19 deletions(-)
 create mode 100644 t/db_dependent/Circulation/MarkIssueReturned.t


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Wed Jul  8 19:40:41 2015
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Wed, 08 Jul 2015 17:40:41 +0000
Subject: [koha-commits] main Koha release repository branch master updated.
	v3.20.00-276-gfbe25b1
Message-ID: <E1ZCtKr-0007QW-9T@git.koha-community.org>

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  fbe25b1d8e1806768b04d829bd9fc1a05f4861cf (commit)
       via  2365537eea9d5cd6526843b1cd0c2152a6def06c (commit)
       via  058b50de5b09ee2ba3efc953b9846bc79d712c31 (commit)
       via  2d877b93d6d3bf479e7a089f7aeff6ee5cdf4da3 (commit)
       via  c656cff676b01b45b2b4057c776f963df37d4bd6 (commit)
       via  aa88125f62031ffce95486e6634b960a6886f6a9 (commit)
      from  52814a9fa0e061e5d8a669ea1895474e01216cfd (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 fbe25b1d8e1806768b04d829bd9fc1a05f4861cf
Author: Mirko Tietgen <mirko at abunchofthings.net>
Date:   Thu Jun 25 15:38:42 2015 +0200

    Bug 14453: (followup) Fix shipped XSLT files
    
    Make the shipped XSLTs for authorities (MARC21 and UNIMARC) the same as the generated version
    
    Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>

commit 2365537eea9d5cd6526843b1cd0c2152a6def06c
Author: Fridolin Somers <fridolin.somers at biblibre.com>
Date:   Wed Jun 24 16:06:05 2015 +0200

    Bug 14453: kohaidx is missing for id in authority-koha-indexdefs.xml
    
    In authority-koha-indexdefs.xml, all tags use the namespace "kohaidx" except the tag "id".
    
    When re-generating authority-zebra-indexdefs.xsl, the line :
      <xslo:variable name="idfield" select="normalize-space(marc:controlfield[@tag='001'])"/>
    is modified :
      <xslo:variable name="idfield" select="normalize-space()"/>
    This is an error.
    
    This patch adds kohaidx namespace to correct.
    
    Test plan :
    - Without patch
    - go to etc/zebradb/marc_defs/marc21/authorities/
    - run : xslproc xsltproc ../../../xsl/koha-indexdefs-to-zebra.xsl authority-koha-indexdefs.xml > authority-zebra-indexdefs.xsl
    - read authority-zebra-indexdefs.xsl
    => the line has changed : <xslo:variable name="idfield" select="normalize-space()"/>
    - Apply patch
    - go to etc/zebradb/marc_defs/marc21/authorities/
    - run : xslproc xsltproc ../../../xsl/koha-indexdefs-to-zebra.xsl authority-koha-indexdefs.xml > authority-zebra-indexdefs.xsl
    - read authority-zebra-indexdefs.xsl
    => the line has not changed
    (same for unimarc flavor)
    
    Signed-off-by: Mirko Tietgen <mirko at abunchofthings.net>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>
    As Mirko mentioned, the xslt's now generate the facet-processing templates in
    the authority xslt's too. They are harmless because we don't define facets
    for authority records. If we did, it would be harmless too.
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>

commit 058b50de5b09ee2ba3efc953b9846bc79d712c31
Author: Winona Salesky <wsalesky at gmail.com>
Date:   Wed Jun 3 22:46:23 2015 -0400

    Bug 14326: XSLT Syntax error in MARC21slimOPACResults.xsl
    
    Test Plan:
    1) Apply this patch
    2) Ensure you are using the default XSLT setting for the staff and opac  record details
    3) Perform an opac search check "Availability" for expected display values.
    5) Note this patch corrects invalid syntax in xslt, there should be no visable changes to the results page.
    
    Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at koha-community.org>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>

commit 2d877b93d6d3bf479e7a089f7aeff6ee5cdf4da3
Author: Jonathan Druart <jonathan.druart at koha-community.org>
Date:   Tue May 26 12:10:50 2015 +0200

    Bug 14189: Use keep_text for the authority header
    
    includes/authorities-search.inc already used the same behavior but with
    another method.
    For consistency it's better to have only 1 way to do that.
    
    Test plan:
    Go on the authority home page
    Fill the input in the header and click on tab 'search all headings' and
    'keyword search' and confirm that the text you have filled is kept.
    
    I tested after applying the patch and the text is kept after removing the
    part from authorities-search.inc. I also tried applying that jQuery solution
    instead of my JS loop but could not get it to work for the other pages with
    a reasonable ammount of effort.
    
    Signed-off-by: Jonathan Druart <jonathan.druart at koha-community.org>
    Signed-off-by: Eivin Giske Skaaren <eskaaren at yahoo.no>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>

commit c656cff676b01b45b2b4057c776f963df37d4bd6
Author: Eivin Giske Skaaren <eskaaren at yahoo.no>
Date:   Mon May 11 18:57:11 2015 +0000

    Bug 14189: Made text persist when clicking the tabs under the searchbox
    
    To test:
    Apply the patch and see that the text now is there in the search
    box when clicking the tabs: check in, check out etc..
    
    (More files changed for persistent text in searchbox)
    
    Sponsored-by: Halland County Library
    
    Signed-off-by: Magnus Enger <magnus at enger.priv.no>
    This is something I have wanted quite a few times over the years...
    
    Tested by going to every main area of Koha, entering some random
    text into the search box and then clicking on all the available tabs
    to check that the entered text is carried over to all the boxes.
    
    There are a couple of places where text is not carried over, but I
    guess that might be because one of the boxes is structurally
    different to the others. These are:
    - "Vendor search" and "Orders search" in Acquisitions
    - "Search subscriptions" in Serials
    
    I have not looked at how this is implemented, just that it works as
    it should.
    
    Bug 14189 refactor after failed QA.
    
    Signed-off-by: Jonathan Druart <jonathan.druart at koha-community.org>
    Amended patch: replace tabs with spaces
    
    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>

commit aa88125f62031ffce95486e6634b960a6886f6a9
Author: Mark Tompsett <mtompset at hotmail.com>
Date:   Fri Jun 5 12:24:22 2015 -0400

    Bug 14345: broken isbn logic prevents display of idreambooks image
    
    TEST PLAN
    ---------
    1) Ensure you have a book that would pull up an idreambooks image
       (e.g. The road to character / David Brooks.)
       -- I imported from the Library of Congress via z39.50
    2) Ensure your system preferences for idreambook stuff is set.
    3) Ensure you have multiple 020$a's for your book, and
       the first one must just be an ISBN number!
       -- I removed the '(hardcover: acidfree paper)' from the first.
       -- I took the second 020 field and changed 020$z to 020$a
    4) Search for that book in OPAC and go to details.
       -- There should be a readometer image, but it will be broken.
       -- Notice the ISBN line has "#############; ..."
          This could also be attained by just putting two semi-colon
          separated ISBN's on the first 020$a.
    5) Apply this patch
    6) Refresh page
       -- readometer image appears. YAY!
    7) run koha qa test tools
    
    NOTE: Only changed test plan, so leaving sign-off on.
    
    Signed-off-by: Nick Clemens <nick at quecheelibrary.org>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at koha-community.org>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>

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

Summary of changes:
 .../authorities/authority-koha-indexdefs.xml       |    2 +-
 .../authorities/authority-zebra-indexdefs.xsl      |    2 ++
 .../authorities/authority-koha-indexdefs.xml       |    2 +-
 .../authorities/authority-zebra-indexdefs.xsl      |    2 ++
 .../prog/en/includes/authorities-search.inc        |   17 ++++-------
 .../prog/en/includes/budgets-admin-search.inc      |   10 +++----
 .../intranet-tmpl/prog/en/includes/cat-search.inc  |   10 +++----
 .../prog/en/includes/cataloging-search.inc         |   14 ++++-----
 .../prog/en/includes/checkin-search.inc            |    6 ++--
 .../intranet-tmpl/prog/en/includes/circ-search.inc |   10 +++----
 .../prog/en/includes/cities-admin-search.inc       |   10 +++----
 .../prog/en/includes/contracts-admin-search.inc    |   10 +++----
 .../prog/en/includes/currencies-admin-search.inc   |   10 +++----
 .../prog/en/includes/doc-head-close.inc            |    3 ++
 .../intranet-tmpl/prog/en/includes/home-search.inc |   14 ++++-----
 .../prog/en/includes/letters-search.inc            |   10 +++----
 .../prog/en/includes/patron-search-box.inc         |    4 +--
 .../prog/en/includes/patron-search.inc             |   14 ++++-----
 .../prog/en/includes/patrons-admin-search.inc      |   10 +++----
 .../prog/en/includes/prefs-admin-search.inc        |   12 ++++----
 .../prog/en/includes/printers-admin-search.inc     |   10 +++----
 .../prog/en/includes/searchbox-keep-text.inc       |   30 ++++++++++++++++++++
 .../prog/en/includes/serials-search.inc            |    6 ++--
 .../prog/en/includes/stopwords-admin-search.inc    |   10 +++----
 .../prog/en/includes/suggestions-add-search.inc    |    6 ++--
 .../prog/en/includes/z3950-admin-search.inc        |   10 +++----
 .../opac-tmpl/bootstrap/en/modules/opac-detail.tt  |    2 +-
 .../bootstrap/en/xslt/MARC21slim2OPACResults.xsl   |    2 +-
 28 files changed, 140 insertions(+), 108 deletions(-)
 create mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/searchbox-keep-text.inc


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Wed Jul  8 20:18:04 2015
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Wed, 08 Jul 2015 18:18:04 +0000
Subject: [koha-commits] main Koha release repository branch master updated.
	v3.20.00-284-gbc29f62
Message-ID: <E1ZCtv2-0007dV-Lv@git.koha-community.org>

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  bc29f6226fd641ec3fcd56aec3a95fe14635714d (commit)
       via  b9cc3e8e72c56d0c62d52071afc1eb8b7b82cf17 (commit)
       via  6d91e791cdf8520a4d16c1b9d35e956ade700741 (commit)
       via  fc95762725bd0af4d156c7643bd6f1a4aedab2c5 (commit)
       via  f573a155974c84a6fb433bff86a220d4644ad27e (commit)
       via  958be9804a50c3e13f74c4d5f81348e2256a8042 (commit)
       via  83387bf3b1d9eb8710e184269338361ac1477d1c (commit)
       via  8eb049a6a1697f8b2cd23cd660d508ad1ef629e7 (commit)
      from  fbe25b1d8e1806768b04d829bd9fc1a05f4861cf (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 bc29f6226fd641ec3fcd56aec3a95fe14635714d
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date:   Wed Jul 8 15:07:24 2015 -0300

    Bug 3206: (RM followup) DBIx updates
    
    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>

commit b9cc3e8e72c56d0c62d52071afc1eb8b7b82cf17
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date:   Wed Jul 8 15:05:13 2015 -0300

    Bug 3206: DBRev 3.21.00.014
    
    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>

commit 6d91e791cdf8520a4d16c1b9d35e956ade700741
Author: Matthias Meusburger <matthias.meusburger at biblibre.com>
Date:   Mon Jun 8 15:33:24 2015 +0200

    Bug 3206: (QA followup) OAI repository deleted records support.
    
     - Fix QA.
    
    Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
    New pref in right order, new option 'no' on syspref, other
    fixes following comment #12
    All seems to work
    No errors
    
    Signed-off-by: Jonathan Druart <jonathan.druart at koha-community.org>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>

commit fc95762725bd0af4d156c7643bd6f1a4aedab2c5
Author: Matthias Meusburger <matthias.meusburger at biblibre.com>
Date:   Thu May 28 16:23:58 2015 +0200

    Bug 3206: OAI repository deleted records support.
    
    This patch allows Koha OAI repository to support deleted records.
    
    The OAI-PMH:DeletedRecord syspref is introduced and can be set to:
    
    - persistent (in case Koha's deletedbiblio table will never be emptied
      or truncated)
    - transient (in case Koha's deletedbiblio table might be emptied or
      truncated at some point)
    
    Test plan:
    
    - After applying the patch, test that:
       - Deleted records appear in ListRecords and ListIdentifiers requests.
       - Filter parameters (from, until, set and resumptionToken) still work
         and are applied to ListRecords and ListIdentifiers requests.
       - Identify request shows if the repository is considered persistent
         or transient, according to the OAI-PMH:DeletedRecord syspref.
       - Deleted records that used to belong to a set are still displayed in
         those sets and marked as deleted.
       - GetRecord requests work on deleted records, which are marked as deleted.
    
    Requests examples:
    /cgi-bin/koha/oai.pl?verb=ListRecords&metadataPrefix=oai_dc
    /cgi-bin/koha/oai.pl?verb=ListRecords&metadataPrefix=oai_dc&from=2015-02-20T11:08:33Z
    /cgi-bin/koha/oai.pl?verb=ListRecords&metadataPrefix=oai_dc&set=new_specSet1
    /cgi-bin/koha/oai.pl?verb=GetRecord&identifier=KOHA-OAI-TEST:2&metadataPrefix=oai_dc
    /cgi-bin/koha/oai.pl?verb=Identify
    
    Signed-off-by: Frederic Demians <f.demians at tamil.fr>
      It works in all situations described in the test plan. Great addition.
      Thanks.
    
    Signed-off-by: Jonathan Druart <jonathan.druart at koha-community.org>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at koha-community.org>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>

commit f573a155974c84a6fb433bff86a220d4644ad27e
Author: David Cook <dcook at prosentient.com.au>
Date:   Tue Jun 9 14:25:23 2015 +1000

    Bug 14366: Units doesn't get saved usefully for patroncards
    
    This patch causes the "Units" to be saved and displayed correctly
    for the "Edit layout" screen in Patroncards.
    
    _TEST PLAN_
    
    Before applying:
    0) Create a new layout
    1) Edit the layout, change the units, and click Save
    2) Edit the layout again, and notice the units are still "PostScript Points"
    
    Apply the patch:
    3) Edit the layout again, change the units, and click Save
    4) Edit the layout again, note that the units have changed to your
    selection
    
    5) Rejoice
    
    Signed-off-by: Nick Clemens <nick at quecheelibrary.org>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at koha-community.org>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>

commit 958be9804a50c3e13f74c4d5f81348e2256a8042
Author: Nick Clemens <nick at quecheelibrary.org>
Date:   Tue Jun 16 21:48:18 2015 -0400

    Bug 13950: Sort Item search home library list by branch name
    
    On the item search form the list of home libraries isn't sorted
    alphabetically by their descrption.
    
    To test:
    - Ensure that you have libraries whose code/name are sorted in a different alphabetical order (e.g. Aardvark/ZZZ & Zebra/AAA)
    - Staff: Advanced search - item search
    - See that libraries are sorted in code order
    - Apply patch
    - Verify selection block for home library is correctly sorted after
      applying the patch.
    
    Signed-off-by: Indranil Das Gupta (L2C2 Technologies) <indradg at gmail.com>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at koha-community.org>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>

commit 83387bf3b1d9eb8710e184269338361ac1477d1c
Author: Katrin Fischer <Katrin.Fischer.83 at web.de>
Date:   Sun May 31 15:52:26 2015 +0200

    Bug 14163: Acq - receive shipment and order from staged: rename 'Show all' to 'Show inactive'
    
    'Show all' in acquisition makes the inactive funds in the fund list
    box visible. This patch changes the text to 'Show inactive' to be more
    clear about the functionality.
    
    Patch changes 2 pages. To test:
    
    1) Order from staged file
    - make sure you have uploaded a few records via the tools
    - create a new order using the 'From a staged file' option
    - select a file to order from - 'Add orders'
    - Verify the 'Select to import' tab now displayed the text
      'Show inactive funds' and that it works as expected
    - Switch to the 'Default accounting details' tab
    - Verify the text there is also changed to 'Show inactive' and
      works like expected.
    
    2) Receive shipment
    - receive a new shipment for a vendor with unreceived orders
    - Verify the label next to the fund list has changed to
      'Show inactive' and works as expected.
    
    Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
    Simple string change, no errors.
    
    Signed-off-by: Jonathan Druart <jonathan.druart at koha-community.org>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>

commit 8eb049a6a1697f8b2cd23cd660d508ad1ef629e7
Author: Katrin Fischer <Katrin.Fischer.83 at web.de>
Date:   Mon May 25 10:45:54 2015 +0200

    Bug 14163: Acq order form: rename 'Show all' to 'Show inactive'
    
    On the order form there is a checkbox next to the fund list labelled
    'show all'. Checking the checkbox will result in the inactive funds
    showing in the pull down list as well.
    
    The patch renames the label to 'Show inactive' to make the purpose
    more clear.
    
    To test:
    - Create a new order
    - Verify the label has changed as described above
    - Decide if the change makes sense
    
    Signed-off-by: tadeasm <tadeas.moravec at gmail.com>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at koha-community.org>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>

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

Summary of changes:
 Koha.pm                                            |    2 +-
 Koha/Schema/Result/Biblio.pm                       |   29 +-----
 Koha/Schema/Result/OaiSet.pm                       |   14 +--
 Koha/Schema/Result/OaiSetsBiblio.pm                |   22 +----
 catalogue/itemsearch.pl                            |    2 +-
 installer/data/mysql/kohastructure.sql             |    1 -
 installer/data/mysql/sysprefs.sql                  |    1 +
 installer/data/mysql/updatedatabase.pl             |   13 +++
 .../prog/en/modules/acqui/addorderiso2709.tt       |    4 +-
 .../prog/en/modules/acqui/neworderempty.tt         |    2 +-
 .../intranet-tmpl/prog/en/modules/acqui/parcels.tt |    2 +-
 .../en/modules/admin/preferences/web_services.pref |    8 ++
 opac/oai.pl                                        |   98 ++++++++++++++++----
 patroncards/edit-layout.pl                         |    7 ++
 14 files changed, 120 insertions(+), 85 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Wed Jul  8 23:15:31 2015
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Wed, 08 Jul 2015 21:15:31 +0000
Subject: [koha-commits] main Koha release repository branch 3.20.x updated.
	v3.20.01-30-g8dd172c
Message-ID: <E1ZCwgl-0008UU-Mk@git.koha-community.org>

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, 3.20.x has been updated
       via  8dd172cde0bc9da6f1267250f829e7eb10601d68 (commit)
       via  487dd985eb86c5555c941c23e82049794aa2ee33 (commit)
       via  5a7c1634c6fcdd1b6568e87145868f7e9ebf2611 (commit)
       via  a36eeb458c8bb0944cb53fb12d6a59348f29b38f (commit)
       via  2413ae8bd9d38791769c861cc455c8f26e6e7708 (commit)
       via  31b3f8d1be3c3d130d68fb1e427b1ad5f2280ef7 (commit)
       via  d8530b61042ce4cef0d54fa4f3b751a3b4de4eb9 (commit)
      from  fe6ee44cab4c5513b9097cee4e6e13f6c4d09a91 (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 8dd172cde0bc9da6f1267250f829e7eb10601d68
Author: Katrin Fischer <Katrin.Fischer.83 at web.de>
Date:   Mon Jun 8 05:29:16 2015 +0200

    Bug 13874: 'Rotating collections' are a circulation tool
    
    Moves the entry for 'Rotating collections' from the Catalog
    column to the 'Patrons and circulation' column.
    
    To test:
    - Verify the entry has been moved on the tools home page
    
    NOTE: I agree that collections makes more sense under the new
          column.
    
    Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at koha-community.org>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>
    (cherry picked from commit da8ec2d37a43c87ad5b087511dd8e4ce082f022f)
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

commit 487dd985eb86c5555c941c23e82049794aa2ee33
Author: Mark Tompsett <mtompset at hotmail.com>
Date:   Wed Apr 15 12:33:29 2015 -0400

    Bug 14001: Inventory has bad $_ references
    
    After receiving an error while attempt a simple inventory run,
    Two lines were changed from:
        ...$_->...
    to
        ...$item->...
    since the loop variable is $item. And $_ is not set to the
    expected hash reference, when there is a loop variable.
    
    This also helps explain the "Why are there blank dates on my
    last seen field?" problem that has been mentioned by users.
    
    TEST PLAN
    ---------
     1) Apply this patch after a reset to master.
     2) Log in to staff client
     3) Add one item via z39.50, setting barcode to a known value (BARCODE1)
     4) Wait for the reindex
     5) Home -> Tools -> Inventory/Stocktaking
     6) Browse for a file with the barcode in it
     7) Set the library dropdown to the library branch of the added item.
     8) Check 'Compare barcodes list to results:'
     9) Click 'Submit'
        -- This should not die under plack.
           This should not generate blank last seen dates.
           The last seen dates should be as expected.
    10) run koha qa test tools
    11) Confirm the two change point correspond to the two change points
        in the patch which shall not be pushed to master.
    
    The test result comply with expected outcome outlined in test plan.
    
    Signed-off-by: Indranil Das Gupta (L2C2 Technologies) <indradg at gmail.com>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at koha-community.org>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>
    (cherry picked from commit 3ebc081962247ce0c598da810451c459909842bc)
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

commit 5a7c1634c6fcdd1b6568e87145868f7e9ebf2611
Author: Katrin Fischer <katrin.fischer at bsz-bw.de>
Date:   Wed Jun 17 12:28:39 2015 +0200

    Bug 14401: Zebra index configuration doesn't allow exact search for C.
    
    2 lines in the Zebra configuration files prevent an exact search for C.,
    while all other [A-Z]. searches work correctly.
    
    After taking a look at the  /etc/zebradb/etc/word-phrase-utf.chr
    those 2 lines cause the problem:
    
    map (^c\.)          @
    map (^C\.)          @
    
    I propose to remove them.
    
    To test:
    - Catalog a record with an item with callnumber: C.
    - Catalog a record with an item with callnumber: B.
    - Try seaching for the second using callnum,ext:B. (exact field search)
      - Verify search works.
    - Try searching for the other with callnum,ext:C.
      - Verify no result.
    - Apply the patch - copy the zebra config file if necessary into the right spot
    - Reindex
    - Repeat searches - both should not bring up the correct record.
    
    Signed-off-by: Indranil Das Gupta (L2C2 Technologies) <indradg at gmail.com>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>
    (cherry picked from commit f86743d893b61a4609d2f02a175db9944710067e)
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

commit a36eeb458c8bb0944cb53fb12d6a59348f29b38f
Author: Robin Sheat <robin at catalyst.net.nz>
Date:   Wed May 27 12:25:34 2015 +1200

    Bug 14394: fix documentation of OpacHiddenItems
    
    The current documentation of OpacHiddenItems told people to go and read
    a file on the server, which most people don't have access to. This
    replaces it with a link to the wiki.
    
    http://bugs.koha-community.org/show_bug.cgi?id=14394
    
    Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
    
    It doesn't apply for some reason. Fixed
    Added target attribute to open in new window/tab,
    hope you don't mind.
    
    Updated documentation
    No errors
    
    Belongs to Aleisha or Robin?
    Update assignee please :)
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>
    (cherry picked from commit 865321f3726c3b6065ef72107017c4171630d140)
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

commit 2413ae8bd9d38791769c861cc455c8f26e6e7708
Author: Mark Tompsett <mtompset at hotmail.com>
Date:   Fri Jun 19 09:00:33 2015 -0400

    Bug 14422: Typo in updatedatabase.pl
    
    TEST PLAN
    ---------
     1) backup db
     2) git checkout -b my_3.6.x origin/3.6.x
     3) drop db and create blank one
     4) git reset --hard origin/3.6.x
     5) run web installer
     6) set HomeorHoldingBranchReturn system preference to 'holdingbranch'.
     7) create a Default checkout, hold rule
        home -> koha administration -> Circulation and fines rules
        -- I put 10 checkouts total and clicked 'Save'
        -- there currently is not 'returnbranch' in default_circ_rules.
     8) git reset --hard origin/3.20.x
        -- or whatever version you apply this to
           (3.8.x, 3.10.x, 3.14.x, 3.16.x, 3.18.x, or 3.20.x
            -- 3.21.00.008 deletes the systempreference involved)
     9) ./installer/data/mysql/updatedatabase.pl
    10) check HomeorHoldingBranchReturn systempreference
        -- Currently says 'holdingbranch', but
           the value of 'returnbranch' in default_circ_rules is
           'homebranch'.
    11) repeat steps 3-8
    12) apply this patch
    13) repeat steps 9-10
        -- Currently says 'holdingbranch', and
           the value of 'returnbranch' in default_circ_rules is
           'holdingbranch'.
    14) run koha qa test tools
    
    Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
    Tested using 3.6.x install, updated to 3.8.x
    Value is preserved
    No errors
    
    Signed-off-by: Jonathan Druart <jonathan.druart at koha-community.org>
    Note: I haven't followed the test plan, but the fix is trivial.
    Maybe it could worth to upate 3.21.00.008 and check the value of
    HomeOrHoldingBranchReturn before deleting it.
    We could raise a warning if HomeOrHoldingBranchReturn ==
    'holdingbranch'.
    Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>
    
    (cherry picked from commit 8c91ca7903846da0cf7a73914a0b78484c0429df)
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

commit 31b3f8d1be3c3d130d68fb1e427b1ad5f2280ef7
Author: Katrin Fischer <Katrin.Fischer.83 at web.de>
Date:   Mon Jun 8 02:15:03 2015 +0200

    Bug 4925: Remove Smithsonian as a delivered z39.50 target
    
    Removes the Smithsonian as a target installed with the
    sample data during installation.
    
    Also adds the newer LOC authority targets to files where
    they were missing.
    
    To test:
    - Verify the Smithsonian has been removed from all
      translated installers
    - Verify the files are still valid SQL and install
      correctly
    
    NOTE: There was tiny scope creep which included ensuring
          there were two Authority z39.50 servers as well.
          Text files properly reflect the removal.
          SQL 'source' of SQL files worked properly.
          Was able to Z39.50 search for all of the 'en'.
    
    Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at koha-community.org>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>
    (cherry picked from commit 0ca21c1e488f150cca74beb9a67b285e5531f3b5)
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

commit d8530b61042ce4cef0d54fa4f3b751a3b4de4eb9
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date:   Wed Apr 15 12:39:05 2015 +0200

    Bug 10172: Hide some uneeded stuffs on printing a record
    
    When printing a record from the OPAC or the staff interface, some
    uneeded blocks are displayed.
    
    OPAC:
    1/ Browse results
    2/ The view tags (Normal, MARC, ISBD)
    
    Intranet:
    1/ Marc view link
    2/ The Please upload one image link
    
    Test plan:
    On a record detail page (staff and OPAC), print the page and confirm
    these blocks no longer appear.
    
    Signed-off-by: Nick Clemens <nick at quecheelibrary.org>
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>
    (cherry picked from commit 68f0fe7b6f152a6db100525724c1ece507258652)
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

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

Summary of changes:
 etc/zebradb/etc/word-phrase-utf.chr                         |    2 --
 .../data/mysql/de-DE/optional/sample_z3950_servers.sql      |    3 +--
 .../data/mysql/de-DE/optional/sample_z3950_servers.txt      |    3 ++-
 installer/data/mysql/en/optional/sample_z3950_servers.sql   |    3 +--
 installer/data/mysql/en/optional/sample_z3950_servers.txt   |    1 -
 .../data/mysql/es-ES/optional/sample_z3950_servers.sql      |   11 ++++++-----
 .../data/mysql/es-ES/optional/sample_z3950_servers.txt      |    3 ++-
 .../data/mysql/pl-PL/optional/sample_z3950_servers.sql      |    3 +--
 .../data/mysql/pl-PL/optional/sample_z3950_servers.txt      |    1 -
 installer/data/mysql/updatedatabase.pl                      |    2 +-
 koha-tmpl/intranet-tmpl/prog/en/css/print.css               |    6 ++++++
 .../prog/en/modules/admin/preferences/opac.pref             |    2 +-
 koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt |    2 +-
 koha-tmpl/intranet-tmpl/prog/en/modules/tools/tools-home.tt |    9 ++++-----
 koha-tmpl/opac-tmpl/bootstrap/css/print.css                 |    2 +-
 koha-tmpl/opac-tmpl/bootstrap/less/print.less               |    5 +++++
 tools/inventory.pl                                          |    4 ++--
 17 files changed, 34 insertions(+), 28 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Wed Jul  8 23:18:39 2015
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Wed, 08 Jul 2015 21:18:39 +0000
Subject: [koha-commits] main Koha release repository branch master updated.
	v3.20.00-285-g6e9086f
Message-ID: <E1ZCwjn-00005M-AA@git.koha-community.org>

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  6e9086fb2c4d031e6e99efca85ad4a5f3c0b9f42 (commit)
      from  bc29f6226fd641ec3fcd56aec3a95fe14635714d (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 6e9086fb2c4d031e6e99efca85ad4a5f3c0b9f42
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date:   Wed Jul 8 18:16:47 2015 -0300

    Bug 3206: (QA followup) missing comma on sysprefs.sql
    
    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>

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

Summary of changes:
 installer/data/mysql/sysprefs.sql |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Thu Jul  9 23:12:49 2015
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Thu, 09 Jul 2015 21:12:49 +0000
Subject: [koha-commits] main Koha release repository branch 3.20.x updated.
	v3.20.01-32-g3737e83
Message-ID: <E1ZDJ7h-0005Kr-SN@git.koha-community.org>

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, 3.20.x has been updated
       via  3737e834659481c0ca1134b5fa6ba8a5364dbba5 (commit)
       via  efe1eb9aca303605bea999198876e6a786d1d5f2 (commit)
      from  8dd172cde0bc9da6f1267250f829e7eb10601d68 (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 3737e834659481c0ca1134b5fa6ba8a5364dbba5
Author: Nick Clemens <nick at quecheelibrary.org>
Date:   Tue Jun 9 21:51:44 2015 -0400

    Bug 14371: Facets should be sorted by label (displayed) not title (link value)
    
    This patch changes one small line in catalogue/search.pl and opac/opac-search to sort facets by:
    facet_label_value
    instead of
    facet_title_value
    
    To test:
    1 - Perform a search with results in two branches e.g. Centerville (code CPL) and Fairfield (code FPL)
    2 - Notice that branch facets appear correctly sorted
    3 - Rename the branches Centervile->Zebra and Fairfeild->Aardvark (but don't change codes)
    4 - Repeat original search
    5 - Note that branch facets are no longer correctly sorted
    6 - Apply patch
    7 - Repeat search
    8 - Facets should be correctly sorted
    9 - Test in both staff and opac search
    10 - Ensure there are no unintended consequences/regressions
    
    Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
    Work as described,  staff AND opac
    No errors
    
    Signed-off-by: Jonathan Druart <jonathan.druart at koha-community.org>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>
    (cherry picked from commit 219f7b5c8fe59034fc7aff1ab81e42bc8cb6eba2)
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

commit efe1eb9aca303605bea999198876e6a786d1d5f2
Author: Katrin Fischer <Katrin.Fischer.83 at web.de>
Date:   Mon Jun 8 04:46:05 2015 +0200

    Bug 14094: DDC - Add separators for repeated $a subfields (MARC21)
    
    Mulitple 082 fields are already separated by |, but multiple
    $a in one 082 field were only separated by space, making those
    not easy to read.
    
    Patch takes care that the | separator is used in all cases.
    
    To test:
    - Catalog a record with multiple 082 fields
    - Add one or multiple $a subfields to each
    - Verify every single classification is separated from
      the others with a | in staff and in OPAC detail pages
    
    Signed-off-by: Nick Clemens <nick at quecheelibrary.org>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at koha-community.org>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>
    (cherry picked from commit 6d9d66e32afaef73cbf2a33ce58d49f373e99dd8)
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

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

Summary of changes:
 catalogue/search.pl                                                |    2 +-
 koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetDetail.xsl |    1 +
 koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACDetail.xsl    |    1 +
 opac/opac-search.pl                                                |    2 +-
 4 files changed, 4 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Thu Jul  9 23:24:36 2015
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Thu, 09 Jul 2015 21:24:36 +0000
Subject: [koha-commits] main Koha release repository branch 3.20.x updated.
	v3.20.01-35-g52fcf50
Message-ID: <E1ZDJJ6-0005Ps-Jv@git.koha-community.org>

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, 3.20.x has been updated
       via  52fcf509498efff6e55e3de9d7575ad94758def9 (commit)
       via  922eed4c327c3ffd2ce52b4c854d55a8a7f7b7e1 (commit)
       via  637c1cdcbbcd175f3f6ca0e7861935d31036aa15 (commit)
      from  3737e834659481c0ca1134b5fa6ba8a5364dbba5 (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 52fcf509498efff6e55e3de9d7575ad94758def9
Author: Nicolas Legrand <nicolas.legrand at bulac.fr>
Date:   Thu May 28 16:32:29 2015 +0200

    Bug 14290: Add a table foot to circulation matrix
    
    Reprint circulation matrix header in a footer helps editing entries in
    big matrix. Otherwise, the header disapears and it's hard to tell
    which columns we're editing.
    
    Test plan : try do add, modify or delete some entries in the
    circulation matrix, everything should work as expected.
    
    Patch works as expected.
    Signed-off-by: Marc V?ron <veron at veron.ch>
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>
    (cherry picked from commit 1ea3465d30b1b0fcd12a5592ce5a4c34a9a58462)
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

commit 922eed4c327c3ffd2ce52b4c854d55a8a7f7b7e1
Author: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
Date:   Wed Jun 17 13:22:49 2015 -0300

    Bug 12616: Locale in subscriptions not preselecting correctly
    
    There is a problem if a language is present but
    don't have ISO639-2 code. Locale pulldown on serial
    suscription is malformed.
    
    To reproduce on master:
    a) remove some entries on language_rfc4646_to_iso639
    b) go to Serials > New suscription
    c) Put any value on Vendor and record, press Next>>
    d) Look at locale pulldown, it must default to last
    removed lang from a), also other langs has no value
    and are also 'selected' on html
    
    To test:
    1) Reproduce the problem
    2) Apply the patch
    3) Add New suscription, pulldown must be fixed
    
    NOTE: Deleted Urdu and Chinese.
          Master had both "selected" in the HTML.
          Applied patch, neither were added.
          Defaults to first item, which is blank meaning English.
    
    Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at koha-community.org>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>
    (cherry picked from commit b9c4061479235d0d79ecbd917b015db5441d8118)
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

commit 637c1cdcbbcd175f3f6ca0e7861935d31036aa15
Author: Katrin Fischer <Katrin.Fischer.83 at web.de>
Date:   Mon Jun 8 00:55:22 2015 +0200

    Bug 8330: Overdue email link contains untranslatable 'Overdue:'
    
    The translation scripts don't pick up text from href attributes,
    which is what we want, with a small exception for this script.
    
    Patch uses a TT trick to make the Overdue: in the subject
    of the mailto: link translatable.
    
    Regression test:
    - Make sure you have an overdue item
    - Go to Circulation > Overdues
    - Verify the [email] link works and a subject
      with 'Overdue: <title>' is generated
    - Apply patch and repeat steps
    
    Bonus: Verify the branch name now shows instead of
           the branchcode in the table
    
    To test translatability:
    - cd misc/translator
    - perl translate update de-DE
    - Open file po/de-DE-staff-prog.po
    - Search for Overdue:
    - Translate string, remove 'fuzzy' marker
    - perl translate install de-DE
    - Test again, subject should now be translated
    
    Signed-off-by: Nick Clemens <nick at quecheelibrary.org>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>
    (cherry picked from commit 67881bd907b4c28843c73bb26b051a69dd489094)
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

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

Summary of changes:
 C4/Languages.pm                                    |    3 ++-
 .../prog/en/modules/admin/smart-rules.tt           |   25 ++++++++++++++++++++
 .../intranet-tmpl/prog/en/modules/circ/overdue.tt  |    7 ++++--
 3 files changed, 32 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Fri Jul 10 00:13:14 2015
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Thu, 09 Jul 2015 22:13:14 +0000
Subject: [koha-commits] main Koha release repository branch 3.20.x updated.
	v3.20.01-37-g9f945e6
Message-ID: <E1ZDK4A-0005fK-Ak@git.koha-community.org>

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, 3.20.x has been updated
       via  9f945e63795ab5ba49cb69750a79cca5d2e125e9 (commit)
       via  aa5e4dcd568edea0894713a18f3e7545d945d5fb (commit)
      from  52fcf509498efff6e55e3de9d7575ad94758def9 (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 9f945e63795ab5ba49cb69750a79cca5d2e125e9
Author: Jonathan Druart <jonathan.druart at koha-community.org>
Date:   Thu Jun 18 18:14:36 2015 +0200

    Bug 11804: Remove references to circ-menu.tt
    
    Signed-off-by: Jonathan Druart <jonathan.druart at koha-community.org>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
    (cherry picked from commit b9ae37ae38886a1b37293f7238302a5300d86087)
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

commit aa5e4dcd568edea0894713a18f3e7545d945d5fb
Author: Katrin Fischer <Katrin.Fischer.83 at web.de>
Date:   Sat Jun 6 13:03:43 2015 +0200

    Bug 11804: Remove unused circ-menu.tt
    
    The formerly used circ-menu.tt is no longer referenced in the
    templates and can be removed.
    
    To test:
    - Verify all tabs in the patron account still work as
      they should.
    - git grep circ-menu.tt
    
    Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
    No problems on patron pages, no more circ-menu.tt
    No errors
    
    Signed-off-by: Jonathan Druart <jonathan.druart at koha-community.org>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
    (cherry picked from commit 46a2585b01255b4257ccb6ca4617e341b0bbb301)
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

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

Summary of changes:
 .../intranet-tmpl/prog/en/includes/circ-menu.tt    |  100 --------------------
 members/boraccount.pl                              |    1 -
 members/pay.pl                                     |    1 -
 members/paycollect.pl                              |    2 -
 4 files changed, 104 deletions(-)
 delete mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.tt


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Fri Jul 10 00:54:21 2015
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Thu, 09 Jul 2015 22:54:21 +0000
Subject: [koha-commits] main Koha release repository branch 3.20.x updated.
	v3.20.01-38-g88f9d6d
Message-ID: <E1ZDKhx-0005rM-KD@git.koha-community.org>

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, 3.20.x has been updated
       via  88f9d6dd3326774217498ffea79364e05f609da0 (commit)
      from  9f945e63795ab5ba49cb69750a79cca5d2e125e9 (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 88f9d6dd3326774217498ffea79364e05f609da0
Author: Mark Tompsett <mtompset at hotmail.com>
Date:   Tue Jun 16 04:39:31 2015 +0000

    Bug 5025: discrepancy between opac doc-head-open.inc and staff doc-head-open.inc
    
    http://library.debiankoha.ca/cgi-bin/koha/errors/400.pl
    http://library.debiankoha.ca/cgi-bin/koha/errors/401.pl
    http://library.debiankoha.ca/cgi-bin/koha/errors/402.pl
    http://library.debiankoha.ca/cgi-bin/koha/errors/403.pl
    http://library.debiankoha.ca/cgi-bin/koha/errors/404.pl
    http://library.debiankoha.ca/cgi-bin/koha/errors/500.pl
    http://library.debiankoha.ca/cgi-bin/koha/ilsdi.pl
    Set OpacMaintenance to "Show" in the Staff client system preferences.
    http://library.debiankoha.ca/cgi-bin/koha/maintenance.pl
    Set OpacMaintenance to "Don't show" in the Staff client system preferences.
    http://library.debiankoha.ca/cgi-bin/koha/opac-ISBDdetail.pl?biblionumber=5390
    http://library.debiankoha.ca/cgi-bin/koha/opac-MARCdetail.pl?biblionumber=5390
    Log into OPAC Client
    http://library.debiankoha.ca/cgi-bin/koha/opac-account.pl
    http://library.debiankoha.ca/cgi-bin/koha/opac-search.pl
    -- This is actually the advanced search.
    FIXME: Don't know how to trigger opac-alert-subscribe.tt
    FIXME: Don't know how to trigger opac-auth-MARCdetail.tt
    FIXME: Don't know how to trigger opac-auth-detail.tt
    FIXME: Don't know how to trigger opac-auth.tt
    Click 'Authority search' in OPAC
    Click 'Submit'
    Search for something in the catalog
    Click 'Select all'
    Change 'With selected titles:' drop down to 'cart'
    View the cart.
    Click 'Send'
    Click 'Cancel'
    Click 'Download'
    Click 'Cancel'
    Close cart window
    Search for something in the catalog
    Select 'Select all'
    Change 'With selected titles:' drop down to '[ New List ]'
    Save the list
    Click 'Lists'
    Click the list you saved
    Click 'Download list'
    Click 'Cancel'
    Click 'Send list'
    Click 'Cancel'
    Copy the URL from download list and remove the '&context=modal'
    Click 'Cancel'
    http://library.debiankoha.ca/cgi-bin/koha/opac-blocked.pl
    http://library.debiankoha.ca/cgi-bin/koha/opac-browser.pl
    FIXME: Don't know how to trigger opac-course-details.tt
    http://library.debiankoha.ca/cgi-bin/koha/opac-course-reserves.pl
    http://library.debiankoha.ca/cgi-bin/koha/opac-detail.pl?biblionumber=5336
    FIXME: Don't know how to trigger opac-full-serial-issues.tt
    http://library.debiankoha.ca/cgi-bin/koha/opac-imageviewer.pl
    http://library.debiankoha.ca/cgi-bin/koha/opac-main.pl
    Click on the user name in the top area.
    Click the 'your personal details' tab.
    Change the birth date.
    Click 'Submit'
    http://library.debiankoha.ca/cgi-bin/koha/opac-messaging.pl
    http://library.debiankoha.ca/cgi-bin/koha/opac-overdrive-search.pl
    Click on the user name in the top area.
    Click the 'change your password' tab.
    Set OPACPrivacy to "Allow" in the Staff client system preferences.
    Refresh OPAC page
    click on the user name in the top area.
    Click the 'your privacy' tab.
    Click the 'your reading history' tab.
    Change the PatronSelfRegistration to "Allow" in the Staff client system preferences.
    Change the PatronSelfRegistrationCategory to "PT" or some other valid patron category code.
    Change the PatronSelfRegistrationAdditionalInstructions to something.
    Refresh OPAC page
    Log out
    Click the 'Register Here' link.
    
    Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
    Tested most pages, inspected all of them.
    No errors
    
    Signed-off-by: Jonathan Druart <jonathan.druart at koha-community.org>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
    (cherry picked from commit cb28aa454a4c97d0dcf7772d13dfb14635596291)
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

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

Summary of changes:
 koha-tmpl/opac-tmpl/bootstrap/en/includes/doc-head-close.inc      |    1 -
 koha-tmpl/opac-tmpl/bootstrap/en/includes/doc-head-open.inc       |    1 -
 koha-tmpl/opac-tmpl/bootstrap/en/modules/errors/400.tt            |    3 ++-
 koha-tmpl/opac-tmpl/bootstrap/en/modules/errors/401.tt            |    3 ++-
 koha-tmpl/opac-tmpl/bootstrap/en/modules/errors/402.tt            |    3 ++-
 koha-tmpl/opac-tmpl/bootstrap/en/modules/errors/403.tt            |    5 +++--
 koha-tmpl/opac-tmpl/bootstrap/en/modules/errors/404.tt            |    3 ++-
 koha-tmpl/opac-tmpl/bootstrap/en/modules/errors/500.tt            |    3 ++-
 koha-tmpl/opac-tmpl/bootstrap/en/modules/ilsdi.tt                 |    4 ++--
 koha-tmpl/opac-tmpl/bootstrap/en/modules/maintenance.tt           |    2 +-
 koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-ISBDdetail.tt       |    3 ++-
 koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-MARCdetail.tt       |    3 ++-
 koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-account.tt          |    3 ++-
 .../opac-tmpl/bootstrap/en/modules/opac-addbybiblionumber.tt      |    2 +-
 koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-advsearch.tt        |    3 +--
 koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-alert-subscribe.tt  |    3 ++-
 koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-auth-MARCdetail.tt  |    3 ++-
 koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-auth-detail.tt      |    3 ++-
 koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-auth.tt             |    4 ++--
 koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-authorities-home.tt |    3 ++-
 .../bootstrap/en/modules/opac-authoritiessearchresultlist.tt      |    3 ++-
 koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-basket.tt           |    2 +-
 koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-blocked.tt          |    2 +-
 koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-browser.tt          |    3 ++-
 koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-course-details.tt   |    2 +-
 koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-course-reserves.tt  |    2 +-
 koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt           |    3 ++-
 koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-downloadcart.tt     |    3 ++-
 koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-downloadshelf.tt    |    3 ++-
 .../opac-tmpl/bootstrap/en/modules/opac-full-serial-issues.tt     |    3 ++-
 koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-imageviewer.tt      |    2 +-
 koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-main.tt             |    2 +-
 .../bootstrap/en/modules/opac-memberentry-update-submitted.tt     |    2 +-
 koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-memberentry.tt      |    2 +-
 koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-messaging.tt        |    3 ++-
 koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-overdrive-search.tt |    2 +-
 koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-passwd.tt           |    3 ++-
 koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-privacy.tt          |    3 ++-
 koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-readingrecord.tt    |    2 +-
 .../bootstrap/en/modules/opac-registration-confirmation.tt        |    2 +-
 .../bootstrap/en/modules/opac-registration-email-sent.tt          |    2 +-
 .../opac-tmpl/bootstrap/en/modules/opac-registration-invalid.tt   |    2 +-
 koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-reserve.tt          |    2 +-
 koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results-grouped.tt  |    4 ++--
 koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt          |    4 ++--
 koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-review.tt           |    2 +-
 koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-search-history.tt   |    2 +-
 koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-sendbasketform.tt   |    3 ++-
 koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-sendshelfform.tt    |    3 ++-
 koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-serial-issues.tt    |    3 ++-
 koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shareshelf.tt       |    3 ++-
 koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shelves.tt          |    3 ++-
 koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-showmarc.tt         |    2 +-
 koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-showreviews.tt      |    3 ++-
 koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-suggestions.tt      |    5 +++--
 koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-tags.tt             |    3 ++-
 koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-tags_subject.tt     |    2 +-
 koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-topissues.tt        |    3 ++-
 koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt             |    2 +-
 koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/help.tt              |    3 ++-
 koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/printslip.tt         |    2 +-
 koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/sco-main.tt          |    3 ++-
 koha-tmpl/opac-tmpl/bootstrap/en/modules/svc/suggestion.tt        |    3 ++-
 63 files changed, 101 insertions(+), 70 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Fri Jul 10 03:59:12 2015
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Fri, 10 Jul 2015 01:59:12 +0000
Subject: [koha-commits] main Koha release repository branch 3.20.x updated.
	v3.20.01-40-g872d5e2
Message-ID: <E1ZDNaq-00073m-Fh@git.koha-community.org>

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, 3.20.x has been updated
       via  872d5e2bff7bed82562d2ef7800d21d0c80ccd46 (commit)
       via  6c412f93505a578bcdbc9bbf17d5a99c3cec5007 (commit)
      from  88f9d6dd3326774217498ffea79364e05f609da0 (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 872d5e2bff7bed82562d2ef7800d21d0c80ccd46
Author: Jonathan Druart <jonathan.druart at koha-community.org>
Date:   Tue Jun 16 17:39:16 2015 +0200

    Bug 14253: (follow-up) Same fix for the basket page
    
    Signed-off-by: Jonathan Druart <jonathan.druart at koha-community.org>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
    (cherry picked from commit b61782f1e78c771d66351b380755182e111eaf81)
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

commit 6c412f93505a578bcdbc9bbf17d5a99c3cec5007
Author: Katrin Fischer <Katrin.Fischer.83 at web.de>
Date:   Tue Jun 9 03:01:08 2015 +0200

    Bug 14253: Acq - notify borrowers popup needs to allow scrolling
    
    The 'notify on receiving' patron search on the new order form
    in acquisitions didn't allow you to scroll, so there was no
    way to select users from the bottom of a longer result list.
    
    To test:
    - Create a new order in acquisitions
    - On the order form, use the 'Add user' button to open
      the popup
    - Perform a patron research with a lot of results
    - Verify that with the patch you can scroll, but
      that you couldn't without it
    
    Signed-off-by: Mirko Tietgen <mirko at abunchofthings.net>
    without patch: no scroll bar in Firefox 38
    with patch: scrolling works fine
    
    Signed-off-by: Jonathan Druart <jonathan.druart at koha-community.org>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
    (cherry picked from commit e835e03ccf1c7f8cf9f2e9949d2d19889c3610a5)
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

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

Summary of changes:
 koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt        |    2 +-
 koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Fri Jul 10 16:00:46 2015
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Fri, 10 Jul 2015 14:00:46 +0000
Subject: [koha-commits] main Koha release repository branch master updated.
	v3.20.00-295-gcd9a827
Message-ID: <E1ZDYr8-0004sd-K3@git.koha-community.org>

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  cd9a827b6928ed0cb80c78ebf897e2d77132296a (commit)
       via  63427fce6074e8f3c5e0c37b9a76b1618fb0add0 (commit)
       via  468d3d9c83a9760e796cdf43c7da2766ccf7c9b9 (commit)
       via  5a57b3c163e6609aa99ab34e906aa05bd033d5ff (commit)
       via  c00c6e3c675da7f244d5042e1ba9be4648bd4ee9 (commit)
       via  4e271637cd64ef733fadb231be51f22146a1a9e8 (commit)
       via  a350d02b995483bdd3bc7ede2271ad8a17190acc (commit)
       via  ddd2ec87523b1d5379c8a021347fa600ddd66cc2 (commit)
       via  274942abbd299e39ba75b947023bdc881d4a54b4 (commit)
       via  e2ab42716825c5dedbb0036ae56a28e6119083f5 (commit)
      from  6e9086fb2c4d031e6e99efca85ad4a5f3c0b9f42 (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 cd9a827b6928ed0cb80c78ebf897e2d77132296a
Author: Katrin Fischer <Katrin.Fischer.83 at web.de>
Date:   Tue Jun 9 02:44:48 2015 +0200

    Bug 14303: Fix item search CSV export - obsolete "by" and display of publication year for MARC21
    
    The exported CSV file from the item search didn't display the publication
    year in MARC21 installations and the title always contained 'by'
    even if there was no author information to display. Also the by is
    not needed by MARC21 as the data should include punctuation.
    
    This basically copies the changes done to the JSON format
    on bug 13859 to the CSV include.
    
    To test: Switch from 'Screen' to 'CSV'
    - Check publication date always displays (MARC21 and UNIMARC)
    - Check that for MARC21 the 'by' has been removed from the title information
    - Check that for UNIMARC the 'by' only displays when there is also
      an author to display
    
    Tested for MARC21, works as expected.
    Signed-off-by: Marc V?ron <veron at veron.ch>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>

commit 63427fce6074e8f3c5e0c37b9a76b1618fb0add0
Author: Mark Tompsett <mtompset at hotmail.com>
Date:   Fri Jul 10 01:08:29 2015 -0400

    Bug 14428: Remove C4::Input
    
    Jonathan Druart agreed that C4::Input is vestigial code that should be removed.
    Here is how I checked. First I found where C4::Input was used. Then, I checked
    what functions are in the package: just checkdigit. Then, I confirmed that
    checkdigit is not used at all in any acquisition, administration, or member
    related perl scripts. Lastly, I took a look at our supposed test file for the
    package. It was painfully sparse.
    
    As such, this patch removes the test file and the package file, and removes
    C4::Input references from these six files:
    - acqui/addorderiso2709.pl
    - acqui/basketgroup.pl
    - acqui/neworderempty.pl
    - acqui/uncertainprice.pl
    - admin/aqplan.pl
    - members/memberentry.pl
    NOTE: neworderempty had 3 lines of it?! Didn't anyone see that?!
    
    Here is the output of what I did to confirm this correction:
    
    mtompset at debian:~/kohaclone$ git reset --hard origin/master
    HEAD is now at 6e9086f Bug 3206: (QA followup) missing comma on sysprefs.sql
    mtompset at debian:~/kohaclone$ git grep C4::Input
    C4/Input.pm:package C4::Input; #assumes C4/Input
    C4/Input.pm:C4::Input - Miscellaneous sanity checks
    C4/Input.pm:  use C4::Input;
    acqui/addorderiso2709.pl:use C4::Input;
    acqui/basketgroup.pl:use C4::Input;
    acqui/neworderempty.pl:use C4::Input;
    acqui/neworderempty.pl:use C4::Input;
    acqui/neworderempty.pl:use C4::Input;
    acqui/uncertainprice.pl:use C4::Input;
    admin/aqplan.pl:use C4::Input;
    members/memberentry.pl:use C4::Input;
    t/Input.t:        use_ok('C4::Input');
    mtompset at debian:~/kohaclone$ grep sub C4/Input.pm
    sub checkdigit ($;$) {
                    my $temp2 = substr($infl,$i,1);
            if ($rem eq substr($infl,8,1)) {
    } # sub checkdigit
    mtompset at debian:~/kohaclone$ grep checkdigit `find acqui -type f`
    mtompset at debian:~/kohaclone$ grep checkdigit `find admin -type f`
    mtompset at debian:~/kohaclone$ grep checkdigit `find members -type f`
    mtompset at debian:~/kohaclone$ cat t/Input.t
    
    use strict;
    use warnings;
    
    use Test::More tests => 1;
    
    BEGIN {
            use_ok('C4::Input');
    }
    
    Apply this patch, and the output of git grep C4::Input will be empty.
    Run koha qa test tools (kind of overkill)
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>

commit 468d3d9c83a9760e796cdf43c7da2766ccf7c9b9
Author: Julian FIOL <julian.fiol at biblibre.com>
Date:   Mon Jul 6 12:27:08 2015 +0200

    Bug 14496: Improving opac-detail.pl performances
    
    Get notes and subjects from MARC record
    ONLY when XSLT is not activated.
    
    It's useless doing it when XSLT is activated,
    because XSLT takes care of it by its own.
    
    => With this patch, we are saving precious
    milliseconds
    
    I compared the display of some records in XSLT view with and without patch, was the same (as expected).
    Signed-off-by: Marc Veron <veron at veron.ch>
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    On a slower server, I saw a time save of 0.0274 to 0.0908 seconds (with XSLT).
    Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>

commit 5a57b3c163e6609aa99ab34e906aa05bd033d5ff
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date:   Wed Jul 8 18:25:45 2015 -0300

    Bug 14508: 'New patron' dropdown empty list on circulation.pl
    
    This patch makes includes/patron-toolbar.inc (the one in charge of
    rendering the 'New patron' dropdown) make use of the Categories
    Template Toolkit plugin to create the list of categories.
    
    (1) To check the setup is sane:
    - Go to the Patrons page
    => SUCCESS: The 'New patron' dropdown is populated
    - Click on the [+] symbol on the Patron search on the top
    => SUCCESS: The Categories dropdown is populated
    
    (2) To test the patch:
    - On the checkout form, perform a patron search that
      (a) returns more than one result
      (b) returns zero results
    - Click the dropdown menu to create a new patron
    => FAIL: Dropdown is empty
    - Repeat for (a) or (b)
    - Apply the patch and reload
    => SUCCESS: The dropdown is correctly populated
    - Repeat (1)
    => SUCCESS: Nothing got broken
    - Verify the logs
    => SUCCESS: No new warnings
    - Sign off :-D
    - Get a cookie
    - Smile
    
    Regards
    
    Discussion: we might need a new bug to start cleaning stuff like this:
    
    @categories=C4::Category->all;
    if(scalar(@categories) < 1){
        $no_add = 1;
        $template->param(no_categories => 1);
    }
    else {
        $template->param(categories=>\@categories);
    }
    
    but it belongs to a new bug me thinks. Well, suggestions are welcome, but this must
    be fixed on stable ASAP so hurry :-D
    
    Followed test plan, works as expected.
    Signed-off-by: Marc V?ron <veron at veron.ch>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>

commit c00c6e3c675da7f244d5042e1ba9be4648bd4ee9
Author: Nicole C. Engard <nicole at bywatersolutions.com>
Date:   Tue Jun 23 14:49:55 2015 -0500

    Bug 14424: Add on site checkouts help for 3.20
    
    There is no help for the pending on site checkouts report. This patch
    adds it.
    
    To test:
    
    * visit pending on site checkouts
    * click help
    * confirm help is there and correct
    
    Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at koha-community.org>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>

commit 4e271637cd64ef733fadb231be51f22146a1a9e8
Author: Nicole C. Engard <nicole at bywatersolutions.com>
Date:   Tue Jun 23 14:44:11 2015 -0500

    Bug 14424: Update Acq Help for 3.20
    
    This patch adds the missing order from subscription help and updates basket
    help.
    
    To test:
    
    * Visit a basket, review the help
    * Click order from a subscrption, review the help
    
    Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at koha-community.org>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>

commit a350d02b995483bdd3bc7ede2271ad8a17190acc
Author: Nicole C. Engard <nicole at bywatersolutions.com>
Date:   Tue Jun 23 14:31:15 2015 -0500

    Bug 14424: Update Discharge Help for 3.20
    
    This patch adds the missing discharge help file and updates the moremember file with
    info on discharges.
    
    To test:
    
    * Visit a patron
    * View and confirm help is right
    * Visit the discharge page on the patron
    * Confirm help file loads and is right
    
    Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at koha-community.org>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>

commit ddd2ec87523b1d5379c8a021347fa600ddd66cc2
Author: Nicole C. Engard <nicole at bywatersolutions.com>
Date:   Tue Jun 23 13:00:06 2015 -0500

    Bug 14424: Update cataloging help for 3.20
    
    This patch updates 3 help files for catalolging in 3.20
    
    To test:
    
    * Visit
     * cataloging home
     * cataloging a new record
     * mergin bib records
    * Confirm text is right and visible
    
    Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at koha-community.org>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>

commit 274942abbd299e39ba75b947023bdc881d4a54b4
Author: Nicole C. Engard <nicole at bywatersolutions.com>
Date:   Tue Jun 23 12:45:17 2015 -0500

    Bug 14424: Patron Help Files for 3.20
    
    This patch updates the help files for 3.20
    
    To test:
    
    * Visit
     * Main patron page
     * Patron search page
     * Patron permissions page
    * Confirm the text is right on all three
    
    Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at koha-community.org>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>

commit e2ab42716825c5dedbb0036ae56a28e6119083f5
Author: Fridolin Somers <fridolin.somers at biblibre.com>
Date:   Thu Jul 2 10:37:22 2015 +0200

    Bug 14485: HTML comment disables translation in cataloguing/addbooks.tt
    
    In cataloguing/addbooks.tt, the line :
      [% total %] result(s) found in catalog,
    is not present in PO files even after an update.
    I've found that the cause is the previous HTML comment line.
    
    This patch converts HTML comment into TT comment and adds a div to have a more comprehensive string to translate.
    
    Test plan :
    - without patch
    - go into <sources>/misc/translator
    - run PO update for example in french : translate update fr-FR
    => the text "result(s) found in catalog" is missing from PO file : fr-FR-staff-prog.po
    - restore default PO files
    - apply patch
    - go into <sources>/misc/translator
    - run PO update for example in french : translate update fr-FR
    => You find text "result(s) found in catalog" in PO file : fr-FR-staff-prog.po
    
    Sponsored-by: Universidad de El Salvador
    
    Signed-off-by: Hector Eduardo Castro Avalos <hector.hecaxmmx at gmail.com>
    Works as advertised. Just one msgid appear with msgid "%s result(s) found in catalog,"
    
    Signed-off-by: Jonathan Druart <jonathan.druart at koha-community.org>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>

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

Summary of changes:
 C4/Input.pm                                        |  122 --------------------
 acqui/addorderiso2709.pl                           |    1 -
 acqui/basketgroup.pl                               |    1 -
 acqui/neworderempty.pl                             |    3 -
 acqui/uncertainprice.pl                            |    1 -
 admin/aqplan.pl                                    |    1 -
 .../en/includes/catalogue/itemsearch_item.csv.inc  |    3 +-
 .../prog/en/includes/patron-toolbar.inc            |    3 +
 .../prog/en/modules/cataloguing/addbooks.tt        |    8 +-
 .../prog/en/modules/help/acqui/basket.tt           |   13 +++
 .../en/modules/help/acqui/newordersubscription.tt  |   17 +++
 .../prog/en/modules/help/cataloguing/addbiblio.tt  |   22 ++--
 .../prog/en/modules/help/cataloguing/addbooks.tt   |   10 +-
 .../prog/en/modules/help/cataloguing/merge.tt      |   17 +--
 .../prog/en/modules/help/circ/on-site_checkouts.tt |   11 ++
 .../prog/en/modules/help/members/discharge.tt      |   21 ++++
 .../prog/en/modules/help/members/member-flags.tt   |   55 ++++++++-
 .../prog/en/modules/help/members/member.tt         |   14 ++-
 .../prog/en/modules/help/members/members-home.tt   |   14 ++-
 .../prog/en/modules/help/members/moremember.tt     |   16 +++
 members/memberentry.pl                             |    1 -
 opac/opac-detail.pl                                |   31 ++---
 t/Input.t                                          |   14 ---
 23 files changed, 206 insertions(+), 193 deletions(-)
 delete mode 100644 C4/Input.pm
 create mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/newordersubscription.tt
 create mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/help/circ/on-site_checkouts.tt
 create mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/help/members/discharge.tt
 delete mode 100755 t/Input.t


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Sun Jul 12 23:17:29 2015
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Sun, 12 Jul 2015 21:17:29 +0000
Subject: [koha-commits] main Koha release repository branch 3.20.x updated.
	v3.20.01-41-g24aac1c
Message-ID: <E1ZEOcr-0001YY-43@git.koha-community.org>

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, 3.20.x has been updated
       via  24aac1c17423a86e9936e64e37b4a500025b3b9a (commit)
      from  872d5e2bff7bed82562d2ef7800d21d0c80ccd46 (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 24aac1c17423a86e9936e64e37b4a500025b3b9a
Author: Katrin Fischer <Katrin.Fischer.83 at web.de>
Date:   Mon Jun 8 01:30:58 2015 +0200

    Bug 14356: Improvements to the 'Transfers to receive' page
    
    Patch makes several small changes to the template for the
    'Transfers to receive page'
    
    1) Show the branch name instead of the branchcode in the
       table of incoming transfers.
    
    If there is a hold connected with the transfer:
    2) Show the patron's name as 'surname, firstname'
       intead of 'surname  firstname'
    3) Restore broken feature: Show a mailto: link with a
       generated subject of 'Hold: <title>'.
    
    The mailto: feature actually existed in the templates, but
    was broken to a misnamed database column. I made some small
    changes to make the subject translatable (see bug 8330).
    
    To test:
    - Create a transfer by placing a hold with pickup at another library
    - Craete a transfer manually
    - Go to the circulation > transfers to receive
    - Check the changes explained above, compare before and after
    - Check the mailto: link works as expected
    
    Bonus: Check the Hold: bit in the subject is really translatable now.
    
    Signed-off-by: Nick Clemens <nick at quecheelibrary.org>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at koha-community.org>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
    (cherry picked from commit e5cea455d00c52b4a81e87b4dc77315c03ce8630)
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

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

Summary of changes:
 circ/transferstoreceive.pl                                |    2 +-
 .../prog/en/modules/circ/transferstoreceive.tt            |   13 ++++++++-----
 2 files changed, 9 insertions(+), 6 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Sun Jul 12 23:54:36 2015
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Sun, 12 Jul 2015 21:54:36 +0000
Subject: [koha-commits] main Koha release repository branch 3.20.x updated.
	v3.20.01-44-ga5d1ed3
Message-ID: <E1ZEPCm-0001le-7n@git.koha-community.org>

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, 3.20.x has been updated
       via  a5d1ed35116f2435104c301db058c223497c9733 (commit)
       via  9dc856985a468e3e0e6f4b01328f2b60c7698095 (commit)
       via  d96b9c1ca2594f98c577bbdf7079dbb0f9581853 (commit)
      from  24aac1c17423a86e9936e64e37b4a500025b3b9a (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 a5d1ed35116f2435104c301db058c223497c9733
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date:   Wed Apr 1 16:23:48 2015 +0200

    Bug 8802: On editing a library group category type is not set
    
    The category type was always set to 'searchdomain', because it's the
    first of the dropdown list.
    
    Test plan:
    1/ Create or edit a library group
    2/ Set the category type to "properties"
    3/ Edit it again
    4/ Confirm "properties" is correctly selected
    
    Signed-off-by: Nick Clemens <nick at quecheelibrary.org>
    Signed-off-by: Katrin Fischer <katrin.fischer at bsz-bw.de>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
    (cherry picked from commit fc6789c20636f8104854b74209b658634831f4e5)
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

commit 9dc856985a468e3e0e6f4b01328f2b60c7698095
Author: Liz Rea <wizzyrea at gmail.com>
Date:   Tue Jun 23 12:37:09 2015 +1200

    Bug 14423: tab characters in auth_subfields_structure
    
    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
    (cherry picked from commit 887bb6d510aaafc94b7a59fea62f773f3ce83116)
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

commit d96b9c1ca2594f98c577bbdf7079dbb0f9581853
Author: Chris <chris at bigballofwax.co.nz>
Date:   Sun Jun 21 08:46:40 2015 +0000

    Bug 14423: XSS issues in marc_subfields_structure
    
    1/ Hit a url like http://localhost:8081/cgi-bin/koha/admin/marc_subfields_structure.pl?op=add_form&tagfield=%22/%3E%3Cscript%3Ealert%28%27oh%20noes%27%29%3C/script%3E
    2/ Notice all the alert boxes
    3/ Apply patch
    4/ Reload page, no more alerts
    5/ Test functionality still works
    
    Signed-off-by: Jonathan Druart <jonathan.druart at koha-community.org>
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
    (cherry picked from commit 91a8584aa845fb1695a46fe3b89197f7d1365d94)
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

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

Summary of changes:
 admin/branches.pl                                  |    2 +-
 .../en/modules/admin/marc_subfields_structure.tt   |   28 ++++++++++----------
 2 files changed, 15 insertions(+), 15 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Mon Jul 13 23:09:34 2015
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Mon, 13 Jul 2015 21:09:34 +0000
Subject: [koha-commits] main Koha release repository branch 3.20.x updated.
	v3.20.01-46-gccfca43
Message-ID: <E1ZEkyk-00047g-Jo@git.koha-community.org>

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, 3.20.x has been updated
       via  ccfca43d93b6607ed086213ae33c741234af48b3 (commit)
       via  0d8c67153f204a499b08cbae6d8da043719a3423 (commit)
      from  a5d1ed35116f2435104c301db058c223497c9733 (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 ccfca43d93b6607ed086213ae33c741234af48b3
Author: Jonathan Druart <jonathan.druart at koha-community.org>
Date:   Tue Jun 23 10:40:15 2015 +0200

    Bug 14324: Display "Add Child" for Organisations on circ/circulation.pl
    
    On moremember, the button is displayed for Organisations.
    To be consistent, it should be displayed on the circulation page too.
    
    Signed-off-by: Jonathan Druart <jonathan.druart at koha-community.org>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
    (cherry picked from commit 198e6669eeb68519b4909d99631d84aed068845e)
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

commit 0d8c67153f204a499b08cbae6d8da043719a3423
Author: Barton Chittenden <barton at bywatersolutions.com>
Date:   Thu Jun 18 13:31:28 2015 -0700

    Bug 14324: Set "adultborrower" regardless of guarantor status.
    
    Signed-off-by: Jason Robb - SEKLS (jrobb at sekls.org)
    
    Signed-off-by: Jonathan Druart <jonathan.druart at koha-community.org>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
    (cherry picked from commit f05931e05154cc85df4036fe7c4acdfc0ddb5995)
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

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

Summary of changes:
 circ/circulation.pl   |    4 ++--
 members/moremember.pl |    3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Mon Jul 13 23:27:12 2015
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Mon, 13 Jul 2015 21:27:12 +0000
Subject: [koha-commits] main Koha release repository branch 3.20.x updated.
	v3.20.01-50-gd5ddcb8
Message-ID: <E1ZElFo-0004FD-7a@git.koha-community.org>

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, 3.20.x has been updated
       via  d5ddcb80a238e0a072c3a1a432611a0d6537ffbc (commit)
       via  244405509c0813381842aa9dd62cedbc6039e8ce (commit)
       via  2f75adf77e02348704aebceebd1bf0743ac6ae83 (commit)
       via  66db459a8161ffe98bf69c200ee011fbdba62bb8 (commit)
      from  ccfca43d93b6607ed086213ae33c741234af48b3 (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 d5ddcb80a238e0a072c3a1a432611a0d6537ffbc
Author: Jonathan Druart <jonathan.druart at koha-community.org>
Date:   Tue Jun 16 19:25:58 2015 +0200

    Bug 14002: Display readonly values as plain text
    
    There is no need to display the cardnumber and expiration date values in
    a disabled input.
    
    Signed-off-by: Jonathan Druart <jonathan.druart at koha-community.org>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>
    (cherry picked from commit f194bca26891a338761f5a4041b0886f87631e27)
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

commit 244405509c0813381842aa9dd62cedbc6039e8ce
Author: Katrin Fischer <Katrin.Fischer.83 at web.de>
Date:   Wed Jun 10 00:52:39 2015 +0200

    Bug 14002: Show patron expiry date in OPAC
    
    This patch makes it possible to show the expiration date
    of a patron account in the OPAC on the details tab in the
    patron account.
    
    Extras:
    - Makes it possible to hide cardnumber with
      PatronSelfRegistrationBorrowerUnwantedField
    
    To test:
    - Toggle OPACPatronDetails and test date expiry always shows
    - Check PatronSelfRegistrationBorrowerUnwantedField for dateexpiry
      and cardnumber
    - Verify a patron address modification request still works
      as expected
    
    Signed-off-by: Aleisha <aleishaamohia at hotmail.com>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at koha-community.org>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>
    (cherry picked from commit 69baa022a587ffd9df2bc065a0e8e72c14cf7c4f)
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

commit 2f75adf77e02348704aebceebd1bf0743ac6ae83
Author: Jonathan Druart <jonathan.druart at koha-community.org>
Date:   Tue Jun 23 16:10:22 2015 +0200

    Bug 14439: Add test - template path should finish by .tt
    
    Signed-off-by: Jonathan Druart <jonathan.druart at koha-community.org>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
    (cherry picked from commit cbf3c9aa40c13f15a704945f7d6ceaf3aab4b3f0)
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

commit 66db459a8161ffe98bf69c200ee011fbdba62bb8
Author: Fridolin Somers <fridolin.somers at biblibre.com>
Date:   Tue Jun 23 15:50:39 2015 +0200

    Bug 14439: Typo in Bug 14408 regexp
    
    In Bug 14408 first patch, the regexp used needs an escape on dot and does not need an ending "?"
    
    Test plan :
      - prove t/db_dependent/Auth.t
    
    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at koha-community.org>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
    (cherry picked from commit cb44a8de3a6fbe7ecf2d349a6cab44ace0dc7165)
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

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

Summary of changes:
 C4/Auth.pm                                                |    2 +-
 .../opac-tmpl/bootstrap/en/modules/opac-memberentry.tt    |   13 +++++++++++--
 t/db_dependent/Auth.t                                     |    3 ++-
 3 files changed, 14 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Tue Jul 14 00:47:28 2015
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Mon, 13 Jul 2015 22:47:28 +0000
Subject: [koha-commits] main Koha release repository branch 3.20.x updated.
	v3.20.01-52-ge873c96
Message-ID: <E1ZEmVU-0004dk-Bq@git.koha-community.org>

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, 3.20.x has been updated
       via  e873c9650af6d1de1b270485cf323ca83a54f8b5 (commit)
       via  da4aeda37a1d7cecf855b1c4f4f990974fce027e (commit)
      from  d5ddcb80a238e0a072c3a1a432611a0d6537ffbc (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 e873c9650af6d1de1b270485cf323ca83a54f8b5
Author: Liz Rea <liz at catalyst.net.nz>
Date:   Tue Jun 16 16:12:57 2015 +1200

    Bug 14389: Editing a syspref in a textarea does not enable the Save button
    
    Test plan:
      1. Navigate to the "opaccredits" syspref (or any other textarea, i.e.,
         "Click to Edit", syspref) in the system preferences editor.
      2. Change its contents, by either pasting or typing. The field may not
         be marked as modified, even after you click outside the box.
      3. Apply the patch.
      4. Reload the page and try again; either pasting or typing should mark
         the field as changed and allow you to save.
    
    Signed-off-by: Jesse Weaver <pianohacker at gmail.com>
    Confirmed working for normal input, paste and middle-click paste in
    Chrome and Firefox in Linux.
    
    Signed-off-by: Jonathan Druart <jonathan.druart at koha-community.org>
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>
    (cherry picked from commit c95e794bd458377d742280ae8fff281ddf395e04)
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

commit da4aeda37a1d7cecf855b1c4f4f990974fce027e
Author: Samanta Tello <samantatellob at yahoo.com.ar>
Date:   Fri Jul 3 11:12:05 2015 -0300

    Bug 14490: Duplicate armenian translator
    
    This patch fix trivial duplicate
    in about page.
    
    To test:
    1) Go to about page > translations
    2) Check duplicate entry for Armenian
    first in 4th line, second before indonesian
    3) Apply patch
    4) Reload page and check again
    
    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
    Trivial string patch. The restults are the expected.
    
    Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
    Double checked :-P
    
    (cherry picked from commit d12b4e0b19d43e10a06a934689b9001bdd9049f4)
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

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

Summary of changes:
 koha-tmpl/intranet-tmpl/prog/en/js/pages/preferences.js |    2 +-
 koha-tmpl/intranet-tmpl/prog/en/modules/about.tt        |    1 -
 2 files changed, 1 insertion(+), 2 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Tue Jul 14 01:26:03 2015
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Mon, 13 Jul 2015 23:26:03 +0000
Subject: [koha-commits] main Koha release repository branch 3.20.x updated.
	v3.20.01-53-g42b55cf
Message-ID: <E1ZEn6p-0004qq-Io@git.koha-community.org>

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, 3.20.x has been updated
       via  42b55cf0f5b2e9a2b5e14f03fbb98ef2d8ec3f3f (commit)
      from  e873c9650af6d1de1b270485cf323ca83a54f8b5 (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 42b55cf0f5b2e9a2b5e14f03fbb98ef2d8ec3f3f
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date:   Thu Jun 25 16:41:23 2015 -0400

    Bug 14467: Security updates break some Koha plugins
    
    The new security updates break previously functioning plugins, most
    notably the cover flow plugin and the Ebsco EDS plugin.
    
    Test Plan:
    1) Install and configure the cover flow plugin ( http://bywatersolutions.com/koha-plugins/ )
    2) Note that attempting to access coverflow.pl from the OPAC results in an error
    3) Apply this patch
    4) Note that coverflow.pl now output html again
    
    Signed-off-by: Nick Clemens <nick at quecheelibrary.org>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at koha-community.org>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>
    (cherry picked from commit e0d2bc669e385cfd1c42c1e83aaff3495a75a822)
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

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

Summary of changes:
 Koha/Plugins/Base.pm |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Tue Jul 14 01:42:06 2015
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Mon, 13 Jul 2015 23:42:06 +0000
Subject: [koha-commits] main Koha release repository branch 3.20.x updated.
	v3.20.01-54-gacdf648
Message-ID: <E1ZEnMM-0004x9-I6@git.koha-community.org>

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, 3.20.x has been updated
       via  acdf64889d6652750fd4b6b08525f85e752350da (commit)
      from  42b55cf0f5b2e9a2b5e14f03fbb98ef2d8ec3f3f (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 acdf64889d6652750fd4b6b08525f85e752350da
Author: Jonathan Druart <jonathan.druart at koha-community.org>
Date:   Mon Jun 22 12:45:50 2015 +0200

    Bug 14431: FIX encoding issues in search (staff client)
    
    Note that this does not appears at the OPAC.
    
    We will need 2 different testers here, the results seem to depend on the
    Encode version.
    
    0/ Determine your Encode version (`pmvers Encode`).
    If you have 2.60:
    1) /cgi-bin/koha/catalogue/search.pl?q=???&op=Submit
    You should get
    " No results match your search for 'kw,wrdl: ???' in my library Catalog."
    2) /cgi-bin/koha/catalogue/search.pl?q=?
    You should get
    Cannot decode string with wide characters at
    /usr/lib/i386-linux-gnu/perl/5.20/Encode.pm line 215.
    
    If you have <2.60 (? not sure here):
    1) /cgi-bin/koha/catalogue/search.pl?q=???&op=Submit
    You should not get encoding problems.
    2) /cgi-bin/koha/catalogue/search.pl?q=?
    You should not get encoding problems.
    
    Apply this patch, try again 1 and 2.
    If the Encode version is >=2.60, the encoding issues should be fixed.
    If not, please detail if there are any regression.
    
    NOTE: Tested on Ubuntu 14.04, Debian 8, and Debian 7. See comment #3.
    
    Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>
    (cherry picked from commit ffedc98577f4967181e9a17886483c6ac5a1d140)
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

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

Summary of changes:
 catalogue/search.pl |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Tue Jul 14 09:26:58 2015
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Tue, 14 Jul 2015 07:26:58 +0000
Subject: [koha-commits] main Koha release repository branch 3.20.x updated.
	v3.20.01-58-gbec1614
Message-ID: <E1ZEucE-0001lF-24@git.koha-community.org>

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, 3.20.x has been updated
       via  bec1614a10a432a8770df0c0f07fd478868ffe61 (commit)
       via  3f92b5e38114572722b983961a1defc0a663989e (commit)
       via  fdf148d15fc647b3521daea84d2ca24626d7ffbf (commit)
       via  23ed6dd88f9bafa6ab0960936fecc2bd7649c613 (commit)
      from  acdf64889d6652750fd4b6b08525f85e752350da (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 bec1614a10a432a8770df0c0f07fd478868ffe61
Author: Mark Tompsett <mtompset at hotmail.com>
Date:   Fri Jun 19 14:00:13 2015 -0400

    Bug 14427: Use Koha::version instead of C4::Context->KOHAVERSION
    
    While testing bug 9006, I discovered this gem in
    installer/install.pl
    
    TEST PLAN
    ---------
     1) back up DB
     2) drop db and create db
     3) git reset --hard origin/3.20.x
     4) run web installer and all sample data
     5) git reset --hard origin/master
     6) empty your koha intranet error log
     7) run web installer to upgrade
        -- there will be warnings regarding regex around
           installer/install.pl line 328 or so.
           grep "\$kohaversion" ~/koha-dev/var/logs/koha-error_log
     8) repeat steps 2-6
     9) apply this patch
    10) run web installer to upgrade
        -- no regex warnings.
           grep "\$kohaversion" ~/koha-dev/var/logs/koha-error_log
    11) koha qa test tools
    
    Signed-off-by: Jonathan Druart <jonathan.druart at koha-community.org>
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>
    (cherry picked from commit 5f3ec7109321f8e928371880e473e84d8db39f8d)
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

commit 3f92b5e38114572722b983961a1defc0a663989e
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date:   Tue Jul 14 11:54:57 2015 +1200

    Bug 9942 : Bumping database version

commit fdf148d15fc647b3521daea84d2ca24626d7ffbf
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date:   Thu Jun 25 17:22:25 2015 -0400

    Bug 9942: [QA Followup] - Add test and alert to returns.pl
    
    Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>
    (cherry picked from commit efedadebf233cf7f2b8c1eb64d1687b282d94474)
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

commit 23ed6dd88f9bafa6ab0960936fecc2bd7649c613
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date:   Thu Apr 9 13:07:05 2015 +0200

    Bug 9942: Make Koha fail if privacy is not respected
    
    If a patron has requested anonymity on returning items and the system is
    not correctly configured (AnonymousPatron no set or set to an inexistent
    patron), the application should take it into account and not fail
    quietly.
    
    This patch is quite radical: the script will die loudly if the privacy
    is not respected.
    
    To be care of the bad "Software error", some checks are done in the
    updatedatabase to be sure the admin will be warned is something is wrong
    in the configuration.
    
    Test plan:
    1/ Test the updatedatabase entry:
    a. Turn on OPACPrivacy and set AnonymousPatron to an existing patron
    => You will get a warning
    b. Turn on OPACPrivacy and set AnonymousPatron to 0 or ''
    => You will get a warning
    c. Turn on OPACPrivacy and set the privacy to 2 (Never) for at least 1 patron
    Turn off OPACPrivacy
    => You will get a warning
    d. In all other cases you will get no error
    
    2/ Test the interface
    a. Turn on OPACPrivacy and set the privacy to 2 (Never) for a patron
    b. Now you can turn off OPACPrivacy or keep it on, behavior should be
    the same
    c. check an item out the patron
    d. Check the item in using the check out table
    => fail
    e. Check the item in using the Check in tab
    => fail (not gracefully).
    
    Note that the software error could appear on other pages too.
    
    Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
    
    Updatedatabase works as described
    On staff, if don't have correct settings for anonymity it's
    impossible to check-in (with OPACPrivacy on)
    No errors
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>
    (cherry picked from commit 94315f663b8a582fb7ef68de2bd9c3933901cd7f)
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

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

Summary of changes:
 C4/Circulation.pm                                  |   28 +++++++---
 Koha.pm                                            |    2 +-
 installer/data/mysql/updatedatabase.pl             |   33 ++++++++++++
 installer/install.pl                               |    2 +-
 .../intranet-tmpl/prog/en/modules/circ/returns.tt  |    5 ++
 t/db_dependent/Circulation/MarkIssueReturned.t     |   55 ++++++++++++++++++++
 6 files changed, 117 insertions(+), 8 deletions(-)
 create mode 100644 t/db_dependent/Circulation/MarkIssueReturned.t


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Tue Jul 14 09:39:22 2015
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Tue, 14 Jul 2015 07:39:22 +0000
Subject: [koha-commits] main Koha release repository branch 3.20.x updated.
	v3.20.01-60-gce9b5d8
Message-ID: <E1ZEuoE-0001rJ-O7@git.koha-community.org>

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, 3.20.x has been updated
       via  ce9b5d8904c0d46350418ed2252fd06910c01b8c (commit)
       via  01fe4aea32829dccb6bb71b4d69e1a603a9fdbb1 (commit)
      from  bec1614a10a432a8770df0c0f07fd478868ffe61 (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 ce9b5d8904c0d46350418ed2252fd06910c01b8c
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date:   Fri Jul 3 11:02:22 2015 +0200

    Bug 14382: [QA Follow-up] Bad regex alarm
    
    The regex /|date>>/ will match much more than you like :)
    The unescaped pipe is bad, but you also need to remove the >> because
    the split a few lines above it removes them already.
    
    This allows you to recover from an error like this one, running another
    report with a string parameter:
    The given date (india%) does not match the date format (us) at
    Koha/DateUtils.pm line 144.
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    Amended for possible spaces around the word date.
    Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>
    
    (cherry picked from commit bfea40b6e8161629c11d97be5eeba56fb6d59ba3)
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

commit 01fe4aea32829dccb6bb71b4d69e1a603a9fdbb1
Author: Mark Tompsett <mtompset at hotmail.com>
Date:   Wed Jun 24 12:13:46 2015 -0400

    Bug 14382: Non-ISO Date parameters generate empty reports.
    
    The issue is that SQL expects ISO dates, but the user may wish to view dates according to the dateformat system preference.
    
    By detecting a date preference, the non-ISO dates can be converted to ISO dates before being stuffed back into the SQL query to be executed.
    
    TEST PLAN
    ---------
    1) Add a report with date parameters.
       -- I used 'Holds placed in date range' from
          http://wiki.koha-community.org/wiki/SQL_Reports_Library
    2) Set your dateformat to YYYY-MM-DD
    3) Run the report
       -- Note the SQL reads
          "... BETWEEN '{date formatted in YYYY-MM-DD}'..."
       -- If there is supposed to be data, there is some.
    4) Set your dateformat to MM/DD/YYYY
    5) Run the report
       -- Note the SQL reads
          "... BETWEEN '{date formatted in MM/DD/YYYY}'..."
       -- If there is supposed to be data, there is none.
    6) Apply patch
    7) Repeat steps 2-5
       -- The SQL will always read YYYY-MM-DD (ISO) format.
       -- The report will have data, if there is some.
    8) koha qa test tools.
    
    Signed-off-by: Amit Gupta <amit.gupta at informaticsglobal.com>
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    Adding a QA follow-up.
    Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>
    
    (cherry picked from commit c3fea53039a6c53c766b0403eedd57f644c6f772)
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    
    Conflicts:
    	reports/guided_reports.pl

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

Summary of changes:
 reports/guided_reports.pl |    9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Tue Jul 14 10:43:07 2015
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Tue, 14 Jul 2015 08:43:07 +0000
Subject: [koha-commits] main Koha release repository branch 3.20.x updated.
	v3.20.01-64-g606b39b
Message-ID: <E1ZEvnv-0002Bg-33@git.koha-community.org>

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, 3.20.x has been updated
       via  606b39b789d89ce90ffe0136b355e695d98383ee (commit)
       via  9dae698bb926866cab15cf61c76fc3e124d35e24 (commit)
       via  833e532597dc3ffa34495554ce06599dfd9e417c (commit)
       via  40bebca747eb52b64eb28f19d0834be0529673cc (commit)
      from  ce9b5d8904c0d46350418ed2252fd06910c01b8c (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 606b39b789d89ce90ffe0136b355e695d98383ee
Author: Mirko Tietgen <mirko at abunchofthings.net>
Date:   Thu Jun 25 15:38:42 2015 +0200

    Bug 14453: (followup) Fix shipped XSLT files
    
    Make the shipped XSLTs for authorities (MARC21 and UNIMARC) the same as the generated version
    
    Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
    (cherry picked from commit fbe25b1d8e1806768b04d829bd9fc1a05f4861cf)
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

commit 9dae698bb926866cab15cf61c76fc3e124d35e24
Author: Fridolin Somers <fridolin.somers at biblibre.com>
Date:   Wed Jun 24 16:06:05 2015 +0200

    Bug 14453: kohaidx is missing for id in authority-koha-indexdefs.xml
    
    In authority-koha-indexdefs.xml, all tags use the namespace "kohaidx" except the tag "id".
    
    When re-generating authority-zebra-indexdefs.xsl, the line :
      <xslo:variable name="idfield" select="normalize-space(marc:controlfield[@tag='001'])"/>
    is modified :
      <xslo:variable name="idfield" select="normalize-space()"/>
    This is an error.
    
    This patch adds kohaidx namespace to correct.
    
    Test plan :
    - Without patch
    - go to etc/zebradb/marc_defs/marc21/authorities/
    - run : xslproc xsltproc ../../../xsl/koha-indexdefs-to-zebra.xsl authority-koha-indexdefs.xml > authority-zebra-indexdefs.xsl
    - read authority-zebra-indexdefs.xsl
    => the line has changed : <xslo:variable name="idfield" select="normalize-space()"/>
    - Apply patch
    - go to etc/zebradb/marc_defs/marc21/authorities/
    - run : xslproc xsltproc ../../../xsl/koha-indexdefs-to-zebra.xsl authority-koha-indexdefs.xml > authority-zebra-indexdefs.xsl
    - read authority-zebra-indexdefs.xsl
    => the line has not changed
    (same for unimarc flavor)
    
    Signed-off-by: Mirko Tietgen <mirko at abunchofthings.net>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>
    As Mirko mentioned, the xslt's now generate the facet-processing templates in
    the authority xslt's too. They are harmless because we don't define facets
    for authority records. If we did, it would be harmless too.
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
    (cherry picked from commit 2365537eea9d5cd6526843b1cd0c2152a6def06c)
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

commit 833e532597dc3ffa34495554ce06599dfd9e417c
Author: Winona Salesky <wsalesky at gmail.com>
Date:   Wed Jun 3 22:46:23 2015 -0400

    Bug 14326: XSLT Syntax error in MARC21slimOPACResults.xsl
    
    Test Plan:
    1) Apply this patch
    2) Ensure you are using the default XSLT setting for the staff and opac  record details
    3) Perform an opac search check "Availability" for expected display values.
    5) Note this patch corrects invalid syntax in xslt, there should be no visable changes to the results page.
    
    Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at koha-community.org>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
    (cherry picked from commit 058b50de5b09ee2ba3efc953b9846bc79d712c31)
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

commit 40bebca747eb52b64eb28f19d0834be0529673cc
Author: Indranil Das Gupta <indradg at l2c2.co.in>
Date:   Mon May 4 18:55:15 2015 +0530

    Bug 14135: Adds 'Free' to variabletypes in systempreferences.tt
    
    The 'Local Use' system preference addition/modification template provides the following options against "Variable Type" - Choice, YesNo, Integer, Textarea, Float, Themes, Languages, Upload or ClassSource.
    
    There is no option presented for "Free" which seems to be the most
    used variable type out-of-the-box (i.e. INTRAdidyoumean,
    OPACdidyoumean, UsageStatsID and UsageStatsLastUpdateTime)
    
    This trivial patch proposes to modify the systempreferences.tt
    and add the option 'Free' to the list offered to users.
    
    Test Plan
    =========
    
    1/ Go to Home > Administration > System preferences > Local use
    2/ Click on 'New preference'.
    3/ In the fieldset 'Koha Internal', the variable types offered
       are Choice, YesNo, Integer, Textarea, Float, Themes,
       Languages, Upload or ClassSources.
    4/ Clicking on 'Choice' should set the 'preftype' field as
       'Choice'.
    5/ Apply this patch.
    6/ Refresh the page.
    7/ The variable types list should read - "Free, Choice, YesNo,
       Integer, Textarea, Float, Themes, Languages, Upload or
       ClassSources".
    8/ Clicking on 'Free' should set the 'preftype' field as 'Free'.
    
    Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
    
    NOTE: Discovered that there is no validation on the type field.
          However, that is beyond the scope of this bug.
    
    Signed-off-by: Amit Gupta <amit.gupta at informaticsglobal.com>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at koha-community.org>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>
    (cherry picked from commit 9f008a102415c8b71a1f4a976bc15691c2663b5c)
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

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

Summary of changes:
 .../marc_defs/marc21/authorities/authority-koha-indexdefs.xml        |    2 +-
 .../marc_defs/marc21/authorities/authority-zebra-indexdefs.xsl       |    2 ++
 .../marc_defs/unimarc/authorities/authority-koha-indexdefs.xml       |    2 +-
 .../marc_defs/unimarc/authorities/authority-zebra-indexdefs.xsl      |    2 ++
 koha-tmpl/intranet-tmpl/prog/en/modules/admin/systempreferences.tt   |    2 +-
 koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACResults.xsl     |    2 +-
 6 files changed, 8 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Tue Jul 14 22:38:08 2015
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Tue, 14 Jul 2015 20:38:08 +0000
Subject: [koha-commits] main Koha release repository branch 3.20.x updated.
	v3.20.01-69-g177ff20
Message-ID: <E1ZF6xr-0005uQ-Q3@git.koha-community.org>

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, 3.20.x has been updated
       via  177ff20ec2f249ebacee5f793fa0926ded6d1184 (commit)
       via  df0d0c96957ee737f59d1ef02bd48ebeb20b3823 (commit)
       via  9c2c171f980d6e6a74ea1122ded2627b42e29d0e (commit)
       via  e67d0dd60285542160a65ccb28e12962948cc438 (commit)
       via  5bc2f3402d23764f2f2142cfa22e17cf01d6e5aa (commit)
      from  606b39b789d89ce90ffe0136b355e695d98383ee (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 177ff20ec2f249ebacee5f793fa0926ded6d1184
Author: Fridolin Somers <fridolin.somers at biblibre.com>
Date:   Thu Jul 2 10:37:22 2015 +0200

    Bug 14485: HTML comment disables translation in cataloguing/addbooks.tt
    
    In cataloguing/addbooks.tt, the line :
      [% total %] result(s) found in catalog,
    is not present in PO files even after an update.
    I've found that the cause is the previous HTML comment line.
    
    This patch converts HTML comment into TT comment and adds a div to have a more comprehensive string to translate.
    
    Test plan :
    - without patch
    - go into <sources>/misc/translator
    - run PO update for example in french : translate update fr-FR
    => the text "result(s) found in catalog" is missing from PO file : fr-FR-staff-prog.po
    - restore default PO files
    - apply patch
    - go into <sources>/misc/translator
    - run PO update for example in french : translate update fr-FR
    => You find text "result(s) found in catalog" in PO file : fr-FR-staff-prog.po
    
    Sponsored-by: Universidad de El Salvador
    
    Signed-off-by: Hector Eduardo Castro Avalos <hector.hecaxmmx at gmail.com>
    Works as advertised. Just one msgid appear with msgid "%s result(s) found in catalog,"
    
    Signed-off-by: Jonathan Druart <jonathan.druart at koha-community.org>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
    (cherry picked from commit e2ab42716825c5dedbb0036ae56a28e6119083f5)
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

commit df0d0c96957ee737f59d1ef02bd48ebeb20b3823
Author: David Cook <dcook at prosentient.com.au>
Date:   Tue Jun 9 14:25:23 2015 +1000

    Bug 14366: Units doesn't get saved usefully for patroncards
    
    This patch causes the "Units" to be saved and displayed correctly
    for the "Edit layout" screen in Patroncards.
    
    _TEST PLAN_
    
    Before applying:
    0) Create a new layout
    1) Edit the layout, change the units, and click Save
    2) Edit the layout again, and notice the units are still "PostScript Points"
    
    Apply the patch:
    3) Edit the layout again, change the units, and click Save
    4) Edit the layout again, note that the units have changed to your
    selection
    
    5) Rejoice
    
    Signed-off-by: Nick Clemens <nick at quecheelibrary.org>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at koha-community.org>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
    (cherry picked from commit f573a155974c84a6fb433bff86a220d4644ad27e)
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

commit 9c2c171f980d6e6a74ea1122ded2627b42e29d0e
Author: Nick Clemens <nick at quecheelibrary.org>
Date:   Tue Jun 16 21:48:18 2015 -0400

    Bug 13950: Sort Item search home library list by branch name
    
    On the item search form the list of home libraries isn't sorted
    alphabetically by their descrption.
    
    To test:
    - Ensure that you have libraries whose code/name are sorted in a different alphabetical order (e.g. Aardvark/ZZZ & Zebra/AAA)
    - Staff: Advanced search - item search
    - See that libraries are sorted in code order
    - Apply patch
    - Verify selection block for home library is correctly sorted after
      applying the patch.
    
    Signed-off-by: Indranil Das Gupta (L2C2 Technologies) <indradg at gmail.com>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at koha-community.org>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
    (cherry picked from commit 958be9804a50c3e13f74c4d5f81348e2256a8042)
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

commit e67d0dd60285542160a65ccb28e12962948cc438
Author: Katrin Fischer <Katrin.Fischer.83 at web.de>
Date:   Sun May 31 15:52:26 2015 +0200

    Bug 14163: Acq - receive shipment and order from staged: rename 'Show all' to 'Show inactive'
    
    'Show all' in acquisition makes the inactive funds in the fund list
    box visible. This patch changes the text to 'Show inactive' to be more
    clear about the functionality.
    
    Patch changes 2 pages. To test:
    
    1) Order from staged file
    - make sure you have uploaded a few records via the tools
    - create a new order using the 'From a staged file' option
    - select a file to order from - 'Add orders'
    - Verify the 'Select to import' tab now displayed the text
      'Show inactive funds' and that it works as expected
    - Switch to the 'Default accounting details' tab
    - Verify the text there is also changed to 'Show inactive' and
      works like expected.
    
    2) Receive shipment
    - receive a new shipment for a vendor with unreceived orders
    - Verify the label next to the fund list has changed to
      'Show inactive' and works as expected.
    
    Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
    Simple string change, no errors.
    
    Signed-off-by: Jonathan Druart <jonathan.druart at koha-community.org>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
    (cherry picked from commit 83387bf3b1d9eb8710e184269338361ac1477d1c)
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

commit 5bc2f3402d23764f2f2142cfa22e17cf01d6e5aa
Author: Katrin Fischer <Katrin.Fischer.83 at web.de>
Date:   Mon May 25 10:45:54 2015 +0200

    Bug 14163: Acq order form: rename 'Show all' to 'Show inactive'
    
    On the order form there is a checkbox next to the fund list labelled
    'show all'. Checking the checkbox will result in the inactive funds
    showing in the pull down list as well.
    
    The patch renames the label to 'Show inactive' to make the purpose
    more clear.
    
    To test:
    - Create a new order
    - Verify the label has changed as described above
    - Decide if the change makes sense
    
    Signed-off-by: tadeasm <tadeas.moravec at gmail.com>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at koha-community.org>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
    (cherry picked from commit 8eb049a6a1697f8b2cd23cd660d508ad1ef629e7)
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

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

Summary of changes:
 catalogue/itemsearch.pl                                        |    2 +-
 .../intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt     |    4 ++--
 koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt |    2 +-
 koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tt       |    2 +-
 .../intranet-tmpl/prog/en/modules/cataloguing/addbooks.tt      |    8 +++++---
 patroncards/edit-layout.pl                                     |    7 +++++++
 6 files changed, 17 insertions(+), 8 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Tue Jul 14 23:02:04 2015
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Tue, 14 Jul 2015 21:02:04 +0000
Subject: [koha-commits] main Koha release repository branch 3.20.x updated.
	v3.20.01-77-g784e05e
Message-ID: <E1ZF7L2-000649-6H@git.koha-community.org>

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, 3.20.x has been updated
       via  784e05e87302363760c47a7c4dfae6019d62fe6f (commit)
       via  72c88c29f0198ab608fe6b8f6f0499c36d7545e9 (commit)
       via  f40acf3c32e9cbe469b3699e6c92601477ec4565 (commit)
       via  757394fd0334c14cd295674b58c57cc7d8e9aebb (commit)
       via  b04dc9f77704c0119b4513022729896705c5799d (commit)
       via  6fae699d0195175210150435b4b8eec0913f7e5e (commit)
       via  d3c5685ecb96e084651b873b311f1e900a7ed2e4 (commit)
       via  acc9775ef44fe701b7142124e2f60f37beff4f32 (commit)
      from  177ff20ec2f249ebacee5f793fa0926ded6d1184 (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 784e05e87302363760c47a7c4dfae6019d62fe6f
Author: Katrin Fischer <Katrin.Fischer.83 at web.de>
Date:   Tue Jun 9 02:44:48 2015 +0200

    Bug 14303: Fix item search CSV export - obsolete "by" and display of publication year for MARC21
    
    The exported CSV file from the item search didn't display the publication
    year in MARC21 installations and the title always contained 'by'
    even if there was no author information to display. Also the by is
    not needed by MARC21 as the data should include punctuation.
    
    This basically copies the changes done to the JSON format
    on bug 13859 to the CSV include.
    
    To test: Switch from 'Screen' to 'CSV'
    - Check publication date always displays (MARC21 and UNIMARC)
    - Check that for MARC21 the 'by' has been removed from the title information
    - Check that for UNIMARC the 'by' only displays when there is also
      an author to display
    
    Tested for MARC21, works as expected.
    Signed-off-by: Marc V?ron <veron at veron.ch>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>
    (cherry picked from commit cd9a827b6928ed0cb80c78ebf897e2d77132296a)
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

commit 72c88c29f0198ab608fe6b8f6f0499c36d7545e9
Author: Julian FIOL <julian.fiol at biblibre.com>
Date:   Mon Jul 6 12:27:08 2015 +0200

    Bug 14496: Improving opac-detail.pl performances
    
    Get notes and subjects from MARC record
    ONLY when XSLT is not activated.
    
    It's useless doing it when XSLT is activated,
    because XSLT takes care of it by its own.
    
    => With this patch, we are saving precious
    milliseconds
    
    I compared the display of some records in XSLT view with and without patch, was the same (as expected).
    Signed-off-by: Marc Veron <veron at veron.ch>
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    On a slower server, I saw a time save of 0.0274 to 0.0908 seconds (with XSLT).
    Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>
    
    (cherry picked from commit 468d3d9c83a9760e796cdf43c7da2766ccf7c9b9)
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

commit f40acf3c32e9cbe469b3699e6c92601477ec4565
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date:   Wed Jul 8 18:25:45 2015 -0300

    Bug 14508: 'New patron' dropdown empty list on circulation.pl
    
    This patch makes includes/patron-toolbar.inc (the one in charge of
    rendering the 'New patron' dropdown) make use of the Categories
    Template Toolkit plugin to create the list of categories.
    
    (1) To check the setup is sane:
    - Go to the Patrons page
    => SUCCESS: The 'New patron' dropdown is populated
    - Click on the [+] symbol on the Patron search on the top
    => SUCCESS: The Categories dropdown is populated
    
    (2) To test the patch:
    - On the checkout form, perform a patron search that
      (a) returns more than one result
      (b) returns zero results
    - Click the dropdown menu to create a new patron
    => FAIL: Dropdown is empty
    - Repeat for (a) or (b)
    - Apply the patch and reload
    => SUCCESS: The dropdown is correctly populated
    - Repeat (1)
    => SUCCESS: Nothing got broken
    - Verify the logs
    => SUCCESS: No new warnings
    - Sign off :-D
    - Get a cookie
    - Smile
    
    Regards
    
    Discussion: we might need a new bug to start cleaning stuff like this:
    
    @categories=C4::Category->all;
    if(scalar(@categories) < 1){
        $no_add = 1;
        $template->param(no_categories => 1);
    }
    else {
        $template->param(categories=>\@categories);
    }
    
    but it belongs to a new bug me thinks. Well, suggestions are welcome, but this must
    be fixed on stable ASAP so hurry :-D
    
    Followed test plan, works as expected.
    Signed-off-by: Marc V?ron <veron at veron.ch>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>
    (cherry picked from commit 5a57b3c163e6609aa99ab34e906aa05bd033d5ff)
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

commit 757394fd0334c14cd295674b58c57cc7d8e9aebb
Author: Nicole C. Engard <nicole at bywatersolutions.com>
Date:   Tue Jun 23 14:49:55 2015 -0500

    Bug 14424: Add on site checkouts help for 3.20
    
    There is no help for the pending on site checkouts report. This patch
    adds it.
    
    To test:
    
    * visit pending on site checkouts
    * click help
    * confirm help is there and correct
    
    Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at koha-community.org>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>
    (cherry picked from commit c00c6e3c675da7f244d5042e1ba9be4648bd4ee9)
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

commit b04dc9f77704c0119b4513022729896705c5799d
Author: Nicole C. Engard <nicole at bywatersolutions.com>
Date:   Tue Jun 23 14:44:11 2015 -0500

    Bug 14424: Update Acq Help for 3.20
    
    This patch adds the missing order from subscription help and updates basket
    help.
    
    To test:
    
    * Visit a basket, review the help
    * Click order from a subscrption, review the help
    
    Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at koha-community.org>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>
    (cherry picked from commit 4e271637cd64ef733fadb231be51f22146a1a9e8)
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

commit 6fae699d0195175210150435b4b8eec0913f7e5e
Author: Nicole C. Engard <nicole at bywatersolutions.com>
Date:   Tue Jun 23 14:31:15 2015 -0500

    Bug 14424: Update Discharge Help for 3.20
    
    This patch adds the missing discharge help file and updates the moremember file with
    info on discharges.
    
    To test:
    
    * Visit a patron
    * View and confirm help is right
    * Visit the discharge page on the patron
    * Confirm help file loads and is right
    
    Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at koha-community.org>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>
    (cherry picked from commit a350d02b995483bdd3bc7ede2271ad8a17190acc)
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

commit d3c5685ecb96e084651b873b311f1e900a7ed2e4
Author: Nicole C. Engard <nicole at bywatersolutions.com>
Date:   Tue Jun 23 13:00:06 2015 -0500

    Bug 14424: Update cataloging help for 3.20
    
    This patch updates 3 help files for catalolging in 3.20
    
    To test:
    
    * Visit
     * cataloging home
     * cataloging a new record
     * mergin bib records
    * Confirm text is right and visible
    
    Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at koha-community.org>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>
    (cherry picked from commit ddd2ec87523b1d5379c8a021347fa600ddd66cc2)

commit acc9775ef44fe701b7142124e2f60f37beff4f32
Author: Nicole C. Engard <nicole at bywatersolutions.com>
Date:   Tue Jun 23 12:45:17 2015 -0500

    Bug 14424: Patron Help Files for 3.20
    
    This patch updates the help files for 3.20
    
    To test:
    
    * Visit
     * Main patron page
     * Patron search page
     * Patron permissions page
    * Confirm the text is right on all three
    
    Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at koha-community.org>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>
    (cherry picked from commit 274942abbd299e39ba75b947023bdc881d4a54b4)
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

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

Summary of changes:
 .../en/includes/catalogue/itemsearch_item.csv.inc  |    3 +-
 .../prog/en/includes/patron-toolbar.inc            |    3 ++
 .../prog/en/modules/help/acqui/basket.tt           |   13 +++++
 .../en/modules/help/acqui/newordersubscription.tt  |   17 ++++++
 .../prog/en/modules/help/cataloguing/addbiblio.tt  |   22 ++++----
 .../prog/en/modules/help/cataloguing/addbooks.tt   |   10 ++--
 .../prog/en/modules/help/cataloguing/merge.tt      |   17 +++---
 .../prog/en/modules/help/circ/on-site_checkouts.tt |   11 ++++
 .../prog/en/modules/help/members/discharge.tt      |   21 ++++++++
 .../prog/en/modules/help/members/member-flags.tt   |   55 +++++++++++++++++---
 .../prog/en/modules/help/members/member.tt         |   14 ++++-
 .../prog/en/modules/help/members/members-home.tt   |   14 ++++-
 .../prog/en/modules/help/members/moremember.tt     |   16 ++++++
 opac/opac-detail.pl                                |   31 ++++++-----
 14 files changed, 201 insertions(+), 46 deletions(-)
 create mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/newordersubscription.tt
 create mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/help/circ/on-site_checkouts.tt
 create mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/help/members/discharge.tt


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Thu Jul 16 01:43:10 2015
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Wed, 15 Jul 2015 23:43:10 +0000
Subject: [koha-commits] main Koha release repository branch 3.20.x updated.
	v3.20.01-83-gfb6b754
Message-ID: <E1ZFWKU-0000In-DB@git.koha-community.org>

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, 3.20.x has been updated
       via  fb6b754a335b5f99721f8808095a3fe145964e96 (commit)
       via  181fcc25424620bcf15e8e8d8fbf0dcafebe4005 (commit)
       via  b710e31b45477d1399bea133294b006bcb88a053 (commit)
       via  d863caeb6b134af74914ddadedd1610669b34e71 (commit)
       via  3bbd749536604d14d2c7a8df2baa25336c8a994d (commit)
       via  f62bc698e737b73c404e8ccc3df9a266b97fc5f6 (commit)
      from  784e05e87302363760c47a7c4dfae6019d62fe6f (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 fb6b754a335b5f99721f8808095a3fe145964e96
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date:   Thu Jul 16 11:43:18 2015 +1200

    Bug 13993 Setting correct db version for 3.20.x

commit 181fcc25424620bcf15e8e8d8fbf0dcafebe4005
Author: Tomas Cohen Arazi <tomascohen at unc.edu.ar>
Date:   Fri Jun 19 11:44:16 2015 -0300

    Bug 13993: DBRev 3.21.00.009
    
    Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>
    (cherry picked from commit a80d188c83be6131c9274a29c5dcc03893c9e617)
    
    Conflicts:
    	Koha.pm

commit b710e31b45477d1399bea133294b006bcb88a053
Author: Jonathan Druart <jonathan.druart at koha-community.org>
Date:   Tue May 26 18:10:14 2015 +0200

    Bug 13993: Clarify test messages
    
    Signed-off-by: Jonathan Druart <jonathan.druart at koha-community.org>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>
    (cherry picked from commit a712f5b7bad38cb9f5ad599fdb063cbe6e49c547)
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

commit d863caeb6b134af74914ddadedd1610669b34e71
Author: Amit Gupta <amit.gupta at informaticsglobal.com>
Date:   Tue Apr 14 14:07:07 2015 +0530

    Bug 13993: (3) Transfer order leaves incorrect orderstatus
    
    11) Apply patch (3)
    12) Log in to staff client
    13) Acquisitions
    14) Create a basket for two different vendors
    15) Place an order in one vendor's basket.
    16) Transfer the order to the other vendor's basket.
    17) prove -v t/db_dependent/Acquisition/TransferOrder.t
        -- This should succeed without intervention.
    18) Run koha qa test tools for the last 3 commits.
    
    Signed-off-by: Indranil Das Gupta <indradg at gmail.com>
    
    Signed-off-by: Indranil Das Gupta (L2C2 Technologies) <indradg at gmail.com>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at koha-community.org>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>
    (cherry picked from commit a810b1cf59fc0e44ca88b3746b7c0a813703c59c)
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

commit 3bbd749536604d14d2c7a8df2baa25336c8a994d
Author: Mark Tompsett <mtompset at hotmail.com>
Date:   Thu Apr 16 09:14:54 2015 -0400

    Bug 13993: (2) Correct poorly transferred orders
    
    Added Atomic Update to fix poorly transferred orders
    
    TEST PLAN
    ---------
    8) Apply patch (2)
    9) Run the database updates
       $ ./installer/data/mysql/updatedatabase.pl
       -- This should run without error
    10) prove -v t/db_dependent/Acquisition/TransferOrder.t
        -- This should fail, because the transfer function is still
           not fixed.
    
    Signed-off-by: Indranil Das Gupta (L2C2 Technologies) <indradg at gmail.com>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at koha-community.org>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>
    (cherry picked from commit f668a46e23746daa18c5fe8c6005a8661553c645)
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

commit f62bc698e737b73c404e8ccc3df9a266b97fc5f6
Author: Mark Tompsett <mtompset at hotmail.com>
Date:   Thu Apr 16 08:54:30 2015 -0400

    Bug 13993: (1) Add tests to confirm 'new' and 'cancelled'
    
    This adds 2 tests to t/db_dependent/Acquisition/TransferOrder.t
    in order to confirm the order's status is properly marked.
    
    TEST PLAN
    ---------
    1) Log into staff client
    2) Acquisitions
    3) Create a basket for two differing vendors.
    4) Place an order in one of the baskets.
    5) Transfer the order from one vendor's basket to the others.
    6) Apply this patch (1) only
    7) prove -v t/db_dependent/Acquisition/TransferOrder.t
       -- should fail one test: not marked as 'cancelled'.
    
    Signed-off-by: Indranil Das Gupta (L2C2 Technologies) <indradg at gmail.com>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at koha-community.org>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>
    (cherry picked from commit b335b7299120f642a0f7d7654937521df8f75ba6)
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

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

Summary of changes:
 C4/Acquisition.pm                          |    4 ++--
 Koha.pm                                    |    2 +-
 installer/data/mysql/updatedatabase.pl     |   11 +++++++++++
 t/db_dependent/Acquisition/TransferOrder.t |    8 +++++++-
 4 files changed, 21 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Mon Jul 20 15:25:16 2015
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Mon, 20 Jul 2015 13:25:16 +0000
Subject: [koha-commits] main Koha release repository branch master updated.
	v3.20.00-305-gd49cba2
Message-ID: <E1ZHB4G-0004xn-3g@git.koha-community.org>

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  d49cba287e46b4c1e6656f9ec2c1867bfd633016 (commit)
       via  ff280e01f4927d3860ec3d607e8d3be310dd358b (commit)
       via  1a8962f306d2d2f0c7789c649aa615192ccd5ca1 (commit)
       via  e0986f5a796b24d6fec00d849f7c71caf0dd5640 (commit)
       via  17d04c46190880d3031adbc02553f82234d70fc1 (commit)
       via  8d58acc565c8500d4b9d55cacb3d6d21628a899b (commit)
       via  a72262a950aa701cebe460e2a3a7586edecd86be (commit)
       via  09b34591b665228c3ab38d3d327224c2c59cee6e (commit)
       via  454becb78f21682be0d868b7577f5595c7250ac7 (commit)
       via  ea263a2284f1b81da5718a0cfbc581909c86cf4a (commit)
      from  cd9a827b6928ed0cb80c78ebf897e2d77132296a (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 d49cba287e46b4c1e6656f9ec2c1867bfd633016
Author: Katrin Fischer <Katrin.Fischer.83 at web.de>
Date:   Wed Jun 10 01:43:22 2015 +0200

    Bug 12352: Patron modification request page: Add link to patron record
    
    The patron modification request page in the staff client does show
    the name and home library of a patron, but there is no way to
    go to the patron record. This patch adds a link to the patron details.
    
    Extras: changes display of patron name, so a missing firstname won't
    result in an extra , showing.
    
    To test:
    - Make some update requests from different patron accounts in the OPAC
    - Go to the patron modification request page in staff
    - Verify a link 'Patron details' now shows on each entry and
      works correctly
    
    Followed test plan. Works as expected. QA tools OK.
    Signed-off-by: Marc V?ron <veron at veron.ch>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at koha-community.org>
    Not sure the "Patron details" link is at the best place, but I don't
    have something better to suggest.
    Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>

commit ff280e01f4927d3860ec3d607e8d3be310dd358b
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Mon Jul 13 15:44:23 2015 +0100

    Bug 14524: Don't escape query_cgi with uri
    
    According to the doc, we should not escape query_cgi with the uri
    filter:
    http://www.template-toolkit.org/docs/manual/Filters.html#section_uri
    
    Since query_cgi can contains something like: "idx=kw&q=42", we should
    not escape the & char
    
    Test plan:
    0/ Don't apply the patch
    1/ Go on launch a search at the OPAC
    2/ Click on the RSS icon
    3/ You should arrive on
    opac-search.pl?idx%3Dkw%26q%3D42&count=50&sort_by=acqdate_dsc&format=rss2
    The & has been escaped.
    4/ Apply the patch
    5/ Now you should get result and see an url correctly formatted.
    
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>

commit 1a8962f306d2d2f0c7789c649aa615192ccd5ca1
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date:   Thu Jul 9 15:35:53 2015 +0200

    Bug 14494: Add some unit tests too for CalcDateDue
    
    The second patch of this report made some changes to CalcDateDue.
    We are adding some unit tests here.
    See the commments on the third patch too.
    
    Test plan:
    Run t/db_dependent/Circulation_dateexpiry.t
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    Amended patch: Set the number of tests for the second subtest (was
    commented) and perltidy the second block.
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>

commit e0986f5a796b24d6fec00d849f7c71caf0dd5640
Author: Jonathan Druart <jonathan.druart at koha-community.org>
Date:   Thu Jul 9 09:52:28 2015 +0100

    Bug 14494: Unit tests for CanBookBeIssued related to dateexpiry
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    Moved the test on its own. Nicer than adding TestBuilder in the final part
    of the test. No warnings/errors from TestBuilder, no dependency..
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>

commit 17d04c46190880d3031adbc02553f82234d70fc1
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date:   Mon Jul 6 14:20:07 2015 +0200

    Bug 14494: Terribly slow checkout caused by DateTime->new in far future
    
    An expiry date like 9999-12-31 in the local timezone will make DateTime
    spend a lot of time (maybe 60 seconds) on date calculation. See the
    DateTime documention on CPAN.
    A calculation in floating (or alternatively in UTC) would only take
    a few milliseconds.
    
    This patch makes two changes in this regard:
    
    [1] The compare between expiry date and today in CanBookBeIssued has been
        adjusted in Jonathan's patch. I am moving the compare to the floating
        timezone (as was done in my original patch). This removes a hardcoded
        9999.
    [2] If ReturnBeforeExpiry is enabled, CalcDateDue compares the normal due
        date with the expiry date. The comparison is now done in the floating
        timezone. If the expiry date is before the due date, it is
        returned in the user context's timezone.
    
    NOTE: The calls to set_time_zone moving to or from floating do not adjust
    the local time.
    
    TEST PLAN:
    First without this patch (and the one from Jonathan):
    [1] Set expiry date to 9999-12-31 for a patron.
    [2] Enable ReturnBeforeExpiry.
    [3] Checkout a book to this patron. This will be (very) slow.
    
    Continue now with this patch applied:
    [4] Check in the same book.
    [5] Check it out again. Should be much faster.
    
    Bonus test:
    [6] Set borrower expiry date to today. Change relevant circulation rule
        to loan period of 21 hours. Test checking out with a manual due date
        /time just before today 23:59 and after that. In the second case the
        due date/time should become today 23:59 (note that 23:59 is not
        shown on the checkout form).
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>

commit 8d58acc565c8500d4b9d55cacb3d6d21628a899b
Author: Jonathan Druart <jonathan.druart at koha-community.org>
Date:   Thu Jul 9 09:52:28 2015 +0100

    Bug 14494: Prevent slow checkout if the patron does not have an expiry date
    
    If a patron has a expiry date set to 9999-12-31 (for organizations for
    instance), the checkouts are very slow.
    
    It's caused by 2 different calls to DateTime in CanBookBeIssued:
    1/
      DateTime->new( year => 9999, month => 12, day => 31, time_zone => C4::Context->tz );
    The time_zone should not be set (as it's done in Koha::DateUtils), set to UTC or floating tz.
    
    2/
      DateTime->compare($today, $expiry_dt)
    The comparaison of 2 DT with 1 related to 9999 is very slow, as you can
    imagine.
    
    For 1/ we need to call Koha::DateUtils::dt_from_string (actually, we
    should never call DateTime directly).
    For 2/ we just need to test if the date is != 9999, no need to compare
    it in this case.
    
    Test plan:
    Before this patch, confirm that the checkouts are slow if the patron has a
    dateexpiry set to 9999-12-31.
    update borrowers set dateexpiry="9999-12-31" where borrowernumber=42;
    
    After this patch, you should not see any regression when checking out
    items to an expired patron and to a valid patron.
    
    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: Kyle M Hall <kyle at bywatersolutions.com>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>

commit a72262a950aa701cebe460e2a3a7586edecd86be
Author: David Cook <dcook at prosentient.com.au>
Date:   Mon Jul 13 14:06:46 2015 +1000

    Bug 14521: SQL injection in local use system preferences
    
    This patch fixes a SQL injection vulnerability in the local use
    system preferences.
    
    _TEST PLAN_
    
    Before applying:
    
    1) Go to Global System Preferences
    2) Click on the "Local use" tab
    3) Add a new preference with the value "') or '1' = '1' -- "
    (be sure to include the space at the end after the comment --).
    4) When the page refreshes, you should now see about 99 other system
    preferences which shouldn't be showing up.
    
    5) Apply the patch
    
    6) Refresh the page
    7) Note that you now only see a system preference for "') or '1' = '1' -- "
    and the other actual local use system preferences.
    
    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: Tomas Cohen Arazi <tomascohen at unc.edu.ar>

commit 09b34591b665228c3ab38d3d327224c2c59cee6e
Author: Aleisha <aleishaamohia at hotmail.com>
Date:   Fri Jul 10 10:31:53 2015 -0400

    Bug 14436: Noisy warns in C4/Utils/DataTables/Members.pm
    
    TEST PLAN
    ---------
    1) Backup the koha intranet error log.
    2) Empty the koha intranet error log.
    3) In staff client, go to Patrons
       (/cgi-bin/koha/members/members-home.pl)
    4) Pick any letter to 'Browse by last name'
       -- koha intranet error log now has warns.
       -- the one of importance is the uninitalized value.
    5) Empty the koha intranet error log.
    6) apply this patch
    7) Repeat steps 3 & 4.
       -- koha intranet error log does not contain the
          uninitialized value error.
    8) run koha qa test tools.
    
    Signed-off-by: Indranil Das Gupta (L2C2 Technologies) <indradg at gmail.com>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>

commit 454becb78f21682be0d868b7577f5595c7250ac7
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date:   Wed Apr 1 13:58:50 2015 +0200

    Bug 9006: Remove AUTOLOAD in C4::Context
    
    Happily this was only used for intranetdir.
    It's time to remove it and replace existing calls.
    
    I used the following commands to catch calls to C4::Context:
    git grep 'C4::Context\->' | grep -v 'C4::Context->preference' | grep -v
    'C4::Context->config' | grep -v  'C4::Context->userenv' | grep -v
    'C4::Context->IsSuperLibrarian' | grep -v 'C4::Context->dbh' | grep -v
    'C4::Context->set_preference' | grep -v '_syspref_cache' | grep -v
    _userenv | grep -v 'C4::Context->interface' | grep -v
    'C4::Context->Zconn' | grep -v 'C4::Context->queryparser' | grep -v
    'C4::Context->tz' | grep -v 'C4::Context->boolean_preference' | grep -v
    'C4::Context->memcached'
    
    NOTE: I applied 14428, and then did what I suggested in comment #2.
          Only intranetdir references appeared.
    
          I applied this patch, and repeated.
          Nothing appeared. This means the autoload references are
          properly removed.
    
          koha qa test tools complained about whitespace, I just fixed
          those. Though, we may wish to perltidy
          auth_fields_substructure.pl on another bug.
    
    Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>

commit ea263a2284f1b81da5718a0cfbc581909c86cf4a
Author: Jonathan Druart <jonathan.druart at koha-community.org>
Date:   Wed Jun 24 11:24:14 2015 +0200

    Bug 14449: Add authentication check on retrieving item info when receiving
    
    The script catalogue/getitem-ajax.pl is called by acqui/orderreceive.pl
    when item is receipt.
    There is not auth check done, this means anybody can retrieve item info.
    
    Test plan:
    With the acquisition => order_receive permission, try to receive an
    item.
    It should work.
    
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    
    Very easy to test.
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>

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

Summary of changes:
 C4/Circulation.pm                                  |   32 +++---
 C4/Context.pm                                      |   18 ----
 C4/Utils/DataTables/Members.pm                     |    2 +-
 Koha/FrameworkPlugin.pm                            |    2 +-
 admin/auth_subfields_structure.pl                  |    4 +-
 admin/marc_subfields_structure.pl                  |    4 +-
 admin/systempreferences.pl                         |    6 +-
 catalogue/getitem-ajax.pl                          |    9 ++
 .../prog/en/modules/members/members-update.tt      |    3 +-
 .../opac-tmpl/bootstrap/en/modules/opac-results.tt |    6 +-
 reports/manager.pl                                 |    2 +-
 t/db_dependent/Circulation_dateexpiry.t            |  111 ++++++++++++++++++++
 12 files changed, 149 insertions(+), 50 deletions(-)
 create mode 100644 t/db_dependent/Circulation_dateexpiry.t


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Mon Jul 20 16:02:29 2015
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Mon, 20 Jul 2015 14:02:29 +0000
Subject: [koha-commits] main Koha release repository branch master updated.
	v3.20.00-316-gee6dced
Message-ID: <E1ZHBeH-0005CD-O7@git.koha-community.org>

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  ee6dced5617acb6132299f8de521c4bb38b501ea (commit)
       via  f8abcf3e8e44d04fde81083575662f401dce438c (commit)
       via  984f051adc64a298b9970e6a747d594cffe8b881 (commit)
       via  db5fe99b33938bacecd80eca60920de997e5a697 (commit)
       via  58c652a0fc7b870b1e393f61905dd48fc2e6ad6e (commit)
       via  0183cc0223678f6b3f0885213c7223ddb31acf5d (commit)
       via  e9061028c1ba95b310be5e9333b224e735e64f40 (commit)
       via  7098a36b19c35a06a51361bd381416a1204de38d (commit)
       via  fe3a49e61133e1e66d0075f3300cd3a99e691890 (commit)
       via  588f13e6999bbc368fc16e7b4f3d0dab067599de (commit)
       via  e799e1cbc33d8fce2f1ff3a9688adb0a68ed1d4d (commit)
      from  d49cba287e46b4c1e6656f9ec2c1867bfd633016 (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 ee6dced5617acb6132299f8de521c4bb38b501ea
Author: Tomas Cohen Arazi <tomascohen at unc.edu.ar>
Date:   Mon Jul 20 11:01:38 2015 -0300

    Bug 12137: DBRev 3.21.00.015
    
    Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>

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

    Bug 12137: Use Koha.Preference to access pref value
    
    Signed-off-by: Jonathan Druart <jonathan.druart at koha-community.org>

commit 984f051adc64a298b9970e6a747d594cffe8b881
Author: Indranil Das Gupta <indradg at gmail.com>
Date:   Sat Jun 20 18:22:32 2015 +0530

    Bug 12137: followup sort <select> index by value
    
    adds alphabetical sorting to <select> lists displayed by
    preferences.tt. although added for sorting the days of the
    week, this may have larger ramifications. haven't been
    tested thoroughly, but no apparent breakage seems to be
    happening in preferences.
    
    NOTE: Nice tweak. Makes days of week in sensible order.
          Properly adds sorting based on documentation that
          is really hard to find.
    
    Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at koha-community.org>

commit db5fe99b33938bacecd80eca60920de997e5a697
Author: Mark Tompsett <mtompset at hotmail.com>
Date:   Thu Apr 24 19:09:31 2014 -0400

    Bug 12137: Extend CalendarFirstDayOfWeek to be any day
    
    Mubassir Ahsan asked on the Koha mailing list:
    Is there any option to set Saturday as the first day of
    the week? Please help me.
    
    CalendarFirstDayOfWeek is currently either Sunday|Monday.
    
    By converting it to 0|1|2|3|4|5|6
    (Sunday, Monday, ..., Saturday), we can allow any day of the
    week to be the first day of the week in the date picker.
    
    TEST PLAN
    ---------
    1) Backup DB
    2) In mysql:
       > DELETE FROM systempreferences;
       > SOURCE .../installer/data/mysql/sysprefs.sql
       > SELECT variable,value FROM systempreferences;
       -- It should say 'CalendarFirstDayOfWeek' and '0'
          May say '1' if you are using Norwegian.
    3) Restore your DB
    4) .../installer/data/mysql/updatedatabase.pl
       -- If your previous value for 'CalendarFirstDayOfWeek' was
          'Sunday', it should be '0'. For 'Monday', it should be '1'.
    5) Test an installation with 'de-DE' as the language.
       -- The default value should be '1'.
    6) Test an installation with 'nb-NO' as the language.
       -- The default value should be '1'.
    7) In the staff client, confirm that any day of the week is
       available in the I18N/L10N system preferences for the
       CalendarFirstDayOfWeek dropdown.
       -- I'm aware they aren't in order, but I'm after
          functionality, not finesse.
    8) In another tab, go to a staff place that has a datepicker.
       For example, Home -> Tools -> Inventory/stocktaking
    9) For each possible value in the CalendarFirstDayOfWeek,
       go to the other tab, refresh the page after updating the
       system preference, and click the datepicker icon.
       -- The date picker should then start on the selected
          day of the week.
    10) Log into OPAC
        -- This may require setting: opacuserlogin to 'Allow'.
    11) Click the personal details tab on the left.
    12) There is a date picker for the date of birth.
        -- The date picker should then start on the selected
           day of the week.
    13) Run koha QA test tools.
    
    NOTE: not an atomic update, since this is an old patch.
    
    Signed-off-by: Indranil Das Gupta (L2C2 Technologies) <indradg at gmail.com>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at koha-community.org>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>

commit 58c652a0fc7b870b1e393f61905dd48fc2e6ad6e
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date:   Tue Apr 28 10:10:56 2015 +0200

    Bug 12054: Inactive vendors should be inactive
    
    This patch make inactive vendors really inactive.
    That means an inactive vendor would not be able to add a basket / add an order.
    
    Revised test plan
    =================
    
    1/ In the acquisition module create 2 vendors: 1 active and 1 inactive.
    
    2/ On the acqui/booksellers.pl, acqui/uncertainprice.pl,
       admin/aqcontract.pl and acqui/supplier.pl (pages which include the
       acq toolbar), you should be able to, for both the 'active' as well
       as the inactive vendor :
         (a) add new basket
         (b) add order items to the basket
    
       Remark: This is *wrong*. You should be able to do so only for active
               vendor.
    
    3/ Apply the patch
    
    4/ Go to the links in step #2 above and select the inactive vendor
       you should no longer be able to:
       (a) add new basket
       (b) add order items to the basket
    
       Remark: This is the *correct* behaviour
    
    5/ No change should be noted for vendor marked "active", and should
       be able to undertake operations 4 (a), 4 (b) and 4 (c).
    
       Remark: This is the *correct* behaviour.
    
    6/ run koha qa tests tool
    
    Bug 12054: (follow-up) Inactive vendors should be inactive
    
    Don't display "add order""block and buttons if the vendor is inactive.
    
    Signed-off-by: Indranil Das Gupta (L2C2 Technologies) <indradg at gmail.com>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>

commit 0183cc0223678f6b3f0885213c7223ddb31acf5d
Author: Jonathan Druart <jonathan.druart at koha-community.org>
Date:   Thu Jul 9 10:31:07 2015 +0100

    Bug 14404: Rename class no-show to noshow for consistency with nosort
    
    Signed-off-by: Jonathan Druart <jonathan.druart at koha-community.org>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>

commit e9061028c1ba95b310be5e9333b224e735e64f40
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date:   Tue Jun 16 19:05:10 2015 -0400

    Bug 14404: Checkouts default sort order for Self Checkout (SCO) confusing for patrons
    
    Libraries are reporting that patrons are very confused during
    self-checkout. The problem is they are expecting the list of checkouts
    to be in the order they checked out the items ( first checkout on the
    bottom, last item checked out on top ). However, the checkouts
    table is sorted by title ( ascending ) then due date ( descending ).
    This is not intuitive.
    
    Test Plan:
    1) Enable Koha's self checkout
    2) Use the SCO to check out a random assortment of items,
       make sure you don't check them out in alphabetical order
    3) Note the order of the items in the list is not based on the order
       you checked them out in
    4) Apply this patch
    5) Refresh the page
    6) Note the items are now in the order you checked them out
       with the last on top and the first on bottom
    
    Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at koha-community.org>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>

commit 7098a36b19c35a06a51361bd381416a1204de38d
Author: Aleisha <aleishaamohia at hotmail.com>
Date:   Wed Jul 1 01:36:00 2015 +0000

    Bug 14445: Silences warns in letter.tt
    
    When creating a new notice, warn is triggered "Argument "" isn't numeric in numeric gt (>) at line 400". Same warn is triggered when changing Koha module option to any other module.
    
    To test:
    1) Go to Tools, then Notices & Slips
    2) Click 'new notice'. Notice warn in intranet-error.log
    3) Change Koha module to another module. Notice warn is triggered for every change
    4) Apply patch and reload page
    5) Change Koha module to another module. Notice there are no longer warns
    6) Go back to Notices & Slips and click 'new notice' again. Notice there are no warns
    
    Signed-off-by: Jonathan Druart <jonathan.druart at koha-community.org>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>

commit fe3a49e61133e1e66d0075f3300cd3a99e691890
Author: Aleisha <aleishaamohia at hotmail.com>
Date:   Wed Jun 24 01:15:32 2015 +0000

    Bug 14445: Silences warn in letter.pl
    
    When changing Koha module to 'Circulation', there is a warn saying that $code is uninitialized. This patch sets $code to an empty string to silence the warn.
    
    To test:
    1) Go to Tools, the Notices & Slips
    2) Click 'new notice' (This will trigger warns, but ignore these as they will be corrected in the next patch)
    3) Change Koha module to 'Circulation'
    4) Notice warn about uninitialized $code variable
    5) Apply patch and reload page, change Koha module to 'Circulation'
    6) Notice page still works and warns are gone
    
    Signed-off-by: Jonathan Druart <jonathan.druart at koha-community.org>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>

commit 588f13e6999bbc368fc16e7b4f3d0dab067599de
Author: Mark Tompsett <mtompset at hotmail.com>
Date:   Wed May 27 16:11:38 2015 -0400

    Bug 14121: Silence warnings t/db_dependent/Auth_with_cas.t
    
    TEST PLAN
    ---------
    1) $ prove t/db_dependent/Auth_with_cas.t
       -- CGI security warning
    2) apply patch
    3) $ prove t/db_dependent/Auth_with_cas.t
       -- no noise.
    4) koha qa test tools
    
    Signed-off-by: Nick Clemens <nick at quecheelibrary.org>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    Not able to reproduce the error on my setup, but the code
    is a clear improvement over the previous version.
    Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>

commit e799e1cbc33d8fce2f1ff3a9688adb0a68ed1d4d
Author: Katrin Fischer <Katrin.Fischer.83 at web.de>
Date:   Mon May 25 13:58:57 2015 +0200

    Bug 11620: Add dissertation-information index for MARC21 (502)
    
    Bug 11202 introduced a new index 'dissertation-information' for
    UNIMARC. This patch adds the index also for MARC21 installations.
    
    http://www.loc.gov/marc/bibliographic/bd502.html
    
    To test:
    - Apply patch
    - Copy files in etc/zebradb changed by this patch to your
      corresponding directory (koha-dev..)
    - Make sure you have records with 502
    - Reindex
    - Verify you can search the field contents with
      dissertation-information= and
      diss=
    
    Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
    Can find by dissertation-information,
    No errors
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>

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

Summary of changes:
 C4/Auth.pm                                            |    2 --
 C4/Auth_with_cas.pm                                   |    9 +++++----
 C4/Search.pm                                          |    1 +
 Koha.pm                                               |    2 +-
 acqui/booksellers.pl                                  |    3 ++-
 acqui/uncertainprice.pl                               |    1 +
 admin/aqcontract.pl                                   |    1 +
 etc/zebradb/ccl.properties                            |    1 +
 .../marc21/biblios/biblio-koha-indexdefs.xml          |    2 ++
 .../marc21/biblios/biblio-zebra-indexdefs.xsl         |    2 +-
 .../data/mysql/de-DE/mandatory/system_preferences.sql |    3 ++-
 .../mysql/nb-NO/1-Obligatorisk/system_preferences.sql |    3 ++-
 installer/data/mysql/sysprefs.sql                     |    2 +-
 installer/data/mysql/updatedatabase.pl                |   16 ++++++++++++++++
 .../prog/en/includes/acquisitions-toolbar.inc         |    6 +++---
 koha-tmpl/intranet-tmpl/prog/en/includes/calendar.inc |    3 ++-
 .../intranet-tmpl/prog/en/modules/acqui/basket.tt     |    7 ++++++-
 .../prog/en/modules/acqui/booksellers.tt              |    2 +-
 .../intranet-tmpl/prog/en/modules/admin/aqcontract.tt |    7 ++++++-
 .../prog/en/modules/admin/preferences.tt              |    2 +-
 .../prog/en/modules/admin/preferences/i18n_l10n.pref  |   11 ++++++++---
 .../intranet-tmpl/prog/en/modules/tools/letter.tt     |    6 +++---
 .../opac-tmpl/bootstrap/en/includes/calendar.inc      |    3 ++-
 .../opac-tmpl/bootstrap/en/modules/sco/sco-main.tt    |   17 ++++++++++++++---
 t/db_dependent/Auth_with_cas.t                        |    1 +
 tools/letter.pl                                       |    4 ++--
 26 files changed, 85 insertions(+), 32 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Mon Jul 20 23:50:35 2015
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Mon, 20 Jul 2015 21:50:35 +0000
Subject: [koha-commits] main Koha release repository branch 3.18.x updated.
	v3.18.08-49-g6783c84
Message-ID: <E1ZHIxH-0007gw-Mm@git.koha-community.org>

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, 3.18.x has been updated
       via  6783c84d4548a71fdaf8bc20eb7f84f5d7f59c5a (commit)
       via  fab8da9b005f3a59502e1474d5da1d7e3a92e307 (commit)
       via  1524b4fd0c0ca13fec0d56a1e30c7234030eb289 (commit)
       via  0545b2f0a59b275b359ab1c578977bd617d0ea26 (commit)
       via  05389408c3b1c3b9af910256cd1f257275d2c3b0 (commit)
       via  3291c8e02f6fb28b4df5a09b35f9f9700d7bdca6 (commit)
       via  6303d6a4dbb20525c595b4f18a97d01fbbf928ce (commit)
       via  981c363d99cf049a08c5b7bde4c03df2a92f766c (commit)
       via  a1e9b4e1edfd7bc870b3ddd0150fac7b2fd51733 (commit)
       via  7763257f019f8cb9ab7434e2d42d34fd73fd63bc (commit)
       via  448bb04f04ee7a0ad24a8a8528ed909a8e90d1fa (commit)
       via  055442cd0d404c49522794b79d269730e0d1ef6c (commit)
       via  a3099a7e5aeb635a879aec4a10fe7ebe3834a1dd (commit)
       via  f69c9023d7c24a06ee06db24b9825015ec3e5229 (commit)
       via  48fc41ac5c97e6a34f93636a34b311f8ac2d850c (commit)
       via  efc9c0adde2666a6a8fc562ab1af3bd864ac6d72 (commit)
       via  f5974a72ab415d03a8b160be93a66230d7a239c5 (commit)
       via  d578222188d5da186d00826ab26de29b0cb4b969 (commit)
       via  15b3b05346601da424baa510723f0e08497c6368 (commit)
       via  b086e3c39fe240dfb24b0e0a49223244938d54e8 (commit)
       via  5b5197849a1e8726a194b87776ae4da004c5f74a (commit)
       via  533ffe694bfeec2e628d12c2dab2b99ae7f3f843 (commit)
       via  3a733cfe52809961d8657945a08e8a6e926ea842 (commit)
       via  16efb376e6dda5f3fa819fe5d4a53f555262a1ea (commit)
       via  e80e4294647cf58f3d4b3cb9a8cc21d1033871a0 (commit)
       via  13325b259775765e8842a1cf2fbe528d734144a9 (commit)
       via  9a0408c029555ee8de98ca5e66844fc91544f9e6 (commit)
       via  3cdaf5c221b9826b7438919770e320d43dfb4b3a (commit)
       via  9c91b66ff6b3cdb2e02aaa464af2b3f71fbfdcc9 (commit)
       via  2db93a5a02229279216e15d39265c7976ca82ea4 (commit)
       via  0a8fa52649ca25b7e6f6425ded46018329232c62 (commit)
       via  a8ca01cc2291e026fb8c83c0e3138b337e378670 (commit)
       via  cb220b605e7ed559b478e6e502802670fded780d (commit)
       via  d04fa7b258f94f4cc65398ae2a98e55c9e95ea58 (commit)
       via  957acc5a815b1d8c63aa0ff24a1fed99bc271bc9 (commit)
       via  7b2207888394c9a49b5764939667534224f1b0fa (commit)
       via  490ad5e19132f9d54c03bba2bd2d2dc4b4cfbe04 (commit)
       via  3db143ccee82ffacb0a92e1f07ec3a8c52c6ba59 (commit)
       via  b9185c4aa87e26fae0a1a30614c8f03b58f60808 (commit)
       via  4f96b7c330886c8213c7df7b21dd5fdf42b87537 (commit)
       via  6cefaa2ae4eb09f441c2a3576e0b9ba98aadfb17 (commit)
       via  7b5f05e4777349718cce59fe612457d190a1c482 (commit)
       via  3ddfda558196c057e6c66401ff640b9a32103ce0 (commit)
       via  ee97bdb58fcd15ab51c56f3c8487357a5a0b8e3d (commit)
       via  aa357855e45d54e48b1ba6314b2761a1a847756e (commit)
       via  cf229ccc7f0612b96eb23a95a31faee4ed9021e4 (commit)
       via  ac92491d08b115059b8e85d781b38ded30dd7fbc (commit)
       via  6650203b9e87c1d02d5a84cabaac16f5c24fff87 (commit)
       via  7b7a8c8d3684f8f162890bd7fbce8ae0623641b5 (commit)
      from  0580342093946f59e8f0f1320f136ad085abe305 (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 6783c84d4548a71fdaf8bc20eb7f84f5d7f59c5a
Author: Liz Rea <wizzyrea at gmail.com>
Date:   Thu Jul 16 12:32:08 2015 +0000

    Bug 14290 - fix number of columns in footer for 3.18
    
    Jonathan pointed out that the smart rules table is slightly different in 3.20, this commit cleans it up for 3.18.

commit fab8da9b005f3a59502e1474d5da1d7e3a92e307
Author: Liz Rea <wizzyrea at gmail.com>
Date:   Thu Jul 16 12:30:51 2015 +0000

    Revert "Bug 14290 - fix number of columns in footer for 3.18"
    
    This reverts commit 1524b4fd0c0ca13fec0d56a1e30c7234030eb289.
    
    extra stuff in here, oops.

commit 1524b4fd0c0ca13fec0d56a1e30c7234030eb289
Author: Liz Rea <wizzyrea at gmail.com>
Date:   Thu Jul 16 12:25:14 2015 +0000

    Bug 14290 - fix number of columns in footer for 3.18
    
    Jonathan pointed out that the smart rules table is slightly different in 3.20, this commit cleans it up for 3.18.

commit 0545b2f0a59b275b359ab1c578977bd617d0ea26
Author: Julian FIOL <julian.fiol at biblibre.com>
Date:   Mon Jul 6 12:27:08 2015 +0200

    Bug 14496: Improving opac-detail.pl performances
    
    Get notes and subjects from MARC record
    ONLY when XSLT is not activated.
    
    It's useless doing it when XSLT is activated,
    because XSLT takes care of it by its own.
    
    => With this patch, we are saving precious
    milliseconds
    
    I compared the display of some records in XSLT view with and without patch, was the same (as expected).
    Signed-off-by: Marc Veron <veron at veron.ch>
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    On a slower server, I saw a time save of 0.0274 to 0.0908 seconds (with XSLT).
    Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>
    
    (cherry picked from commit 468d3d9c83a9760e796cdf43c7da2766ccf7c9b9)
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    
    Signed-off-by: Liz Rea <wizzyrea at gmail.com>

commit 05389408c3b1c3b9af910256cd1f257275d2c3b0
Author: Fridolin Somers <fridolin.somers at biblibre.com>
Date:   Thu Jul 2 10:37:22 2015 +0200

    Bug 14485: HTML comment disables translation in cataloguing/addbooks.tt
    
    In cataloguing/addbooks.tt, the line :
      [% total %] result(s) found in catalog,
    is not present in PO files even after an update.
    I've found that the cause is the previous HTML comment line.
    
    This patch converts HTML comment into TT comment and adds a div to have a more comprehensive string to translate.
    
    Test plan :
    - without patch
    - go into <sources>/misc/translator
    - run PO update for example in french : translate update fr-FR
    => the text "result(s) found in catalog" is missing from PO file : fr-FR-staff-prog.po
    - restore default PO files
    - apply patch
    - go into <sources>/misc/translator
    - run PO update for example in french : translate update fr-FR
    => You find text "result(s) found in catalog" in PO file : fr-FR-staff-prog.po
    
    Sponsored-by: Universidad de El Salvador
    
    Signed-off-by: Hector Eduardo Castro Avalos <hector.hecaxmmx at gmail.com>
    Works as advertised. Just one msgid appear with msgid "%s result(s) found in catalog,"
    
    Signed-off-by: Jonathan Druart <jonathan.druart at koha-community.org>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
    (cherry picked from commit e2ab42716825c5dedbb0036ae56a28e6119083f5)
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    
    Signed-off-by: Liz Rea <wizzyrea at gmail.com>

commit 3291c8e02f6fb28b4df5a09b35f9f9700d7bdca6
Author: David Cook <dcook at prosentient.com.au>
Date:   Tue Jun 9 14:25:23 2015 +1000

    Bug 14366: Units doesn't get saved usefully for patroncards
    
    This patch causes the "Units" to be saved and displayed correctly
    for the "Edit layout" screen in Patroncards.
    
    _TEST PLAN_
    
    Before applying:
    0) Create a new layout
    1) Edit the layout, change the units, and click Save
    2) Edit the layout again, and notice the units are still "PostScript Points"
    
    Apply the patch:
    3) Edit the layout again, change the units, and click Save
    4) Edit the layout again, note that the units have changed to your
    selection
    
    5) Rejoice
    
    Signed-off-by: Nick Clemens <nick at quecheelibrary.org>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at koha-community.org>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
    (cherry picked from commit f573a155974c84a6fb433bff86a220d4644ad27e)
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    
    Signed-off-by: Liz Rea <wizzyrea at gmail.com>

commit 6303d6a4dbb20525c595b4f18a97d01fbbf928ce
Author: Nick Clemens <nick at quecheelibrary.org>
Date:   Tue Jun 16 21:48:18 2015 -0400

    Bug 13950: Sort Item search home library list by branch name
    
    On the item search form the list of home libraries isn't sorted
    alphabetically by their descrption.
    
    To test:
    - Ensure that you have libraries whose code/name are sorted in a different alphabetical order (e.g. Aardvark/ZZZ & Zebra/AAA)
    - Staff: Advanced search - item search
    - See that libraries are sorted in code order
    - Apply patch
    - Verify selection block for home library is correctly sorted after
      applying the patch.
    
    Signed-off-by: Indranil Das Gupta (L2C2 Technologies) <indradg at gmail.com>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at koha-community.org>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
    (cherry picked from commit 958be9804a50c3e13f74c4d5f81348e2256a8042)
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    
    Signed-off-by: Liz Rea <wizzyrea at gmail.com>

commit 981c363d99cf049a08c5b7bde4c03df2a92f766c
Author: Mirko Tietgen <mirko at abunchofthings.net>
Date:   Thu Jun 25 15:38:42 2015 +0200

    Bug 14453: (followup) Fix shipped XSLT files
    
    Make the shipped XSLTs for authorities (MARC21 and UNIMARC) the same as the generated version
    
    Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
    (cherry picked from commit fbe25b1d8e1806768b04d829bd9fc1a05f4861cf)
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    
    Signed-off-by: Liz Rea <wizzyrea at gmail.com>

commit a1e9b4e1edfd7bc870b3ddd0150fac7b2fd51733
Author: Fridolin Somers <fridolin.somers at biblibre.com>
Date:   Wed Jun 24 16:06:05 2015 +0200

    Bug 14453: kohaidx is missing for id in authority-koha-indexdefs.xml
    
    In authority-koha-indexdefs.xml, all tags use the namespace "kohaidx" except the tag "id".
    
    When re-generating authority-zebra-indexdefs.xsl, the line :
      <xslo:variable name="idfield" select="normalize-space(marc:controlfield[@tag='001'])"/>
    is modified :
      <xslo:variable name="idfield" select="normalize-space()"/>
    This is an error.
    
    This patch adds kohaidx namespace to correct.
    
    Test plan :
    - Without patch
    - go to etc/zebradb/marc_defs/marc21/authorities/
    - run : xslproc xsltproc ../../../xsl/koha-indexdefs-to-zebra.xsl authority-koha-indexdefs.xml > authority-zebra-indexdefs.xsl
    - read authority-zebra-indexdefs.xsl
    => the line has changed : <xslo:variable name="idfield" select="normalize-space()"/>
    - Apply patch
    - go to etc/zebradb/marc_defs/marc21/authorities/
    - run : xslproc xsltproc ../../../xsl/koha-indexdefs-to-zebra.xsl authority-koha-indexdefs.xml > authority-zebra-indexdefs.xsl
    - read authority-zebra-indexdefs.xsl
    => the line has not changed
    (same for unimarc flavor)
    
    Signed-off-by: Mirko Tietgen <mirko at abunchofthings.net>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>
    As Mirko mentioned, the xslt's now generate the facet-processing templates in
    the authority xslt's too. They are harmless because we don't define facets
    for authority records. If we did, it would be harmless too.
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
    (cherry picked from commit 2365537eea9d5cd6526843b1cd0c2152a6def06c)
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    
    Signed-off-by: Liz Rea <wizzyrea at gmail.com>

commit 7763257f019f8cb9ab7434e2d42d34fd73fd63bc
Author: Winona Salesky <wsalesky at gmail.com>
Date:   Wed Jun 3 22:46:23 2015 -0400

    Bug 14326: XSLT Syntax error in MARC21slimOPACResults.xsl
    
    Test Plan:
    1) Apply this patch
    2) Ensure you are using the default XSLT setting for the staff and opac  record details
    3) Perform an opac search check "Availability" for expected display values.
    5) Note this patch corrects invalid syntax in xslt, there should be no visable changes to the results page.
    
    Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at koha-community.org>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
    (cherry picked from commit 058b50de5b09ee2ba3efc953b9846bc79d712c31)
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    
    Signed-off-by: Liz Rea <wizzyrea at gmail.com>

commit 448bb04f04ee7a0ad24a8a8528ed909a8e90d1fa
Author: Indranil Das Gupta <indradg at l2c2.co.in>
Date:   Mon May 4 18:55:15 2015 +0530

    Bug 14135: Adds 'Free' to variabletypes in systempreferences.tt
    
    The 'Local Use' system preference addition/modification template provides the following options against "Variable Type" - Choice, YesNo, Integer, Textarea, Float, Themes, Languages, Upload or ClassSource.
    
    There is no option presented for "Free" which seems to be the most
    used variable type out-of-the-box (i.e. INTRAdidyoumean,
    OPACdidyoumean, UsageStatsID and UsageStatsLastUpdateTime)
    
    This trivial patch proposes to modify the systempreferences.tt
    and add the option 'Free' to the list offered to users.
    
    Test Plan
    =========
    
    1/ Go to Home > Administration > System preferences > Local use
    2/ Click on 'New preference'.
    3/ In the fieldset 'Koha Internal', the variable types offered
       are Choice, YesNo, Integer, Textarea, Float, Themes,
       Languages, Upload or ClassSources.
    4/ Clicking on 'Choice' should set the 'preftype' field as
       'Choice'.
    5/ Apply this patch.
    6/ Refresh the page.
    7/ The variable types list should read - "Free, Choice, YesNo,
       Integer, Textarea, Float, Themes, Languages, Upload or
       ClassSources".
    8/ Clicking on 'Free' should set the 'preftype' field as 'Free'.
    
    Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
    
    NOTE: Discovered that there is no validation on the type field.
          However, that is beyond the scope of this bug.
    
    Signed-off-by: Amit Gupta <amit.gupta at informaticsglobal.com>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at koha-community.org>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>
    (cherry picked from commit 9f008a102415c8b71a1f4a976bc15691c2663b5c)
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    
    Signed-off-by: Liz Rea <wizzyrea at gmail.com>

commit 055442cd0d404c49522794b79d269730e0d1ef6c
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date:   Fri Jul 3 11:02:22 2015 +0200

    Bug 14382: [QA Follow-up] Bad regex alarm
    
    The regex /|date>>/ will match much more than you like :)
    The unescaped pipe is bad, but you also need to remove the >> because
    the split a few lines above it removes them already.
    
    This allows you to recover from an error like this one, running another
    report with a string parameter:
    The given date (india%) does not match the date format (us) at
    Koha/DateUtils.pm line 144.
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    Amended for possible spaces around the word date.
    Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>
    
    (cherry picked from commit bfea40b6e8161629c11d97be5eeba56fb6d59ba3)
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    
    Signed-off-by: Liz Rea <wizzyrea at gmail.com>

commit a3099a7e5aeb635a879aec4a10fe7ebe3834a1dd
Author: Mark Tompsett <mtompset at hotmail.com>
Date:   Wed Jun 24 12:13:46 2015 -0400

    Bug 14382: Non-ISO Date parameters generate empty reports.
    
    The issue is that SQL expects ISO dates, but the user may wish to view dates according to the dateformat system preference.
    
    By detecting a date preference, the non-ISO dates can be converted to ISO dates before being stuffed back into the SQL query to be executed.
    
    TEST PLAN
    ---------
    1) Add a report with date parameters.
       -- I used 'Holds placed in date range' from
          http://wiki.koha-community.org/wiki/SQL_Reports_Library
    2) Set your dateformat to YYYY-MM-DD
    3) Run the report
       -- Note the SQL reads
          "... BETWEEN '{date formatted in YYYY-MM-DD}'..."
       -- If there is supposed to be data, there is some.
    4) Set your dateformat to MM/DD/YYYY
    5) Run the report
       -- Note the SQL reads
          "... BETWEEN '{date formatted in MM/DD/YYYY}'..."
       -- If there is supposed to be data, there is none.
    6) Apply patch
    7) Repeat steps 2-5
       -- The SQL will always read YYYY-MM-DD (ISO) format.
       -- The report will have data, if there is some.
    8) koha qa test tools.
    
    Signed-off-by: Amit Gupta <amit.gupta at informaticsglobal.com>
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    Adding a QA follow-up.
    Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>
    
    (cherry picked from commit c3fea53039a6c53c766b0403eedd57f644c6f772)
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    
    Conflicts:
    	reports/guided_reports.pl
    
    Signed-off-by: Liz Rea <wizzyrea at gmail.com>

commit f69c9023d7c24a06ee06db24b9825015ec3e5229
Author: Liz Rea <wizzyrea at gmail.com>
Date:   Thu Jul 16 10:13:07 2015 +0000

    Bumping database version

commit 48fc41ac5c97e6a34f93636a34b311f8ac2d850c
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date:   Thu Jun 25 17:22:25 2015 -0400

    Bug 9942: [QA Followup] - Add test and alert to returns.pl
    
    Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>
    (cherry picked from commit efedadebf233cf7f2b8c1eb64d1687b282d94474)
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    
    Signed-off-by: Liz Rea <wizzyrea at gmail.com>

commit efc9c0adde2666a6a8fc562ab1af3bd864ac6d72
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date:   Thu Apr 9 13:07:05 2015 +0200

    Bug 9942: Make Koha fail if privacy is not respected
    
    If a patron has requested anonymity on returning items and the system is
    not correctly configured (AnonymousPatron no set or set to an inexistent
    patron), the application should take it into account and not fail
    quietly.
    
    This patch is quite radical: the script will die loudly if the privacy
    is not respected.
    
    To be care of the bad "Software error", some checks are done in the
    updatedatabase to be sure the admin will be warned is something is wrong
    in the configuration.
    
    Test plan:
    1/ Test the updatedatabase entry:
    a. Turn on OPACPrivacy and set AnonymousPatron to an existing patron
    => You will get a warning
    b. Turn on OPACPrivacy and set AnonymousPatron to 0 or ''
    => You will get a warning
    c. Turn on OPACPrivacy and set the privacy to 2 (Never) for at least 1 patron
    Turn off OPACPrivacy
    => You will get a warning
    d. In all other cases you will get no error
    
    2/ Test the interface
    a. Turn on OPACPrivacy and set the privacy to 2 (Never) for a patron
    b. Now you can turn off OPACPrivacy or keep it on, behavior should be
    the same
    c. check an item out the patron
    d. Check the item in using the check out table
    => fail
    e. Check the item in using the Check in tab
    => fail (not gracefully).
    
    Note that the software error could appear on other pages too.
    
    Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
    
    Updatedatabase works as described
    On staff, if don't have correct settings for anonymity it's
    impossible to check-in (with OPACPrivacy on)
    No errors
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>
    (cherry picked from commit 94315f663b8a582fb7ef68de2bd9c3933901cd7f)
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    
    Signed-off-by: Liz Rea <wizzyrea at gmail.com>

commit f5974a72ab415d03a8b160be93a66230d7a239c5
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date:   Thu Jun 25 16:41:23 2015 -0400

    Bug 14467: Security updates break some Koha plugins
    
    The new security updates break previously functioning plugins, most
    notably the cover flow plugin and the Ebsco EDS plugin.
    
    Test Plan:
    1) Install and configure the cover flow plugin ( http://bywatersolutions.com/koha-plugins/ )
    2) Note that attempting to access coverflow.pl from the OPAC results in an error
    3) Apply this patch
    4) Note that coverflow.pl now output html again
    
    Signed-off-by: Nick Clemens <nick at quecheelibrary.org>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at koha-community.org>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>
    (cherry picked from commit e0d2bc669e385cfd1c42c1e83aaff3495a75a822)
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    
    Signed-off-by: Liz Rea <wizzyrea at gmail.com>

commit d578222188d5da186d00826ab26de29b0cb4b969
Author: Liz Rea <liz at catalyst.net.nz>
Date:   Tue Jun 16 16:12:57 2015 +1200

    Bug 14389: Editing a syspref in a textarea does not enable the Save button
    
    Test plan:
      1. Navigate to the "opaccredits" syspref (or any other textarea, i.e.,
         "Click to Edit", syspref) in the system preferences editor.
      2. Change its contents, by either pasting or typing. The field may not
         be marked as modified, even after you click outside the box.
      3. Apply the patch.
      4. Reload the page and try again; either pasting or typing should mark
         the field as changed and allow you to save.
    
    Signed-off-by: Jesse Weaver <pianohacker at gmail.com>
    Confirmed working for normal input, paste and middle-click paste in
    Chrome and Firefox in Linux.
    
    Signed-off-by: Jonathan Druart <jonathan.druart at koha-community.org>
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>
    (cherry picked from commit c95e794bd458377d742280ae8fff281ddf395e04)
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    
    Signed-off-by: Liz Rea <wizzyrea at gmail.com>

commit 15b3b05346601da424baa510723f0e08497c6368
Author: Jonathan Druart <jonathan.druart at koha-community.org>
Date:   Tue Jun 23 10:40:15 2015 +0200

    Bug 14324: Display "Add Child" for Organisations on circ/circulation.pl
    
    On moremember, the button is displayed for Organisations.
    To be consistent, it should be displayed on the circulation page too.
    
    Signed-off-by: Jonathan Druart <jonathan.druart at koha-community.org>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
    (cherry picked from commit 198e6669eeb68519b4909d99631d84aed068845e)
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

commit b086e3c39fe240dfb24b0e0a49223244938d54e8
Author: Barton Chittenden <barton at bywatersolutions.com>
Date:   Thu Jun 18 13:31:28 2015 -0700

    Bug 14324: Set "adultborrower" regardless of guarantor status.
    
    Signed-off-by: Jason Robb - SEKLS (jrobb at sekls.org)
    
    Signed-off-by: Jonathan Druart <jonathan.druart at koha-community.org>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
    (cherry picked from commit f05931e05154cc85df4036fe7c4acdfc0ddb5995)
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    
    Signed-off-by: Liz Rea <wizzyrea at gmail.com>

commit 5b5197849a1e8726a194b87776ae4da004c5f74a
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date:   Wed Apr 1 16:23:48 2015 +0200

    Bug 8802: On editing a library group category type is not set
    
    The category type was always set to 'searchdomain', because it's the
    first of the dropdown list.
    
    Test plan:
    1/ Create or edit a library group
    2/ Set the category type to "properties"
    3/ Edit it again
    4/ Confirm "properties" is correctly selected
    
    Signed-off-by: Nick Clemens <nick at quecheelibrary.org>
    Signed-off-by: Katrin Fischer <katrin.fischer at bsz-bw.de>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
    (cherry picked from commit fc6789c20636f8104854b74209b658634831f4e5)
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    
    Signed-off-by: Liz Rea <wizzyrea at gmail.com>

commit 533ffe694bfeec2e628d12c2dab2b99ae7f3f843
Author: Katrin Fischer <Katrin.Fischer.83 at web.de>
Date:   Mon Jun 8 01:30:58 2015 +0200

    Bug 14356: Improvements to the 'Transfers to receive' page
    
    Patch makes several small changes to the template for the
    'Transfers to receive page'
    
    1) Show the branch name instead of the branchcode in the
       table of incoming transfers.
    
    If there is a hold connected with the transfer:
    2) Show the patron's name as 'surname, firstname'
       intead of 'surname  firstname'
    3) Restore broken feature: Show a mailto: link with a
       generated subject of 'Hold: <title>'.
    
    The mailto: feature actually existed in the templates, but
    was broken to a misnamed database column. I made some small
    changes to make the subject translatable (see bug 8330).
    
    To test:
    - Create a transfer by placing a hold with pickup at another library
    - Craete a transfer manually
    - Go to the circulation > transfers to receive
    - Check the changes explained above, compare before and after
    - Check the mailto: link works as expected
    
    Bonus: Check the Hold: bit in the subject is really translatable now.
    
    Signed-off-by: Nick Clemens <nick at quecheelibrary.org>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at koha-community.org>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
    (cherry picked from commit e5cea455d00c52b4a81e87b4dc77315c03ce8630)
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    
    Signed-off-by: Liz Rea <wizzyrea at gmail.com>

commit 3a733cfe52809961d8657945a08e8a6e926ea842
Author: Nicolas Legrand <nicolas.legrand at bulac.fr>
Date:   Thu May 28 16:32:29 2015 +0200

    Bug 14290: Add a table foot to circulation matrix
    
    Reprint circulation matrix header in a footer helps editing entries in
    big matrix. Otherwise, the header disapears and it's hard to tell
    which columns we're editing.
    
    Test plan : try do add, modify or delete some entries in the
    circulation matrix, everything should work as expected.
    
    Patch works as expected.
    Signed-off-by: Marc V?ron <veron at veron.ch>
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>
    (cherry picked from commit 1ea3465d30b1b0fcd12a5592ce5a4c34a9a58462)
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    
    Signed-off-by: Liz Rea <wizzyrea at gmail.com>

commit 16efb376e6dda5f3fa819fe5d4a53f555262a1ea
Author: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
Date:   Wed Jun 17 13:22:49 2015 -0300

    Bug 12616: Locale in subscriptions not preselecting correctly
    
    There is a problem if a language is present but
    don't have ISO639-2 code. Locale pulldown on serial
    suscription is malformed.
    
    To reproduce on master:
    a) remove some entries on language_rfc4646_to_iso639
    b) go to Serials > New suscription
    c) Put any value on Vendor and record, press Next>>
    d) Look at locale pulldown, it must default to last
    removed lang from a), also other langs has no value
    and are also 'selected' on html
    
    To test:
    1) Reproduce the problem
    2) Apply the patch
    3) Add New suscription, pulldown must be fixed
    
    NOTE: Deleted Urdu and Chinese.
          Master had both "selected" in the HTML.
          Applied patch, neither were added.
          Defaults to first item, which is blank meaning English.
    
    Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at koha-community.org>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>
    (cherry picked from commit b9c4061479235d0d79ecbd917b015db5441d8118)
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    
    Signed-off-by: Liz Rea <wizzyrea at gmail.com>

commit e80e4294647cf58f3d4b3cb9a8cc21d1033871a0
Author: Katrin Fischer <Katrin.Fischer.83 at web.de>
Date:   Mon Jun 8 05:29:16 2015 +0200

    Bug 13874: 'Rotating collections' are a circulation tool
    
    Moves the entry for 'Rotating collections' from the Catalog
    column to the 'Patrons and circulation' column.
    
    To test:
    - Verify the entry has been moved on the tools home page
    
    NOTE: I agree that collections makes more sense under the new
          column.
    
    Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at koha-community.org>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>
    (cherry picked from commit da8ec2d37a43c87ad5b087511dd8e4ce082f022f)
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    
    Signed-off-by: Liz Rea <wizzyrea at gmail.com>

commit 13325b259775765e8842a1cf2fbe528d734144a9
Author: Mark Tompsett <mtompset at hotmail.com>
Date:   Wed Apr 15 12:33:29 2015 -0400

    Bug 14001: Inventory has bad $_ references
    
    After receiving an error while attempt a simple inventory run,
    Two lines were changed from:
        ...$_->...
    to
        ...$item->...
    since the loop variable is $item. And $_ is not set to the
    expected hash reference, when there is a loop variable.
    
    This also helps explain the "Why are there blank dates on my
    last seen field?" problem that has been mentioned by users.
    
    TEST PLAN
    ---------
     1) Apply this patch after a reset to master.
     2) Log in to staff client
     3) Add one item via z39.50, setting barcode to a known value (BARCODE1)
     4) Wait for the reindex
     5) Home -> Tools -> Inventory/Stocktaking
     6) Browse for a file with the barcode in it
     7) Set the library dropdown to the library branch of the added item.
     8) Check 'Compare barcodes list to results:'
     9) Click 'Submit'
        -- This should not die under plack.
           This should not generate blank last seen dates.
           The last seen dates should be as expected.
    10) run koha qa test tools
    11) Confirm the two change point correspond to the two change points
        in the patch which shall not be pushed to master.
    
    The test result comply with expected outcome outlined in test plan.
    
    Signed-off-by: Indranil Das Gupta (L2C2 Technologies) <indradg at gmail.com>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at koha-community.org>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>
    (cherry picked from commit 3ebc081962247ce0c598da810451c459909842bc)
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    
    Signed-off-by: Liz Rea <wizzyrea at gmail.com>

commit 9a0408c029555ee8de98ca5e66844fc91544f9e6
Author: Katrin Fischer <katrin.fischer at bsz-bw.de>
Date:   Wed Jun 17 12:28:39 2015 +0200

    Bug 14401: Zebra index configuration doesn't allow exact search for C.
    
    2 lines in the Zebra configuration files prevent an exact search for C.,
    while all other [A-Z]. searches work correctly.
    
    After taking a look at the  /etc/zebradb/etc/word-phrase-utf.chr
    those 2 lines cause the problem:
    
    map (^c\.)          @
    map (^C\.)          @
    
    I propose to remove them.
    
    To test:
    - Catalog a record with an item with callnumber: C.
    - Catalog a record with an item with callnumber: B.
    - Try seaching for the second using callnum,ext:B. (exact field search)
      - Verify search works.
    - Try searching for the other with callnum,ext:C.
      - Verify no result.
    - Apply the patch - copy the zebra config file if necessary into the right spot
    - Reindex
    - Repeat searches - both should not bring up the correct record.
    
    Signed-off-by: Indranil Das Gupta (L2C2 Technologies) <indradg at gmail.com>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>
    (cherry picked from commit f86743d893b61a4609d2f02a175db9944710067e)
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    
    Signed-off-by: Liz Rea <wizzyrea at gmail.com>

commit 3cdaf5c221b9826b7438919770e320d43dfb4b3a
Author: Robin Sheat <robin at catalyst.net.nz>
Date:   Wed May 27 12:25:34 2015 +1200

    Bug 14394: fix documentation of OpacHiddenItems
    
    The current documentation of OpacHiddenItems told people to go and read
    a file on the server, which most people don't have access to. This
    replaces it with a link to the wiki.
    
    http://bugs.koha-community.org/show_bug.cgi?id=14394
    
    Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
    
    It doesn't apply for some reason. Fixed
    Added target attribute to open in new window/tab,
    hope you don't mind.
    
    Updated documentation
    No errors
    
    Belongs to Aleisha or Robin?
    Update assignee please :)
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>
    (cherry picked from commit 865321f3726c3b6065ef72107017c4171630d140)
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    
    Signed-off-by: Liz Rea <wizzyrea at gmail.com>

commit 9c91b66ff6b3cdb2e02aaa464af2b3f71fbfdcc9
Author: Mark Tompsett <mtompset at hotmail.com>
Date:   Fri Jun 19 09:00:33 2015 -0400

    Bug 14422: Typo in updatedatabase.pl
    
    TEST PLAN
    ---------
     1) backup db
     2) git checkout -b my_3.6.x origin/3.6.x
     3) drop db and create blank one
     4) git reset --hard origin/3.6.x
     5) run web installer
     6) set HomeorHoldingBranchReturn system preference to 'holdingbranch'.
     7) create a Default checkout, hold rule
        home -> koha administration -> Circulation and fines rules
        -- I put 10 checkouts total and clicked 'Save'
        -- there currently is not 'returnbranch' in default_circ_rules.
     8) git reset --hard origin/3.20.x
        -- or whatever version you apply this to
           (3.8.x, 3.10.x, 3.14.x, 3.16.x, 3.18.x, or 3.20.x
            -- 3.21.00.008 deletes the systempreference involved)
     9) ./installer/data/mysql/updatedatabase.pl
    10) check HomeorHoldingBranchReturn systempreference
        -- Currently says 'holdingbranch', but
           the value of 'returnbranch' in default_circ_rules is
           'homebranch'.
    11) repeat steps 3-8
    12) apply this patch
    13) repeat steps 9-10
        -- Currently says 'holdingbranch', and
           the value of 'returnbranch' in default_circ_rules is
           'holdingbranch'.
    14) run koha qa test tools
    
    Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
    Tested using 3.6.x install, updated to 3.8.x
    Value is preserved
    No errors
    
    Signed-off-by: Jonathan Druart <jonathan.druart at koha-community.org>
    Note: I haven't followed the test plan, but the fix is trivial.
    Maybe it could worth to upate 3.21.00.008 and check the value of
    HomeOrHoldingBranchReturn before deleting it.
    We could raise a warning if HomeOrHoldingBranchReturn ==
    'holdingbranch'.
    Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>
    
    (cherry picked from commit 8c91ca7903846da0cf7a73914a0b78484c0429df)
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    
    Signed-off-by: Liz Rea <wizzyrea at gmail.com>

commit 2db93a5a02229279216e15d39265c7976ca82ea4
Author: Katrin Fischer <Katrin.Fischer.83 at web.de>
Date:   Mon Jun 8 02:15:03 2015 +0200

    Bug 4925: Remove Smithsonian as a delivered z39.50 target
    
    Removes the Smithsonian as a target installed with the
    sample data during installation.
    
    Also adds the newer LOC authority targets to files where
    they were missing.
    
    To test:
    - Verify the Smithsonian has been removed from all
      translated installers
    - Verify the files are still valid SQL and install
      correctly
    
    NOTE: There was tiny scope creep which included ensuring
          there were two Authority z39.50 servers as well.
          Text files properly reflect the removal.
          SQL 'source' of SQL files worked properly.
          Was able to Z39.50 search for all of the 'en'.
    
    Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at koha-community.org>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>
    (cherry picked from commit 0ca21c1e488f150cca74beb9a67b285e5531f3b5)
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    
    Signed-off-by: Liz Rea <wizzyrea at gmail.com>

commit 0a8fa52649ca25b7e6f6425ded46018329232c62
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date:   Wed Apr 15 12:39:05 2015 +0200

    Bug 10172: Hide some uneeded stuffs on printing a record
    
    When printing a record from the OPAC or the staff interface, some
    uneeded blocks are displayed.
    
    OPAC:
    1/ Browse results
    2/ The view tags (Normal, MARC, ISBD)
    
    Intranet:
    1/ Marc view link
    2/ The Please upload one image link
    
    Test plan:
    On a record detail page (staff and OPAC), print the page and confirm
    these blocks no longer appear.
    
    Signed-off-by: Nick Clemens <nick at quecheelibrary.org>
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>
    (cherry picked from commit 68f0fe7b6f152a6db100525724c1ece507258652)
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    
    Conflicts:
    	koha-tmpl/intranet-tmpl/prog/en/css/print.css
    
    Signed-off-by: Liz Rea <wizzyrea at gmail.com>

commit a8ca01cc2291e026fb8c83c0e3138b337e378670
Author: Katrin Fischer <Katrin.Fischer.83 at web.de>
Date:   Mon Jun 8 02:58:53 2015 +0200

    Bug 10119: Add note about CalculateFinesOnReturn to description of finesmode
    
    This adds a note to the descrpition of the finesmode system
    preference mentioning that CalculateFinesOnReturn is another
    option for charging fines:
    
    Note: Fines can also be charged by the CalculateFinesOnReturn system preference.
    
    To test:
    - Search for the finesmode system preference
    - Verify the new text shows and is correct
    
    NOTE: New text appears as expected. You can also just scroll for
          it on the Circulation preferences tab.
    
    Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at koha-community.org>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>
    (cherry picked from commit 45c1b8f7b261493c27aa4d734e9795be619c1c70)
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    
    Signed-off-by: Liz Rea <wizzyrea at gmail.com>

commit cb220b605e7ed559b478e6e502802670fded780d
Author: Liz Rea <wizzyrea at gmail.com>
Date:   Wed Jun 10 12:04:18 2015 +1200

    spaces on dbupdate

commit d04fa7b258f94f4cc65398ae2a98e55c9e95ea58
Author: Marc V?ron <veron at veron.ch>
Date:   Tue Jun 2 09:54:15 2015 +0200

    Bug 14313: OPAC - Adding a comment makes result browser disappear
    
    To reproduce:
    
    - Allow commenting in OPAC (Syspref reviewson)
    - Log in to OPAC
    - Do a search with many results
    - Click on a biblio in result list
    - Verify that you can browse the results in detail view ("Browse results")
    - Repeat teh search above
    - Click on the same biblio as above
    - Add a comment (Tab "Comments")
    - Close commenting window
    - Click on "Next" in result browser
    
    Result: The next biblio is displayed, but result browser has disappeared.
    
    To test:
    
    - Apply patch
    - Try to reproduce issue above, verify that result browser does no longer disappear
    
    AMended to remove whitespace chars. / MV
    
    Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
    Bug & solution checked, works well. No koha-qa errors
    
    Signed-off-by: Jonathan Druart <jonathan.druart at koha-community.org>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
    (cherry picked from commit 22c5c4b468b3584ed8bf45039c1494e969f2d66b)
    Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
    Signed-off-by: Liz Rea <wizzyrea at gmail.com>

commit 957acc5a815b1d8c63aa0ff24a1fed99bc271bc9
Author: Fridolin Somers <fridolin.somers at biblibre.com>
Date:   Tue Jun 23 17:45:30 2015 +0200

    Bug 14440: get_template_and_user can not have an empty template_name (opac-ratings.pl)
    
    Since Bug 14408, the method get_template_and_user can not have an empty template_name.
    Pages calling with an empty value should use C4::Auth::checkauth()
    
    This patch corrects opac/opac-ratings.pl
    
    Test plan :
    - Apply patch
    - Set sysopref OpacStarRatings to 'results and details'
    - Disable Javascipt on your browser (otherwise it will use ajax)
    - Login at OPAC
    - Go to a record
    - Click on a button left of 'Rate me' to choose a rating, ie 4
    - Click on 'Rate me'
    => The page is reloaded and you see 'your rating: 4'
    - Loggout from OPAC
    - Try to access URL : http://<serveur>/cgi-bin/koha/opac-ratings.pl
    => You see the loggin page
    
    Signed-off-by: Indranil Das Gupta (L2C2 Technologies) <indradg at gmail.com>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
    Signed-off-by: Katrin Fischer <katrin.fischer at bsz-bw.de>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>
    (cherry picked from commit f1acb5615d0cbcba5db5b84e12fbad3d41454347)
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    (cherry picked from commit 3d8af819a84847b35ad08e62ba137d3febd878dd)
    
    Conflicts:
    	opac/opac-ratings.pl
    
    Signed-off-by: Liz <wizzyrea at gmail.com>

commit 7b2207888394c9a49b5764939667534224f1b0fa
Author: Eivin Giske Skaaren <eskaaren at yahoo.no>
Date:   Fri Jun 19 13:08:29 2015 +0200

    Bug 14421: Corrected example in SMS.pm to working version with hashref.
    
    Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
    
    Test:
    1) Apply patch
    2) perldoc C4/SMS.pm
    3) Check fixed argument in example
    
    Argument is hashref, POD is now right
    Added additional space on second arg
    No errors
    
    Signed-off-by: Jonathan Druart <jonathan.druart at koha-community.org>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>
    (cherry picked from commit 0cb82c8d02cc4b672b169c8b0261c4bb6360cd00)
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    
    Signed-off-by: Liz <wizzyrea at gmail.com>

commit 490ad5e19132f9d54c03bba2bd2d2dc4b4cfbe04
Author: Mark Tompsett <mtompset at hotmail.com>
Date:   Fri Jun 19 11:24:57 2015 -0400

    Bug 14425: Typo in C4::Context IsSuperLibrarian perldoc
    
    TEST PLAN
    ---------
    1) git checkout -b bug_14425 origin/master
    2) perldoc C4::Context
       /IsSuperlibr
       -- see it is bad.
    3) apply patch
    4) perldoc C4::Context
       /IsSuperLibr
       -- see it is fixed.
    5) koha qa test tools.
    
    Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
    Fix typo, no errors.
    
    Signed-off-by: Jonathan Druart <jonathan.druart at koha-community.org>
    % git grep -i IsSuperLibrarian|wc -l
    55
    % git grep IsSuperLibrarian|wc -l
    55
    Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>
    
    (cherry picked from commit 2b255be22c919b11d690f4dcf8a5e84e93290878)
    Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
    
    Signed-off-by: Liz <wizzyrea at gmail.com>

commit 3db143ccee82ffacb0a92e1f07ec3a8c52c6ba59
Author: Katrin Fischer <Katrin.Fischer.83 at web.de>
Date:   Wed Jun 10 00:11:19 2015 +0200

    Bug 11458: Improve confusing description of syspref 'gist'
    
    The description of "gist" was:
    
    "Default tax rates are ... (enter in numeric form, 0.12 for 12%.
    First is the default. If you want more than 1 value, please
    separate with |) "
    
    The doubled use of "default" is confusing here.
    
    With the patch it reads:
    
    Tax rates are ... Enter in numeric form, 0.12 for 12%.
    The first item in the list will be selected by default.
    For more than one value, separate with | (pipe)
    
    To test:
    - Verify that the gist system preference description is
      correct.
    
    The use of "default" is confusing here.
    
    Signed-off-by: Aleisha <aleishaamohia at hotmail.com>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at koha-community.org>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>
    (cherry picked from commit 6c94fe52f954f93916993f71c472b068096806da)
    Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
    
    Signed-off-by: Liz <wizzyrea at gmail.com>

commit b9185c4aa87e26fae0a1a30614c8f03b58f60808
Author: Katrin Fischer <Katrin.Fischer.83 at web.de>
Date:   Tue Jun 9 02:32:46 2015 +0200

    Bug 14215: Change the 'delimiter' syspref description for its wider use
    
    Patch changes 'report files' to 'CSV files' as there are more
    options now for downloading and creating CSV files where this
    preference is taken into account.
    
    To test:
    - Verify the changed system preference description for
      'delimiter' is correct.
    
    Signed-off-by: Marc V?ron <veron at veron.ch>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at koha-community.org>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>
    (cherry picked from commit 2eaeb708795e7624eb8873b617d4a38d69fa84fc)
    Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
    
    Signed-off-by: Liz <wizzyrea at gmail.com>

commit 4f96b7c330886c8213c7df7b21dd5fdf42b87537
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date:   Tue Mar 24 17:01:30 2015 +0100

    Bug 4137: Fix the OPACViewOthersSuggestions behavior
    
    This pref does not work at all, the interface let the user choose to
    list all suggestions, but whatever he chooses the suggestion list is the
    same.
    
    This patch cleans a bit the suggestedby management.
    
    There are a lot of cases to test, because linked to 2 prefs:
     AnonSuggestions and OPACViewOthersSuggestions.
    1/ AnonSuggestions = 0 and OPACViewOthersSuggestions = 0
      - A non logged in user is not able to make a suggestion.
      - A logged in user is not able to see suggestions made by someone else.
    2/ AnonSuggestions = 0 and OPACViewOthersSuggestions = 1
      - A non logged in user is not able to make a suggestion.
      - A logged in user is able to see suggestions made by someone else.
    3/ AnonSuggestions = 1 and OPACViewOthersSuggestions = 0
      - A non logged in user is able to make a suggestion.
      The suggestedby field will be filled with the AnonymousPatron pref value.
      He is not able to see suggestions, even the ones made by AnonymousPatron.
      - A logged in user is not able to see suggestions made by someone else.
    4/ AnonSuggestions = 1 and OPACViewOthersSuggestions = 1
      - A non logged in user is able to make a suggestion.
      He is able to see all suggestions.
      - A logged in user is able to see suggestions made by someone else.
    
    In all cases a logged in user should be able to search for suggestions
    (except if he is not able to see them).
    
    Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
    All use cases tested, work as expected
    No errors
    
    Only comment is perhaps (in the future) a gracefull failure
    when AnonymousPatron is not set, or has '0' value
    
    Message is DBIx::Class::ResultSet::create(): Column 'suggestedby' cannot be null at ...
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>
    (cherry picked from commit be35039b55a351c97f2c1f9a5b373cb26ac5e0b0)
    Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
    
    Signed-off-by: Liz <wizzyrea at gmail.com>

commit 6cefaa2ae4eb09f441c2a3576e0b9ba98aadfb17
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date:   Wed Apr 22 12:14:24 2015 +0200

    Bug 10866: Hide patron's history if intranetreadinghistory is set to not allow
    
    If set to "not allow", the intranetreadinghistory pref prevent staff
    members to access patron's checkout history.
    But:
    1/ The page is still accessible if you know the url
    2/ The history can be consulted on the item history page
    
    Test plan:
    0/ Don't apply this patch
    1/ Set the intranetreadinghistory to allow
    2/ Go on a patron's checkout history page
    3/ Open a new tab and go on a item's checkout history page
    4/ Set the intranetreadinghistory to not allow
    5/ Refresh both pages => no change
    6/ Apply this patch
    7/ Refresh both page.
    On the first page, you should see a warning
    On the other one, you should see that the patron column is not displayed
    anymore.
    
    Followed test plan, results were as expected.
    Signed-off-by: Marc V?ron <veron at veron.ch>
    
    http://bugs.koha-community.org/show_bug.cgi?id=10886
    Signed-off-by: Katrin Fischer <katrin.fischer at bsz-bw.de>
    Nice addition!
    Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>
    
    (cherry picked from commit d847b1d92a9df6db2bb5321f032f3ec13d6ba55d)
    Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
    
    Signed-off-by: Liz <wizzyrea at gmail.com>

commit 7b5f05e4777349718cce59fe612457d190a1c482
Author: Magnus Enger <magnus at libriotech.no>
Date:   Wed Jun 17 14:36:44 2015 +0200

    Bug 14403: Remove warn in Koha::NorwegianPatronDB
    
    Line 99 has an unconditional warn, left over from development:
    
    warn "$combined_username => $combined_password";
    
    This patch deletes the line i question.
    
    To test:
    No testing needed, just have a look at the diff and see that
    it makes sense to delete the warn.
    
    Signed-off-by: Indranil Das Gupta (L2C2 Technologies) <indradg at gmail.com>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at koha-community.org>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>
    (cherry picked from commit b740b1b412e11b1d540b243e7b1767cc0c1cb962)
    Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
    
    Signed-off-by: Liz <wizzyrea at gmail.com>

commit 3ddfda558196c057e6c66401ff640b9a32103ce0
Author: Katrin Fischer <Katrin.Fischer.83 at web.de>
Date:   Mon Jun 8 05:04:56 2015 +0200

    Bug 13427: jQuery Timepicker is not translated on returns page
    
    The returns page was missing an include with the translated strings.
    
    To test:
    - Install an additional language, like de-DE
    - Confirm the bug on the returns page
      - Make sure SpecifyReturnDate is activated
      - Open the datepicker, look at the time settings
    - Apply the patch
    - Reinstall the language, no update of the po files is needed
    - Retest
    - Verify, that now the time settings are translated
    
    Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
    Works as expected
    
    Signed-off-by: Jonathan Druart <jonathan.druart at koha-community.org>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>
    (cherry picked from commit 688452ad7e9131a53a96bd826e6228e73494fa53)
    Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
    
    Signed-off-by: Liz <wizzyrea at gmail.com>

commit ee97bdb58fcd15ab51c56f3c8487357a5a0b8e3d
Author: Katrin Fischer <Katrin.Fischer.83 at web.de>
Date:   Mon Jun 8 03:18:35 2015 +0200

    Bug 11467: Bug Untranslatable srings in opac-detail.tt (IDreamBooks*, OpacBrowseResults)
    
    Patch marks several strings in the Javascript on the OPAC detail
    and result page for translation.
    
    1) IDreamBooks*
    - Activate the 3 IDreamBooks* system preferences
    - Check the 'cloud' and additional content shows up correctly on
      the detail and result pages
    - Verify everything works as expected and the same as without the patch
    
    2) OpacBrowseResults
    - Activate OpacBrowseResults
    - Do various searches
    - Verify the nex, previous, browse result list features still
      work the same as without the patch
    
    Bonus: Check new strings appear in the .po files by updating one
           language with the patch applied (perl translate update de-DE)
    
    NOTE: Really should have read the test plan more closely.
          I couldn't find the 'Go to detail:' section, until I clicked
          'Browse results'.
    
    Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at koha-community.org>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>
    (cherry picked from commit 7ab873aaea298c787e93438012fa8792345664f4)
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    
    Conflicts:
    	koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt
    
    Signed-off-by: Liz <wizzyrea at gmail.com>

commit aa357855e45d54e48b1ba6314b2761a1a847756e
Author: Jonathan Druart <jonathan.druart at koha-community.org>
Date:   Wed Jun 24 11:03:22 2015 +0200

    Bug 14440: get_template_and_user can not have an empty template_name (quote*_ajax.pl)
    
    This patch uses check_api_auth instead of get_template_and_user.
    
    Test plan:
    Confirm that you are still able to access to the quote editor with the
    edit_quotes permission.
    Confirm that you are not if you don't have the permission.
    
    wget your_url/cgi-bin/koha/tools/quotes/quotes_ajax.pl
    should return "403?: Forbidden."
    
    Signed-off-by: Indranil Das Gupta (L2C2 Technologies) <indradg at gmail.com>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
    Signed-off-by: Katrin Fischer <katrin.fischer at bsz-bw.de>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>
    (cherry picked from commit 08871a324fa731ffdbbe87afde1ee145c604a22b)
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    
    Signed-off-by: Liz <wizzyrea at gmail.com>

commit cf229ccc7f0612b96eb23a95a31faee4ed9021e4
Author: Fridolin Somers <fridolin.somers at biblibre.com>
Date:   Tue Jun 23 16:45:21 2015 +0200

    Bug 14440: get_template_and_user can not have an empty template_name (updatesupplier.pl)
    
    Since Bug 14408, the method get_template_and_user can not have an empty template_name.
    Pages calling with an empty value should use C4::Auth::checkauth()
    
    This patch corrects acqui/updatesupplier.pl
    
    Test plan :
    - Apply patch
    - Connect to intranet with a user having "vendors_manage" permission
    - Go to acquisition module
    - Create a new vendor
    - Click on "Edit vendor"
    - Change some information and save
    => Your change is saved
    - Connect to intranet with a user not having "vendors_manage" permission
    - Try to access <intranet>/cgi-bin/koha/acqui/updatesupplier.pl
    => Access is denied
    - Disconnect from intranet
    - Try to access <intranet>/cgi-bin/koha/acqui/updatesupplier.pl
    => Access is denied
    
    Signed-off-by: Indranil Das Gupta (L2C2 Technologies) <indradg at gmail.com>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>
    (cherry picked from commit 015c26a5e36dae5070eab57f400237715d93ae44)
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

commit ac92491d08b115059b8e85d781b38ded30dd7fbc
Author: Liz <wizzyrea at gmail.com>
Date:   Wed Jun 24 09:52:05 2015 +0000

    Bug 14450: itemsearch no longer working
    
    To test:
    Click Advanced search in staff client
    Click the link for "Go to Item Search" at the top of the page
    Do a search, you should get results. Try some combinations and make sure it works like it should.
    
    Signed-off-by: Jacek Ablewicz <abl at biblos.pk.edu.pl>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at koha-community.org>
    Signed-off-by: Katrin Fischer <katrin.fischer at bsz-bw.de>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
    (cherry picked from commit f900ea03bf15746bd2c310b59f2fb06972f6bdee)
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    
    Signed-off-by: Liz <wizzyrea at gmail.com>

commit 6650203b9e87c1d02d5a84cabaac16f5c24fff87
Author: Aleisha <aleishaamohia at hotmail.com>
Date:   Tue Jun 9 18:20:52 2015 +0000

    Bug 11011: Rephrasing 'in keyword' in OPAC authority search
    
    Using 'in the complete record' rather than 'in keyword'. I think this fits well as it seems that this means the search looks anywhere in the record.
    
    To test:
    
    1) In the OPAC, click on Authority Search
    2) Notice that in the drop-down menu for the 'Where:' field, there is an 'in keyword' option.
    3) Apply patch
    4) Now says 'in the complete record'
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at koha-community.org>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>
    (cherry picked from commit 892d374b64fa4eed98955d75b517702f78f1ca40)
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    
    Signed-off-by: Liz <wizzyrea at gmail.com>

commit 7b7a8c8d3684f8f162890bd7fbce8ae0623641b5
Author: Katrin Fischer <Katrin.Fischer.83 at web.de>
Date:   Sun Jun 7 23:45:10 2015 +0200

    Bug 8686: Raise required version of URI::Escape to 3.31
    
    Raises the minimum required version of URI::Escape from
    1.36 to 3.31.
    
    TEST PLAN
    ---------
    1) git branch -b bug_8686 origin/master
    2) ./koha_perl_deps.pl -a | grep URI
       -- it will list 1.36 required
    3) git bz apply 8686
    4) ./koha_perl_deps.pl -a | grep URI
       -- it will list 3.31 required
    5) koha qa test tools
    
    NOTE: Also default in Ubuntu 14.04 LTS,
          not just Wheezy as noted in comment #15.
    
    Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at koha-community.org>
    Signoff based on Nicole's comment (bug 9990 comment 6):
    "This stops happening if you upgrade URI::Escape to
    3.31.  We should make it clear in the Perl Modules page that an upgrade
    is needed."
    Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>
    
    (cherry picked from commit 7c0c92807f49ef61aa975e84cf26d42f7dfa425f)
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    
    Signed-off-by: Liz <wizzyrea at gmail.com>

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

Summary of changes:
 C4/Auth.pm                                         |    8 +--
 C4/Circulation.pm                                  |   28 +++++++---
 C4/Context.pm                                      |    2 +-
 C4/Installer/PerlDependencies.pm                   |    2 +-
 C4/Languages.pm                                    |    3 +-
 C4/SMS.pm                                          |    4 +-
 Koha/NorwegianPatronDB.pm                          |    1 -
 Koha/Plugins/Base.pm                               |    3 +-
 acqui/updatesupplier.pl                            |   11 +---
 admin/branches.pl                                  |    2 +-
 catalogue/itemsearch.pl                            |    6 +--
 circ/circulation.pl                                |    4 +-
 circ/transferstoreceive.pl                         |    2 +-
 etc/zebradb/etc/word-phrase-utf.chr                |    2 -
 .../authorities/authority-koha-indexdefs.xml       |    2 +-
 .../authorities/authority-zebra-indexdefs.xsl      |    2 +
 .../authorities/authority-koha-indexdefs.xml       |    2 +-
 .../authorities/authority-zebra-indexdefs.xsl      |    2 +
 .../mysql/de-DE/optional/sample_z3950_servers.sql  |    3 +-
 .../mysql/de-DE/optional/sample_z3950_servers.txt  |    3 +-
 .../mysql/en/optional/sample_z3950_servers.sql     |    3 +-
 .../mysql/en/optional/sample_z3950_servers.txt     |    1 -
 .../mysql/es-ES/optional/sample_z3950_servers.sql  |   11 ++--
 .../mysql/es-ES/optional/sample_z3950_servers.txt  |    3 +-
 .../mysql/pl-PL/optional/sample_z3950_servers.sql  |    3 +-
 .../mysql/pl-PL/optional/sample_z3950_servers.txt  |    1 -
 installer/data/mysql/updatedatabase.pl             |   35 +++++++++++-
 koha-tmpl/intranet-tmpl/prog/en/css/print.css      |    8 ++-
 .../intranet-tmpl/prog/en/js/pages/preferences.js  |    2 +-
 .../en/modules/admin/preferences/acquisitions.pref |    4 +-
 .../prog/en/modules/admin/preferences/admin.pref   |    2 +-
 .../en/modules/admin/preferences/circulation.pref  |    1 +
 .../prog/en/modules/admin/preferences/opac.pref    |    2 +-
 .../prog/en/modules/admin/smart-rules.tt           |   23 ++++++++
 .../prog/en/modules/admin/systempreferences.tt     |    2 +-
 .../prog/en/modules/catalogue/detail.tt            |    2 +-
 .../prog/en/modules/catalogue/issuehistory.tt      |   26 +++++----
 .../{itemsearch.csv.tt => itemsearch_csv.tt}       |    0
 .../{itemsearch.json.tt => itemsearch_json.tt}     |    0
 .../prog/en/modules/cataloguing/addbooks.tt        |    8 +--
 .../intranet-tmpl/prog/en/modules/circ/returns.tt  |    6 +++
 .../prog/en/modules/circ/transferstoreceive.tt     |   13 +++--
 .../prog/en/modules/members/readingrec.tt          |    4 +-
 .../prog/en/modules/tools/tools-home.tt            |    9 ++--
 koha-tmpl/opac-tmpl/bootstrap/css/print.css        |    2 +-
 .../opac-tmpl/bootstrap/en/includes/usermenu.inc   |   12 ++---
 .../bootstrap/en/modules/opac-authorities-home.tt  |    2 +-
 .../opac-tmpl/bootstrap/en/modules/opac-detail.tt  |    9 ++--
 .../opac-tmpl/bootstrap/en/modules/opac-results.tt |    4 +-
 .../bootstrap/en/modules/opac-suggestions.tt       |   57 ++++++++++++--------
 .../bootstrap/en/xslt/MARC21slim2OPACResults.xsl   |    2 +-
 koha-tmpl/opac-tmpl/bootstrap/less/print.less      |    5 ++
 kohaversion.pl                                     |    2 +-
 members/moremember.pl                              |    3 +-
 opac/opac-detail.pl                                |   31 ++++++-----
 opac/opac-ratings.pl                               |   24 +++------
 opac/opac-suggestions.pl                           |   46 +++++++++++-----
 patroncards/edit-layout.pl                         |    7 +++
 reports/guided_reports.pl                          |    9 +++-
 t/db_dependent/Circulation/MarkIssueReturned.t     |   55 +++++++++++++++++++
 tools/inventory.pl                                 |    4 +-
 tools/quotes/quotes-upload_ajax.pl                 |   16 +++---
 tools/quotes/quotes_ajax.pl                        |   16 +++---
 63 files changed, 374 insertions(+), 193 deletions(-)
 rename koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/{itemsearch.csv.tt => itemsearch_csv.tt} (100%)
 rename koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/{itemsearch.json.tt => itemsearch_json.tt} (100%)
 create mode 100644 t/db_dependent/Circulation/MarkIssueReturned.t


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Tue Jul 21 00:22:15 2015
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Mon, 20 Jul 2015 22:22:15 +0000
Subject: [koha-commits] main Koha release repository branch 3.18.x updated.
	v3.18.08-50-g5e32072
Message-ID: <E1ZHJRv-0007vC-5K@git.koha-community.org>

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, 3.18.x has been updated
       via  5e320728ed8e97803931da588084f2d574e0f867 (commit)
      from  6783c84d4548a71fdaf8bc20eb7f84f5d7f59c5a (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 5e320728ed8e97803931da588084f2d574e0f867
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Mon Jul 13 15:44:23 2015 +0100

    Bug 14524: Don't escape query_cgi with uri
    
    According to the doc, we should not escape query_cgi with the uri
    filter:
    http://www.template-toolkit.org/docs/manual/Filters.html#section_uri
    
    Since query_cgi can contains something like: "idx=kw&q=42", we should
    not escape the & char
    
    Test plan:
    0/ Don't apply the patch
    1/ Go on launch a search at the OPAC
    2/ Click on the RSS icon
    3/ You should arrive on
    opac-search.pl?idx%3Dkw%26q%3D42&count=50&sort_by=acqdate_dsc&format=rss2
    The & has been escaped.
    4/ Apply the patch
    5/ Now you should get result and see an url correctly formatted.
    
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    Signed-off-by: Liz Rea <wizzyrea at gmail.com>

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

Summary of changes:
 koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Tue Jul 21 02:05:17 2015
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Tue, 21 Jul 2015 00:05:17 +0000
Subject: [koha-commits] main Koha release repository branch 3.18.x updated.
	v3.18.08-52-g76cb0ce
Message-ID: <E1ZHL3d-0000Jc-32@git.koha-community.org>

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, 3.18.x has been updated
       via  76cb0ce2ba09d596b95de41ab2d2a0b58bf65f5f (commit)
       via  9b158d3887fac219d6f96cbc8babc74b98c5dc84 (commit)
      from  5e320728ed8e97803931da588084f2d574e0f867 (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 76cb0ce2ba09d596b95de41ab2d2a0b58bf65f5f
Author: Liz Rea <wizzyrea at gmail.com>
Date:   Tue Jul 21 12:05:08 2015 +1200

    Incrementing version number fo 3.18.09 release
    
    Signed-off-by: Liz Rea <wizzyrea at gmail.com>

commit 9b158d3887fac219d6f96cbc8babc74b98c5dc84
Author: Liz Rea <wizzyrea at gmail.com>
Date:   Tue Jul 21 12:01:39 2015 +1200

    Update release notes for 3.18.09 release
    
    Signed-off-by: Liz Rea <wizzyrea at gmail.com>

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

Summary of changes:
 installer/data/mysql/updatedatabase.pl      |    7 +
 kohaversion.pl                              |    2 +-
 misc/release_notes/release_notes_3_18_9.txt |  334 +++++++++++++++++++++++++++
 3 files changed, 342 insertions(+), 1 deletion(-)
 create mode 100644 misc/release_notes/release_notes_3_18_9.txt


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Tue Jul 21 05:56:14 2015
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Tue, 21 Jul 2015 03:56:14 +0000
Subject: [koha-commits] main Koha release repository branch 3.20.x updated.
	v3.20.01-84-g7375931
Message-ID: <E1ZHOf8-00048R-1J@git.koha-community.org>

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, 3.20.x has been updated
       via  73759312d2a58056e2cc4fd336a1204f3e661a02 (commit)
      from  fb6b754a335b5f99721f8808095a3fe145964e96 (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 73759312d2a58056e2cc4fd336a1204f3e661a02
Author: Jonathan Druart <jonathan.druart at koha-community.org>
Date:   Wed Jun 24 11:24:14 2015 +0200

    Bug 14449: Add authentication check on retrieving item info when receiving
    
    The script catalogue/getitem-ajax.pl is called by acqui/orderreceive.pl
    when item is receipt.
    There is not auth check done, this means anybody can retrieve item info.
    
    Test plan:
    With the acquisition => order_receive permission, try to receive an
    item.
    It should work.
    
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    
    Very easy to test.
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>
    (cherry picked from commit ea263a2284f1b81da5718a0cfbc581909c86cf4a)
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

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

Summary of changes:
 catalogue/getitem-ajax.pl |    9 +++++++++
 1 file changed, 9 insertions(+)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Tue Jul 21 05:58:28 2015
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Tue, 21 Jul 2015 03:58:28 +0000
Subject: [koha-commits] main Koha release repository branch 3.20.x updated.
	v3.20.01-85-g0df49d5
Message-ID: <E1ZHOhI-0004C1-Dm@git.koha-community.org>

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, 3.20.x has been updated
       via  0df49d540612fe841365d9b6c4c7265fdb65c737 (commit)
      from  73759312d2a58056e2cc4fd336a1204f3e661a02 (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 0df49d540612fe841365d9b6c4c7265fdb65c737
Author: Aleisha <aleishaamohia at hotmail.com>
Date:   Fri Jul 10 10:31:53 2015 -0400

    Bug 14436: Noisy warns in C4/Utils/DataTables/Members.pm
    
    TEST PLAN
    ---------
    1) Backup the koha intranet error log.
    2) Empty the koha intranet error log.
    3) In staff client, go to Patrons
       (/cgi-bin/koha/members/members-home.pl)
    4) Pick any letter to 'Browse by last name'
       -- koha intranet error log now has warns.
       -- the one of importance is the uninitalized value.
    5) Empty the koha intranet error log.
    6) apply this patch
    7) Repeat steps 3 & 4.
       -- koha intranet error log does not contain the
          uninitialized value error.
    8) run koha qa test tools.
    
    Signed-off-by: Indranil Das Gupta (L2C2 Technologies) <indradg at gmail.com>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>
    (cherry picked from commit 09b34591b665228c3ab38d3d327224c2c59cee6e)
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

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

Summary of changes:
 C4/Utils/DataTables/Members.pm |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Tue Jul 21 06:01:51 2015
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Tue, 21 Jul 2015 04:01:51 +0000
Subject: [koha-commits] main Koha release repository branch 3.20.x updated.
	v3.20.01-86-gb928430
Message-ID: <E1ZHOkZ-0004Fy-4m@git.koha-community.org>

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, 3.20.x has been updated
       via  b928430696cf25ed705e463af24639f2876475ab (commit)
      from  0df49d540612fe841365d9b6c4c7265fdb65c737 (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 b928430696cf25ed705e463af24639f2876475ab
Author: David Cook <dcook at prosentient.com.au>
Date:   Mon Jul 13 14:06:46 2015 +1000

    Bug 14521: SQL injection in local use system preferences
    
    This patch fixes a SQL injection vulnerability in the local use
    system preferences.
    
    _TEST PLAN_
    
    Before applying:
    
    1) Go to Global System Preferences
    2) Click on the "Local use" tab
    3) Add a new preference with the value "') or '1' = '1' -- "
    (be sure to include the space at the end after the comment --).
    4) When the page refreshes, you should now see about 99 other system
    preferences which shouldn't be showing up.
    
    5) Apply the patch
    
    6) Refresh the page
    7) Note that you now only see a system preference for "') or '1' = '1' -- "
    and the other actual local use system preferences.
    
    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: Tomas Cohen Arazi <tomascohen at unc.edu.ar>
    (cherry picked from commit a72262a950aa701cebe460e2a3a7586edecd86be)
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

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

Summary of changes:
 admin/systempreferences.pl |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Tue Jul 21 06:19:36 2015
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Tue, 21 Jul 2015 04:19:36 +0000
Subject: [koha-commits] main Koha release repository branch 3.18.x updated.
	v3.18.08-56-g5368765
Message-ID: <E1ZHP1k-0004Nd-Ud@git.koha-community.org>

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, 3.18.x has been updated
       via  536876521ab81e549ee567aab92de3638e77d0b6 (commit)
       via  d50680852a6a485d81028805d8b8ed21651b596d (commit)
       via  9513b93c828dfbc4413f9e0df63647401aaf4e58 (commit)
       via  21d6252b1f8680dee66e49d9083e96e70c0554b1 (commit)
      from  76cb0ce2ba09d596b95de41ab2d2a0b58bf65f5f (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 536876521ab81e549ee567aab92de3638e77d0b6
Author: Liz Rea <wizzyrea at gmail.com>
Date:   Tue Jul 21 16:19:11 2015 +1200

    Updating release notes for 3.18.09 release
    
    Signed-off-by: Liz Rea <wizzyrea at gmail.com>

commit d50680852a6a485d81028805d8b8ed21651b596d
Author: Liz Rea <wizzyrea at gmail.com>
Date:   Tue Jul 21 16:16:20 2015 +1200

    Revert "Update release notes for 3.18.09 release"
    
    This reverts commit 9b158d3887fac219d6f96cbc8babc74b98c5dc84.
    
    Too soon, executus!

commit 9513b93c828dfbc4413f9e0df63647401aaf4e58
Author: David Cook <dcook at prosentient.com.au>
Date:   Mon Jul 13 14:06:46 2015 +1000

    Bug 14521: SQL injection in local use system preferences
    
    This patch fixes a SQL injection vulnerability in the local use
    system preferences.
    
    _TEST PLAN_
    
    Before applying:
    
    1) Go to Global System Preferences
    2) Click on the "Local use" tab
    3) Add a new preference with the value "') or '1' = '1' -- "
    (be sure to include the space at the end after the comment --).
    4) When the page refreshes, you should now see about 99 other system
    preferences which shouldn't be showing up.
    
    5) Apply the patch
    
    6) Refresh the page
    7) Note that you now only see a system preference for "') or '1' = '1' -- "
    and the other actual local use system preferences.
    
    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: Tomas Cohen Arazi <tomascohen at unc.edu.ar>
    (cherry picked from commit a72262a950aa701cebe460e2a3a7586edecd86be)
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    Signed-off-by: Liz Rea <wizzyrea at gmail.com>

commit 21d6252b1f8680dee66e49d9083e96e70c0554b1
Author: Mason James <mtj at kohaaloha.com>
Date:   Wed Apr 8 19:14:55 2015 +1200

    Bug 13966 - Backport HEA to Koha 3.16 and/or 3.14
    
    This trivial patch stops any potential SQL errors/warnings for a HEA enabled 3.16 or 3.14 Koha, when upgrading to a newer Koha
    
    Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
    Add the missing prefs unless they exist and don't raise an error if already
    exist.
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>

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

Summary of changes:
 admin/systempreferences.pl                  |    6 +++--
 installer/data/mysql/updatedatabase.pl      |    2 +-
 misc/release_notes/release_notes_3_18_9.txt |   37 +++++++++++++++++----------
 3 files changed, 29 insertions(+), 16 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Tue Jul 21 16:56:18 2015
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Tue, 21 Jul 2015 14:56:18 +0000
Subject: [koha-commits] main Koha release repository branch master updated.
	v3.20.00-325-g2331a21
Message-ID: <E1ZHYxu-0007gn-2s@git.koha-community.org>

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  2331a21cc8901ee69a57a7ade472b4b21c29e5b6 (commit)
       via  b69beb2499f1f8da4c02a5a593fbeb3221d5ef8b (commit)
       via  e32d731238ed8f2c1e77d2a9c82050b1f97d4998 (commit)
       via  c339b5e4ccf86575c9fa9d6a184db9cd05a9c56f (commit)
       via  347d12c41f9ebe638a844b059df5523975e1867d (commit)
       via  25df3abb22e6f36ed80e8510f1e3b9f2150f1b2c (commit)
       via  1044e620ca3bb24a96947b58857b30775341b856 (commit)
       via  02821d52e3406cadc96fda362abfb11e91cd6784 (commit)
       via  a269e8ec4480732ade4f0cbcda0e1560c4c257d3 (commit)
      from  ee6dced5617acb6132299f8de521c4bb38b501ea (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 2331a21cc8901ee69a57a7ade472b4b21c29e5b6
Author: Tomas Cohen Arazi <tomascohen at unc.edu.ar>
Date:   Tue Jul 21 11:54:17 2015 -0300

    Bug 14167: (QA followup) new entries in koha-conf.xml should be tested in about.pl
    
    Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>

commit b69beb2499f1f8da4c02a5a593fbeb3221d5ef8b
Author: Tomas Cohen Arazi <tomascohen at unc.edu.ar>
Date:   Tue Jul 21 10:50:17 2015 -0300

    Bug 14167: (QA followup) use warn instead of just STDERR
    
    This patch makes Koha::Logger use 'warn' instead of just printing
    to STDERR. It introduces tests for this warnings too.
    
    Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>

commit e32d731238ed8f2c1e77d2a9c82050b1f97d4998
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date:   Thu Jun 25 14:23:48 2015 -0400

    Bug 14167: (QA followup) Tidy Koha/Logger.pm
    
    Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>

commit c339b5e4ccf86575c9fa9d6a184db9cd05a9c56f
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date:   Fri Jun 26 14:22:04 2015 +0200

    Bug 14167: Add a unit test for Koha::Logger
    
    Test plan:
    Run the test.
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>

commit 347d12c41f9ebe638a844b059df5523975e1867d
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date:   Fri Jun 26 14:12:20 2015 +0200

    Bug 14167: (QA followup) Making Koha::Logger bit more crash resistant
    
    Moving the BEGIN block to _init for the most part. We only need to
    initialize when we actually start using the logger.
    Removed the third init part. If we do not have a log4perl_conf in the
    koha config, we are not using it yet.
    Method get uses hash parameters now. It calls init. If we do not have a
    config or the logfile is not writable, we will not use log4perl.
    Using AUTOLOAD as a wrapper around Log4perl in order to add some checks
    that log4perl does not have.
    If a logrotate would change file permissions on a default logfile, we
    should catch that now too (see recheck).
    
    Test plan:
    Run the previous tests again.
    Will still add a unit test.
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>

commit 25df3abb22e6f36ed80e8510f1e3b9f2150f1b2c
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date:   Tue Jun 16 13:32:53 2015 -0400

    Bug 14167: (QA followup) Embed default config into Koha::Logger
    
    Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>

commit 1044e620ca3bb24a96947b58857b30775341b856
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date:   Thu May 14 07:04:19 2015 -0400

    Bug 14167: (QA followup) Add template and changes needed for packages
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    Amended: upgraded DEBUG level to WARN in config file.
    Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>

commit 02821d52e3406cadc96fda362abfb11e91cd6784
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date:   Fri Jun 5 10:08:22 2015 +0200

    Bug 14167: (QA followup) Adjust category handling in Koha::Logger
    
    The first patch makes the category parameter mandatory.
    This patch makes it optional, falling back to the current package. This is
    the expected log4perl model. It would not be necessary to pass the class
    name everywhere (check subclasses..)
    It also adds a delimiter between the interface and the class name.
    
    This allows you to add config lines like:
    
    log4perl.logger.opac.C4.Auth = DEBUG, OPAC
    log4perl.logger.intranet.C4.Circulation = TRACE, INTRANET
    
    The first line would make the logger more sensitive to C4::Auth log
    messages while staying at the WARN level for other messages, etc. The
    second line makes the trace visible from the renewal example.
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>

commit a269e8ec4480732ade4f0cbcda0e1560c4c257d3
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date:   Thu May 7 11:20:50 2015 -0400

    Bug 14167: Add Koha::Logger based on Log4perl
    
    Koha needs a better logger, and it seems like the best solution would be
    to take advantage of Log4perl which is already a fully featured logger.
    We use Log4perl to selectively decide what statements should be logged,
    and where they should go!
    
    Test plan:
    0) Install Log::Log4perl via packages or cpan
    1) Apply this patch and the example renewal patch
    2) Copy etc/log4perl.conf to your koha conf directory, edit the paths
       to match your current error logs
    3) Edit your koha-conf file and add the
       <log4perl_conf>/path/to/log4perl.conf</log4perl_conf> line
    4) Watch your intranet and opac error logs
    5) Perform a renewal via the staff interface, note there is nothing new
       in the log file
    7) Update the log4perl.conf, change the log level from WARN to TRACE
       for both the staff and opac sides
    8) Perform a renewal via the staff interface, note the logged lines
    9) Perform a renewal via the opac, note the logged lines
    
    Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    Amended this patch: Moved the renewal stuff to a separate example patch.
    And upgraded the DEBUG level to WARN in the log4perl config file.
    Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>

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

Summary of changes:
 C4/Installer/PerlDependencies.pm                 |    5 +
 Koha/Logger.pm                                   |  189 ++++++++++++++++++++++
 about.pl                                         |    6 +
 debian/scripts/koha-create                       |    4 +
 debian/templates/koha-conf-site.xml.in           |    1 +
 debian/templates/log4perl-site.conf.in           |   13 ++
 etc/koha-conf.xml                                |    1 +
 etc/log4perl.conf                                |   13 ++
 koha-tmpl/intranet-tmpl/prog/en/modules/about.tt |    7 +
 t/Logger.t                                       |   77 +++++++++
 10 files changed, 316 insertions(+)
 create mode 100644 Koha/Logger.pm
 create mode 100644 debian/templates/log4perl-site.conf.in
 create mode 100644 etc/log4perl.conf
 create mode 100644 t/Logger.t


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Tue Jul 21 23:06:57 2015
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Tue, 21 Jul 2015 21:06:57 +0000
Subject: [koha-commits] main Koha release repository branch 3.20.x updated.
	v3.20.01-87-g0bb19c9
Message-ID: <E1ZHekb-0000xJ-BY@git.koha-community.org>

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, 3.20.x has been updated
       via  0bb19c95f7aa51a6de8d8cb1790bad7980dacfff (commit)
      from  b928430696cf25ed705e463af24639f2876475ab (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 0bb19c95f7aa51a6de8d8cb1790bad7980dacfff
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Mon Jul 13 15:44:23 2015 +0100

    Bug 14524: Don't escape query_cgi with uri
    
    According to the doc, we should not escape query_cgi with the uri
    filter:
    http://www.template-toolkit.org/docs/manual/Filters.html#section_uri
    
    Since query_cgi can contains something like: "idx=kw&q=42", we should
    not escape the & char
    
    Test plan:
    0/ Don't apply the patch
    1/ Go on launch a search at the OPAC
    2/ Click on the RSS icon
    3/ You should arrive on
    opac-search.pl?idx%3Dkw%26q%3D42&count=50&sort_by=acqdate_dsc&format=rss2
    The & has been escaped.
    4/ Apply the patch
    5/ Now you should get result and see an url correctly formatted.
    
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>
    (cherry picked from commit ff280e01f4927d3860ec3d607e8d3be310dd358b)
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

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

Summary of changes:
 koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Wed Jul 22 00:04:50 2015
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Tue, 21 Jul 2015 22:04:50 +0000
Subject: [koha-commits] main Koha release repository branch 3.20.x updated.
	v3.20.01-88-geb8a8a4
Message-ID: <E1ZHfec-0001Ew-VR@git.koha-community.org>

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, 3.20.x has been updated
       via  eb8a8a412c3f5c78060c67d69056506d6fe9910b (commit)
      from  0bb19c95f7aa51a6de8d8cb1790bad7980dacfff (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 eb8a8a412c3f5c78060c67d69056506d6fe9910b
Author: Mark Tompsett <mtompset at hotmail.com>
Date:   Wed May 27 16:11:38 2015 -0400

    Bug 14121: Silence warnings t/db_dependent/Auth_with_cas.t
    
    TEST PLAN
    ---------
    1) $ prove t/db_dependent/Auth_with_cas.t
       -- CGI security warning
    2) apply patch
    3) $ prove t/db_dependent/Auth_with_cas.t
       -- no noise.
    4) koha qa test tools
    
    Signed-off-by: Nick Clemens <nick at quecheelibrary.org>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    Not able to reproduce the error on my setup, but the code
    is a clear improvement over the previous version.
    Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>
    
    (cherry picked from commit 588f13e6999bbc368fc16e7b4f3d0dab067599de)
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

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

Summary of changes:
 C4/Auth_with_cas.pm            |    9 +++++----
 t/db_dependent/Auth_with_cas.t |    1 +
 2 files changed, 6 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Wed Jul 22 02:20:42 2015
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Wed, 22 Jul 2015 00:20:42 +0000
Subject: [koha-commits] main Koha release repository branch 3.20.x updated.
	v3.20.01-89-gff2e10e
Message-ID: <E1ZHhm6-0002Bd-Hy@git.koha-community.org>

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, 3.20.x has been updated
       via  ff2e10e2d0f437a57bb536f54f91840500cc91a2 (commit)
      from  eb8a8a412c3f5c78060c67d69056506d6fe9910b (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 ff2e10e2d0f437a57bb536f54f91840500cc91a2
Author: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
Date:   Tue Jul 21 21:06:11 2015 -0300

    Translation updates for Koha 3.20.02 release

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

Summary of changes:
 misc/translator/po/am-Ethi-opac-bootstrap.po    | 3876 ++++++++---------
 misc/translator/po/am-Ethi-pref.po              |   12 +-
 misc/translator/po/am-Ethi-staff-help.po        | 1862 +++++---
 misc/translator/po/am-Ethi-staff-prog.po        |  921 ++--
 misc/translator/po/ar-Arab-opac-bootstrap.po    | 3926 ++++++++---------
 misc/translator/po/ar-Arab-pref.po              |   20 +-
 misc/translator/po/ar-Arab-staff-help.po        | 2017 +++++----
 misc/translator/po/ar-Arab-staff-prog.po        |  928 ++--
 misc/translator/po/az-AZ-opac-bootstrap.po      | 3876 ++++++++---------
 misc/translator/po/az-AZ-pref.po                |   12 +-
 misc/translator/po/az-AZ-staff-help.po          | 1898 ++++++---
 misc/translator/po/az-AZ-staff-prog.po          |  927 ++--
 misc/translator/po/be-BY-opac-bootstrap.po      | 5154 +++++++++++-----------
 misc/translator/po/be-BY-pref.po                |   18 +-
 misc/translator/po/be-BY-staff-help.po          | 1921 ++++++---
 misc/translator/po/be-BY-staff-prog.po          |  925 ++--
 misc/translator/po/bg-Cyrl-opac-bootstrap.po    | 3944 ++++++++---------
 misc/translator/po/bg-Cyrl-pref.po              |   12 +-
 misc/translator/po/bg-Cyrl-staff-help.po        | 1862 +++++---
 misc/translator/po/bg-Cyrl-staff-prog.po        |  921 ++--
 misc/translator/po/bn-IN-opac-bootstrap.po      | 3918 ++++++++---------
 misc/translator/po/bn-IN-pref.po                |   12 +-
 misc/translator/po/bn-IN-staff-help.po          | 1862 +++++---
 misc/translator/po/bn-IN-staff-prog.po          |  921 ++--
 misc/translator/po/ca-ES-opac-bootstrap.po      | 3940 ++++++++---------
 misc/translator/po/ca-ES-pref.po                |   12 +-
 misc/translator/po/ca-ES-staff-help.po          | 1858 +++++---
 misc/translator/po/ca-ES-staff-prog.po          |  923 ++--
 misc/translator/po/cs-CZ-opac-bootstrap.po      | 4051 ++++++++----------
 misc/translator/po/cs-CZ-pref.po                |   45 +-
 misc/translator/po/cs-CZ-staff-help.po          | 2046 +++++----
 misc/translator/po/cs-CZ-staff-prog.po          |  949 +++--
 misc/translator/po/da-DK-opac-bootstrap.po      | 3920 ++++++++---------
 misc/translator/po/da-DK-pref.po                |   20 +-
 misc/translator/po/da-DK-staff-help.po          | 2015 +++++----
 misc/translator/po/da-DK-staff-prog.po          |  926 ++--
 misc/translator/po/de-CH-opac-bootstrap.po      | 3998 ++++++++----------
 misc/translator/po/de-CH-pref.po                |   39 +-
 misc/translator/po/de-CH-staff-help.po          | 2052 +++++----
 misc/translator/po/de-CH-staff-prog.po          |  936 ++--
 misc/translator/po/de-DE-opac-bootstrap.po      | 4062 ++++++++----------
 misc/translator/po/de-DE-pref.po                |   47 +-
 misc/translator/po/de-DE-staff-help.po          | 2202 ++++++----
 misc/translator/po/de-DE-staff-prog.po          | 1029 ++---
 misc/translator/po/el-GR-opac-bootstrap.po      | 3941 ++++++++---------
 misc/translator/po/el-GR-pref.po                |   18 +-
 misc/translator/po/el-GR-staff-help.po          | 1985 ++++++---
 misc/translator/po/el-GR-staff-prog.po          |  926 ++--
 misc/translator/po/en-GB-opac-bootstrap.po      | 3881 ++++++++---------
 misc/translator/po/en-GB-pref.po                |   20 +-
 misc/translator/po/en-GB-staff-help.po          | 3921 +++++++++++------
 misc/translator/po/en-GB-staff-prog.po          | 1006 ++---
 misc/translator/po/en-NZ-marc-MARC21.po         |  244 +-
 misc/translator/po/en-NZ-marc-UNIMARC.po        |  158 +-
 misc/translator/po/en-NZ-opac-bootstrap.po      | 4115 +++++++++---------
 misc/translator/po/en-NZ-pref.po                |   40 +-
 misc/translator/po/en-NZ-staff-help.po          | 2591 ++++++++----
 misc/translator/po/en-NZ-staff-prog.po          |  990 ++---
 misc/translator/po/eo-opac-bootstrap.po         | 3920 ++++++++---------
 misc/translator/po/eo-pref.po                   |   12 +-
 misc/translator/po/eo-staff-help.po             | 1862 +++++---
 misc/translator/po/eo-staff-prog.po             |  921 ++--
 misc/translator/po/es-ES-marc-MARC21.po         |   24 +-
 misc/translator/po/es-ES-marc-UNIMARC.po        |    8 +-
 misc/translator/po/es-ES-opac-bootstrap.po      | 4073 ++++++++----------
 misc/translator/po/es-ES-pref.po                |   72 +-
 misc/translator/po/es-ES-staff-help.po          | 2403 +++++++----
 misc/translator/po/es-ES-staff-prog.po          | 1039 ++---
 misc/translator/po/eu-opac-bootstrap.po         | 3918 ++++++++---------
 misc/translator/po/eu-pref.po                   |   12 +-
 misc/translator/po/eu-staff-help.po             | 1862 +++++---
 misc/translator/po/eu-staff-prog.po             |  921 ++--
 misc/translator/po/fa-Arab-opac-bootstrap.po    | 3934 ++++++++---------
 misc/translator/po/fa-Arab-pref.po              |   12 +-
 misc/translator/po/fa-Arab-staff-help.po        | 1862 +++++---
 misc/translator/po/fa-Arab-staff-prog.po        |  923 ++--
 misc/translator/po/fi-FI-opac-bootstrap.po      | 3886 ++++++++---------
 misc/translator/po/fi-FI-pref.po                |   20 +-
 misc/translator/po/fi-FI-staff-help.po          | 1884 ++++++---
 misc/translator/po/fi-FI-staff-prog.po          |  925 ++--
 misc/translator/po/fo-FO-opac-bootstrap.po      | 4552 ++++++++++----------
 misc/translator/po/fo-FO-pref.po                |   12 +-
 misc/translator/po/fo-FO-staff-help.po          | 1862 +++++---
 misc/translator/po/fo-FO-staff-prog.po          |  917 ++--
 misc/translator/po/fr-CA-opac-bootstrap.po      | 3937 ++++++++---------
 misc/translator/po/fr-CA-pref.po                |   20 +-
 misc/translator/po/fr-CA-staff-help.po          | 2049 +++++----
 misc/translator/po/fr-CA-staff-prog.po          |  931 ++--
 misc/translator/po/fr-FR-opac-bootstrap.po      | 4031 ++++++++----------
 misc/translator/po/fr-FR-pref.po                |   20 +-
 misc/translator/po/fr-FR-staff-help.po          | 2090 +++++----
 misc/translator/po/fr-FR-staff-prog.po          |  941 +++--
 misc/translator/po/gl-opac-bootstrap.po         | 3934 ++++++++---------
 misc/translator/po/gl-pref.po                   |   16 +-
 misc/translator/po/gl-staff-help.po             | 1862 +++++---
 misc/translator/po/gl-staff-prog.po             |  923 ++--
 misc/translator/po/he-Hebr-opac-bootstrap.po    | 3944 ++++++++---------
 misc/translator/po/he-Hebr-pref.po              |   12 +-
 misc/translator/po/he-Hebr-staff-help.po        | 1862 +++++---
 misc/translator/po/he-Hebr-staff-prog.po        |  923 ++--
 misc/translator/po/hi-opac-bootstrap.po         | 3867 ++++++++---------
 misc/translator/po/hi-pref.po                   |   12 +-
 misc/translator/po/hi-staff-help.po             | 1902 ++++++---
 misc/translator/po/hi-staff-prog.po             |  927 ++--
 misc/translator/po/hr-HR-opac-bootstrap.po      | 3916 ++++++++---------
 misc/translator/po/hr-HR-pref.po                |   12 +-
 misc/translator/po/hr-HR-staff-help.po          | 1894 ++++++---
 misc/translator/po/hr-HR-staff-prog.po          |  925 ++--
 misc/translator/po/hu-HU-opac-bootstrap.po      | 3940 ++++++++---------
 misc/translator/po/hu-HU-pref.po                |   12 +-
 misc/translator/po/hu-HU-staff-help.po          | 1884 ++++++---
 misc/translator/po/hu-HU-staff-prog.po          |  927 ++--
 misc/translator/po/hy-Armn-opac-bootstrap.po    | 3934 ++++++++---------
 misc/translator/po/hy-Armn-pref.po              |   34 +-
 misc/translator/po/hy-Armn-staff-help.po        | 2034 +++++----
 misc/translator/po/hy-Armn-staff-prog.po        |  992 ++---
 misc/translator/po/id-ID-opac-bootstrap.po      | 3865 ++++++++---------
 misc/translator/po/id-ID-pref.po                |   16 +-
 misc/translator/po/id-ID-staff-help.po          | 1862 +++++---
 misc/translator/po/id-ID-staff-prog.po          |  929 ++--
 misc/translator/po/is-IS-opac-bootstrap.po      | 3882 ++++++++---------
 misc/translator/po/is-IS-pref.po                |   18 +-
 misc/translator/po/is-IS-staff-help.po          | 1862 +++++---
 misc/translator/po/is-IS-staff-prog.po          |  923 ++--
 misc/translator/po/it-IT-opac-bootstrap.po      | 4062 ++++++++----------
 misc/translator/po/it-IT-pref.po                |   45 +-
 misc/translator/po/it-IT-staff-help.po          | 2107 +++++----
 misc/translator/po/it-IT-staff-prog.po          |  969 ++---
 misc/translator/po/ja-Jpan-JP-opac-bootstrap.po | 4032 ++++++++----------
 misc/translator/po/ja-Jpan-JP-pref.po           |   12 +-
 misc/translator/po/ja-Jpan-JP-staff-help.po     | 1862 +++++---
 misc/translator/po/ja-Jpan-JP-staff-prog.po     |  928 ++--
 misc/translator/po/ka-opac-bootstrap.po         | 3917 ++++++++---------
 misc/translator/po/ka-pref.po                   |   12 +-
 misc/translator/po/ka-staff-help.po             | 1862 +++++---
 misc/translator/po/ka-staff-prog.po             |  921 ++--
 misc/translator/po/km-KH-opac-bootstrap.po      | 3920 ++++++++---------
 misc/translator/po/km-KH-pref.po                |   12 +-
 misc/translator/po/km-KH-staff-help.po          | 1862 +++++---
 misc/translator/po/km-KH-staff-prog.po          |  921 ++--
 misc/translator/po/kn-Knda-opac-bootstrap.po    | 3928 ++++++++---------
 misc/translator/po/kn-Knda-pref.po              |   12 +-
 misc/translator/po/kn-Knda-staff-help.po        | 1880 ++++++---
 misc/translator/po/kn-Knda-staff-prog.po        |  927 ++--
 misc/translator/po/ko-Kore-KP-marc-MARC21.po    |   14 +-
 misc/translator/po/ko-Kore-KP-opac-bootstrap.po | 3924 ++++++++---------
 misc/translator/po/ko-Kore-KP-pref.po           |   18 +-
 misc/translator/po/ko-Kore-KP-staff-help.po     | 1878 ++++++---
 misc/translator/po/ko-Kore-KP-staff-prog.po     |  941 +++--
 misc/translator/po/ku-Arab-opac-bootstrap.po    | 3918 ++++++++---------
 misc/translator/po/ku-Arab-pref.po              |   25 +-
 misc/translator/po/ku-Arab-staff-help.po        | 1976 ++++++---
 misc/translator/po/ku-Arab-staff-prog.po        |  926 ++--
 misc/translator/po/lo-Laoo-opac-bootstrap.po    | 3874 ++++++++---------
 misc/translator/po/lo-Laoo-pref.po              |   12 +-
 misc/translator/po/lo-Laoo-staff-help.po        | 1862 +++++---
 misc/translator/po/lo-Laoo-staff-prog.po        |  929 ++--
 misc/translator/po/mi-NZ-opac-bootstrap.po      | 3874 ++++++++---------
 misc/translator/po/mi-NZ-pref.po                |   12 +-
 misc/translator/po/mi-NZ-staff-help.po          | 1858 +++++---
 misc/translator/po/mi-NZ-staff-prog.po          |  923 ++--
 misc/translator/po/mon-opac-bootstrap.po        | 3920 ++++++++---------
 misc/translator/po/mon-pref.po                  |   12 +-
 misc/translator/po/mon-staff-help.po            | 1888 ++++++---
 misc/translator/po/mon-staff-prog.po            |  928 ++--
 misc/translator/po/mr-opac-bootstrap.po         | 3928 ++++++++---------
 misc/translator/po/mr-pref.po                   |   12 +-
 misc/translator/po/mr-staff-help.po             | 1862 +++++---
 misc/translator/po/mr-staff-prog.po             |  929 ++--
 misc/translator/po/ms-MY-opac-bootstrap.po      | 3960 ++++++++---------
 misc/translator/po/ms-MY-pref.po                |   12 +-
 misc/translator/po/ms-MY-staff-help.po          | 1866 +++++---
 misc/translator/po/ms-MY-staff-prog.po          |  933 ++--
 misc/translator/po/nb-NO-opac-bootstrap.po      | 3962 ++++++++---------
 misc/translator/po/nb-NO-pref.po                |   36 +-
 misc/translator/po/nb-NO-staff-help.po          | 1910 ++++++---
 misc/translator/po/nb-NO-staff-prog.po          |  928 ++--
 misc/translator/po/ne-NE-opac-bootstrap.po      | 3988 ++++++++---------
 misc/translator/po/ne-NE-pref.po                |   12 +-
 misc/translator/po/ne-NE-staff-help.po          | 1862 +++++---
 misc/translator/po/ne-NE-staff-prog.po          |  921 ++--
 misc/translator/po/nl-BE-opac-bootstrap.po      | 3947 ++++++++---------
 misc/translator/po/nl-BE-pref.po                |   20 +-
 misc/translator/po/nl-BE-staff-help.po          | 1881 ++++++---
 misc/translator/po/nl-BE-staff-prog.po          |  923 ++--
 misc/translator/po/nl-NL-opac-bootstrap.po      | 3997 ++++++++----------
 misc/translator/po/nl-NL-pref.po                |   12 +-
 misc/translator/po/nl-NL-staff-help.po          | 1862 +++++---
 misc/translator/po/nl-NL-staff-prog.po          |  921 ++--
 misc/translator/po/nn-NO-opac-bootstrap.po      | 3876 ++++++++---------
 misc/translator/po/nn-NO-pref.po                |   12 +-
 misc/translator/po/nn-NO-staff-help.po          | 1910 ++++++---
 misc/translator/po/nn-NO-staff-prog.po          |  923 ++--
 misc/translator/po/pbr-opac-bootstrap.po        | 3920 ++++++++---------
 misc/translator/po/pbr-pref.po                  |   12 +-
 misc/translator/po/pbr-staff-help.po            | 1862 +++++---
 misc/translator/po/pbr-staff-prog.po            |  921 ++--
 misc/translator/po/pl-PL-marc-MARC21.po         |  284 +-
 misc/translator/po/pl-PL-marc-UNIMARC.po        |   62 +-
 misc/translator/po/pl-PL-opac-bootstrap.po      | 3959 ++++++++---------
 misc/translator/po/pl-PL-pref.po                |  537 +--
 misc/translator/po/pl-PL-staff-help.po          | 1998 +++++----
 misc/translator/po/pl-PL-staff-prog.po          | 3003 ++++++-------
 misc/translator/po/prs-opac-bootstrap.po        | 3922 ++++++++---------
 misc/translator/po/prs-pref.po                  |   18 +-
 misc/translator/po/prs-staff-help.po            | 1862 +++++---
 misc/translator/po/prs-staff-prog.po            |  929 ++--
 misc/translator/po/pt-BR-opac-bootstrap.po      | 5128 +++++++++++-----------
 misc/translator/po/pt-BR-pref.po                |   20 +-
 misc/translator/po/pt-BR-staff-help.po          | 2041 +++++----
 misc/translator/po/pt-BR-staff-prog.po          |  929 ++--
 misc/translator/po/pt-PT-opac-bootstrap.po      | 5152 +++++++++++-----------
 misc/translator/po/pt-PT-pref.po                |   39 +-
 misc/translator/po/pt-PT-staff-help.po          | 2034 +++++----
 misc/translator/po/pt-PT-staff-prog.po          |  938 ++--
 misc/translator/po/ro-RO-opac-bootstrap.po      | 3876 ++++++++---------
 misc/translator/po/ro-RO-pref.po                |   14 +-
 misc/translator/po/ro-RO-staff-help.po          | 1915 ++++++---
 misc/translator/po/ro-RO-staff-prog.po          |  927 ++--
 misc/translator/po/ru-RU-opac-bootstrap.po      | 5162 +++++++++++------------
 misc/translator/po/ru-RU-pref.po                |   18 +-
 misc/translator/po/ru-RU-staff-help.po          | 1923 ++++++---
 misc/translator/po/ru-RU-staff-prog.po          |  925 ++--
 misc/translator/po/rw-RW-opac-bootstrap.po      | 4548 ++++++++++----------
 misc/translator/po/rw-RW-pref.po                |   12 +-
 misc/translator/po/rw-RW-staff-help.po          | 1862 +++++---
 misc/translator/po/rw-RW-staff-prog.po          |  917 ++--
 misc/translator/po/sd-PK-opac-bootstrap.po      | 3964 ++++++++---------
 misc/translator/po/sd-PK-pref.po                |   12 +-
 misc/translator/po/sd-PK-staff-help.po          | 1862 +++++---
 misc/translator/po/sd-PK-staff-prog.po          |  921 ++--
 misc/translator/po/sk-SK-opac-bootstrap.po      | 3921 ++++++++---------
 misc/translator/po/sk-SK-pref.po                |   35 +-
 misc/translator/po/sk-SK-staff-help.po          | 2031 +++++----
 misc/translator/po/sk-SK-staff-prog.po          |  938 ++--
 misc/translator/po/sl-SI-opac-bootstrap.po      | 4548 ++++++++++----------
 misc/translator/po/sl-SI-pref.po                |   18 +-
 misc/translator/po/sl-SI-staff-help.po          | 1862 +++++---
 misc/translator/po/sl-SI-staff-prog.po          |  917 ++--
 misc/translator/po/sq-AL-opac-bootstrap.po      | 3866 ++++++++---------
 misc/translator/po/sq-AL-pref.po                |   14 +-
 misc/translator/po/sq-AL-staff-help.po          | 1862 +++++---
 misc/translator/po/sq-AL-staff-prog.po          |  923 ++--
 misc/translator/po/sr-Cyrl-opac-bootstrap.po    | 3876 ++++++++---------
 misc/translator/po/sr-Cyrl-pref.po              |   12 +-
 misc/translator/po/sr-Cyrl-staff-help.po        | 1862 +++++---
 misc/translator/po/sr-Cyrl-staff-prog.po        |  921 ++--
 misc/translator/po/sv-SE-opac-bootstrap.po      | 3901 ++++++++---------
 misc/translator/po/sv-SE-pref.po                | 3466 ++++-----------
 misc/translator/po/sv-SE-staff-help.po          | 2029 +++++----
 misc/translator/po/sv-SE-staff-prog.po          |  926 ++--
 misc/translator/po/sw-KE-opac-bootstrap.po      | 4548 ++++++++++----------
 misc/translator/po/sw-KE-pref.po                |   12 +-
 misc/translator/po/sw-KE-staff-help.po          | 1862 +++++---
 misc/translator/po/sw-KE-staff-prog.po          |  917 ++--
 misc/translator/po/ta-LK-opac-bootstrap.po      | 3868 ++++++++---------
 misc/translator/po/ta-LK-pref.po                |   18 +-
 misc/translator/po/ta-LK-staff-help.po          | 1862 +++++---
 misc/translator/po/ta-LK-staff-prog.po          |  921 ++--
 misc/translator/po/ta-opac-bootstrap.po         | 3930 ++++++++---------
 misc/translator/po/ta-pref.po                   |   12 +-
 misc/translator/po/ta-staff-help.po             | 1862 +++++---
 misc/translator/po/ta-staff-prog.po             |  921 ++--
 misc/translator/po/tet-opac-bootstrap.po        | 3950 ++++++++---------
 misc/translator/po/tet-pref.po                  |   12 +-
 misc/translator/po/tet-staff-help.po            | 1903 ++++++---
 misc/translator/po/tet-staff-prog.po            |  928 ++--
 misc/translator/po/th-TH-opac-bootstrap.po      | 3880 ++++++++---------
 misc/translator/po/th-TH-pref.po                |   12 +-
 misc/translator/po/th-TH-staff-help.po          | 1862 +++++---
 misc/translator/po/th-TH-staff-prog.po          |  921 ++--
 misc/translator/po/tl-PH-opac-bootstrap.po      | 3977 ++++++++---------
 misc/translator/po/tl-PH-pref.po                |   18 +-
 misc/translator/po/tl-PH-staff-help.po          | 1862 +++++---
 misc/translator/po/tl-PH-staff-prog.po          |  927 ++--
 misc/translator/po/tr-TR-marc-MARC21.po         |   58 +-
 misc/translator/po/tr-TR-marc-NORMARC.po        |   12 +-
 misc/translator/po/tr-TR-marc-UNIMARC.po        |  130 +-
 misc/translator/po/tr-TR-opac-bootstrap.po      | 4007 ++++++++----------
 misc/translator/po/tr-TR-pref.po                |   50 +-
 misc/translator/po/tr-TR-staff-help.po          | 2038 +++++----
 misc/translator/po/tr-TR-staff-prog.po          |  936 ++--
 misc/translator/po/uk-UA-opac-bootstrap.po      | 4005 ++++++++----------
 misc/translator/po/uk-UA-pref.po                |   18 +-
 misc/translator/po/uk-UA-staff-help.po          | 1921 ++++++---
 misc/translator/po/uk-UA-staff-prog.po          |  925 ++--
 misc/translator/po/ur-Arab-opac-bootstrap.po    | 3916 ++++++++---------
 misc/translator/po/ur-Arab-pref.po              |   12 +-
 misc/translator/po/ur-Arab-staff-help.po        | 1862 +++++---
 misc/translator/po/ur-Arab-staff-prog.po        |  921 ++--
 misc/translator/po/vi-VN-opac-bootstrap.po      | 3900 ++++++++---------
 misc/translator/po/vi-VN-pref.po                |   20 +-
 misc/translator/po/vi-VN-staff-help.po          | 2023 +++++----
 misc/translator/po/vi-VN-staff-prog.po          |  928 ++--
 misc/translator/po/zh-Hans-CN-opac-bootstrap.po | 3967 ++++++++---------
 misc/translator/po/zh-Hans-CN-pref.po           |   20 +-
 misc/translator/po/zh-Hans-CN-staff-help.po     | 1973 ++++++---
 misc/translator/po/zh-Hans-CN-staff-prog.po     |  928 ++--
 misc/translator/po/zh-Hans-TW-opac-bootstrap.po | 4028 ++++++++----------
 misc/translator/po/zh-Hans-TW-pref.po           |  103 +-
 misc/translator/po/zh-Hans-TW-staff-help.po     | 2166 ++++++----
 misc/translator/po/zh-Hans-TW-staff-prog.po     | 1036 ++---
 302 files changed, 267888 insertions(+), 247215 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Wed Jul 22 02:42:06 2015
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Wed, 22 Jul 2015 00:42:06 +0000
Subject: [koha-commits] main Koha release repository branch 3.20.x updated.
	v3.20.02
Message-ID: <E1ZHi6o-0002Lw-GT@git.koha-community.org>

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, 3.20.x has been updated
       via  cede10ef4b43b69c8c9a0573e73b8c86854a8d99 (commit)
       via  c583fdbd2c1355250318b669ceabf16093d33b38 (commit)
      from  ff2e10e2d0f437a57bb536f54f91840500cc91a2 (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 cede10ef4b43b69c8c9a0573e73b8c86854a8d99
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date:   Wed Jul 22 12:41:59 2015 +1200

    Release notes

commit c583fdbd2c1355250318b669ceabf16093d33b38
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date:   Wed Jul 22 12:26:09 2015 +1200

    Bumping version number for release

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

Summary of changes:
 Koha.pm                                      |    2 +-
 installer/data/mysql/updatedatabase.pl       |    7 +
 misc/release_notes/release_notes_3_20_2.html |  479 ++++++++++++++++++++++++++
 misc/release_notes/release_notes_3_20_2.txt  |  381 ++++++++++++++++++++
 4 files changed, 868 insertions(+), 1 deletion(-)
 create mode 100644 misc/release_notes/release_notes_3_20_2.html
 create mode 100644 misc/release_notes/release_notes_3_20_2.txt


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Wed Jul 22 02:42:08 2015
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Wed, 22 Jul 2015 00:42:08 +0000
Subject: [koha-commits] main Koha release repository annotated tag v3.20.02
	created. v3.20.02
Message-ID: <E1ZHi6q-0002MM-Ak@git.koha-community.org>

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 annotated tag, v3.20.02 has been created
        at  ccc79f3dd1c4de42c7d57b209e97881d9985fc51 (tag)
   tagging  cede10ef4b43b69c8c9a0573e73b8c86854a8d99 (commit)
  replaces  v3.20.01
 tagged by  Chris Cormack
        on  Wed Jul 22 12:42:16 2015 +1200

- Log -----------------------------------------------------------------
Koha Release 3.20.02
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1

iQIcBAABCAAGBQJVruboAAoJEG5T+NVYEYs1xs4QALNez8kM0KBQy8uvC+CBXsNe
9IRKl31zvFPwPfdQ2BpcT2hsrDuVANAx2XQsryHD3mPqFBHTTLgX8BDGhWQlm97D
S8iG8STlfgv64mb1kwpGawWgaF6lyRAS8vQNqY3o3FJw9n/ptI37jD4TGqF3HvWd
EtUziDv1A12B/iS3BtTYJne51gcO+HwLxNM0nOtpcXzxxoiSQIwazsNWE8df+L4H
fnIXDUSZtoPIx8ce3sCequ66MMGvV4f3yQpFdZR5i0lYRSBXQ6QIVog+Q5FWcgOt
sWEe7wejAT3HCcKjvleJ/76B6Jm/t90wcfdZiIu8EdxB4wclIGMw5KBvblCtwlPJ
MvsuYJGIWNd4+VYLai4Fqf2zEb02Wa6CEjWiiDv2gYM6UMLwIHgTlHDg5dJHvrU4
vILUYRRgIS4KhalLzS5iwi7Uf3g2E19c9Wn4V46iHPQigwnO9FKGuayWxtKHx2G5
qFgQulphyDl/rj/IRIIVPStHO9k1MThLeCLWrwdu4u7qwwx5JgsbSUOxGw67mAiC
FLGSMBHQw4TTXYS7VSuSYlqAesic8boPgrFjOabrpk0Z68PbCL1YA5DeyjsM8BMV
2NKbvjA/I+ZWCZgr5OvifUXpsy86mhsDPvbJBSif5S5Kl8j8LHax3C5Rr4tcZQpa
Qq7USlg5E3oEn1GYPsFx
=U+S/
-----END PGP SIGNATURE-----

Aleisha (2):
      Bug 11011: Rephrasing 'in keyword' in OPAC authority search
      Bug 14436: Noisy warns in C4/Utils/DataTables/Members.pm

Amit Gupta (1):
      Bug 13993: (3) Transfer order leaves incorrect orderstatus

Barton Chittenden (1):
      Bug 14324: Set "adultborrower" regardless of guarantor status.

Bernardo Gonzalez Kriegel (2):
      Bug 12616: Locale in subscriptions not preselecting correctly
      Translation updates for Koha 3.20.02 release

Chris (1):
      Bug 14423: XSS issues in marc_subfields_structure

Chris Cormack (6):
      Revert "bug 14440 - work around for empty tt filenames"
      Merge branch '3.20.2' into 3.20.x
      Bug 9942 : Bumping database version
      Bug 13993 Setting correct db version for 3.20.x
      Bumping version number for release
      Release notes

David Cook (2):
      Bug 14366: Units doesn't get saved usefully for patroncards
      Bug 14521: SQL injection in local use system preferences

Eivin Giske Skaaren (1):
      Bug 14421: Corrected example in SMS.pm to working version with hashref.

Fridolin Somers (5):
      Bug 14440: get_template_and_user can not have an empty template_name (updatesupplier.pl)
      Bug 14440: get_template_and_user can not have an empty template_name (opac-ratings.pl)
      Bug 14439: Typo in Bug 14408 regexp
      Bug 14453: kohaidx is missing for id in authority-koha-indexdefs.xml
      Bug 14485: HTML comment disables translation in cataloguing/addbooks.tt

Indranil Das Gupta (1):
      Bug 14135: Adds 'Free' to variabletypes in systempreferences.tt

Jonathan Druart (16):
      Bug 14440: get_template_and_user can not have an empty template_name (quote*_ajax.pl)
      Bug 10866: Hide patron's history if intranetreadinghistory is set to not allow
      Bug 4137: Fix the OPACViewOthersSuggestions behavior
      Bug 10063: Remove outdated FIXME
      Bug 10172: Hide some uneeded stuffs on printing a record
      Bug 11804: Remove references to circ-menu.tt
      Bug 14253: (follow-up) Same fix for the basket page
      Bug 8802: On editing a library group category type is not set
      Bug 14324: Display "Add Child" for Organisations on circ/circulation.pl
      Bug 14439: Add test - template path should finish by .tt
      Bug 14002: Display readonly values as plain text
      Bug 14431: FIX encoding issues in search (staff client)
      Bug 9942: Make Koha fail if privacy is not respected
      Bug 13993: Clarify test messages
      Bug 14449: Add authentication check on retrieving item info when receiving
      Bug 14524: Don't escape query_cgi with uri

Julian FIOL (1):
      Bug 14496: Improving opac-detail.pl performances

Katrin Fischer (19):
      Bug 8686: Raise required version of URI::Escape to 3.31
      Bug 11467: Bug Untranslatable srings in opac-detail.tt (IDreamBooks*, OpacBrowseResults)
      Bug 13427: jQuery Timepicker is not translated on returns page
      Bug 14215: Change the 'delimiter' syspref description for its wider use
      Bug 11458: Improve confusing description of syspref 'gist'
      Bug 10119: Add note about CalculateFinesOnReturn to description of finesmode
      Bug 10063: Correct documentation of C4::Members::IsMemberBlocked
      Bug 4925: Remove Smithsonian as a delivered z39.50 target
      Bug 14401: Zebra index configuration doesn't allow exact search for C.
      Bug 13874: 'Rotating collections' are a circulation tool
      Bug 14094: DDC - Add separators for repeated $a subfields (MARC21)
      Bug 8330: Overdue email link contains untranslatable 'Overdue:'
      Bug 11804: Remove unused circ-menu.tt
      Bug 14253: Acq - notify borrowers popup needs to allow scrolling
      Bug 14356: Improvements to the 'Transfers to receive' page
      Bug 14002: Show patron expiry date in OPAC
      Bug 14163: Acq order form: rename 'Show all' to 'Show inactive'
      Bug 14163: Acq - receive shipment and order from staged: rename 'Show all' to 'Show inactive'
      Bug 14303: Fix item search CSV export - obsolete "by" and display of publication year for MARC21

Kyle M Hall (2):
      Bug 14467: Security updates break some Koha plugins
      Bug 9942: [QA Followup] - Add test and alert to returns.pl

Liz (1):
      Bug 14450: itemsearch no longer working

Liz Rea (3):
      bug 14440 - work around for empty tt filenames
      Bug 14423: tab characters in auth_subfields_structure
      Bug 14389: Editing a syspref in a textarea does not enable the Save button

Magnus Enger (1):
      Bug 14403: Remove warn in Koha::NorwegianPatronDB

Marcel de Rooy (1):
      Bug 14382: [QA Follow-up] Bad regex alarm

Mark Tompsett (9):
      Bug 14425: Typo in C4::Context IsSuperLibrarian perldoc
      Bug 14422: Typo in updatedatabase.pl
      Bug 14001: Inventory has bad $_ references
      Bug 5025: discrepancy between opac doc-head-open.inc and staff doc-head-open.inc
      Bug 14427: Use Koha::version instead of C4::Context->KOHAVERSION
      Bug 14382: Non-ISO Date parameters generate empty reports.
      Bug 13993: (1) Add tests to confirm 'new' and 'cancelled'
      Bug 13993: (2) Correct poorly transferred orders
      Bug 14121: Silence warnings t/db_dependent/Auth_with_cas.t

Mirko Tietgen (1):
      Bug 14453: (followup) Fix shipped XSLT files

Nick Clemens (2):
      Bug 14371: Facets should be sorted by label (displayed) not title (link value)
      Bug 13950: Sort Item search home library list by branch name

Nicolas Legrand (1):
      Bug 14290: Add a table foot to circulation matrix

Nicole C. Engard (7):
      Bug 14424: Admin Help Files for 3.20
      Bug 14424: Tools Help Files for 3.20
      Bug 14424: Patron Help Files for 3.20
      Bug 14424: Update cataloging help for 3.20
      Bug 14424: Update Discharge Help for 3.20
      Bug 14424: Update Acq Help for 3.20
      Bug 14424: Add on site checkouts help for 3.20

Robin Sheat (1):
      Bug 14394: fix documentation of OpacHiddenItems

Samanta Tello (1):
      Bug 14490: Duplicate armenian translator

Tomas Cohen Arazi (2):
      Bug 14508: 'New patron' dropdown empty list on circulation.pl
      Bug 13993: DBRev 3.21.00.009

Winona Salesky (1):
      Bug 14326: XSLT Syntax error in MARC21slimOPACResults.xsl

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


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Wed Jul 22 04:34:04 2015
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Wed, 22 Jul 2015 02:34:04 +0000
Subject: [koha-commits] main Koha release repository branch 3.18.x updated.
	v3.18.08-58-gfecc566
Message-ID: <E1ZHjrA-0002u1-CL@git.koha-community.org>

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, 3.18.x has been updated
       via  fecc5666c15b4a6e50404e319d88ec442a6e8059 (commit)
       via  9ea6df96e0b36813152f278cd3316e8aa610e531 (commit)
      from  536876521ab81e549ee567aab92de3638e77d0b6 (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 fecc5666c15b4a6e50404e319d88ec442a6e8059
Merge: 5368765 9ea6df9
Author: Liz Rea <wizzyrea at gmail.com>
Date:   Wed Jul 22 12:25:28 2015 +1200

    Merge remote-tracking branch 'translation/3.18.09'

commit 9ea6df96e0b36813152f278cd3316e8aa610e531
Author: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
Date:   Mon Jul 20 21:23:48 2015 -0300

    Translation updates for Koha 3.18.09 release

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

Summary of changes:
 .../po/am-Ethi-i-staff-t-prog-v-3006000.po         |  659 +++---
 misc/translator/po/am-Ethi-opac-bootstrap.po       |  378 ++--
 misc/translator/po/am-Ethi-pref.po                 |   12 +-
 misc/translator/po/am-Ethi-staff-help.po           |    2 +-
 .../po/ar-Arab-i-staff-t-prog-v-3006000.po         |  661 +++---
 misc/translator/po/ar-Arab-opac-bootstrap.po       |  379 ++--
 misc/translator/po/ar-Arab-pref.po                 |   20 +-
 misc/translator/po/ar-Arab-staff-help.po           |    2 +-
 .../po/az-AZ-i-staff-t-prog-v-3006000.po           |  659 +++---
 misc/translator/po/az-AZ-opac-bootstrap.po         |  378 ++--
 misc/translator/po/az-AZ-pref.po                   |   12 +-
 misc/translator/po/az-AZ-staff-help.po             |    2 +-
 .../po/be-BY-i-staff-t-prog-v-3006000.po           |  660 +++---
 misc/translator/po/be-BY-opac-bootstrap.po         |  379 ++--
 misc/translator/po/be-BY-pref.po                   |   18 +-
 misc/translator/po/be-BY-staff-help.po             |    2 +-
 .../po/bg-Cyrl-i-staff-t-prog-v-3006000.po         |  659 +++---
 misc/translator/po/bg-Cyrl-opac-bootstrap.po       |  376 ++--
 misc/translator/po/bg-Cyrl-pref.po                 |   12 +-
 misc/translator/po/bg-Cyrl-staff-help.po           |    2 +-
 .../po/bn-IN-i-staff-t-prog-v-3006000.po           |  671 +++---
 misc/translator/po/bn-IN-opac-bootstrap.po         |  374 ++--
 misc/translator/po/bn-IN-pref.po                   |   12 +-
 misc/translator/po/bn-IN-staff-help.po             |    2 +-
 .../po/ca-ES-i-staff-t-prog-v-3006000.po           |  659 +++---
 misc/translator/po/ca-ES-opac-bootstrap.po         |  379 ++--
 misc/translator/po/ca-ES-pref.po                   |   12 +-
 misc/translator/po/ca-ES-staff-help.po             |    2 +-
 .../po/cs-CZ-i-staff-t-prog-v-3006000.po           |  661 +++---
 misc/translator/po/cs-CZ-opac-bootstrap.po         |  379 ++--
 misc/translator/po/cs-CZ-pref.po                   |   20 +-
 misc/translator/po/cs-CZ-staff-help.po             |    2 +-
 .../po/da-DK-i-staff-t-prog-v-3006000.po           |  661 +++---
 misc/translator/po/da-DK-opac-bootstrap.po         |  379 ++--
 misc/translator/po/da-DK-pref.po                   |   20 +-
 misc/translator/po/da-DK-staff-help.po             |    2 +-
 .../po/de-CH-i-staff-t-prog-v-3006000.po           |  661 +++---
 misc/translator/po/de-CH-opac-bootstrap.po         |  379 ++--
 misc/translator/po/de-CH-pref.po                   |   20 +-
 misc/translator/po/de-CH-staff-help.po             |    2 +-
 .../po/de-DE-i-staff-t-prog-v-3006000.po           |  691 +++---
 misc/translator/po/de-DE-opac-bootstrap.po         |  411 ++--
 misc/translator/po/de-DE-pref.po                   |   20 +-
 misc/translator/po/de-DE-staff-help.po             |    2 +-
 .../po/el-GR-i-staff-t-prog-v-3006000.po           |  661 +++---
 misc/translator/po/el-GR-opac-bootstrap.po         |  378 ++--
 misc/translator/po/el-GR-pref.po                   |   18 +-
 misc/translator/po/el-GR-staff-help.po             |    2 +-
 .../po/en-GB-i-staff-t-prog-v-3006000.po           | 2312 +++++++++++---------
 misc/translator/po/en-GB-opac-bootstrap.po         |  378 ++--
 misc/translator/po/en-GB-pref.po                   |   20 +-
 misc/translator/po/en-GB-staff-help.po             |    2 +-
 .../po/en-NZ-i-staff-t-prog-v-3006000.po           |  661 +++---
 misc/translator/po/en-NZ-opac-bootstrap.po         |  379 ++--
 misc/translator/po/en-NZ-pref.po                   |   20 +-
 misc/translator/po/en-NZ-staff-help.po             |    2 +-
 misc/translator/po/eo-i-staff-t-prog-v-3006000.po  |  663 +++---
 misc/translator/po/eo-opac-bootstrap.po            |  394 ++--
 misc/translator/po/eo-pref.po                      |   12 +-
 misc/translator/po/eo-staff-help.po                |    2 +-
 .../po/es-ES-i-staff-t-prog-v-3006000.po           |  737 ++++---
 misc/translator/po/es-ES-opac-bootstrap.po         |  397 ++--
 misc/translator/po/es-ES-pref.po                   |   48 +-
 misc/translator/po/es-ES-staff-help.po             |   45 +-
 misc/translator/po/eu-i-staff-t-prog-v-3006000.po  |  659 +++---
 misc/translator/po/eu-opac-bootstrap.po            |  379 ++--
 misc/translator/po/eu-pref.po                      |   12 +-
 misc/translator/po/eu-staff-help.po                |    2 +-
 .../po/fa-Arab-i-staff-t-prog-v-3006000.po         |  659 +++---
 misc/translator/po/fa-Arab-opac-bootstrap.po       |  378 ++--
 misc/translator/po/fa-Arab-pref.po                 |   12 +-
 misc/translator/po/fa-Arab-staff-help.po           |    2 +-
 .../po/fi-FI-i-staff-t-prog-v-3006000.po           |  661 +++---
 misc/translator/po/fi-FI-opac-bootstrap.po         |  379 ++--
 misc/translator/po/fi-FI-pref.po                   |   20 +-
 misc/translator/po/fi-FI-staff-help.po             |    2 +-
 .../po/fo-FO-i-staff-t-prog-v-3006000.po           |  659 +++---
 misc/translator/po/fo-FO-opac-bootstrap.po         |  374 ++--
 misc/translator/po/fo-FO-pref.po                   |   12 +-
 misc/translator/po/fo-FO-staff-help.po             |    2 +-
 .../po/fr-CA-i-staff-t-prog-v-3006000.po           |  663 +++---
 misc/translator/po/fr-CA-opac-bootstrap.po         |  381 ++--
 misc/translator/po/fr-CA-pref.po                   |   20 +-
 misc/translator/po/fr-CA-staff-help.po             |    2 +-
 .../po/fr-FR-i-staff-t-prog-v-3006000.po           |  661 +++---
 misc/translator/po/fr-FR-opac-bootstrap.po         |  379 ++--
 misc/translator/po/fr-FR-pref.po                   |   20 +-
 misc/translator/po/fr-FR-staff-help.po             |    2 +-
 misc/translator/po/gl-i-staff-t-prog-v-3006000.po  |  659 +++---
 misc/translator/po/gl-opac-bootstrap.po            |  376 ++--
 misc/translator/po/gl-pref.po                      |   16 +-
 misc/translator/po/gl-staff-help.po                |    2 +-
 .../po/he-Hebr-i-staff-t-prog-v-3006000.po         |  659 +++---
 misc/translator/po/he-Hebr-opac-bootstrap.po       |  374 ++--
 misc/translator/po/he-Hebr-pref.po                 |   12 +-
 misc/translator/po/he-Hebr-staff-help.po           |    2 +-
 misc/translator/po/hi-i-staff-t-prog-v-3006000.po  |  659 +++---
 misc/translator/po/hi-opac-bootstrap.po            |  378 ++--
 misc/translator/po/hi-pref.po                      |   12 +-
 misc/translator/po/hi-staff-help.po                |    2 +-
 .../po/hr-HR-i-staff-t-prog-v-3006000.po           |  663 +++---
 misc/translator/po/hr-HR-opac-bootstrap.po         |  378 ++--
 misc/translator/po/hr-HR-pref.po                   |   12 +-
 misc/translator/po/hr-HR-staff-help.po             |    2 +-
 .../po/hu-HU-i-staff-t-prog-v-3006000.po           |  659 +++---
 misc/translator/po/hu-HU-opac-bootstrap.po         |  378 ++--
 misc/translator/po/hu-HU-pref.po                   |   12 +-
 misc/translator/po/hu-HU-staff-help.po             |    2 +-
 .../po/hy-Armn-i-staff-t-prog-v-3006000.po         |  663 +++---
 misc/translator/po/hy-Armn-opac-bootstrap.po       |  379 ++--
 misc/translator/po/hy-Armn-pref.po                 |   20 +-
 misc/translator/po/hy-Armn-staff-help.po           |    2 +-
 .../po/id-ID-i-staff-t-prog-v-3006000.po           |  663 +++---
 misc/translator/po/id-ID-opac-bootstrap.po         |  378 ++--
 misc/translator/po/id-ID-pref.po                   |   16 +-
 misc/translator/po/id-ID-staff-help.po             |    2 +-
 .../po/is-IS-i-staff-t-prog-v-3006000.po           |  659 +++---
 misc/translator/po/is-IS-opac-bootstrap.po         |  378 ++--
 misc/translator/po/is-IS-pref.po                   |   18 +-
 misc/translator/po/is-IS-staff-help.po             |    2 +-
 .../po/it-IT-i-staff-t-prog-v-3006000.po           |  712 +++---
 misc/translator/po/it-IT-opac-bootstrap.po         |  382 ++--
 misc/translator/po/it-IT-pref.po                   |   35 +-
 misc/translator/po/it-IT-staff-help.po             |    2 +-
 .../po/ja-Jpan-JP-i-staff-t-prog-v-3006000.po      |  659 +++---
 misc/translator/po/ja-Jpan-JP-opac-bootstrap.po    |  378 ++--
 misc/translator/po/ja-Jpan-JP-pref.po              |   12 +-
 misc/translator/po/ja-Jpan-JP-staff-help.po        |    2 +-
 misc/translator/po/ka-i-staff-t-prog-v-3006000.po  |  659 +++---
 misc/translator/po/ka-opac-bootstrap.po            |  374 ++--
 misc/translator/po/ka-pref.po                      |   12 +-
 misc/translator/po/ka-staff-help.po                |    2 +-
 .../po/km-KH-i-staff-t-prog-v-3006000.po           |  659 +++---
 misc/translator/po/km-KH-opac-bootstrap.po         |  374 ++--
 misc/translator/po/km-KH-pref.po                   |   12 +-
 misc/translator/po/km-KH-staff-help.po             |    2 +-
 .../po/kn-Knda-i-staff-t-prog-v-3006000.po         |  659 +++---
 misc/translator/po/kn-Knda-opac-bootstrap.po       |  376 ++--
 misc/translator/po/kn-Knda-pref.po                 |   12 +-
 misc/translator/po/kn-Knda-staff-help.po           |    2 +-
 .../po/ko-Kore-KP-i-staff-t-prog-v-3006000.po      |  659 +++---
 misc/translator/po/ko-Kore-KP-opac-bootstrap.po    |  378 ++--
 misc/translator/po/ko-Kore-KP-pref.po              |   18 +-
 misc/translator/po/ko-Kore-KP-staff-help.po        |    2 +-
 .../po/ku-Arab-i-staff-t-prog-v-3006000.po         |  661 +++---
 misc/translator/po/ku-Arab-opac-bootstrap.po       |  378 ++--
 misc/translator/po/ku-Arab-pref.po                 |   20 +-
 misc/translator/po/ku-Arab-staff-help.po           |    2 +-
 .../po/lo-Laoo-i-staff-t-prog-v-3006000.po         |  661 +++---
 misc/translator/po/lo-Laoo-opac-bootstrap.po       |  378 ++--
 misc/translator/po/lo-Laoo-pref.po                 |   12 +-
 misc/translator/po/lo-Laoo-staff-help.po           |    2 +-
 .../po/mi-NZ-i-staff-t-prog-v-3006000.po           |  659 +++---
 misc/translator/po/mi-NZ-opac-bootstrap.po         |  378 ++--
 misc/translator/po/mi-NZ-pref.po                   |   12 +-
 misc/translator/po/mi-NZ-staff-help.po             |    2 +-
 misc/translator/po/mon-i-staff-t-prog-v-3006000.po |  660 +++---
 misc/translator/po/mon-opac-bootstrap.po           |  378 ++--
 misc/translator/po/mon-pref.po                     |   12 +-
 misc/translator/po/mon-staff-help.po               |    2 +-
 misc/translator/po/mr-i-staff-t-prog-v-3006000.po  |  663 +++---
 misc/translator/po/mr-opac-bootstrap.po            |  378 ++--
 misc/translator/po/mr-pref.po                      |   12 +-
 misc/translator/po/mr-staff-help.po                |    2 +-
 .../po/ms-MY-i-staff-t-prog-v-3006000.po           |  665 +++---
 misc/translator/po/ms-MY-opac-bootstrap.po         |  378 ++--
 misc/translator/po/ms-MY-pref.po                   |   12 +-
 misc/translator/po/ms-MY-staff-help.po             |    2 +-
 .../po/nb-NO-i-staff-t-prog-v-3006000.po           |  661 +++---
 misc/translator/po/nb-NO-opac-bootstrap.po         |  379 ++--
 misc/translator/po/nb-NO-pref.po                   |   20 +-
 misc/translator/po/nb-NO-staff-help.po             |    2 +-
 .../po/ne-NE-i-staff-t-prog-v-3006000.po           |  659 +++---
 misc/translator/po/ne-NE-opac-bootstrap.po         |  374 ++--
 misc/translator/po/ne-NE-pref.po                   |   12 +-
 misc/translator/po/ne-NE-staff-help.po             |    2 +-
 .../po/nl-BE-i-staff-t-prog-v-3006000.po           |  661 +++---
 misc/translator/po/nl-BE-opac-bootstrap.po         |  379 ++--
 misc/translator/po/nl-BE-pref.po                   |   20 +-
 misc/translator/po/nl-BE-staff-help.po             |    2 +-
 .../po/nl-NL-i-staff-t-prog-v-3006000.po           |  659 +++---
 misc/translator/po/nl-NL-opac-bootstrap.po         |  379 ++--
 misc/translator/po/nl-NL-pref.po                   |   12 +-
 misc/translator/po/nl-NL-staff-help.po             |    2 +-
 .../po/nn-NO-i-staff-t-prog-v-3006000.po           |  659 +++---
 misc/translator/po/nn-NO-opac-bootstrap.po         |  378 ++--
 misc/translator/po/nn-NO-pref.po                   |   12 +-
 misc/translator/po/nn-NO-staff-help.po             |    2 +-
 misc/translator/po/pbr-i-staff-t-prog-v-3006000.po |  659 +++---
 misc/translator/po/pbr-opac-bootstrap.po           |  374 ++--
 misc/translator/po/pbr-pref.po                     |   12 +-
 misc/translator/po/pbr-staff-help.po               |    2 +-
 .../po/pl-PL-i-staff-t-prog-v-3006000.po           |  742 ++++---
 misc/translator/po/pl-PL-opac-bootstrap.po         |  379 ++--
 misc/translator/po/pl-PL-pref.po                   |   20 +-
 misc/translator/po/pl-PL-staff-help.po             |    2 +-
 misc/translator/po/prs-i-staff-t-prog-v-3006000.po |  663 +++---
 misc/translator/po/prs-opac-bootstrap.po           |  376 ++--
 misc/translator/po/prs-pref.po                     |   18 +-
 misc/translator/po/prs-staff-help.po               |    2 +-
 .../po/pt-BR-i-staff-t-prog-v-3006000.po           |  662 +++---
 misc/translator/po/pt-BR-opac-bootstrap.po         |  379 ++--
 misc/translator/po/pt-BR-pref.po                   |   20 +-
 misc/translator/po/pt-BR-staff-help.po             |    2 +-
 .../po/pt-PT-i-staff-t-prog-v-3006000.po           |  661 +++---
 misc/translator/po/pt-PT-opac-bootstrap.po         |  379 ++--
 misc/translator/po/pt-PT-pref.po                   |   20 +-
 misc/translator/po/pt-PT-staff-help.po             |    2 +-
 .../po/ro-RO-i-staff-t-prog-v-3006000.po           |  659 +++---
 misc/translator/po/ro-RO-opac-bootstrap.po         |  378 ++--
 misc/translator/po/ro-RO-pref.po                   |   14 +-
 misc/translator/po/ro-RO-staff-help.po             |    2 +-
 .../po/ru-RU-i-staff-t-prog-v-3006000.po           |  660 +++---
 misc/translator/po/ru-RU-opac-bootstrap.po         |  379 ++--
 misc/translator/po/ru-RU-pref.po                   |   18 +-
 misc/translator/po/ru-RU-staff-help.po             |    2 +-
 .../po/rw-RW-i-staff-t-prog-v-3006000.po           |  659 +++---
 misc/translator/po/rw-RW-opac-bootstrap.po         |  374 ++--
 misc/translator/po/rw-RW-pref.po                   |   12 +-
 misc/translator/po/rw-RW-staff-help.po             |    2 +-
 .../po/sd-PK-i-staff-t-prog-v-3006000.po           |  659 +++---
 misc/translator/po/sd-PK-opac-bootstrap.po         |  376 ++--
 misc/translator/po/sd-PK-pref.po                   |   12 +-
 misc/translator/po/sd-PK-staff-help.po             |    2 +-
 .../po/sk-SK-i-staff-t-prog-v-3006000.po           |  661 +++---
 misc/translator/po/sk-SK-opac-bootstrap.po         |  379 ++--
 misc/translator/po/sk-SK-pref.po                   |   20 +-
 misc/translator/po/sk-SK-staff-help.po             |    2 +-
 .../po/sl-SI-i-staff-t-prog-v-3006000.po           |  659 +++---
 misc/translator/po/sl-SI-opac-bootstrap.po         |  374 ++--
 misc/translator/po/sl-SI-pref.po                   |   18 +-
 misc/translator/po/sl-SI-staff-help.po             |    2 +-
 .../po/sq-AL-i-staff-t-prog-v-3006000.po           |  663 +++---
 misc/translator/po/sq-AL-opac-bootstrap.po         |  374 ++--
 misc/translator/po/sq-AL-pref.po                   |   14 +-
 misc/translator/po/sq-AL-staff-help.po             |    2 +-
 .../po/sr-Cyrl-i-staff-t-prog-v-3006000.po         |  659 +++---
 misc/translator/po/sr-Cyrl-opac-bootstrap.po       |  378 ++--
 misc/translator/po/sr-Cyrl-pref.po                 |   12 +-
 misc/translator/po/sr-Cyrl-staff-help.po           |    2 +-
 .../po/sv-SE-i-staff-t-prog-v-3006000.po           |  661 +++---
 misc/translator/po/sv-SE-opac-bootstrap.po         |  379 ++--
 misc/translator/po/sv-SE-pref.po                   |   20 +-
 misc/translator/po/sv-SE-staff-help.po             |    2 +-
 .../po/sw-KE-i-staff-t-prog-v-3006000.po           |  659 +++---
 misc/translator/po/sw-KE-opac-bootstrap.po         |  374 ++--
 misc/translator/po/sw-KE-pref.po                   |   12 +-
 misc/translator/po/sw-KE-staff-help.po             |    2 +-
 .../po/ta-LK-i-staff-t-prog-v-3006000.po           |  659 +++---
 misc/translator/po/ta-LK-opac-bootstrap.po         |  374 ++--
 misc/translator/po/ta-LK-pref.po                   |   18 +-
 misc/translator/po/ta-LK-staff-help.po             |    2 +-
 misc/translator/po/ta-i-staff-t-prog-v-3006000.po  |  663 +++---
 misc/translator/po/ta-opac-bootstrap.po            |  374 ++--
 misc/translator/po/ta-pref.po                      |   12 +-
 misc/translator/po/ta-staff-help.po                |    2 +-
 misc/translator/po/tet-i-staff-t-prog-v-3006000.po | 1597 +++++++-------
 misc/translator/po/tet-opac-bootstrap.po           |  378 ++--
 misc/translator/po/tet-pref.po                     |   12 +-
 misc/translator/po/tet-staff-help.po               |    2 +-
 .../po/th-TH-i-staff-t-prog-v-3006000.po           |  659 +++---
 misc/translator/po/th-TH-opac-bootstrap.po         |  378 ++--
 misc/translator/po/th-TH-pref.po                   |   12 +-
 misc/translator/po/th-TH-staff-help.po             |    2 +-
 .../po/tl-PH-i-staff-t-prog-v-3006000.po           |  659 +++---
 misc/translator/po/tl-PH-opac-bootstrap.po         |  374 ++--
 misc/translator/po/tl-PH-pref.po                   |   18 +-
 misc/translator/po/tl-PH-staff-help.po             |    2 +-
 .../po/tr-TR-i-staff-t-prog-v-3006000.po           |  662 +++---
 misc/translator/po/tr-TR-opac-bootstrap.po         |  379 ++--
 misc/translator/po/tr-TR-pref.po                   |   20 +-
 misc/translator/po/tr-TR-staff-help.po             |    2 +-
 .../po/uk-UA-i-staff-t-prog-v-3006000.po           |  660 +++---
 misc/translator/po/uk-UA-opac-bootstrap.po         |  379 ++--
 misc/translator/po/uk-UA-pref.po                   |   18 +-
 misc/translator/po/uk-UA-staff-help.po             |    2 +-
 .../po/ur-Arab-i-staff-t-prog-v-3006000.po         |  659 +++---
 misc/translator/po/ur-Arab-opac-bootstrap.po       |  374 ++--
 misc/translator/po/ur-Arab-pref.po                 |   12 +-
 misc/translator/po/ur-Arab-staff-help.po           |    2 +-
 .../po/vi-VN-i-staff-t-prog-v-3006000.po           |  661 +++---
 misc/translator/po/vi-VN-opac-bootstrap.po         |  379 ++--
 misc/translator/po/vi-VN-pref.po                   |   20 +-
 misc/translator/po/vi-VN-staff-help.po             |    2 +-
 .../po/zh-Hans-CN-i-staff-t-prog-v-3006000.po      |  661 +++---
 misc/translator/po/zh-Hans-CN-opac-bootstrap.po    |  379 ++--
 misc/translator/po/zh-Hans-CN-pref.po              |   20 +-
 misc/translator/po/zh-Hans-CN-staff-help.po        |    2 +-
 .../po/zh-Hans-TW-i-staff-t-prog-v-3006000.po      |  661 +++---
 misc/translator/po/zh-Hans-TW-opac-bootstrap.po    |  387 ++--
 misc/translator/po/zh-Hans-TW-pref.po              |   20 +-
 misc/translator/po/zh-Hans-TW-staff-help.po        |    2 +-
 292 files changed, 43777 insertions(+), 36279 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Wed Jul 22 04:41:04 2015
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Wed, 22 Jul 2015 02:41:04 +0000
Subject: [koha-commits] main Koha release repository annotated tag v3.18.09
	created. v3.18.09
Message-ID: <E1ZHjxw-0002xN-DM@git.koha-community.org>

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 annotated tag, v3.18.09 has been created
        at  8680932b0ac8541dc30c671fd742085ebc009c9b (tag)
   tagging  fecc5666c15b4a6e50404e319d88ec442a6e8059 (commit)
  replaces  v3.18.08
 tagged by  Liz Rea
        on  Wed Jul 22 14:41:20 2015 +1200

- Log -----------------------------------------------------------------
Koha release 3.18.09
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1

iQIcBAABAgAGBQJVrwLQAAoJEBuNTiU1Z9kHossP/R8KpwbHLcFEf9i4dC/4+I6o
HfvDYPE2KRN32z3vNYAdzzZ+HHXv/l5GegOJr7+JpfpyXS4sYjISLANVytwn16/7
XdMUNPdbNW0cn1qWTCfF6rLZs0L0Fcs4CFSAA7XliYJbZsGqPTIwYdOS5z56fqbi
OYd9MFmcYt+ThOeLp7eS7p7EGrjrMzOKEiGMe1tTBRwzvluwjun08CTGPBKp+DNR
kEXjEMfiwEXTievdFOZHOkxyjIWmYvgAd3jWtQqvrW363GPEFMrz1wOrpwMOIMF+
KakqkKOSIl5yzXAGR8hPJC0CQlNa2kju99s3/zWexjy0bxy0GkNnxfp9WTZTrlfE
r59XeDQW+wuFGdmzixGC3IHp8E8FGTlrz38yh/twhh4De5AvIQm9wlsf86x2dnyl
+CUImCV6G3haDcnAnoj3pw3nArTGJt4DIDu35KrveGn4Fce1ZXcjg+AUdn6vpj7t
BrQncbi91tFpx3Uvr7xFzHZy6Jl4goFmzouywh8Ieo30I76Mko12FFwd0CvTCT89
3SRgeFLuRmuYyGebLh5gF/vYSDy66rlnv/VDYZ5IPwHXywVE7AckjpOwCVyDlrwx
nwL2yADVtiReuMMt91MkEgDkBY/E0HiPLpF6kTqXVzxogkWzGemZuc9jdAt7d6+O
JZvg3W5rEj6QPyxya6CT
=BSwI
-----END PGP SIGNATURE-----

Aleisha (1):
      Bug 11011: Rephrasing 'in keyword' in OPAC authority search

Barton Chittenden (1):
      Bug 14324: Set "adultborrower" regardless of guarantor status.

Bernardo Gonzalez Kriegel (2):
      Bug 12616: Locale in subscriptions not preselecting correctly
      Translation updates for Koha 3.18.09 release

David Cook (2):
      Bug 14366: Units doesn't get saved usefully for patroncards
      Bug 14521: SQL injection in local use system preferences

Eivin Giske Skaaren (1):
      Bug 14421: Corrected example in SMS.pm to working version with hashref.

Fridolin Somers (4):
      Bug 14440: get_template_and_user can not have an empty template_name (updatesupplier.pl)
      Bug 14440: get_template_and_user can not have an empty template_name (opac-ratings.pl)
      Bug 14453: kohaidx is missing for id in authority-koha-indexdefs.xml
      Bug 14485: HTML comment disables translation in cataloguing/addbooks.tt

Indranil Das Gupta (1):
      Bug 14135: Adds 'Free' to variabletypes in systempreferences.tt

Jonathan Druart (8):
      Bug 14440: get_template_and_user can not have an empty template_name (quote*_ajax.pl)
      Bug 10866: Hide patron's history if intranetreadinghistory is set to not allow
      Bug 4137: Fix the OPACViewOthersSuggestions behavior
      Bug 10172: Hide some uneeded stuffs on printing a record
      Bug 8802: On editing a library group category type is not set
      Bug 14324: Display "Add Child" for Organisations on circ/circulation.pl
      Bug 9942: Make Koha fail if privacy is not respected
      Bug 14524: Don't escape query_cgi with uri

Julian FIOL (1):
      Bug 14496: Improving opac-detail.pl performances

Katrin Fischer (10):
      Bug 8686: Raise required version of URI::Escape to 3.31
      Bug 11467: Bug Untranslatable srings in opac-detail.tt (IDreamBooks*, OpacBrowseResults)
      Bug 13427: jQuery Timepicker is not translated on returns page
      Bug 14215: Change the 'delimiter' syspref description for its wider use
      Bug 11458: Improve confusing description of syspref 'gist'
      Bug 10119: Add note about CalculateFinesOnReturn to description of finesmode
      Bug 4925: Remove Smithsonian as a delivered z39.50 target
      Bug 14401: Zebra index configuration doesn't allow exact search for C.
      Bug 13874: 'Rotating collections' are a circulation tool
      Bug 14356: Improvements to the 'Transfers to receive' page

Kyle M Hall (2):
      Bug 14467: Security updates break some Koha plugins
      Bug 9942: [QA Followup] - Add test and alert to returns.pl

Liz (1):
      Bug 14450: itemsearch no longer working

Liz Rea (11):
      spaces on dbupdate
      Bug 14389: Editing a syspref in a textarea does not enable the Save button
      Bumping database version
      Bug 14290 - fix number of columns in footer for 3.18
      Revert "Bug 14290 - fix number of columns in footer for 3.18"
      Bug 14290 - fix number of columns in footer for 3.18
      Update release notes for 3.18.09 release
      Incrementing version number fo 3.18.09 release
      Revert "Update release notes for 3.18.09 release"
      Updating release notes for 3.18.09 release
      Merge remote-tracking branch 'translation/3.18.09'

Magnus Enger (1):
      Bug 14403: Remove warn in Koha::NorwegianPatronDB

Marc V?ron (1):
      Bug 14313: OPAC - Adding a comment makes result browser disappear

Marcel de Rooy (1):
      Bug 14382: [QA Follow-up] Bad regex alarm

Mark Tompsett (4):
      Bug 14425: Typo in C4::Context IsSuperLibrarian perldoc
      Bug 14422: Typo in updatedatabase.pl
      Bug 14001: Inventory has bad $_ references
      Bug 14382: Non-ISO Date parameters generate empty reports.

Mason James (1):
      Bug 13966 - Backport HEA to Koha 3.16 and/or 3.14

Mirko Tietgen (1):
      Bug 14453: (followup) Fix shipped XSLT files

Nick Clemens (1):
      Bug 13950: Sort Item search home library list by branch name

Nicolas Legrand (1):
      Bug 14290: Add a table foot to circulation matrix

Robin Sheat (1):
      Bug 14394: fix documentation of OpacHiddenItems

Winona Salesky (1):
      Bug 14326: XSLT Syntax error in MARC21slimOPACResults.xsl

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


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Fri Jul 24 01:12:28 2015
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Thu, 23 Jul 2015 23:12:28 +0000
Subject: [koha-commits] main Koha release repository branch 3.18.x updated.
	v3.18.09-1-g6d6c6c1
Message-ID: <E1ZIPfA-0004wc-8r@git.koha-community.org>

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, 3.18.x has been updated
       via  6d6c6c1d9f3ab7126415d9695068656b9e98ccb9 (commit)
      from  fecc5666c15b4a6e50404e319d88ec442a6e8059 (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 6d6c6c1d9f3ab7126415d9695068656b9e98ccb9
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date:   Thu Jun 25 12:54:51 2015 -0400

    Bug 14465 - Broken umlauts/diacritics in feedback of last checkout
    
    This was tested in 3.18 after upgrading to the security release. The
    feedback on the last checkout information introcuded by bug 13315 has
    encoding problems in the displayed title (see screenshot).
    
    This is a really prominent place to display broken encoding.
    
    Test Plan:
    1) Apply this patch
    2) Check out an item with broken encoding
    3) Note the title now displays properly
    
    Signed-off-by: Amit Gupta <amit.gupta at informaticsglobal.com>
    Signed-off-by: Katrin Fischer <katrin.fischer at bsz-bw.de>
    We already put it in production... so this better works :)
    Signed-off-by: Liz Rea <wizzyrea at gmail.com>

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

Summary of changes:
 koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Fri Jul 24 19:07:01 2015
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Fri, 24 Jul 2015 17:07:01 +0000
Subject: [koha-commits] main Koha release repository branch master updated.
	v3.20.00-344-g3b23fb8
Message-ID: <E1ZIgR3-00058J-4l@git.koha-community.org>

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  3b23fb8b211c3fbedadc8b67bf294b65ed2ddf2d (commit)
       via  b6c8de6503c41996c37cff79665bd4c7498a9e55 (commit)
       via  6e3bcc387e8d0d2d6bf638fdb6b7171a03facfb0 (commit)
       via  ff89e6234ae0427b8a76ee8d6e758fff1bda179e (commit)
       via  d4bbb08eef5471eb1c5ac70ec66ddac5ac24598a (commit)
       via  b1d05cb44d85667f2e479e35aaf1578783380f20 (commit)
       via  cf5df6590d16e5d78f031fa276d888c91e5367e6 (commit)
       via  342a7a120593092ca33d15dfe07c9e5d06d8f0a5 (commit)
       via  ab1fd8a55691254702460b6710de254444349cf7 (commit)
       via  ee7666a5fdd1b04f1bf50aa89900488e1a01402b (commit)
       via  f7ed250d618c57a3fc00728bbb93460b25ceda52 (commit)
       via  2eded5f165eb1cc175bc61a93c1b5b7c8f5ac02f (commit)
       via  fa5104a6a1c7e3b0bcb232e4d888066dd20eebe8 (commit)
       via  f3a8b7a0e1e1bf112628c6215105ab80f25ed94f (commit)
       via  5e1474836024a9ccd1a9fb4eef91641fba6f8598 (commit)
       via  fa54a6f04d5e84f8747d268efc2e0e1d175a1ecb (commit)
       via  7d4e7e4e525fc99cb4452de135e161a0e0866753 (commit)
       via  224d4d4dec19b50f39127de643eb78b0d1704ca2 (commit)
       via  53c75d3523e45045be0cb01aa12a1ab3eed045ac (commit)
      from  2331a21cc8901ee69a57a7ade472b4b21c29e5b6 (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 3b23fb8b211c3fbedadc8b67bf294b65ed2ddf2d
Author: Marc V?ron <veron at veron.ch>
Date:   Sat May 2 07:20:22 2015 +0200

    Bug 14107: Patron cards: Make barcode width and height scaling editable
    
    The size of the barcode in patron card creator was hardcoded to 1% of the card height and 80% of the card width.
    This patch exposes both values in the layout editor. If no values are given, the previousely hard coded values (0.01 / 0.8) are used in order to work with existing card definitions.
    
    To test:
    - Go to Home > Tools > Patron card creator
    - Export a patron card (PDF) from en existing definition
    - Apply patch
    - Export patron card again, compare results (should be the same)
    - Go to Home > Tools > Patron card creator > Manage card layouts
    - Edit the layout you use for testing and set barcode scaling values e.g. to 0.03 for height and 0.4 for widht
    - Export patron card again, verify that barcode size changed
    
    Signed-off-by: Chris Nighswonger <cnighswonger at foundations.edu>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at koha-community.org>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>

commit b6c8de6503c41996c37cff79665bd4c7498a9e55
Author: Indranil Das Gupta <indradg at gmail.com>
Date:   Tue May 26 02:47:00 2015 +0530

    Bug 14268: Followup - instruction for preftype selection
    
    removes the now redundant instruction "Note: you should have no
    reasons to modify the following default values" and replaces it
    with "Note: change the variable type to one of the dropdown values
    as needed"
    
    Signed-off-by: Tadeasm <tadeas.moravec at gmail.com>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at koha-community.org>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>

commit 6e3bcc387e8d0d2d6bf638fdb6b7171a03facfb0
Author: Mark Tompsett <mtompset at hotmail.com>
Date:   Mon May 25 15:38:36 2015 -0400

    Bug 14268: Use dropdown for variable types
    
    The information needed to build the dropdown is already passed.
    This patch uses it to build the variable type dropdown correctly.
    
    TEST PLAN
    ---------
     1) Apply 14135
     2) In the staff client:
         Home -> Global system preferences -> Local use
     3) Click 'Edit' on any system preference.
     4) Note all the types listed.
     5) Click 'Cancel'
     6) Apply this patch
     7) Click '+New Preference'
     8) Enter data to have a decent 'Free' type preference.
     9) Click 'Save'
    10) For each type noted in step 4 (do 'Free' again last)
        a) Click 'Edit' for the added system preference
           -- it should be the last saved variable type.
        b) Change the variable type to the next type.
        c) Click 'Save'
        d) Repeat steps (a) through (c) until all the types have
           been done.
        -- NOTE: Yes, there are other strange things here, but
                 those are beyond the scope of this bug.
    11) Run koha qa test tools
    
    Signed-off-by: Indranil Das Gupta (L2C2 Technologies) <indradg at gmail.com>
    
    Signed-off-by: Tadeasm <tadeas.moravec at gmail.com>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at koha-community.org>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>

commit ff89e6234ae0427b8a76ee8d6e758fff1bda179e
Author: Jonathan Druart <jonathan.druart at koha-community.org>
Date:   Tue Jun 16 18:46:54 2015 +0200

    Bug 12906: DataTables: Use -1 to specify the last column
    
    It will avoid further changes.
    
    Signed-off-by: Jonathan Druart <jonathan.druart at koha-community.org>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>

commit d4bbb08eef5471eb1c5ac70ec66ddac5ac24598a
Author: Katrin Fischer <Katrin.Fischer.83 at web.de>
Date:   Mon Jun 8 04:28:50 2015 +0200

    Bug 12906: Show shipment date in invoice search result list
    
    Patch adds the shipment as a new separate column to the
    search results of the invoices search.
    
    To test:
    - Search for invoices in the acquisition module
    - Verify the results table shows the shipment date
    - Verify that sorting works correctly
    
    Signed-off-by: Marc V?ron <veron at veron.ch>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at koha-community.org>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>

commit b1d05cb44d85667f2e479e35aaf1578783380f20
Author: Mark Tompsett <mtompset at hotmail.com>
Date:   Wed Apr 29 20:52:43 2015 -0400

    Bug 5685: Add missing about information
    
    In comment #20, Katrin requested the about page be updated
    to reflect the addition of a jquery plugin.
    
    TEST PLAN
    ---------
    1) Apply all patches
    2) Log in to Staff Client
    3) Home -> About Koha -> Licenses
       -- jQuery Validation Plugin is now listed nicely.
    4) Run koha qa test tools
    
    License appears as expected, qa OK
    Signed-off-by: Marc V?ron <veron at veron.ch>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>

commit cf5df6590d16e5d78f031fa276d888c91e5367e6
Author: Owen Leonard <oleonard at myacpl.org>
Date:   Thu Oct 23 09:50:38 2014 -0400

    Bug 5685: [OPAC follow-up] Validation of email address field
    
    This patch makes a few changes to the way errors are handled in the
    OPAC:
    
    - The validation plugin has been moved from the global include file to
      the template itself. Since we aren't doing form validation on any
      other page yet it doesn't make sense to include it globally at this
      time.
    
    - The error message which appears if you have JavaScript disabled and
      have submitted invalid emails was styled in a non-standard way.
    
    - I have added in-page links to the error message which appears if you
      have JavaScript disabled so that you can click to jump to the field
      which contains the error.
    
    - I have modified the error message language slightly to make it (I
      hope) read better.
    
    Signed-off-by: Nicole Engard <nengard at bywatersolutions.com>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>

commit 342a7a120593092ca33d15dfe07c9e5d06d8f0a5
Author: Owen Leonard <oleonard at myacpl.org>
Date:   Thu Oct 23 09:16:08 2014 -0400

    Bug 5685: [Compiled CSS] Validation of email address field
    
    This patch contains the recompiled opac.css file based on changes made
    to opac.less in the previous patch.
    
    Signed-off-by: Nicole Engard <nengard at bywatersolutions.com>
    
    FIXED the compress. - mtompset
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>

commit ab1fd8a55691254702460b6710de254444349cf7
Author: Juhani Sepp?l? <jseppal at student.uef.fi>
Date:   Fri Aug 15 12:11:17 2014 +0300

    Bug 5685: Validation of email address field
    
    This patch adds server-side & client-side validation for email
    form fields in the members/memberentry -view and in the
    opac/memberentry-view (bootstrap).
    
    I recently added simple validation for phone number and email address fields
    for our in-house koha and saw this old bug: I'm open to any ideas on how
    to do this better. Validation for phone numbers would be easy to add on
    top of this but I left it out since this bug is only about the email
    fields.
    
    To test:
    1) Select a member and go to any of the edit forms with email fields
    (Primary info, "Library use", "Alternate address", "Alternative
    contact").
    2) Disable javascript in the browser in order to test server-side
    validation and try to input invalid emails in each of the email form
    fields.
    3) Confirm that an invalid address is catched from any of the email
    fields, an alert shown for each invalid address and that the member's
    information was not updated with invalid data.
    4) Enable javascript in the browser.
    5) Confirm that the jquery validation plugin caches invalid addresses
    from any of the email fields and that you cannot send the form before
    correcting the problem.
    6) Perform the same tests for the opac-memberentry-view.
    
    Note: as the jQuery validation plugin doesn't exist in the bootstrap
    folder, I just copied it over from the staff-client folder -how to deal
    with this?
    
    Signed-off-by: Owen Leonard <oleonard at myacpl.org>
    
    I have undone the changes to opac.css so that they can be submitted as a
    separate patch. I have some other follow-ups to make as well.
    
    Signed-off-by: Nicole Engard <nengard at bywatersolutions.com>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>

commit ee7666a5fdd1b04f1bf50aa89900488e1a01402b
Author: mxbeaulieu <maxime.beaulieu at inlibro.com>
Date:   Mon Jun 15 11:05:51 2015 -0400

    Bug 14387: Merge reference selection has no effect when merging authorities.
    
    This patch swaps the authority records according to the refenrece record selection.
    
    To TEST:
    Merge two authority records, select the second as merge reference.
    The reference authority is always the first.
    
    Apply the patch.
    Repeat previous steps, the authority is now merged using the selected reference record.
    
    	modified:   authorities/merge.pl
    
    Signed-off-by: Nick Clemens <nick at quecheelibrary.org>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>

commit f7ed250d618c57a3fc00728bbb93460b25ceda52
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date:   Sun Jul 5 13:17:02 2015 +0200

    Bug 11693: Default emailing preferences not loaded for self registering patron
    
    The call to AddMember_Opac does not take care of the messaging prefs
    when enhanced messaging is enabled.
    This patch adds the call to handle_form_action to do that.
    
    Test plan:
    Enable self registering patrons and enhanced messaging.
    Check the (default) message prefs for the relevant patron category. At least
    enable email for one notice.
    Self-register a user with and without verification email enabled.
    Check in both cases that the message prefs of the user conform to
    those in the patron category. (So at least one enabled.)
    
    Followed test plan, works as expected.
    Signed-off-by: Marc V?ron <veron at veron.ch>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>

commit 2eded5f165eb1cc175bc61a93c1b5b7c8f5ac02f
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date:   Mon Apr 13 10:12:03 2015 +0200

    Bug 8684: Add regression tests for SearchItemsByField
    
    Signed-off-by: Amit Gupta <amit.gupta at informaticsglobal.com>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>

commit fa5104a6a1c7e3b0bcb232e4d888066dd20eebe8
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date:   Tue Apr 7 14:14:18 2015 +0200

    Bug 8684: Fix duplicate check on creating items in the acquisition module
    
    The script acqui/check_uniqueness.pl has been introduced by bug 7178.
    But bug 11425 added a call to a new subroutine SearchItemsByField in
    order to refactore some code. This subroutine calls SearchItems with an
    arrayref, which is not what SearchItems is expecting.
    This broke the duplicate check done on creating items in the acquisition
    module.
    
    To reproduce the issue:
    1/ Fill the pref UniqueItemFields with "barcode" and AcqCreateItem with
    "placing an order"
    2/ Create a new basket
    3/ Create a new order
    4/ Close the basket
    5/ Receive items and set barcode with one already in your DB
    6/ Save
    7/ Nothing happen on the interface, but an error should have been added
    in your Koha log file:
      Can't use an undefined value as an ARRAY reference at
      /home/koha/src/acqui/check_uniqueness.pl line 48.
    
    Test plan:
    1/ Repeat steps 1-6
    2/ You should see a warning on the interface
    
    Note that this should also happen with AcqCreateItem set to "creating an
    order".
    
    Works well, no errors.
    
    Signed-off-by: Amit Gupta <amit.gupta at informaticsglobal.com>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>

commit f3a8b7a0e1e1bf112628c6215105ab80f25ed94f
Author: Jacek Ablewicz <abl at biblos.pk.edu.pl>
Date:   Wed Jun 24 19:43:05 2015 +0200

    Bug 14456: EmbedSeeFromHeadings record filter shouldn't process MARC holding fields
    
    If the system preference IncludeSeeFromInSearches is enabled, records
    exported for zebra indexing are being additionally processed by
    EmbedSeeFromHeadings record filter (right now used only in rebuild_zebra.pl
    script). This filter embeds 'see from' fields (extracted from authority
    records linked with the given biblio via $9 subfields) into target MARC
    record, which is then subsequently indexed in zebra.
    
    Currently all fields containing $9 are getting the same exact treatment
    by this filter. But on the export stage when the filter is applied, MARC
    record being processed already does have holdings data fields added in
    the previous stage (usually 952 / 995, depending on the MARC format).
    Problem is that holdings data fields use to have $9 subfields in them
    as well (mapped to item.itemnumber by default). As a consequence, some
    (great many in the typical setup) records exported for zebra indexing
    may have surplus "see from" fields added erroneously in semi-random
    fashion, so biblio searches would often return some completely
    unexpected additional results.
    
    EmbedSeeFromHeadings record filter should not process holdings fields
    when dealing with MARC records intended for zebra indexing.
    
    To reproduce:
    
    1) database with as many sample or real-world biblio, item and authority
    records as possible is recommended for testing purposes
    2) enable IncludeSeeFromInSearches
    3) export a bunch of biblio records for zebra (e.g.:
    misc/migration_tools/rebuild_zebra.pl -I -b -x -k -length=1000),
    inspect the result xml records in /tmp/<whatever> file; observe that at
    the end of many records, here and there some extra "see from" (= 1st
    indicator: 'z') fields tend to appear, which shouldn't be there ;)
    
    To test:
    
    4) apply patch
    5) redo 3)
    6) compare results from 3) and 5) with diff
    
    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
    I introduced a regression test for this. You should run the tests
    without/with the patch and verify that the patch actually fixes the problem.
    Good job Jacek! I'm sure writing the regression test would take less time
    than such a detailed commit message!
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>

commit 5e1474836024a9ccd1a9fb4eef91641fba6f8598
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date:   Wed Jul 22 11:22:20 2015 -0300

    Bug 14456: (regression test) Holdings fields should be skipped by EmbedSeeFromHeadings
    
    This patch introduces a regression test for the situation in which
    an itemnumber on a record matches the authid of an authority record
    and the current implementation of the EmbedSeeFromHeadings filter
    wrongly includes new holding fields with authority data...
    
    To test:
    - Apply the patch
    - Run:
      $ prove t/db_dependent/RecordProcessor_EmbedSeeFromHeadings.t
    => FAIL: The test 'Holdings fields not processed to introduce See-from heading'
       fails.
    
    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>

commit fa54a6f04d5e84f8747d268efc2e0e1d175a1ecb
Author: Hector Castro <hector.hecaxmmx at gmail.com>
Date:   Fri Jul 17 13:42:38 2015 -0600

    Bug 14545: Typo in help file (stage-marc-import.tt)
    
    Typo found in stage-marc-import.tt file for Koha help in 3.20
    
    Test plan:
    1) Go to url 'koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/stage-marc-import.tt:28' and check the typo "precendence" or go to Tools > Stage MARC records for import and open up the help
    2) Apply the patch
    3) Repeat step 1 and check if the typo is fixed.
    
    Sponsored-by: Universidad de El Salvador
    Signed-off-by: Nick Clemens <nick at quecheelibrary.org>
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>

commit 7d4e7e4e525fc99cb4452de135e161a0e0866753
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date:   Mon Jul 20 11:38:56 2015 +0200

    Bug 14569: Typo borroewr|borow
    
    Trivial correction. Only touches comments.
    
    Test plan:
    Run git grep -E "borroewr|borow". You should not find anything now.
    
    Signed-off-by: Hector Castro <hector.hecaxmmx at gmail.com>
    Typos in comments corrected.
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>

commit 224d4d4dec19b50f39127de643eb78b0d1704ca2
Author: Robin Sheat <robin at catalyst.net.nz>
Date:   Fri Jul 24 11:36:38 2015 +1200

    Bug 14167: remove the log4perl.conf file from /etc for packages
    
    We don't need that file in the package build because it's generated on a
    per-site basis from a template.
    
    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>

commit 53c75d3523e45045be0cb01aa12a1ab3eed045ac
Author: Robin Sheat <robin at catalyst.net.nz>
Date:   Fri Jul 24 11:14:25 2015 +1200

    Bug 14167: package dependencies for Log::Log4perl
    
    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>

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

Summary of changes:
 C4/Items.pm                                        |    8 +--
 C4/Members/Attributes.pm                           |    2 +-
 C4/Patroncards/Patroncard.pm                       |   13 +++--
 Koha/Filter/MARC/EmbedSeeFromHeadings.pm           |    5 ++
 authorities/merge.pl                               |   11 ++--
 debian/control                                     |    2 +
 debian/rules                                       |    1 +
 installer/data/mysql/kohastructure.sql             |    4 +-
 koha-tmpl/intranet-tmpl/prog/en/modules/about.tt   |    3 ++
 .../prog/en/modules/acqui/invoices.tt              |   10 +++-
 .../prog/en/modules/admin/systempreferences.tt     |   56 ++++++++++++++++++--
 .../en/modules/help/tools/stage-marc-import.tt     |    5 +-
 .../prog/en/modules/members/memberentrygen.tt      |   20 +++++++
 .../prog/en/modules/patroncards/edit-layout.tt     |    8 +++
 koha-tmpl/opac-tmpl/bootstrap/css/opac.css         |    2 +-
 .../bootstrap/en/modules/opac-memberentry.tt       |   45 ++++++++++++++++
 koha-tmpl/opac-tmpl/bootstrap/less/opac.less       |   17 ++++++
 .../lib/jquery/plugins/jquery.validate.min.js      |    4 ++
 members/memberentry.pl                             |   16 ++++++
 opac/opac-memberentry.pl                           |   26 ++++++++-
 opac/opac-registration-verify.pl                   |    2 +
 patroncards/create-pdf.pl                          |    3 +-
 patroncards/edit-layout.pl                         |    2 +
 t/db_dependent/Items.t                             |    5 +-
 .../RecordProcessor_EmbedSeeFromHeadings.t         |   48 +++++++++++++++++
 25 files changed, 291 insertions(+), 27 deletions(-)
 create mode 100644 koha-tmpl/opac-tmpl/bootstrap/lib/jquery/plugins/jquery.validate.min.js


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Sat Jul 25 15:23:07 2015
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Sat, 25 Jul 2015 13:23:07 +0000
Subject: [koha-commits] main Koha release repository branch 3.16.x updated.
	v3.16.12-53-ga694c3f
Message-ID: <E1ZIzPv-0005AN-9x@git.koha-community.org>

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, 3.16.x has been updated
       via  a694c3faccd20bd8bdc3e9e7801993df28d53b6e (commit)
       via  f9aacc69ad8cf778fd2b1c49384b01545bafb67b (commit)
       via  a6736a7e1660e09aab633e1493c45d39108c3a26 (commit)
       via  06909e8ead42e74eda6b5af36731ece7226737c6 (commit)
       via  aff48ab48928027b6ea1528ebd3d81392e480764 (commit)
       via  f3965b7fb6912c75d55a0a007b1e4256e5f7f12e (commit)
       via  d35eb08bc91180c36ddc3fcb705b765d4b02bc2a (commit)
       via  26ccf1b00ffcfeaf5cb4557f96df9cb352e5bf10 (commit)
       via  e61436eb14249aab12aea6e684cea76df45b6310 (commit)
       via  bc43710c790b61f639cf51eea6635dc58c128e40 (commit)
       via  e19702213ca11959fc83fbc403e3e14ee6e11d9d (commit)
       via  13c9959c608eebd9523edcaac1cb7270abe5c67e (commit)
       via  05ede4a16d6f054954878feb650d55aa418f4161 (commit)
       via  2e07ea6512d2d1afa63786d3a2d8703b6b93509e (commit)
       via  b3339e8afa4d59877b3ccda1f1378b1e43ab0667 (commit)
       via  87a5b94de94b9cb2936d49de258662a8f6c5524a (commit)
       via  7c6c4e3ddf2bd10f11c002bdd4048e47bf4eb45e (commit)
       via  1812e6ab09a7dc9ca8aa1604ff5cb6c7a9502999 (commit)
       via  99a2002d35dbf9f8b512c294a30bf32d43c98a09 (commit)
       via  45db6e12937625d59bc097b535d77d52a09f36ea (commit)
       via  ecae848cdf138c00a65bfda99347752bb3bcfb8c (commit)
       via  ecf4473fac8210039926bfef5c3b17fc3430785a (commit)
       via  5ca9430d1e7233adfb8af461ddc5cecd7470c39f (commit)
       via  65d406d3a63fab0cca336cf23202a4986f595280 (commit)
       via  6a4f3bcd0e9d01d1370870260923ab537facd319 (commit)
       via  8f9db880ee6d1d8f1f0d4c47a067e77a1c7f55e4 (commit)
       via  d9783d6e81d31a175677a4954f17e7b4cb99b8cf (commit)
       via  c212d9f4fc092ae355154949589b9d8aad5010a0 (commit)
       via  43ecf4c778367de1900b22f3a3d6e816b91eed93 (commit)
       via  d2ad672404ea5a06ffe63b5264b3b58afb45593d (commit)
       via  bbc42b204b2ded11a9462c9bbd4be7dd99e3a44d (commit)
       via  bad18ee246e77bcbc41810a6594676d69408df92 (commit)
       via  92ad0ac7ba7fabd33efc7648d5dfb6babeed4051 (commit)
       via  7ae18b424eeabea044b873fd494c375aa22fb1f0 (commit)
       via  4617eb7e12c3613512a4a4728d7061c441841873 (commit)
       via  4ead8eeeb010197ce48dd4b27f31bfe852684a25 (commit)
       via  81b8ce4fdda2340c9a95f9fe40a290d473840c0f (commit)
       via  140d3fb95543c42c0cf630e2084038ebb25e5929 (commit)
       via  a1c83e28bc8264fb579f0269b289226571e66281 (commit)
       via  6e06d103216488f86d1bbe215d391014f5b40f80 (commit)
       via  f9503c2290aeb018bc294e74687d18605822a9ae (commit)
       via  8a9184c4bc0de4866f7bdf7f945133d71c868f5b (commit)
       via  69a74bb8806ff78ef6a086bc71b831e15c5974bb (commit)
       via  012b4bc5742859ee5a2edfe963056c4ee54897c4 (commit)
       via  51c8e095fd0627b7551cdf0d602bdc21c83365cd (commit)
       via  8161d1a5174f8fd63e0280cce1a750ad23a0e4f9 (commit)
       via  d67f513eb37e3b6769d6897ed10c51ed9d2c2431 (commit)
       via  23de58d6e53a51276bdb8321f60efa1dfc93d643 (commit)
       via  a2cdb740bd9106c19bb5fb9435ca6ca6f1f74704 (commit)
       via  5902d3ca6944d57256bbbcaf984509b8d282a4ea (commit)
       via  0b96ac33da15bebd3728da01a9229e7f0fab0ec7 (commit)
       via  5acd5c4a6ed9292be3faeda6f8e9beff3e299141 (commit)
       via  148249423a1a88db52d0ba9d2fbb508a16869caf (commit)
      from  04d1d375b1a6c9fa40d5df9559d6bd72ccf7d44d (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 a694c3faccd20bd8bdc3e9e7801993df28d53b6e
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date:   Fri Jun 5 08:06:29 2015 -0400

    Bug 14338 - Unable to delete patron images [3.16.x]
    
    The call to RmPatronImage is still passing cardnumber as its parameter
    instead of borrowernumber.
    
    Test Plan:
    1) Upload a patron image
    2) Ensure the card number is not the same as the borrower number
    3) Attempt to delete patron image
       -- Image will remain
    4) Apply this patch
    5) Attempt to delete patron image
       -- Image will be removed
    6) run koha qa test tools
    
    NOTE: Deletion worked in 3.16.x, though the message for
          debugging differed (cardnumber vs. borrowernumber).
          This effectively removes cardnumber from the URL and
          messages for the delete operation.
    
    Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    Signed-off-by: Mason James <mtj at kohaaloha.com>

commit f9aacc69ad8cf778fd2b1c49384b01545bafb67b
Author: Mark Tompsett <mtompset at hotmail.com>
Date:   Sat Jul 25 04:24:42 2015 -0400

    Bug 4925: Remove Smithsonian as a delivered z39.50 target [3.16.x]
    
    Removes the Smithsonian as a target installed with the
    sample data during installation.
    
    Also adds the newer LOC authority targets to files where
    they were missing.
    
    To test:
    - Verify the Smithsonian has been removed from all
      translated installers
    - Verify the files are still valid SQL and install
      correctly
    
    NOTE: There was tiny scope creep which included ensuring
          there were two Authority z39.50 servers as well.
          Text files properly reflect the removal.
          SQL 'source' of SQL files worked properly.
          Was able to Z39.50 search for all of the 'en'.
    
    Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at koha-community.org>
    Signed-off-by: Mason James <mtj at kohaaloha.com>

commit a6736a7e1660e09aab633e1493c45d39108c3a26
Author: Mason James <mtj at kohaaloha.com>
Date:   Sat Jul 25 20:51:52 2015 +1200

    Bug 14602 - Fix failing t/Creators.t test
    
    to test..
    
    1/ run t/Creators.t test from git repo, get a FAIL
    
    2/ apply patch
    
    3/ repeat step 1, get a PASS
    
    mason at xen1:~/g/k/3.16.x$ sudo  koha-shell -c 'export PERL5LIB=/home/mason/g/k/3.16.x ; cd /home/mason/g/k/3.16.x ;  prove -v  t/Creators.t' k316x1
    t/Creators.t ..
    1..16
    ok 1 - use C4::Creators;
    ok 2 - use C4::Creators::PDF;
    ok 3 - testing new() works
    ok 4 - testing pdf file created
    ok 5 - testing Add() works
    ok 6 - testing Bookmark() works
    ok 7 - testing Compress() works
    ok 8 - testing Font() works
    ok 9 - testing FontSize() is set to 12 by default
    ok 10 - testing FontSize() can be set to a different value
    ok 11 - testing Page() works
    ok 12 - testing StrWidth() returns correct point width
    ok 13 - testing Text() writes from a given x-value
    ok 14 - testing Text() writes to the correct x-value
    ok 15 - testing End() works
    ok 16 - test file /tmp/4YjPQDExeS created OK
    ok
    All tests successful.
    Files=1, Tests=16,  1 wallclock secs ( 0.03 usr  0.01 sys +  0.48 cusr  0.05 csys =  0.57 CPU)
    Result: PASS

commit 06909e8ead42e74eda6b5af36731ece7226737c6
Author: Tomas Cohen Arazi <tomascohen at gmail.com>
Date:   Fri Aug 8 14:48:59 2014 -0300

    Bug 12647: PQF QueryParser driver and unit tests fixes
    
    Due to Perl 5.18, QueryParser the default search class is no longer
    'keyword' (see bug 12738), and needs to be set manually. This patch
    adds a line that does that. The problem that gets fixed is with test
    'super simple keyword query'.
    
    The rest of the non-deterministically failing tests are due to the same
    problem, keys returning differently sorted keys from hashes.
    
    So this patch sorts keys in the step that concatenates attributes when building
    the PQF queries (and tests get adjusted to match the now deterministic result).
    
    I did that (sorting there) under Jared's recommendation. Hopefuly he will step
    in and comment/fix any mistake I made. My main concern was a possible loss
    in performance. That we agreed it is almost void, because of the tiny size
    of the hash.
    
    Sponsored-by: Universidad Nacional de Cordoba
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
    All tests are passing now again :)
    Signed-off-by: Mason James <mtj at kohaaloha.com>

commit aff48ab48928027b6ea1528ebd3d81392e480764
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date:   Thu Jun 12 17:04:03 2014 +0200

    Bug 12411: Preferences values should be utf8 encoded
    
    Test plan:
    Fill OPACMySummaryNote or NoLoginInstructions with something like "???"
    and verify the display is broken.
    
    Signed-off-by: Paola Rossi <paola.rossi at cineca.it>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    Signed-off-by: Mason James <mtj at kohaaloha.com>

commit f3965b7fb6912c75d55a0a007b1e4256e5f7f12e
Author: David Cook <dcook at prosentient.com.au>
Date:   Mon Jul 13 14:06:46 2015 +1000

    Bug 14521 - SQL injection in local use system preferences
    
    This patch fixes a SQL injection vulnerability in the local use
    system preferences.
    
    _TEST PLAN_
    
    Before applying:
    
    1) Go to Global System Preferences
    2) Click on the "Local use" tab
    3) Add a new preference with the value "') or '1' = '1' -- "
    (be sure to include the space at the end after the comment --).
    4) When the page refreshes, you should now see about 99 other system
    preferences which shouldn't be showing up.
    
    5) Apply the patch
    
    6) Refresh the page
    7) Note that you now only see a system preference for "') or '1' = '1' -- "
    and the other actual local use system preferences.
    
    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: Mason James <mtj at kohaaloha.com>

commit d35eb08bc91180c36ddc3fcb705b765d4b02bc2a
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Mon Jul 13 15:44:23 2015 +0100

    Bug 14524: Don't escape query_cgi with uri
    
    According to the doc, we should not escape query_cgi with the uri
    filter:
    http://www.template-toolkit.org/docs/manual/Filters.html#section_uri
    
    Since query_cgi can contains something like: "idx=kw&q=42", we should
    not escape the & char
    
    Test plan:
    0/ Don't apply the patch
    1/ Go on launch a search at the OPAC
    2/ Click on the RSS icon
    3/ You should arrive on
    opac-search.pl?idx%3Dkw%26q%3D42&count=50&sort_by=acqdate_dsc&format=rss2
    The & has been escaped.
    4/ Apply the patch
    5/ Now you should get result and see an url correctly formatted.
    
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    Signed-off-by: Mason James <mtj at kohaaloha.com>

commit 26ccf1b00ffcfeaf5cb4557f96df9cb352e5bf10
Author: Julian FIOL <julian.fiol at biblibre.com>
Date:   Mon Jul 6 12:27:08 2015 +0200

    Bug 14496 : Improving opac-detail.pl performances
    
    Get notes and subjects from MARC record
    ONLY when XSLT is not activated.
    
    It's useless doing it when XSLT is activated,
    because XSLT takes care of it by its own.
    
    => With this patch, we are saving precious
    milliseconds
    
    I compared the display of some records in XSLT view with and without patch, was the same (as expected).
    Signed-off-by: Marc Veron <veron at veron.ch>
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    On a slower server, I saw a time save of 0.0274 to 0.0908 seconds (with XSLT).
    Signed-off-by: Mason James <mtj at kohaaloha.com>

commit e61436eb14249aab12aea6e684cea76df45b6310
Author: Fridolin Somers <fridolin.somers at biblibre.com>
Date:   Thu Jul 2 10:37:22 2015 +0200

    Bug 14485 - HTML comment disables translation in cataloguing/addbooks.tt
    
    In cataloguing/addbooks.tt, the line :
      [% total %] result(s) found in catalog,
    is not present in PO files even after an update.
    I've found that the cause is the previous HTML comment line.
    
    This patch converts HTML comment into TT comment and adds a div to have a more comprehensive string to translate.
    
    Test plan :
    - without patch
    - go into <sources>/misc/translator
    - run PO update for example in french : translate update fr-FR
    => the text "result(s) found in catalog" is missing from PO file : fr-FR-staff-prog.po
    - restore default PO files
    - apply patch
    - go into <sources>/misc/translator
    - run PO update for example in french : translate update fr-FR
    => You find text "result(s) found in catalog" in PO file : fr-FR-staff-prog.po
    
    Sponsored-by: Universidad de El Salvador
    
    Signed-off-by: Hector Eduardo Castro Avalos <hector.hecaxmmx at gmail.com>
    Works as advertised. Just one msgid appear with msgid "%s result(s) found in catalog,"
    
    Signed-off-by: Jonathan Druart <jonathan.druart at koha-community.org>
    Signed-off-by: Mason James <mtj at kohaaloha.com>

commit bc43710c790b61f639cf51eea6635dc58c128e40
Author: David Cook <dcook at prosentient.com.au>
Date:   Tue Jun 9 14:25:23 2015 +1000

    Bug 14366 - Units doesn't get saved usefully for patroncards
    
    This patch causes the "Units" to be saved and displayed correctly
    for the "Edit layout" screen in Patroncards.
    
    _TEST PLAN_
    
    Before applying:
    0) Create a new layout
    1) Edit the layout, change the units, and click Save
    2) Edit the layout again, and notice the units are still "PostScript Points"
    
    Apply the patch:
    3) Edit the layout again, change the units, and click Save
    4) Edit the layout again, note that the units have changed to your
    selection
    
    5) Rejoice
    
    Signed-off-by: Nick Clemens <nick at quecheelibrary.org>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at koha-community.org>
    Signed-off-by: Mason James <mtj at kohaaloha.com>

commit e19702213ca11959fc83fbc403e3e14ee6e11d9d
Author: Mirko Tietgen <mirko at abunchofthings.net>
Date:   Thu Jun 25 15:38:42 2015 +0200

    Bug 14453: (followup) Fix shipped XSLT files
    
    Make the shipped XSLTs for authorities (MARC21 and UNIMARC) the same as the generated version
    
    Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    Signed-off-by: Mason James <mtj at kohaaloha.com>

commit 13c9959c608eebd9523edcaac1cb7270abe5c67e
Author: Fridolin Somers <fridolin.somers at biblibre.com>
Date:   Wed Jun 24 16:06:05 2015 +0200

    Bug 14453: kohaidx is missing for id in authority-koha-indexdefs.xml
    
    In authority-koha-indexdefs.xml, all tags use the namespace "kohaidx" except the tag "id".
    
    When re-generating authority-zebra-indexdefs.xsl, the line :
      <xslo:variable name="idfield" select="normalize-space(marc:controlfield[@tag='001'])"/>
    is modified :
      <xslo:variable name="idfield" select="normalize-space()"/>
    This is an error.
    
    This patch adds kohaidx namespace to correct.
    
    Test plan :
    - Without patch
    - go to etc/zebradb/marc_defs/marc21/authorities/
    - run : xslproc xsltproc ../../../xsl/koha-indexdefs-to-zebra.xsl authority-koha-indexdefs.xml > authority-zebra-indexdefs.xsl
    - read authority-zebra-indexdefs.xsl
    => the line has changed : <xslo:variable name="idfield" select="normalize-space()"/>
    - Apply patch
    - go to etc/zebradb/marc_defs/marc21/authorities/
    - run : xslproc xsltproc ../../../xsl/koha-indexdefs-to-zebra.xsl authority-koha-indexdefs.xml > authority-zebra-indexdefs.xsl
    - read authority-zebra-indexdefs.xsl
    => the line has not changed
    (same for unimarc flavor)
    
    Signed-off-by: Mirko Tietgen <mirko at abunchofthings.net>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>
    As Mirko mentioned, the xslt's now generate the facet-processing templates in
    the authority xslt's too. They are harmless because we don't define facets
    for authority records. If we did, it would be harmless too.
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    Signed-off-by: Mason James <mtj at kohaaloha.com>

commit 05ede4a16d6f054954878feb650d55aa418f4161
Author: Winona Salesky <wsalesky at gmail.com>
Date:   Wed Jun 3 22:46:23 2015 -0400

    Bug 14326 - XSLT Syntax error in MARC21slimOPACResults.xsl
    
    Test Plan:
    1) Apply this patch
    2) Ensure you are using the default XSLT setting for the staff and opac  record details
    3) Perform an opac search check "Availability" for expected display values.
    5) Note this patch corrects invalid syntax in xslt, there should be no visable changes to the results page.
    
    Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at koha-community.org>
    Signed-off-by: Mason James <mtj at kohaaloha.com>

commit 2e07ea6512d2d1afa63786d3a2d8703b6b93509e
Author: Indranil Das Gupta <indradg at l2c2.co.in>
Date:   Mon May 4 18:55:15 2015 +0530

    Bug 14135: Adds 'Free' to variabletypes in systempreferences.tt
    
    The 'Local Use' system preference addition/modification template provides the following options against "Variable Type" - Choice, YesNo, Integer, Textarea, Float, Themes, Languages, Upload or ClassSource.
    
    There is no option presented for "Free" which seems to be the most
    used variable type out-of-the-box (i.e. INTRAdidyoumean,
    OPACdidyoumean, UsageStatsID and UsageStatsLastUpdateTime)
    
    This trivial patch proposes to modify the systempreferences.tt
    and add the option 'Free' to the list offered to users.
    
    Test Plan
    =========
    
    1/ Go to Home > Administration > System preferences > Local use
    2/ Click on 'New preference'.
    3/ In the fieldset 'Koha Internal', the variable types offered
       are Choice, YesNo, Integer, Textarea, Float, Themes,
       Languages, Upload or ClassSources.
    4/ Clicking on 'Choice' should set the 'preftype' field as
       'Choice'.
    5/ Apply this patch.
    6/ Refresh the page.
    7/ The variable types list should read - "Free, Choice, YesNo,
       Integer, Textarea, Float, Themes, Languages, Upload or
       ClassSources".
    8/ Clicking on 'Free' should set the 'preftype' field as 'Free'.
    
    Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
    
    NOTE: Discovered that there is no validation on the type field.
          However, that is beyond the scope of this bug.
    
    Signed-off-by: Amit Gupta <amit.gupta at informaticsglobal.com>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at koha-community.org>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>
    (cherry picked from commit 9f008a102415c8b71a1f4a976bc15691c2663b5c)
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    
    Signed-off-by: Liz Rea <wizzyrea at gmail.com>

commit b3339e8afa4d59877b3ccda1f1378b1e43ab0667
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date:   Thu Jun 25 16:41:23 2015 -0400

    Bug 14467 - Security updates break some Koha plugins
    
    The new security updates break previously functioning plugins, most
    notably the cover flow plugin and the Ebsco EDS plugin.
    
    Test Plan:
    1) Install and configure the cover flow plugin ( http://bywatersolutions.com/koha-plugins/ )
    2) Note that attempting to access coverflow.pl from the OPAC results in an error
    3) Apply this patch
    4) Note that coverflow.pl now output html again
    
    Signed-off-by: Nick Clemens <nick at quecheelibrary.org>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at koha-community.org>
    Signed-off-by: Mason James <mtj at kohaaloha.com>

commit 87a5b94de94b9cb2936d49de258662a8f6c5524a
Author: Liz Rea <liz at catalyst.net.nz>
Date:   Tue Jun 16 16:12:57 2015 +1200

    Bug 14389 - Editing a syspref in a textarea does not enable the Save button
    
    Test plan:
      1. Navigate to the "opaccredits" syspref (or any other textarea, i.e.,
         "Click to Edit", syspref) in the system preferences editor.
      2. Change its contents, by either pasting or typing. The field may not
         be marked as modified, even after you click outside the box.
      3. Apply the patch.
      4. Reload the page and try again; either pasting or typing should mark
         the field as changed and allow you to save.
    
    Signed-off-by: Jesse Weaver <pianohacker at gmail.com>
    Confirmed working for normal input, paste and middle-click paste in
    Chrome and Firefox in Linux.
    
    Signed-off-by: Jonathan Druart <jonathan.druart at koha-community.org>
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    Signed-off-by: Mason James <mtj at kohaaloha.com>

commit 7c6c4e3ddf2bd10f11c002bdd4048e47bf4eb45e
Author: Jonathan Druart <jonathan.druart at koha-community.org>
Date:   Tue Jun 23 10:40:15 2015 +0200

    Bug 14324: Display "Add Child" for Organisations on circ/circulation.pl
    
    On moremember, the button is displayed for Organisations.
    To be consistent, it should be displayed on the circulation page too.
    
    Signed-off-by: Jonathan Druart <jonathan.druart at koha-community.org>
    Signed-off-by: Mason James <mtj at kohaaloha.com>

commit 1812e6ab09a7dc9ca8aa1604ff5cb6c7a9502999
Author: Barton Chittenden <barton at bywatersolutions.com>
Date:   Thu Jun 18 13:31:28 2015 -0700

    Bug 14324: Set "adultborrower" regardless of guarantor status.
    
    Signed-off-by: Jason Robb - SEKLS (jrobb at sekls.org)
    
    Signed-off-by: Jonathan Druart <jonathan.druart at koha-community.org>
    Signed-off-by: Mason James <mtj at kohaaloha.com>

commit 99a2002d35dbf9f8b512c294a30bf32d43c98a09
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date:   Wed Apr 1 16:23:48 2015 +0200

    Bug 8802: On editing a library group category type is not set
    
    The category type was always set to 'searchdomain', because it's the
    first of the dropdown list.
    
    Test plan:
    1/ Create or edit a library group
    2/ Set the category type to "properties"
    3/ Edit it again
    4/ Confirm "properties" is correctly selected
    
    Signed-off-by: Nick Clemens <nick at quecheelibrary.org>
    Signed-off-by: Katrin Fischer <katrin.fischer at bsz-bw.de>
    Signed-off-by: Mason James <mtj at kohaaloha.com>

commit 45db6e12937625d59bc097b535d77d52a09f36ea
Author: Katrin Fischer <Katrin.Fischer.83 at web.de>
Date:   Mon Jun 8 01:30:58 2015 +0200

    Bug 14356: Improvements to the 'Transfers to receive' page
    
    Patch makes several small changes to the template for the
    'Transfers to receive page'
    
    1) Show the branch name instead of the branchcode in the
       table of incoming transfers.
    
    If there is a hold connected with the transfer:
    2) Show the patron's name as 'surname, firstname'
       intead of 'surname  firstname'
    3) Restore broken feature: Show a mailto: link with a
       generated subject of 'Hold: <title>'.
    
    The mailto: feature actually existed in the templates, but
    was broken to a misnamed database column. I made some small
    changes to make the subject translatable (see bug 8330).
    
    To test:
    - Create a transfer by placing a hold with pickup at another library
    - Craete a transfer manually
    - Go to the circulation > transfers to receive
    - Check the changes explained above, compare before and after
    - Check the mailto: link works as expected
    
    Bonus: Check the Hold: bit in the subject is really translatable now.
    
    Signed-off-by: Nick Clemens <nick at quecheelibrary.org>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at koha-community.org>
    Signed-off-by: Mason James <mtj at kohaaloha.com>

commit ecae848cdf138c00a65bfda99347752bb3bcfb8c
Author: Katrin Fischer <Katrin.Fischer.83 at web.de>
Date:   Mon Jun 8 05:29:16 2015 +0200

    Bug 13874: 'Rotating collections' are a circulation tool
    
    Moves the entry for 'Rotating collections' from the Catalog
    column to the 'Patrons and circulation' column.
    
    To test:
    - Verify the entry has been moved on the tools home page
    
    NOTE: I agree that collections makes more sense under the new
          column.
    
    Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at koha-community.org>
    Signed-off-by: Mason James <mtj at kohaaloha.com>

commit ecf4473fac8210039926bfef5c3b17fc3430785a
Author: Mark Tompsett <mtompset at hotmail.com>
Date:   Wed Apr 15 12:33:29 2015 -0400

    Bug 14001 - Inventory has bad $_ references
    
    After receiving an error while attempt a simple inventory run,
    Two lines were changed from:
        ...$_->...
    to
        ...$item->...
    since the loop variable is $item. And $_ is not set to the
    expected hash reference, when there is a loop variable.
    
    This also helps explain the "Why are there blank dates on my
    last seen field?" problem that has been mentioned by users.
    
    TEST PLAN
    ---------
     1) Apply this patch after a reset to master.
     2) Log in to staff client
     3) Add one item via z39.50, setting barcode to a known value (BARCODE1)
     4) Wait for the reindex
     5) Home -> Tools -> Inventory/Stocktaking
     6) Browse for a file with the barcode in it
     7) Set the library dropdown to the library branch of the added item.
     8) Check 'Compare barcodes list to results:'
     9) Click 'Submit'
        -- This should not die under plack.
           This should not generate blank last seen dates.
           The last seen dates should be as expected.
    10) run koha qa test tools
    11) Confirm the two change point correspond to the two change points
        in the patch which shall not be pushed to master.
    
    The test result comply with expected outcome outlined in test plan.
    
    Signed-off-by: Indranil Das Gupta (L2C2 Technologies) <indradg at gmail.com>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at koha-community.org>
    Signed-off-by: Mason James <mtj at kohaaloha.com>

commit 5ca9430d1e7233adfb8af461ddc5cecd7470c39f
Author: Katrin Fischer <katrin.fischer at bsz-bw.de>
Date:   Wed Jun 17 12:28:39 2015 +0200

    Bug 14401: Zebra index configuration doesn't allow exact search for C.
    
    2 lines in the Zebra configuration files prevent an exact search for C.,
    while all other [A-Z]. searches work correctly.
    
    After taking a look at the  /etc/zebradb/etc/word-phrase-utf.chr
    those 2 lines cause the problem:
    
    map (^c\.)          @
    map (^C\.)          @
    
    I propose to remove them.
    
    To test:
    - Catalog a record with an item with callnumber: C.
    - Catalog a record with an item with callnumber: B.
    - Try seaching for the second using callnum,ext:B. (exact field search)
      - Verify search works.
    - Try searching for the other with callnum,ext:C.
      - Verify no result.
    - Apply the patch - copy the zebra config file if necessary into the right spot
    - Reindex
    - Repeat searches - both should not bring up the correct record.
    
    Signed-off-by: Indranil Das Gupta (L2C2 Technologies) <indradg at gmail.com>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    Signed-off-by: Mason James <mtj at kohaaloha.com>

commit 65d406d3a63fab0cca336cf23202a4986f595280
Author: Mark Tompsett <mtompset at hotmail.com>
Date:   Fri Jun 19 09:00:33 2015 -0400

    Bug 14422: Typo in updatedatabase.pl
    
    TEST PLAN
    ---------
     1) backup db
     2) git checkout -b my_3.6.x origin/3.6.x
     3) drop db and create blank one
     4) git reset --hard origin/3.6.x
     5) run web installer
     6) set HomeorHoldingBranchReturn system preference to 'holdingbranch'.
     7) create a Default checkout, hold rule
        home -> koha administration -> Circulation and fines rules
        -- I put 10 checkouts total and clicked 'Save'
        -- there currently is not 'returnbranch' in default_circ_rules.
     8) git reset --hard origin/3.20.x
        -- or whatever version you apply this to
           (3.8.x, 3.10.x, 3.14.x, 3.16.x, 3.18.x, or 3.20.x
            -- 3.21.00.008 deletes the systempreference involved)
     9) ./installer/data/mysql/updatedatabase.pl
    10) check HomeorHoldingBranchReturn systempreference
        -- Currently says 'holdingbranch', but
           the value of 'returnbranch' in default_circ_rules is
           'homebranch'.
    11) repeat steps 3-8
    12) apply this patch
    13) repeat steps 9-10
        -- Currently says 'holdingbranch', and
           the value of 'returnbranch' in default_circ_rules is
           'holdingbranch'.
    14) run koha qa test tools
    
    Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
    Tested using 3.6.x install, updated to 3.8.x
    Value is preserved
    No errors
    
    Signed-off-by: Jonathan Druart <jonathan.druart at koha-community.org>
    Note: I haven't followed the test plan, but the fix is trivial.
    Maybe it could worth to upate 3.21.00.008 and check the value of
    HomeOrHoldingBranchReturn before deleting it.
    We could raise a warning if HomeOrHoldingBranchReturn ==
    'holdingbranch'.
    Signed-off-by: Mason James <mtj at kohaaloha.com>

commit 6a4f3bcd0e9d01d1370870260923ab537facd319
Author: Fridolin Somers <fridolin.somers at biblibre.com>
Date:   Tue Jun 23 17:45:30 2015 +0200

    Bug 14440: get_template_and_user can not have an empty template_name (opac-ratings.pl)
    
    Since Bug 14408, the method get_template_and_user can not have an empty template_name.
    Pages calling with an empty value should use C4::Auth::checkauth()
    
    This patch corrects opac/opac-ratings.pl
    
    Test plan :
    - Apply patch
    - Set sysopref OpacStarRatings to 'results and details'
    - Disable Javascipt on your browser (otherwise it will use ajax)
    - Login at OPAC
    - Go to a record
    - Click on a button left of 'Rate me' to choose a rating, ie 4
    - Click on 'Rate me'
    => The page is reloaded and you see 'your rating: 4'
    - Loggout from OPAC
    - Try to access URL : http://<serveur>/cgi-bin/koha/opac-ratings.pl
    => You see the loggin page
    
    Signed-off-by: Indranil Das Gupta (L2C2 Technologies) <indradg at gmail.com>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
    Signed-off-by: Katrin Fischer <katrin.fischer at bsz-bw.de>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>
    (cherry picked from commit f1acb5615d0cbcba5db5b84e12fbad3d41454347)
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    (cherry picked from commit 3d8af819a84847b35ad08e62ba137d3febd878dd)
    
    Conflicts:
    	opac/opac-ratings.pl
    
    Signed-off-by: Liz <wizzyrea at gmail.com>
    
    Conflicts:
    	opac/opac-ratings.pl

commit 8f9db880ee6d1d8f1f0d4c47a067e77a1c7f55e4
Author: Eivin Giske Skaaren <eskaaren at yahoo.no>
Date:   Fri Jun 19 13:08:29 2015 +0200

    Bug 14421: Corrected example in SMS.pm to working version with hashref.
    
    Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
    
    Test:
    1) Apply patch
    2) perldoc C4/SMS.pm
    3) Check fixed argument in example
    
    Argument is hashref, POD is now right
    Added additional space on second arg
    No errors
    
    Signed-off-by: Jonathan Druart <jonathan.druart at koha-community.org>
    Signed-off-by: Mason James <mtj at kohaaloha.com>

commit d9783d6e81d31a175677a4954f17e7b4cb99b8cf
Author: Katrin Fischer <Katrin.Fischer.83 at web.de>
Date:   Tue Jun 9 02:32:46 2015 +0200

    Bug 14215: Change the 'delimiter' syspref description for its wider use
    
    Patch changes 'report files' to 'CSV files' as there are more
    options now for downloading and creating CSV files where this
    preference is taken into account.
    
    To test:
    - Verify the changed system preference description for
      'delimiter' is correct.
    
    Signed-off-by: Marc V?ron <veron at veron.ch>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at koha-community.org>
    Signed-off-by: Mason James <mtj at kohaaloha.com>

commit c212d9f4fc092ae355154949589b9d8aad5010a0
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date:   Wed Apr 22 12:14:24 2015 +0200

    Bug 10866: Hide patron's history if intranetreadinghistory is set to not allow
    
    If set to "not allow", the intranetreadinghistory pref prevent staff
    members to access patron's checkout history.
    But:
    1/ The page is still accessible if you know the url
    2/ The history can be consulted on the item history page
    
    Test plan:
    0/ Don't apply this patch
    1/ Set the intranetreadinghistory to allow
    2/ Go on a patron's checkout history page
    3/ Open a new tab and go on a item's checkout history page
    4/ Set the intranetreadinghistory to not allow
    5/ Refresh both pages => no change
    6/ Apply this patch
    7/ Refresh both page.
    On the first page, you should see a warning
    On the other one, you should see that the patron column is not displayed
    anymore.
    
    Signed-off-by: Mason James <mtj at kohaaloha.com>

commit 43ecf4c778367de1900b22f3a3d6e816b91eed93
Author: Katrin Fischer <Katrin.Fischer.83 at web.de>
Date:   Mon Jun 8 05:04:56 2015 +0200

    Bug 13427: jQuery Timepicker is not translated on returns page
    
    The returns page was missing an include with the translated strings.
    
    To test:
    - Install an additional language, like de-DE
    - Confirm the bug on the returns page
      - Make sure SpecifyReturnDate is activated
      - Open the datepicker, look at the time settings
    - Apply the patch
    - Reinstall the language, no update of the po files is needed
    - Retest
    - Verify, that now the time settings are translated
    
    Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
    Works as expected
    
    Signed-off-by: Jonathan Druart <jonathan.druart at koha-community.org>
    Signed-off-by: Mason James <mtj at kohaaloha.com>

commit d2ad672404ea5a06ffe63b5264b3b58afb45593d
Author: Fridolin Somers <fridolin.somers at biblibre.com>
Date:   Tue Jun 23 17:45:30 2015 +0200

    Bug 14440: get_template_and_user can not have an empty template_name (opac-ratings.pl)
    
    Since Bug 14408, the method get_template_and_user can not have an empty template_name.
    Pages calling with an empty value should use C4::Auth::checkauth()
    
    This patch corrects opac/opac-ratings.pl
    
    Test plan :
    - Apply patch
    - Set sysopref OpacStarRatings to 'results and details'
    - Disable Javascipt on your browser (otherwise it will use ajax)
    - Login at OPAC
    - Go to a record
    - Click on a button left of 'Rate me' to choose a rating, ie 4
    - Click on 'Rate me'
    => The page is reloaded and you see 'your rating: 4'
    - Loggout from OPAC
    - Try to access URL : http://<serveur>/cgi-bin/koha/opac-ratings.pl
    => You see the loggin page
    
    Signed-off-by: Indranil Das Gupta (L2C2 Technologies) <indradg at gmail.com>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
    Signed-off-by: Katrin Fischer <katrin.fischer at bsz-bw.de>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>
    
    Conflicts:
    	opac/opac-ratings.pl

commit bbc42b204b2ded11a9462c9bbd4be7dd99e3a44d
Author: Jonathan Druart <jonathan.druart at koha-community.org>
Date:   Wed Jun 24 11:03:22 2015 +0200

    ?Bug 14440: get_template_and_user can not have an empty template_name (quote*_ajax.pl)
    
    This patch uses check_api_auth instead of get_template_and_user.
    
    Test plan:
    Confirm that you are still able to access to the quote editor with the
    edit_quotes permission.
    Confirm that you are not if you don't have the permission.
    
    wget your_url/cgi-bin/koha/tools/quotes/quotes_ajax.pl
    should return "403?: Forbidden."
    
    Signed-off-by: Indranil Das Gupta (L2C2 Technologies) <indradg at gmail.com>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
    Signed-off-by: Katrin Fischer <katrin.fischer at bsz-bw.de>

commit bad18ee246e77bcbc41810a6594676d69408df92
Author: Fridolin Somers <fridolin.somers at biblibre.com>
Date:   Tue Jun 23 17:45:30 2015 +0200

    ?Bug 14440: get_template_and_user can not have an empty template_name (opac-ratings.pl)
    
    Since Bug 14408, the method get_template_and_user can not have an empty template_name.
    Pages calling with an empty value should use C4::Auth::checkauth()
    
    This patch corrects opac/opac-ratings.pl
    
    Test plan :
    - Apply patch
    - Set sysopref OpacStarRatings to 'results and details'
    - Disable Javascipt on your browser (otherwise it will use ajax)
    - Login at OPAC
    - Go to a record
    - Click on a button left of 'Rate me' to choose a rating, ie 4
    - Click on 'Rate me'
    => The page is reloaded and you see 'your rating: 4'
    - Loggout from OPAC
    - Try to access URL : http://<serveur>/cgi-bin/koha/opac-ratings.pl
    => You see the loggin page
    
    Signed-off-by: Indranil Das Gupta (L2C2 Technologies) <indradg at gmail.com>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
    Signed-off-by: Katrin Fischer <katrin.fischer at bsz-bw.de>
    Signed-off-by: Mason James <mtj at kohaaloha.com>

commit 92ad0ac7ba7fabd33efc7648d5dfb6babeed4051
Author: Fridolin Somers <fridolin.somers at biblibre.com>
Date:   Tue Jun 23 16:45:21 2015 +0200

    Bug 14440: get_template_and_user can not have an empty template_name (updatesupplier.pl)
    
    Since Bug 14408, the method get_template_and_user can not have an empty template_name.
    Pages calling with an empty value should use C4::Auth::checkauth()
    
    This patch corrects acqui/updatesupplier.pl
    
    Test plan :
    - Apply patch
    - Connect to intranet with a user having "vendors_manage" permission
    - Go to acquisition module
    - Create a new vendor
    - Click on "Edit vendor"
    - Change some information and save
    => Your change is saved
    - Connect to intranet with a user not having "vendors_manage" permission
    - Try to access <intranet>/cgi-bin/koha/acqui/updatesupplier.pl
    => Access is denied
    - Disconnect from intranet
    - Try to access <intranet>/cgi-bin/koha/acqui/updatesupplier.pl
    => Access is denied
    
    Signed-off-by: Indranil Das Gupta (L2C2 Technologies) <indradg at gmail.com>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
    Signed-off-by: Mason James <mtj at kohaaloha.com>

commit 7ae18b424eeabea044b873fd494c375aa22fb1f0
Author: Katrin Fischer <Katrin.Fischer.83 at web.de>
Date:   Sun Jun 7 23:45:10 2015 +0200

    Bug 8686: Raise required version of URI::Escape to 3.31
    
    Raises the minimum required version of URI::Escape from
    1.36 to 3.31.
    
    TEST PLAN
    ---------
    1) git branch -b bug_8686 origin/master
    2) ./koha_perl_deps.pl -a | grep URI
       -- it will list 1.36 required
    3) git bz apply 8686
    4) ./koha_perl_deps.pl -a | grep URI
       -- it will list 3.31 required
    5) koha qa test tools
    
    NOTE: Also default in Ubuntu 14.04 LTS,
          not just Wheezy as noted in comment #15.
    
    Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at koha-community.org>
    Signoff based on Nicole's comment (bug 9990 comment 6):
    "This stops happening if you upgrade URI::Escape to
    3.31.  We should make it clear in the Perl Modules page that an upgrade
    is needed."
    Signed-off-by: Mason James <mtj at kohaaloha.com>

commit 4617eb7e12c3613512a4a4728d7061c441841873
Author: Jonathan Druart <jonathan.druart at koha-community.org>
Date:   Mon Jun 22 10:56:26 2015 +0200

    Bug 14426: Escape or use placeholders for sql parameters
    
    Does this patch enough to prevent sql injection in borrowers_out.pl?
    
    ====================================================================
    1. "Criteria" Parameter, Payload: ELT(1=1,'evil') / ELT(1=2,'evil')
    ====================================================================
    
    echo -ne "POST /cgi-bin/koha/reports/borrowers_out.pl
    HTTP/1.1\r\nHost: testbox:9002\r\nContent-Length:
    186\r\n\r\nFilter=P_COM&Filter=&Limit=&output=file&basename=Export&MIME=CSV&sep=%3B&report_name=&do_it=1&userid=<username>&password=<password>&branch=&koha_login_context=intranet&Criteria=ELT(1=2,'evil')"
    | nc testbox 9002
    
    echo -ne "POST /cgi-bin/koha/reports/borrowers_out.pl
    HTTP/1.1\r\nHost: testbox:9002\r\nContent-Length:
    186\r\n\r\nFilter=P_COM&Filter=&Limit=&output=file&basename=Export&MIME=CSV&sep=%3B&report_name=&do_it=1&userid=<username>&password=<password>&branch=&koha_login_context=intranet&Criteria=ELT(1=1,'evil')"
    | nc testbox 9002
    
    ====================================================================
    2. "Filter" Parameter, Payload: P_COM'+AND+'a'='a / P_COM'+AND+'a'='b
    ====================================================================
    
    echo -ne "POST /cgi-bin/koha/reports/borrowers_out.pl
    HTTP/1.1\r\nHost: testbox:9002\r\nContent-Length:
    183\r\n\r\nkoha_login_context=intranet&Limit=&Criteria=branchcode&output=file&basename=Export&MIME=CSV&sep=;&report_name=&do_it=1&userid=<userid>&password=<password>&branch=&Filter=P_COM'+AND+'a'='a"
    | nc testbox 9002
    
    echo -ne "POST /cgi-bin/koha/reports/borrowers_out.pl
    HTTP/1.1\r\nHost: testbox:9002\r\nContent-Length:
    183\r\n\r\nkoha_login_context=intranet&Limit=&Criteria=branchcode&output=file&basename=Export&MIME=CSV&sep=;&report_name=&do_it=1&userid=<userid>&password=<password>&branch=&Filter=P_COM'+AND+'a'='b"
    | nc testbox 9002
    
    ====================================================================
    
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    Signed-off-by: Mason James <mtj at kohaaloha.com>

commit 4ead8eeeb010197ce48dd4b27f31bfe852684a25
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date:   Thu Apr 16 16:39:09 2015 +0200

    Bug 10355: paramater 'object' lost on the road
    
    Test plan:
    1) Go to any detail page in staff
    2) Click on the modification log tab
    3) Verify, that the object is prefilled with the records biblionumber
    and you can also see it as parameter in the url
    4) Click a second time on modification log to reset your search
    
    Before this patch, the object parameter was empty.
    It now contains the value of the biblionumber.
    
    Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
    Work as described, no koha-qa errors
    
    http://bugs.koha-community.org/show_bug.cgi?id=10335
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
    (cherry picked from commit 0002126a2ab0ac38a8d3f144f446dc3ba69dab59)
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    Signed-off-by: Liz Rea <wizzyrea at gmail.com>
    
    Conflicts:
    	tools/viewlog.pl

commit 81b8ce4fdda2340c9a95f9fe40a290d473840c0f
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date:   Fri Apr 24 17:03:09 2015 +0200

    Bug 11790: Remove dependency C4::Context from C4::Charset
    
    C4::Context is only used to retrieve a syspref value.
    This patch moves the use of C4::Context to a require.
    
    Test plan:
    Try to reach the SetMarcUnicodeFlag subroutine (batchmod, add/update a biblio, etc.)
    
    Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
    Tested on French UNIMARC install
    No errors adding/editing biblios
    No koha-qa errors
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    Signed-off-by: Mason James <mtj at kohaaloha.com>

commit 140d3fb95543c42c0cf630e2084038ebb25e5929
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date:   Thu Jun 4 12:03:42 2015 +0200

    Bug 14329: Useless copy/pasta from Template::Plugin::HtmlToText
    
    The synopsis of this TT plugin contains two example lines:
    [% myhtml FILTER html2text(leftmargin => 0, rightmargin => 0) %]
    [% myhtmltext | html2text %]
    
    These lines have been copied (without too much thought :) to a few templates. Since we do no use the variables myhtml or myhtmltext in these templates, these lines are useless.
    
    Test plan:
    [1] Put some items in your cart. And send it.
    [2] Send a shelf.
    [3] Git grep on myhtml. Should not have results.
    
    NOTE: Sent carts and lists in Intranet and OPAC successfully.
          Though, this does bring into question why the letters
          have HTML formatting if it is getting removed. That,
          however, is beyond the scope of this bug.
    
    Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
    Signed-off-by: Mason James <mtj at kohaaloha.com>

commit a1c83e28bc8264fb579f0269b289226571e66281
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date:   Tue May 26 14:52:07 2015 +0200

    Bug 14276: Keep highlight on the active item in item editor
    
    The highlight only works on even items.
    This patch should resolve it.
    
    Test plan:
    Edit biblio with multiple items.
    Verify that the highlight is visible on the selected item you edit.
    And that there is no highlight for a new item.
    
    Signed-off-by: Jonathan Druart <jonathan.druart at koha-community.org>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    Signed-off-by: Mason James <mtj at kohaaloha.com>

commit 6e06d103216488f86d1bbe215d391014f5b40f80
Author: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
Date:   Mon Jun 1 15:34:00 2015 -0300

    Bug 14173: Paging on 'recent comments' page in OPAC is not displaying correctly
    
    This patch corrects the display of current page on
    a multipage recent comments.
    
    To test:
    1) Enable OpacShowRecentComments
    
    2) Add multiple comments to multiple records
    I used a script to add multiple lines like
    "insert into reviews values ($i, 51, $i, 'Comment $i', 1, '2015-06-01 00:00:00')"
    to table reviews
    
    3) On OPAC, go to 'Recent comments', verify the bug
    
    4) Apply the patch
    
    5) Reload and check correct display
    
    Can't found missing space near 'by' from description.
    Display is correct for me.
    
    Followed test plan, displays as expected.
    Signed-off-by: Marc V?ron <veron at veron.ch>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at koha-community.org>
    Signed-off-by: Mason James <mtj at kohaaloha.com>

commit f9503c2290aeb018bc294e74687d18605822a9ae
Author: Marc V?ron <veron at veron.ch>
Date:   Sun Apr 26 21:36:25 2015 +0200

    Bug 11929: patron modification error shows borrowernumber
    
    If an error occurs in patron batch modification, a message similar to the following is displayed:
    Can not update patron with borrowernumber 7055
    
    It would be useful to have the cardnumber as well.
    
    This patch adds the card number to the lists of errors.
    
    It is not easy to trigger an error (see comments).
    For testing, I tweaked the sub ModMember in C4/Members.pm to always return false.
    
    TEST PLAN
    ---------
    1) Log in as a superlibrarian and create a test user
    2) Change the cardnumber to a number differing from the
       borrower number.
    3) Home -> Tools -> Batch patron modification
    4) Type in the cardnumber of that test user
    5) Check the Library checkbox.
    6) Click Save
       -- nice error, but it is borrower number instead of
          the card number which was entered.
    7) Apply the patch
    8) Repeat steps 3-6
       -- nice error, but it is now more informative.
    9) run koha qa test tools.
    
    Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
    (cherry picked from commit 3b3f82de377c87f9108bf07dd0d293182e5b9bdc)
    Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
    Signed-off-by: Liz Rea <wizzyrea at gmail.com>

commit 8a9184c4bc0de4866f7bdf7f945133d71c868f5b
Author: Jonathan Druart <jonathan.druart at koha-community.org>
Date:   Tue May 26 13:05:51 2015 +0200

    Bug 14266: Trim the email address in the pl script
    
    The original concern of bug 14266 was to provide a compatibility for
    <IE9.
    But actually we don't need to trim the email address template side.
    It will even better to trim it in the perl script, so that the email
    will be trimed even if JS is disabled.
    
    Test plan:
    1/ Share a list and does not provide any email address
    2/ Submit
    => The form is not submited, no alert/message is displayed (same as
    before this patch).
    3/ Share a list and provide an email address with spaces before and
    after
    4/ Submit
    => You should receive the email
    
    Signed-off-by: Indranil Das Gupta (L2C2 Technologies) <indradg at gmail.com>
    Test output compliant with expected test plan outcome.
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    Signed-off-by: Mason James <mtj at kohaaloha.com>

commit 69a74bb8806ff78ef6a086bc71b831e15c5974bb
Author: David Cook <dcook at prosentient.com.au>
Date:   Mon May 25 14:07:27 2015 +1000

    Replace trim() with $.trim() in opac-shareshelf.tt
    
    This patch replaces trim() with $.trim() which is supported
    in versions of IE older than IE9.
    
    Revised test plan
    =================
    
    Before applying patch:
    
    0) Use IE 8 or Document Mode 8 in a newer IE using F12 Developer Tools
    1) Set OpacAllowSharingPrivateLists to "Allow" in Global System Preferences
    2) Create a private list in the OPAC
    3) Add a record to the private list
    4) Click "Share" or "Share list" on one of the list screens
    5) Type in an email address and click "Send"
    6) Note the error in the console log
    7) The page should submit
    
    Apply the patch:
    
    7) Hold shift + refresh the browser to update any Javascript cache
    8) Try to "Share" the list again
    9) Note that the form submit after clicking "Send" and
    that there are no errors in the console log
    
    http://bugs.koha-community.org/show_bug.cgi?id=14266
    
    Signed-off-by: Indranil Das Gupta <indradg at gmail.com>
    Remarks: Works as per revised test plan
    Signed-off-by: Mason James <mtj at kohaaloha.com>

commit 012b4bc5742859ee5a2edfe963056c4ee54897c4
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date:   Wed May 20 11:31:18 2015 -0400

    Bug 12066: New renew page in staff client doesn't record branch in statistics
    
    Test Plan:
    1) Apply this patch
    2) Renew an item via circ/renew.pl
    3) Note the branch code of your logged in library is set as the
       branch in the generated statistic line
    
    Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
    Tested pre and post patch, now branch is saved
    No errors
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    Signed-off-by: Mason James <mtj at kohaaloha.com>

commit 51c8e095fd0627b7551cdf0d602bdc21c83365cd
Author: Katrin Fischer <Katrin.Fischer.83 at web.de>
Date:   Mon May 25 11:22:07 2015 +0200

    Bug 13946: Change order status 'Pending' to 'Ordered'
    
    The order status after closing the basket is 'ordered' in the
    database, but displays as 'pending' in the staff interface.
    
    As we use 'pending' when you have to review a suggestion, this
    clashes in translations and the meaning is different. The patch
    renames 'pending' for the order status to 'Ordered' to be more
    clear.
    
    To test:
    - Verfiy 'Ordered' shows in the pull down on the acq advanced
      search and search still works correctly
    - Verify the results table also display 'Ordered' as the status
    
    Signed-off-by: C?dric Vita <cedric.vita at dracenie.com>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at koha-community.org>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
    Signed-off-by: Mason James <mtj at kohaaloha.com>

commit 8161d1a5174f8fd63e0280cce1a750ad23a0e4f9
Author: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
Date:   Tue May 26 11:00:02 2015 -0300

    Bug 14275: Remove CGI::scrolling_list from guided_reports.pl
    
    Remove an instance of CGI::scrolling_list from this file
    
    To test:
    1) Go to Reports, Guided report wizard, New SQL report
    
    2) Create a report with some auth value list, e.g.
    
    SELECT surname,firstname FROM borrowers WHERE branchcode=<<Enter patrons library|branches>>
    
    Save
    
    3) Clic on 'Run this report", look at the dropdown, that will be changed
    
    4) Apply the patch
    
    5) Reload, check dropdown and any regression
    
    Followed test plan, works as expected.
    Signed-off-by: Marc V?ron <veron at veron.ch>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at koha-community.org>
    Signed-off-by: Mason James <mtj at kohaaloha.com>

commit d67f513eb37e3b6769d6897ed10c51ed9d2c2431
Author: Mark Tompsett <mtompset at hotmail.com>
Date:   Fri May 22 09:02:23 2015 -0400

    Bug 14112 - Silence warnings in t/Charset.t
    
    After Jonathan said this was the wrong way to correct the issue,
    www.utf8-chartable.de made it clear to me that the \c3\a9 were
    missing x's.
    
    TEST PLAN
    ---------
    1) prove t/Charset.t
       -- noise
    2) apply patch
    3) prove t/Charset.t
       -- no noise
    4) koha qa test tools
    
    Signed-off-by: Aleisha <aleishaamohia at hotmail.com>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at koha-community.org>
    Signed-off-by: Mason James <mtj at kohaaloha.com>

commit 23de58d6e53a51276bdb8321f60efa1dfc93d643
Author: Indranil Das Gupta <indradg at gmail.com>
Date:   Fri May 15 01:12:11 2015 +0530

    Bug 14203 - Message for non-existent lang removal
    
    A trivial string patch to update the error message displayed to
    user if koha-translate is used to attempt removal of a language
    that is not installed.
    
    Test plan
    =========
    
    1/ attempt to remove a non-existent language by
       <installdir>/debian/scripts/koha-translate --remove <langcode>
    2/ it should show "Error: the selected language is not already
       installed."
    3/ apply patch
    4/ repeat step 1; it should show "Error: the selected language is
       not installed."
    
    Signed-off-by: Nick Clemens <nick at quecheelibrary.org>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at koha-community.org>
    Signed-off-by: Mason James <mtj at kohaaloha.com>

commit a2cdb740bd9106c19bb5fb9435ca6ca6f1f74704
Author: Aleisha <aleishaamohia at hotmail.com>
Date:   Tue May 12 02:08:17 2015 +0000

    Bug 14184: Undefined $term causes noisy warns in C4/CourseReserves.pm
    
    This patch sets $term to be an empty string.
    
    Test plan
    =========
    
    1/ enable 'UseCourseReserves' syspref in Circulation preferences
    2/ in a terminal, run a `tail -f ` on your instance's opac-error.log
    3/ go to the opac, click on 'Course reserve' tab to go to
       opac-course-reserves.pl
    4/ notice the warning - "opac-course-reserves.pl: Use of uninitialized
       value $term" appear in the `tail`ed opac-error.log
    5/ apply the patch
    6/ reload the page (opac-course-reserves.pl)
    7/ page works but the warning in step #4 is no longer logged
    8/ run qa test (i.e. koha-qa.pl -c 1 -v 2), there should be no error
    
    Remarks: Testing result match expected test plan output. The QA tests
             pass with "OK" for the commit.
    
    Signed-off-by: Indranil Das Gupta (L2C2 Technologies) <indradg at gmail.com>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    Signed-off-by: Mason James <mtj at kohaaloha.com>

commit 5902d3ca6944d57256bbbcaf984509b8d282a4ea
Author: Aleisha <aleishaamohia at hotmail.com>
Date:   Tue May 12 03:01:35 2015 +0000

    Bug 14185: Undefined $limit causes warn in opac/opac-readingrecord.pl
    
    This patch sets $limit to be an empty string.
    
    Test plan
    =========
    
    1/ login into the opac using your user account credentials
    2/ in a terminal, run a `tail -f ` on your instance's opac-error.log
    3/ go back to the opac, click on 'your reading history' tab to go to
       opac-readingrecord.pl
    4/ notice the warning - "opac-readingrecord.pl: Use of uninitialized
       value $limit" appear in the `tail`ed opac-error.log
    5/ apply the patch
    6/ reload the page (opac-readingrecord.pl)
    7/ page works but the warning in step #4 is no longer logged
    8/ run qa test (i.e. koha-qa.pl -c 1 -v 2), there should be no error
    
    Remarks: Testing result match expected test plan output. The QA tests
             pass with "OK" for the commit.
    
    Signed-off-by: Indranil Das Gupta (L2C2 Technologies) <indradg at gmail.com>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    Signed-off-by: Mason James <mtj at kohaaloha.com>

commit 0b96ac33da15bebd3728da01a9229e7f0fab0ec7
Author: Indranil Das Gupta <indradg at gmail.com>
Date:   Thu May 14 07:23:16 2015 +0530

    Bug 14186 [QA Followup]: Undefined $reservedfor causes warn in opac-reserve.pl
    
    This is a followup for Bug 14186 that removes the extraneous tab
    char on line 470, so that the patch can clear QA tools.
    
    This patch sets $reservedfor to an empty string.
    
    Test plan
    =========
    
    1/ in a terminal, run `tail -f ` on your instance's opac-error.log
    2/ go to the opac and search from an item that exists on the Koha
       instance.
    3/ Select the title (if more than one title is returned) and click on
       'Place hold' link to go to opac-reserve.pl
    4/ notice the warning - "opac-reserve.pl: Use of uninitialized value
       $reservedfor" appear in the `tail`ed opac-error.log
    5/ apply the patch
    6/ reload the page (opac-reserve.pl)
    7/ page works but the warning in step #4 is no longer thrown up
    8/ run qa test (i.e. koha-qa.pl -c 1 -v 2), there should be no error
    
    Remarks: Testing result match expected test plan output. The QA tests
             pass with "OK" for the commit.
    
    Signed-off-by: Indranil Das Gupta (L2C2 Technologies) <indradg at gmail.com>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    Signed-off-by: Mason James <mtj at kohaaloha.com>

commit 5acd5c4a6ed9292be3faeda6f8e9beff3e299141
Author: Aleisha <aleishaamohia at hotmail.com>
Date:   Tue May 12 03:30:46 2015 +0000

    Bug 14186: Undefined $reservedfor causes warn in opac-reserve.pl
    
    This patch sets $reservedfor to an empty string.
    
    Test plan
    =========
    
    1/ in a terminal, run `tail -f ` on your instance's opac-error.log
    2/ go to the opac and search from an item that exists on the Koha
       instance.
    3/ Select the title (if more than one title is returned) and click on
       'Place hold' link to go to opac-reserve.pl
    4/ notice the warning - "opac-reserve.pl: Use of uninitialized value
       $reservedfor" appear in the `tail`ed opac-error.log
    5/ apply the patch
    6/ reload the page (opac-reserve.pl)
    7/ page works but the warning in step #4 is no longer thrown up
    8/ run qa test (i.e. koha-qa.pl -c 1 -v 2), there should be no error
    
    Remarks: The QA test failed - "forbidden pattern: tab char (line 470)".
    
             Marking this as 'FAILED QA'
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    Signed-off-by: Mason James <mtj at kohaaloha.com>

commit 148249423a1a88db52d0ba9d2fbb508a16869caf
Author: Katrin Fischer <Katrin.Fischer.83 at web.de>
Date:   Mon May 4 22:08:04 2015 +0200

    Bug 14130: Update columns.def
    
    - Updates columns.def with new columns in items
    - Adds some descriptions
    - Corrects some existing column descrpitions
    
    To test:
    - Read the patch to see what has been changed
    - Run the guided report builder for the 'circulation'
      module
    - Observe changes show up
    
    Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
    Changes show up, no errors
    
    Signed-off-by: Jonathan Druart <jonathan.druart at koha-community.org>
    Signed-off-by: Mason James <mtj at kohaaloha.com>

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

Summary of changes:
 C4/Charset.pm                                      |    2 +-
 C4/CourseReserves.pm                               |    1 +
 C4/Installer/PerlDependencies.pm                   |    2 +-
 C4/SMS.pm                                          |    4 +-
 Koha/Plugins/Base.pm                               |    3 +-
 Koha/QueryParser/Driver/PQF/Util.pm                |    5 +-
 Koha/Template/Plugin/Koha.pm                       |    3 +-
 acqui/updatesupplier.pl                            |   11 +--
 admin/branches.pl                                  |    2 +-
 admin/systempreferences.pl                         |    6 +-
 circ/circulation.pl                                |    4 +-
 circ/renew.pl                                      |    3 +-
 circ/transferstoreceive.pl                         |    2 +-
 debian/scripts/koha-translate                      |    2 +-
 etc/zebradb/etc/word-phrase-utf.chr                |    2 -
 .../authorities/authority-koha-indexdefs.xml       |    2 +-
 .../authorities/authority-zebra-indexdefs.xsl      |    2 +
 .../authorities/authority-koha-indexdefs.xml       |    2 +-
 .../authorities/authority-zebra-indexdefs.xsl      |    2 +
 .../mysql/de-DE/optional/sample_z3950_servers.sql  |    3 +-
 .../mysql/de-DE/optional/sample_z3950_servers.txt  |    3 +-
 .../mysql/en/optional/sample_z3950_servers.sql     |    3 +-
 .../mysql/en/optional/sample_z3950_servers.txt     |    1 -
 .../mysql/es-ES/optional/sample_z3950_servers.sql  |   11 +--
 .../mysql/es-ES/optional/sample_z3950_servers.txt  |    3 +-
 installer/data/mysql/updatedatabase.pl             |    2 +-
 koha-tmpl/intranet-tmpl/prog/en/columns.def        |   14 ++--
 .../prog/en/includes/biblio-view-menu.inc          |    2 +-
 .../intranet-tmpl/prog/en/js/pages/preferences.js  |    2 +-
 .../prog/en/modules/acqui/histsearch.tt            |    6 +-
 .../prog/en/modules/admin/preferences/admin.pref   |    2 +-
 .../prog/en/modules/admin/systempreferences.tt     |    2 +-
 .../prog/en/modules/basket/sendbasket.tt           |    2 -
 .../prog/en/modules/catalogue/issuehistory.tt      |   26 +++++---
 .../prog/en/modules/cataloguing/addbooks.tt        |    8 ++-
 .../prog/en/modules/cataloguing/additem.tt         |   11 +--
 .../intranet-tmpl/prog/en/modules/circ/returns.tt  |    1 +
 .../prog/en/modules/circ/transferstoreceive.tt     |   13 ++--
 .../prog/en/modules/members/moremember.tt          |    2 +-
 .../prog/en/modules/members/readingrec.tt          |    4 +-
 .../en/modules/reports/guided_reports_start.tt     |    8 ++-
 .../prog/en/modules/tools/modborrowers.tt          |    7 +-
 .../prog/en/modules/tools/tools-home.tt            |   11 ++-
 .../prog/en/modules/virtualshelves/sendshelf.tt    |    2 -
 .../opac-tmpl/bootstrap/en/modules/opac-detail.tt  |    1 -
 .../opac-tmpl/bootstrap/en/modules/opac-results.tt |    6 +-
 .../bootstrap/en/modules/opac-sendbasket.tt        |    2 -
 .../bootstrap/en/modules/opac-sendshelf.tt         |    2 -
 .../bootstrap/en/modules/opac-shareshelf.tt        |   17 ++++-
 .../bootstrap/en/modules/opac-showreviews.tt       |    2 +-
 .../bootstrap/en/xslt/MARC21slim2OPACResults.xsl   |    2 +-
 members/moremember.pl                              |    3 +-
 opac/opac-detail.pl                                |   31 +++++----
 opac/opac-ratings.pl                               |   23 ++-----
 opac/opac-readingrecord.pl                         |    1 +
 opac/opac-reserve.pl                               |    1 +
 opac/opac-shareshelf.pl                            |    6 ++
 patroncards/edit-layout.pl                         |    7 ++
 reports/borrowers_out.pl                           |   41 +++++++-----
 reports/guided_reports.pl                          |   17 ++---
 t/Charset.t                                        |    4 +-
 t/Creators.t                                       |   11 +--
 t/QueryParser.t                                    |   70 ++++++++++++++++----
 tools/inventory.pl                                 |    4 +-
 tools/modborrowers.pl                              |    6 +-
 tools/picture-upload.pl                            |    2 +-
 tools/quotes/quotes-upload_ajax.pl                 |   16 ++---
 tools/quotes/quotes_ajax.pl                        |   16 ++---
 tools/viewlog.pl                                   |    1 +
 69 files changed, 289 insertions(+), 212 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Tue Jul 28 15:36:02 2015
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Tue, 28 Jul 2015 13:36:02 +0000
Subject: [koha-commits] main Koha release repository branch master updated.
	v3.20.00-355-gaac6c26
Message-ID: <E1ZK534-0008QM-Bd@git.koha-community.org>

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  aac6c2687155e61f78f34767c2b2e45160658c90 (commit)
       via  c0a52bb1981cea372033ccac02430cba761d3def (commit)
       via  daab662c7cf8f91ef5e431393da86a985eb309c3 (commit)
       via  aa356f47ea5a00fdc8800ae6c35890524b8c1dfb (commit)
       via  e12127127f779bae509966f7101810d343b85b53 (commit)
       via  5c3c67972841f7ec99638a9387bd53d62ce9ef7d (commit)
       via  41f3cab1f53b4fddb382a9d4ebd1afa01293baea (commit)
       via  62dc6b0ca15a9de99a1cb41809e6c9c016e6b0d0 (commit)
       via  298c4c76a5f231d9cc0935b6f14a5f191b727804 (commit)
       via  beef8534724900e5777fc7b6d163763712decb1f (commit)
       via  0d632a606f499c31afb8a08f81625c4dfbddb445 (commit)
      from  3b23fb8b211c3fbedadc8b67bf294b65ed2ddf2d (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 aac6c2687155e61f78f34767c2b2e45160658c90
Author: Tomas Cohen Arazi <tomascohen at unc.edu.ar>
Date:   Tue Jul 28 10:32:31 2015 -0300

    Bug 13948: DBRev 3.21.00.016
    
    Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>

commit c0a52bb1981cea372033ccac02430cba761d3def
Author: Mark Tompsett <mtompset at hotmail.com>
Date:   Fri May 15 00:49:18 2015 -0400

    Bug 13948: Prevent explosion when Template::Plugin::Stash not installed
    
    TEST PLAN
    ---------
    1) Install first two patches
    2) do not install, or uninstall Template::Plugin::Stash
    3) Upgrade to make sure system preference is added.
    4) Set the system preference to turn it on for Staff and OPAC
    5) Refresh staff -- kaboom
    6) Load OPAC -- kaboom
    7) Apply this patch
    8) Reload staff and OPAC
       -- nice HTML comment about what is wrong.
    9) run koha qa test tools.
    
    Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
    
    Neat, runs well. Tested with/without sysprefs and Template::Plugin::Stash
    No koha-qa errors
    
    Signed-off-by: Jonathan Druart <jonathan.druart at koha-community.org>

commit daab662c7cf8f91ef5e431393da86a985eb309c3
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date:   Tue May 12 12:42:07 2015 -0400

    Bug 13948: (QA followup) Make dependency optional
    
    Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at koha-community.org>

commit aa356f47ea5a00fdc8800ae6c35890524b8c1dfb
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date:   Thu Apr 2 11:14:45 2015 -0400

    Bug 13948: Add ability to dump template toolkit variables to html comment
    
    It would be incredibly helpful if we could easily enable Koha to dump
    all Template Toolkit variables to a comment for debugging purposes.
    
    Test Plan:
    1) Apply this patch
    2) Run updatedatabase
    3) Enable the new system preferences DumpTemplateVarsIntranet and
       DumpTemplateVarsOpac
    4) Load a page in the staff intranet, view the html source
    5) Note the template toolkit variables are embedded in an html comment
    6) Load a page in the opac, view the html source
    7) Note the template toolkit variable are embedded in an html comment
    
    NOTE: I had to cpan2deb Template::Plugin::Stash to test.
          This is not optimal. Additionally:
          http://www.template-toolkit.org/docs/modules/Template/Plugin/index.html
          does not contain Stash. I suspect this was how it was
          introduced initially by TT.
    
    Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
    Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at koha-community.org>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>

commit e12127127f779bae509966f7101810d343b85b53
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date:   Wed May 20 13:42:37 2015 +0200

    Bug 13049: [QA Follow-up] Remove unneeded module
    
    The call to cronlogaction is done in cleanup_database. So there is no use
    in keeping the module here.
    
    Test plan:
    Run or compile (perl -c) script delete_expired_opac_registrations.pl.
    Run or compile (perl -c) script delete_unverified_opac_registrations.pl.
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>

commit 5c3c67972841f7ec99638a9387bd53d62ce9ef7d
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date:   Thu Oct 9 09:52:44 2014 +0200

    Bug 13049: Merge selfreg cron jobs into cleanup_database
    
    This patch moves the core code of two selfreg cron jobs into the Members
    module. The new routines are called from cleanup_database with two new
    parameters. The old cron jobs are now wrappers to cleanup_database.
    As a bonus, we can add a unit test now.
    
    In time, we can obsolete the selfreg cron jobs. For now, the code is in one
    place and behavior does not change.
    A next step (as described on the Bugzilla report) would be: remove the Delay
    pref for self regs.
    
    Test plan:
    Run the unit test t/db_dependent/Members.t.
    Test the two new parameters of cleanup_database.pl.
    Verify if delete_expired_opac_registrations.pl still works.
    Same for delete_unverified_opac_registrations.pl.
    
    Signed-off-by: Frederic Demians <f.demians at tamil.fr>
    . Fixed minor merge confict on UT & cleanup_database.pl
    . UT ok
    . The two deprecated scripts still work as before, with a warning
      message.
    . cleanup_database.pl do the deletion job, calling new C4::Members
      function rather that doing it directly.
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>

commit 41f3cab1f53b4fddb382a9d4ebd1afa01293baea
Author: Indranil Das Gupta <indradg at gmail.com>
Date:   Thu May 21 07:24:28 2015 +0530

    Bug 14240: Add '(All libraries)' to notice deletion form
    
    Trivial patch that shows (All libraries) instead of an empty cell
    for notices that are applicable across all libraries.
    
    Test plan
    =========
    1) Log in to staff client
    2) Tools->Notices & slips
    3) Add a dummy notice for all libraries
       -- test code, test description, email - test subject, test content
          Click Submit
    4) Click Delete
       -- note that the Library column value is blank.
    5) Click the no option
    6) Apply this patch
    7) Click Delete
       -- note that the Library column value is (All Libraries).
    8) run koha qa test tools.
    
    Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>

commit 62dc6b0ca15a9de99a1cb41809e6c9c016e6b0d0
Author: St?phane Delaune <stephane.delaune at biblibre.com>
Date:   Thu Jul 23 16:28:57 2015 +0200

    Bug 10961: (followup) Make query fields explicit and add regression tests
    
    add correct frameworkcode to _koha_marc_update_bib_ids parameters
    
    add test, prove with : prove t/db_dependent/Biblio.t
    
    TEST PLAN
    ---------
    1) git checkout -b bug_10961 origin/master
    2) git bz apply 10961
    3) git checkout origin/master -- C4/Biblio.pm
    4) prove t/db_dependent/Biblio.t
       -- was expecting failure, got failure.
    5) git reset --hard origin/master
    6) git bz apply 10961
    7) prove t/db_dependent/Biblio.t
       -- success as expected.
    8) Read over code.
       -- Noted it also grabs the framework code for the biblio, rather than uses default.
          And it also corrects an indentation issue.
          Test case looks like it attempts to cover the biblionumber!=biblioitemnumber case
          by adding 1.
    9) run koha qa test tools.
    
    Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>

commit 298c4c76a5f231d9cc0935b6f14a5f191b727804
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date:   Fri Sep 27 12:53:39 2013 -0400

    Bug 10961: Error in GetMarcBiblio can cause severe data loss
    
    A bug in GetMarcBiblio can cause severe data loss if your database has
    records where the biblionumber and biblioitemnumber do not match and the
    script misc/batchRebuildBiblioTables.pl is run.
    
    The Biblio::GetMarcBiblio makes a kall to
    C4::Biblio::_koha_marc_update_bib_ids which passes the biblionumber as
    both the biblionumber *and the biblioitemnumber*.
    
    Thus, if your biblio and biblioitem numbers are not always equal, you
    will end up with a record where the biblioitemnumber is incorrect in the
    record!
    
    This is usually not a severe issue, but since batchRebuildBiblioTables
    uses that record to update the database tables, it ends up updating the
    wrong biblioitem row!
    
    NOTE: What a horrible, horrible typo that was. Tested this with the
          second patch.
    
    Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>

commit beef8534724900e5777fc7b6d163763712decb1f
Author: Mark Tompsett <mtompset at hotmail.com>
Date:   Fri Jul 3 18:04:04 2015 -0400

    Bug 14487: Noise best detected under Debian 8
    
    The first error is caused by the fact that
    $messages->{'IsPermanent'} is undefined.
    
    The second error is caused by querying the CGI
    parameter 'barcode' inside a function call. This is not required.
    There is a variable $barcode set with the parameter. Changed to
    use the variable.
    
    TEST PLAN
    ----------
    1) Test first patch.
    2) Clear the log
    3) Put in a barcode which is not checked out.
    4) Check the log.
       -- should be two errors. One about a hash,
          the other will only be detectable under Debian 8.
    5) Apply this second patch
    6) Clear the log
    7) Put in a barcode which is not checked out.
    8) Check the log.
       -- should be empty.
    9) run koha qa test tools
    
    Signed-off-by: Indranil Das Gupta (L2C2 Technologies) <indradg at gmail.com>
    Signed-off-by: Nick Clemens <nick at quecheelibrary.org>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>

commit 0d632a606f499c31afb8a08f81625c4dfbddb445
Author: Indranil Das Gupta <indradg at gmail.com>
Date:   Fri Jul 3 13:33:06 2015 +0530

    Bug 14487: silence warns during checkin
    
    Test plan
    =========
    
    1/ check out an item and then check it back in.
    1/ check the logs after the check-in to see the warns from
       returns.pl line 623 of :
        (a) Use of uninitialized value $holdingBranch
        (b) Use of uninitialized value $collectionBranch
    2/ apply patch
    3/ check out and check-in again. no warns are recorded this time.
    
    NOTE: Under Debian Jessie, there are other messages.
          Additionally, this only corrects the line 623 ones.
    
    Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
    Signed-off-by: Nick Clemens <nick at quecheelibrary.org>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>

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

Summary of changes:
 C4/Biblio.pm                                       |    8 +-
 C4/Installer/PerlDependencies.pm                   |   13 +-
 C4/Members.pm                                      |   55 ++++++++
 Koha.pm                                            |    2 +-
 circ/returns.pl                                    |    7 +-
 installer/data/mysql/sysprefs.sql                  |    2 +
 installer/data/mysql/updatedatabase.pl             |   24 +++-
 .../prog/en/includes/doc-head-open.inc             |   21 +++
 .../prog/en/modules/admin/preferences/logs.pref    |  134 +++++++++++---------
 .../intranet-tmpl/prog/en/modules/tools/letter.tt  |    2 +-
 .../bootstrap/en/includes/doc-head-open.inc        |   21 +++
 misc/cronjobs/cleanup_database.pl                  |   46 ++++++-
 misc/cronjobs/delete_expired_opac_registrations.pl |   37 +-----
 .../delete_unverified_opac_registrations.pl        |   18 +--
 t/db_dependent/Biblio.t                            |   19 ++-
 t/db_dependent/Members.t                           |   24 +++-
 16 files changed, 309 insertions(+), 124 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Wed Jul 29 21:30:00 2015
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Wed, 29 Jul 2015 19:30:00 +0000
Subject: [koha-commits] main Koha release repository branch master updated.
	v3.20.00-358-g04d0924
Message-ID: <E1ZKX3A-000442-BE@git.koha-community.org>

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  04d09249a650056cc9cfb9fe0441bf3d80e6ae4a (commit)
       via  a9ec41e9629e84d06babe7fdcf39a4cc7eec6216 (commit)
       via  062f34c55df312f2f8295850c203638343dabdaa (commit)
      from  aac6c2687155e61f78f34767c2b2e45160658c90 (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 04d09249a650056cc9cfb9fe0441bf3d80e6ae4a
Author: Jonathan Druart <jonathan.druart at koha-community.org>
Date:   Thu Jun 18 10:49:24 2015 +0200

    Bug 13851: Fix typo in POD
    
    Signed-off-by: Jonathan Druart <jonathan.druart at koha-community.org>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>

commit a9ec41e9629e84d06babe7fdcf39a4cc7eec6216
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date:   Tue Jun 16 22:53:10 2015 -0400

    Bug 13851: (QA followup) Unit Tests
    
    Signed-off-by: Jonathan Druart <jonathan.druart at koha-community.org>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>

commit 062f34c55df312f2f8295850c203638343dabdaa
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date:   Tue Sep 30 15:07:50 2014 -0400

    Bug 13851: Replace waiting holds logic in circulation.pl with Koha Objects
    
    This is the original patch for bug 12892 and replaces the older style of
    fetching the holds data with Koha Objects. It will be used as a
    foundation for future features.
    
    Test Plan:
    1) Apply this patch
    2) Create a hold, set to waiting
    3) Browse to circulation.pl for that patron
    4) Note you see the list of waiting holds
    5) Switch your logged in branch to a different branch
    6) Note the "Waiting at" line is no longer emphasized.
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    
    Signed-off-by: Cathi Wiggins <CWIGGINS at ci.arcadia.ca.us>
    
    Signed-off-by: Megan Wianecki <mwianecki at mplmain.mtpl.org>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at koha-community.org>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>

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

Summary of changes:
 Koha/{Borrower.pm => Biblio.pm}                    |    6 +--
 Koha/{Borrowers.pm => Biblios.pm}                  |   14 ++++--
 Koha/{Borrower.pm => Branch.pm}                    |    6 +--
 Koha/{Borrowers.pm => Branches.pm}                 |   14 ++++--
 Koha/{Config/SysPref.pm => Hold.pm}                |   52 ++++++++++++++++++--
 Koha/{Config/SysPrefs.pm => Holds.pm}              |   26 ++++++++--
 Koha/{Borrower.pm => Item.pm}                      |   18 +++++--
 Koha/{Borrowers.pm => Items.pm}                    |   14 ++++--
 circ/circulation.pl                                |   32 ++----------
 .../prog/en/modules/circ/circulation.tt            |   37 ++++++++------
 t/db_dependent/Holds.t                             |   19 ++++++-
 t/db_dependent/Reserves.t                          |    7 ++-
 12 files changed, 169 insertions(+), 76 deletions(-)
 copy Koha/{Borrower.pm => Biblio.pm} (91%)
 copy Koha/{Borrowers.pm => Biblios.pm} (86%)
 copy Koha/{Borrower.pm => Branch.pm} (91%)
 copy Koha/{Borrowers.pm => Branches.pm} (86%)
 copy Koha/{Config/SysPref.pm => Hold.pm} (55%)
 copy Koha/{Config/SysPrefs.pm => Holds.pm} (75%)
 copy Koha/{Borrower.pm => Item.pm} (76%)
 copy Koha/{Borrowers.pm => Items.pm} (87%)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Wed Jul 29 22:57:27 2015
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Wed, 29 Jul 2015 20:57:27 +0000
Subject: [koha-commits] main Koha release repository branch 3.20.x updated.
	v3.20.02-4-g7abf1d9
Message-ID: <E1ZKYPn-0004Sw-W1@git.koha-community.org>

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, 3.20.x has been updated
       via  7abf1d9a184dd7cc2805f05e921a883871092b33 (commit)
       via  58b5b915a0ba4c86639a260b53dd0ad89320ec36 (commit)
       via  03a110b637343111d0906db557d2179a14857a92 (commit)
       via  7eb7b6d90caeeb65fc930c34bc3f0f28603bedd9 (commit)
      from  cede10ef4b43b69c8c9a0573e73b8c86854a8d99 (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 7abf1d9a184dd7cc2805f05e921a883871092b33
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date:   Thu Jul 9 15:35:53 2015 +0200

    Bug 14494: Add some unit tests too for CalcDateDue
    
    The second patch of this report made some changes to CalcDateDue.
    We are adding some unit tests here.
    See the commments on the third patch too.
    
    Test plan:
    Run t/db_dependent/Circulation_dateexpiry.t
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    Amended patch: Set the number of tests for the second subtest (was
    commented) and perltidy the second block.
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>
    (cherry picked from commit 1a8962f306d2d2f0c7789c649aa615192ccd5ca1)
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

commit 58b5b915a0ba4c86639a260b53dd0ad89320ec36
Author: Jonathan Druart <jonathan.druart at koha-community.org>
Date:   Thu Jul 9 09:52:28 2015 +0100

    Bug 14494: Unit tests for CanBookBeIssued related to dateexpiry
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    Moved the test on its own. Nicer than adding TestBuilder in the final part
    of the test. No warnings/errors from TestBuilder, no dependency..
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>
    (cherry picked from commit e0986f5a796b24d6fec00d849f7c71caf0dd5640)
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

commit 03a110b637343111d0906db557d2179a14857a92
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date:   Mon Jul 6 14:20:07 2015 +0200

    Bug 14494: Terribly slow checkout caused by DateTime->new in far future
    
    An expiry date like 9999-12-31 in the local timezone will make DateTime
    spend a lot of time (maybe 60 seconds) on date calculation. See the
    DateTime documention on CPAN.
    A calculation in floating (or alternatively in UTC) would only take
    a few milliseconds.
    
    This patch makes two changes in this regard:
    
    [1] The compare between expiry date and today in CanBookBeIssued has been
        adjusted in Jonathan's patch. I am moving the compare to the floating
        timezone (as was done in my original patch). This removes a hardcoded
        9999.
    [2] If ReturnBeforeExpiry is enabled, CalcDateDue compares the normal due
        date with the expiry date. The comparison is now done in the floating
        timezone. If the expiry date is before the due date, it is
        returned in the user context's timezone.
    
    NOTE: The calls to set_time_zone moving to or from floating do not adjust
    the local time.
    
    TEST PLAN:
    First without this patch (and the one from Jonathan):
    [1] Set expiry date to 9999-12-31 for a patron.
    [2] Enable ReturnBeforeExpiry.
    [3] Checkout a book to this patron. This will be (very) slow.
    
    Continue now with this patch applied:
    [4] Check in the same book.
    [5] Check it out again. Should be much faster.
    
    Bonus test:
    [6] Set borrower expiry date to today. Change relevant circulation rule
        to loan period of 21 hours. Test checking out with a manual due date
        /time just before today 23:59 and after that. In the second case the
        due date/time should become today 23:59 (note that 23:59 is not
        shown on the checkout form).
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>
    (cherry picked from commit 17d04c46190880d3031adbc02553f82234d70fc1)
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

commit 7eb7b6d90caeeb65fc930c34bc3f0f28603bedd9
Author: Jonathan Druart <jonathan.druart at koha-community.org>
Date:   Thu Jul 9 09:52:28 2015 +0100

    Bug 14494: Prevent slow checkout if the patron does not have an expiry date
    
    If a patron has a expiry date set to 9999-12-31 (for organizations for
    instance), the checkouts are very slow.
    
    It's caused by 2 different calls to DateTime in CanBookBeIssued:
    1/
      DateTime->new( year => 9999, month => 12, day => 31, time_zone => C4::Context->tz );
    The time_zone should not be set (as it's done in Koha::DateUtils), set to UTC or floating tz.
    
    2/
      DateTime->compare($today, $expiry_dt)
    The comparaison of 2 DT with 1 related to 9999 is very slow, as you can
    imagine.
    
    For 1/ we need to call Koha::DateUtils::dt_from_string (actually, we
    should never call DateTime directly).
    For 2/ we just need to test if the date is != 9999, no need to compare
    it in this case.
    
    Test plan:
    Before this patch, confirm that the checkouts are slow if the patron has a
    dateexpiry set to 9999-12-31.
    update borrowers set dateexpiry="9999-12-31" where borrowernumber=42;
    
    After this patch, you should not see any regression when checking out
    items to an expired patron and to a valid patron.
    
    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: Kyle M Hall <kyle at bywatersolutions.com>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>
    (cherry picked from commit 8d58acc565c8500d4b9d55cacb3d6d21628a899b)
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

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

Summary of changes:
 C4/Circulation.pm                       |   32 ++++-----
 t/db_dependent/Circulation_dateexpiry.t |  111 +++++++++++++++++++++++++++++++
 2 files changed, 124 insertions(+), 19 deletions(-)
 create mode 100644 t/db_dependent/Circulation_dateexpiry.t


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Thu Jul 30 04:40:41 2015
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Thu, 30 Jul 2015 02:40:41 +0000
Subject: [koha-commits] main Koha release repository branch 3.16.x updated.
	v3.16.12-54-g0c5e0a7
Message-ID: <E1ZKdlx-0001o8-56@git.koha-community.org>

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, 3.16.x has been updated
       via  0c5e0a76e8a18233f494737b80b34a9b7b940550 (commit)
      from  a694c3faccd20bd8bdc3e9e7801993df28d53b6e (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 0c5e0a76e8a18233f494737b80b34a9b7b940550
Author: Mason James <mtj at kohaaloha.com>
Date:   Thu Jul 30 13:51:17 2015 +1200

    Revert "Bug 14602 - Fix failing t/Creators.t test"
    
    This reverts commit a6736a7e1660e09aab633e1493c45d39108c3a26.

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

Summary of changes:
 t/Creators.t |   11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Thu Jul 30 04:53:39 2015
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Thu, 30 Jul 2015 02:53:39 +0000
Subject: [koha-commits] main Koha release repository branch 3.16.x updated.
	v3.16.12-57-g71a6918
Message-ID: <E1ZKdyV-0002E6-AE@git.koha-community.org>

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, 3.16.x has been updated
       via  71a69181b1ea37df86cbeeafd34e9704104a22b5 (commit)
       via  016ead574e82ed7a74a2b5b83c0bf001a5930f1c (commit)
       via  4924c8542da5c2c19928e7a9549e9a04f34ad4e5 (commit)
      from  0c5e0a76e8a18233f494737b80b34a9b7b940550 (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 71a69181b1ea37df86cbeeafd34e9704104a22b5
Author: Mason James <mtj at kohaaloha.com>
Date:   Thu Jul 30 14:32:47 2015 +1200

    Bumping version number for release

commit 016ead574e82ed7a74a2b5b83c0bf001a5930f1c
Author: Mason James <mtj at kohaaloha.com>
Date:   Thu Jul 30 14:24:40 2015 +1200

    Add release notes
    
    Signed-off-by: Mason James <mtj at kohaaloha.com>

commit 4924c8542da5c2c19928e7a9549e9a04f34ad4e5
Author: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
Date:   Wed Jul 29 10:20:10 2015 -0300

    Translation updates for Koha 3.16.13 release

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

Summary of changes:
 installer/data/mysql/updatedatabase.pl             |    5 +
 kohaversion.pl                                     |    2 +-
 misc/release_notes/release_notes_3_16_13.html      |  408 +
 ..._notes_3_16_8.txt => release_notes_3_16_13.txt} |  267 +-
 .../po/am-Ethi-i-opac-t-prog-v-3006000.po          |  897 +-
 .../po/am-Ethi-i-staff-t-prog-v-3006000.po         | 3592 ++----
 misc/translator/po/am-Ethi-opac-bootstrap.po       | 1280 +-
 misc/translator/po/am-Ethi-opac-ccsr.po            |   23 +-
 misc/translator/po/am-Ethi-pref.po                 |    3 +-
 misc/translator/po/am-Ethi-staff-help.po           | 5952 ++-------
 .../po/ar-Arab-i-opac-t-prog-v-3006000.po          | 1676 +--
 .../po/ar-Arab-i-staff-t-prog-v-3006000.po         | 5718 +++------
 misc/translator/po/ar-Arab-opac-bootstrap.po       | 2103 +---
 misc/translator/po/ar-Arab-opac-ccsr.po            |   47 +-
 misc/translator/po/ar-Arab-pref.po                 |    5 +-
 misc/translator/po/ar-Arab-staff-help.po           |10815 ++++-------------
 .../translator/po/az-AZ-i-opac-t-prog-v-3006000.po | 1046 +-
 .../po/az-AZ-i-staff-t-prog-v-3006000.po           | 4337 +++----
 misc/translator/po/az-AZ-opac-bootstrap.po         | 1429 +--
 misc/translator/po/az-AZ-opac-ccsr.po              |   23 +-
 misc/translator/po/az-AZ-pref.po                   |    3 +-
 misc/translator/po/az-AZ-staff-help.po             | 6702 +++--------
 .../translator/po/be-BY-i-opac-t-prog-v-3006000.po | 2034 +---
 .../po/be-BY-i-staff-t-prog-v-3006000.po           | 5911 +++------
 misc/translator/po/be-BY-opac-bootstrap.po         | 2436 +---
 misc/translator/po/be-BY-opac-ccsr.po              |   51 +-
 misc/translator/po/be-BY-pref.po                   |    5 +-
 misc/translator/po/be-BY-staff-help.po             | 6736 +++--------
 .../po/bg-Cyrl-i-opac-t-prog-v-3006000.po          |  901 +-
 .../po/bg-Cyrl-i-staff-t-prog-v-3006000.po         | 3592 ++----
 misc/translator/po/bg-Cyrl-opac-bootstrap.po       | 1284 +-
 misc/translator/po/bg-Cyrl-opac-ccsr.po            |   23 +-
 misc/translator/po/bg-Cyrl-pref.po                 |    3 +-
 misc/translator/po/bg-Cyrl-staff-help.po           | 5952 ++-------
 .../translator/po/bn-IN-i-opac-t-prog-v-3006000.po |  909 +-
 .../po/bn-IN-i-staff-t-prog-v-3006000.po           | 3592 ++----
 misc/translator/po/bn-IN-opac-bootstrap.po         | 1272 +-
 misc/translator/po/bn-IN-opac-ccsr.po              |   23 +-
 misc/translator/po/bn-IN-pref.po                   |    3 +-
 misc/translator/po/bn-IN-staff-help.po             | 5952 ++-------
 .../translator/po/ca-ES-i-opac-t-prog-v-3006000.po | 1704 +--
 .../po/ca-ES-i-staff-t-prog-v-3006000.po           | 3796 ++----
 misc/translator/po/ca-ES-opac-bootstrap.po         | 2217 +---
 misc/translator/po/ca-ES-opac-ccsr.po              |   43 +-
 misc/translator/po/ca-ES-pref.po                   |    3 +-
 misc/translator/po/ca-ES-staff-help.po             | 5955 +++------
 .../translator/po/cs-CZ-i-opac-t-prog-v-3006000.po |    1 -
 .../po/cs-CZ-i-staff-t-prog-v-3006000.po           | 1151 +-
 misc/translator/po/cs-CZ-opac-bootstrap.po         |  341 +-
 misc/translator/po/cs-CZ-opac-ccsr.po              |    1 -
 misc/translator/po/cs-CZ-pref.po                   |    5 +-
 misc/translator/po/cs-CZ-staff-help.po             |    1 -
 .../translator/po/da-DK-i-opac-t-prog-v-3006000.po | 1698 +--
 .../po/da-DK-i-staff-t-prog-v-3006000.po           | 5884 +++------
 misc/translator/po/da-DK-opac-bootstrap.po         | 2153 +---
 misc/translator/po/da-DK-opac-ccsr.po              |   47 +-
 misc/translator/po/da-DK-pref.po                   |    5 +-
 misc/translator/po/da-DK-staff-help.po             |11158 ++++-------------
 .../translator/po/de-CH-i-opac-t-prog-v-3006000.po | 1898 +--
 .../po/de-CH-i-staff-t-prog-v-3006000.po           | 6961 +++--------
 misc/translator/po/de-CH-opac-bootstrap.po         | 2332 +---
 misc/translator/po/de-CH-opac-ccsr.po              |   51 +-
 misc/translator/po/de-CH-pref.po                   |    5 +-
 misc/translator/po/de-CH-staff-help.po             |    1 -
 .../translator/po/de-DE-i-opac-t-prog-v-3006000.po |    9 +-
 .../po/de-DE-i-staff-t-prog-v-3006000.po           | 1150 +-
 misc/translator/po/de-DE-opac-bootstrap.po         |  349 +-
 misc/translator/po/de-DE-opac-ccsr.po              |    1 -
 misc/translator/po/de-DE-pref.po                   |    5 +-
 misc/translator/po/de-DE-staff-help.po             |    1 -
 .../translator/po/el-GR-i-opac-t-prog-v-3006000.po | 1925 +--
 .../po/el-GR-i-staff-t-prog-v-3006000.po           | 5923 +++------
 misc/translator/po/el-GR-opac-bootstrap.po         | 2103 +---
 misc/translator/po/el-GR-opac-ccsr.po              |   49 +-
 misc/translator/po/el-GR-pref.po                   |    5 +-
 misc/translator/po/el-GR-staff-help.po             |11002 ++++-------------
 .../translator/po/en-GB-i-opac-t-prog-v-3006000.po | 1618 +--
 .../po/en-GB-i-staff-t-prog-v-3006000.po           | 4599 +++----
 misc/translator/po/en-GB-opac-bootstrap.po         | 2007 +---
 misc/translator/po/en-GB-opac-ccsr.po              |   34 +-
 misc/translator/po/en-GB-pref.po                   |    5 +-
 misc/translator/po/en-GB-staff-help.po             | 9573 ++++-----------
 .../translator/po/en-NZ-i-opac-t-prog-v-3006000.po | 1687 +--
 .../po/en-NZ-i-staff-t-prog-v-3006000.po           | 5553 +++------
 misc/translator/po/en-NZ-opac-bootstrap.po         | 2123 +---
 misc/translator/po/en-NZ-opac-ccsr.po              |   41 +-
 misc/translator/po/en-NZ-pref.po                   |    5 +-
 misc/translator/po/en-NZ-staff-help.po             |11384 ++++--------------
 misc/translator/po/eo-i-opac-t-prog-v-3006000.po   |  870 +-
 misc/translator/po/eo-i-staff-t-prog-v-3006000.po  | 3592 ++----
 misc/translator/po/eo-opac-bootstrap.po            | 1253 +-
 misc/translator/po/eo-opac-ccsr.po                 |   23 +-
 misc/translator/po/eo-pref.po                      |    3 +-
 misc/translator/po/eo-staff-help.po                | 5952 ++-------
 .../translator/po/es-ES-i-opac-t-prog-v-3006000.po |    1 -
 .../po/es-ES-i-staff-t-prog-v-3006000.po           | 1153 +-
 misc/translator/po/es-ES-opac-bootstrap.po         |  343 +-
 misc/translator/po/es-ES-opac-ccsr.po              |    1 -
 misc/translator/po/es-ES-pref.po                   |    5 +-
 misc/translator/po/es-ES-staff-help.po             |    1 -
 misc/translator/po/eu-i-opac-t-prog-v-3006000.po   | 1605 +--
 misc/translator/po/eu-i-staff-t-prog-v-3006000.po  | 3592 ++----
 misc/translator/po/eu-opac-bootstrap.po            | 2173 +---
 misc/translator/po/eu-opac-ccsr.po                 |   35 +-
 misc/translator/po/eu-pref.po                      |    3 +-
 misc/translator/po/eu-staff-help.po                | 5952 ++-------
 .../po/fa-Arab-i-opac-t-prog-v-3006000.po          |  939 +-
 .../po/fa-Arab-i-staff-t-prog-v-3006000.po         | 3617 ++----
 misc/translator/po/fa-Arab-opac-bootstrap.po       | 1322 +-
 misc/translator/po/fa-Arab-opac-ccsr.po            |   23 +-
 misc/translator/po/fa-Arab-pref.po                 |    3 +-
 misc/translator/po/fa-Arab-staff-help.po           | 5952 ++-------
 .../translator/po/fi-FI-i-opac-t-prog-v-3006000.po | 1612 +--
 .../po/fi-FI-i-staff-t-prog-v-3006000.po           | 5278 +++-----
 misc/translator/po/fi-FI-opac-bootstrap.po         | 1668 +--
 misc/translator/po/fi-FI-opac-ccsr.po              |   45 +-
 misc/translator/po/fi-FI-pref.po                   |    5 +-
 misc/translator/po/fi-FI-staff-help.po             | 6166 +++-------
 .../translator/po/fo-FO-i-opac-t-prog-v-3006000.po |  874 +-
 .../po/fo-FO-i-staff-t-prog-v-3006000.po           | 3592 ++----
 misc/translator/po/fo-FO-opac-bootstrap.po         | 1253 +-
 misc/translator/po/fo-FO-opac-ccsr.po              |   23 +-
 misc/translator/po/fo-FO-pref.po                   |    3 +-
 misc/translator/po/fo-FO-staff-help.po             | 5952 ++-------
 .../translator/po/fr-CA-i-opac-t-prog-v-3006000.po | 1793 +--
 .../po/fr-CA-i-staff-t-prog-v-3006000.po           | 6481 +++-------
 misc/translator/po/fr-CA-opac-bootstrap.po         | 2190 +---
 misc/translator/po/fr-CA-opac-ccsr.po              |   43 +-
 misc/translator/po/fr-CA-pref.po                   |    5 +-
 misc/translator/po/fr-CA-staff-help.po             |12416 +++++--------------
 .../translator/po/fr-FR-i-opac-t-prog-v-3006000.po | 1879 +--
 .../po/fr-FR-i-staff-t-prog-v-3006000.po           | 6867 +++--------
 misc/translator/po/fr-FR-opac-bootstrap.po         | 2344 +---
 misc/translator/po/fr-FR-opac-ccsr.po              |   48 +-
 misc/translator/po/fr-FR-pref.po                   |    5 +-
 misc/translator/po/fr-FR-staff-help.po             |12700 +++++---------------
 misc/translator/po/gl-i-opac-t-prog-v-3006000.po   | 1264 +-
 misc/translator/po/gl-i-staff-t-prog-v-3006000.po  | 3623 ++----
 misc/translator/po/gl-opac-bootstrap.po            | 1286 +-
 misc/translator/po/gl-opac-ccsr.po                 |   48 +-
 misc/translator/po/gl-pref.po                      |    3 +-
 misc/translator/po/gl-staff-help.po                | 5952 ++-------
 .../po/he-Hebr-i-opac-t-prog-v-3006000.po          |  870 +-
 .../po/he-Hebr-i-staff-t-prog-v-3006000.po         | 3611 ++----
 misc/translator/po/he-Hebr-opac-bootstrap.po       | 1253 +-
 misc/translator/po/he-Hebr-opac-ccsr.po            |   23 +-
 misc/translator/po/he-Hebr-pref.po                 |    3 +-
 misc/translator/po/he-Hebr-staff-help.po           | 5952 ++-------
 misc/translator/po/hi-i-opac-t-prog-v-3006000.po   | 1101 +-
 misc/translator/po/hi-i-staff-t-prog-v-3006000.po  | 4060 +++----
 misc/translator/po/hi-opac-bootstrap.po            | 1495 +--
 misc/translator/po/hi-opac-ccsr.po                 |   23 +-
 misc/translator/po/hi-pref.po                      |    3 +-
 misc/translator/po/hi-staff-help.po                | 6507 +++-------
 .../translator/po/hr-HR-i-opac-t-prog-v-3006000.po | 1496 +--
 .../po/hr-HR-i-staff-t-prog-v-3006000.po           | 4066 +++----
 misc/translator/po/hr-HR-opac-bootstrap.po         | 1910 +--
 misc/translator/po/hr-HR-opac-ccsr.po              |   47 +-
 misc/translator/po/hr-HR-pref.po                   |    3 +-
 misc/translator/po/hr-HR-staff-help.po             | 6531 +++-------
 .../translator/po/hu-HU-i-opac-t-prog-v-3006000.po | 1408 +--
 .../po/hu-HU-i-staff-t-prog-v-3006000.po           | 4191 +++----
 misc/translator/po/hu-HU-opac-bootstrap.po         | 1753 +--
 misc/translator/po/hu-HU-opac-ccsr.po              |   47 +-
 misc/translator/po/hu-HU-pref.po                   |    3 +-
 misc/translator/po/hu-HU-staff-help.po             | 6355 +++-------
 .../po/hy-Armn-i-opac-t-prog-v-3006000.po          |    9 +-
 .../po/hy-Armn-i-staff-t-prog-v-3006000.po         | 1166 +-
 misc/translator/po/hy-Armn-opac-bootstrap.po       |  346 +-
 misc/translator/po/hy-Armn-opac-ccsr.po            |    1 -
 misc/translator/po/hy-Armn-pref.po                 |    4 +-
 misc/translator/po/hy-Armn-staff-help.po           |    1 -
 .../translator/po/id-ID-i-opac-t-prog-v-3006000.po | 1821 +--
 .../po/id-ID-i-staff-t-prog-v-3006000.po           | 3995 ++----
 misc/translator/po/id-ID-opac-bootstrap.po         | 2072 +---
 misc/translator/po/id-ID-opac-ccsr.po              |   23 +-
 misc/translator/po/id-ID-pref.po                   |    5 +-
 misc/translator/po/id-ID-staff-help.po             | 5957 +++------
 .../translator/po/is-IS-i-opac-t-prog-v-3006000.po | 1437 +--
 .../po/is-IS-i-staff-t-prog-v-3006000.po           | 3738 ++----
 misc/translator/po/is-IS-opac-bootstrap.po         | 1824 +--
 misc/translator/po/is-IS-opac-ccsr.po              |   27 +-
 misc/translator/po/is-IS-pref.po                   |    5 +-
 misc/translator/po/is-IS-staff-help.po             | 5958 +++------
 .../translator/po/it-IT-i-opac-t-prog-v-3006000.po |    1 -
 .../po/it-IT-i-staff-t-prog-v-3006000.po           | 1164 +-
 misc/translator/po/it-IT-opac-bootstrap.po         |  340 +-
 misc/translator/po/it-IT-opac-ccsr.po              |    1 -
 misc/translator/po/it-IT-pref.po                   |    5 +-
 misc/translator/po/it-IT-staff-help.po             |    1 -
 .../po/ja-Jpan-JP-i-opac-t-prog-v-3006000.po       | 1302 +-
 .../po/ja-Jpan-JP-i-staff-t-prog-v-3006000.po      | 3676 ++----
 misc/translator/po/ja-Jpan-JP-opac-bootstrap.po    | 1686 +--
 misc/translator/po/ja-Jpan-JP-opac-ccsr.po         |   23 +-
 misc/translator/po/ja-Jpan-JP-pref.po              |    3 +-
 misc/translator/po/ja-Jpan-JP-staff-help.po        | 5952 ++-------
 .../translator/po/km-KH-i-opac-t-prog-v-3006000.po |  870 +-
 .../po/km-KH-i-staff-t-prog-v-3006000.po           | 3592 ++----
 misc/translator/po/km-KH-opac-bootstrap.po         | 1253 +-
 misc/translator/po/km-KH-opac-ccsr.po              |   23 +-
 misc/translator/po/km-KH-pref.po                   |    3 +-
 misc/translator/po/km-KH-staff-help.po             | 5952 ++-------
 .../po/kn-Knda-i-opac-t-prog-v-3006000.po          |  898 +-
 .../po/kn-Knda-i-staff-t-prog-v-3006000.po         | 3741 ++----
 misc/translator/po/kn-Knda-opac-bootstrap.po       | 1285 +-
 misc/translator/po/kn-Knda-opac-ccsr.po            |   23 +-
 misc/translator/po/kn-Knda-pref.po                 |    3 +-
 misc/translator/po/kn-Knda-staff-help.po           | 5963 +++------
 .../po/ko-Kore-KP-i-opac-t-prog-v-3006000.po       |  925 +-
 .../po/ko-Kore-KP-i-staff-t-prog-v-3006000.po      | 3635 ++----
 misc/translator/po/ko-Kore-KP-opac-bootstrap.po    | 1308 +-
 misc/translator/po/ko-Kore-KP-opac-ccsr.po         |   23 +-
 misc/translator/po/ko-Kore-KP-pref.po              |    3 +-
 misc/translator/po/ko-Kore-KP-staff-help.po        | 5952 ++-------
 .../po/ku-Arab-i-opac-t-prog-v-3006000.po          | 1704 +--
 .../po/ku-Arab-i-staff-t-prog-v-3006000.po         | 5145 +++-----
 misc/translator/po/ku-Arab-opac-bootstrap.po       | 2102 +---
 misc/translator/po/ku-Arab-opac-ccsr.po            |   38 +-
 misc/translator/po/ku-Arab-pref.po                 |   11 +-
 misc/translator/po/ku-Arab-staff-help.po           | 9877 ++++-----------
 .../po/lo-Laoo-i-opac-t-prog-v-3006000.po          | 1426 +--
 .../po/lo-Laoo-i-staff-t-prog-v-3006000.po         | 3854 ++----
 misc/translator/po/lo-Laoo-opac-bootstrap.po       | 1820 +--
 misc/translator/po/lo-Laoo-opac-ccsr.po            |   35 +-
 misc/translator/po/lo-Laoo-pref.po                 |    3 +-
 misc/translator/po/lo-Laoo-staff-help.po           | 5952 ++-------
 .../translator/po/mi-NZ-i-opac-t-prog-v-3006000.po | 1060 +-
 .../po/mi-NZ-i-staff-t-prog-v-3006000.po           | 3651 ++----
 misc/translator/po/mi-NZ-opac-bootstrap.po         | 1443 +--
 misc/translator/po/mi-NZ-opac-ccsr.po              |   26 +-
 misc/translator/po/mi-NZ-pref.po                   |    3 +-
 misc/translator/po/mi-NZ-staff-help.po             | 5952 ++-------
 misc/translator/po/mon-i-opac-t-prog-v-3006000.po  | 1037 +-
 misc/translator/po/mon-i-staff-t-prog-v-3006000.po | 4283 +++----
 misc/translator/po/mon-opac-bootstrap.po           | 1423 +--
 misc/translator/po/mon-opac-ccsr.po                |   26 +-
 misc/translator/po/mon-pref.po                     |    3 +-
 misc/translator/po/mon-staff-help.po               | 6462 +++-------
 misc/translator/po/mr-i-opac-t-prog-v-3006000.po   |  897 +-
 misc/translator/po/mr-i-staff-t-prog-v-3006000.po  | 3909 ++----
 misc/translator/po/mr-opac-bootstrap.po            | 1280 +-
 misc/translator/po/mr-opac-ccsr.po                 |   23 +-
 misc/translator/po/mr-pref.po                      |    3 +-
 misc/translator/po/mr-staff-help.po                | 5978 +++------
 .../translator/po/ms-MY-i-opac-t-prog-v-3006000.po | 1679 +--
 .../po/ms-MY-i-staff-t-prog-v-3006000.po           | 4418 +++----
 misc/translator/po/ms-MY-opac-bootstrap.po         | 2075 +---
 misc/translator/po/ms-MY-opac-ccsr.po              |   27 +-
 misc/translator/po/ms-MY-pref.po                   |    3 +-
 misc/translator/po/ms-MY-staff-help.po             | 6052 +++-------
 .../translator/po/nb-NO-i-opac-t-prog-v-3006000.po | 1710 +--
 .../po/nb-NO-i-staff-t-prog-v-3006000.po           | 6169 +++-------
 misc/translator/po/nb-NO-opac-bootstrap.po         | 2144 +---
 misc/translator/po/nb-NO-opac-ccsr.po              |   47 +-
 misc/translator/po/nb-NO-pref.po                   |    5 +-
 misc/translator/po/nb-NO-staff-help.po             | 7037 +++--------
 .../translator/po/ne-NE-i-opac-t-prog-v-3006000.po |  870 +-
 .../po/ne-NE-i-staff-t-prog-v-3006000.po           | 3592 ++----
 misc/translator/po/ne-NE-opac-bootstrap.po         | 1253 +-
 misc/translator/po/ne-NE-opac-ccsr.po              |   23 +-
 misc/translator/po/ne-NE-pref.po                   |    3 +-
 misc/translator/po/ne-NE-staff-help.po             | 5952 ++-------
 .../translator/po/nl-BE-i-opac-t-prog-v-3006000.po | 1809 +--
 .../po/nl-BE-i-staff-t-prog-v-3006000.po           | 4729 +++-----
 misc/translator/po/nl-BE-opac-bootstrap.po         | 2218 +---
 misc/translator/po/nl-BE-opac-ccsr.po              |   48 +-
 misc/translator/po/nl-BE-pref.po                   |    5 +-
 misc/translator/po/nl-BE-staff-help.po             | 7101 +++--------
 .../translator/po/nl-NL-i-opac-t-prog-v-3006000.po | 1697 +--
 .../po/nl-NL-i-staff-t-prog-v-3006000.po           | 3727 ++----
 misc/translator/po/nl-NL-opac-bootstrap.po         | 2261 +---
 misc/translator/po/nl-NL-opac-ccsr.po              |   26 +-
 misc/translator/po/nl-NL-pref.po                   |    3 +-
 misc/translator/po/nl-NL-staff-help.po             | 5962 +++------
 .../translator/po/nn-NO-i-opac-t-prog-v-3006000.po | 1004 +-
 .../po/nn-NO-i-staff-t-prog-v-3006000.po           | 4273 +++----
 misc/translator/po/nn-NO-opac-bootstrap.po         | 1387 +--
 misc/translator/po/nn-NO-opac-ccsr.po              |   23 +-
 misc/translator/po/nn-NO-pref.po                   |    3 +-
 misc/translator/po/nn-NO-staff-help.po             | 6302 +++-------
 misc/translator/po/pbr-i-opac-t-prog-v-3006000.po  |  870 +-
 misc/translator/po/pbr-i-staff-t-prog-v-3006000.po | 3592 ++----
 misc/translator/po/pbr-opac-bootstrap.po           | 1253 +-
 misc/translator/po/pbr-opac-ccsr.po                |   23 +-
 misc/translator/po/pbr-pref.po                     |    3 +-
 misc/translator/po/pbr-staff-help.po               | 5952 ++-------
 .../translator/po/pl-PL-i-opac-t-prog-v-3006000.po | 1764 +--
 .../po/pl-PL-i-staff-t-prog-v-3006000.po           | 6436 +++-------
 misc/translator/po/pl-PL-opac-bootstrap.po         | 2160 +---
 misc/translator/po/pl-PL-opac-ccsr.po              |   52 +-
 misc/translator/po/pl-PL-pref.po                   |    5 +-
 misc/translator/po/pl-PL-staff-help.po             |11714 ++++--------------
 misc/translator/po/prs-i-opac-t-prog-v-3006000.po  |  870 +-
 misc/translator/po/prs-i-staff-t-prog-v-3006000.po | 3615 ++----
 misc/translator/po/prs-opac-bootstrap.po           | 1253 +-
 misc/translator/po/prs-opac-ccsr.po                |   23 +-
 misc/translator/po/prs-pref.po                     |    3 +-
 misc/translator/po/prs-staff-help.po               | 5952 ++-------
 .../translator/po/pt-BR-i-opac-t-prog-v-3006000.po | 1841 +--
 .../po/pt-BR-i-staff-t-prog-v-3006000.po           | 6135 +++-------
 misc/translator/po/pt-BR-opac-bootstrap.po         | 2275 +---
 misc/translator/po/pt-BR-opac-ccsr.po              |   48 +-
 misc/translator/po/pt-BR-pref.po                   |    5 +-
 misc/translator/po/pt-BR-staff-help.po             |12449 +++++--------------
 .../translator/po/pt-PT-i-opac-t-prog-v-3006000.po | 1844 +--
 .../po/pt-PT-i-staff-t-prog-v-3006000.po           | 6572 +++-------
 misc/translator/po/pt-PT-opac-bootstrap.po         | 2279 +---
 misc/translator/po/pt-PT-opac-ccsr.po              |   47 +-
 misc/translator/po/pt-PT-pref.po                   |    5 +-
 misc/translator/po/pt-PT-staff-help.po             |12301 +++++--------------
 .../translator/po/ro-RO-i-opac-t-prog-v-3006000.po | 1537 +--
 .../po/ro-RO-i-staff-t-prog-v-3006000.po           | 4591 +++----
 misc/translator/po/ro-RO-opac-bootstrap.po         | 1924 +--
 misc/translator/po/ro-RO-opac-ccsr.po              |   30 +-
 misc/translator/po/ro-RO-pref.po                   |    5 +-
 misc/translator/po/ro-RO-staff-help.po             | 7146 +++--------
 .../translator/po/ru-RU-i-opac-t-prog-v-3006000.po | 2034 +---
 .../po/ru-RU-i-staff-t-prog-v-3006000.po           | 5911 +++------
 misc/translator/po/ru-RU-opac-bootstrap.po         | 2442 +---
 misc/translator/po/ru-RU-opac-ccsr.po              |   51 +-
 misc/translator/po/ru-RU-pref.po                   |    5 +-
 misc/translator/po/ru-RU-staff-help.po             | 6671 +++-------
 .../translator/po/rw-RW-i-opac-t-prog-v-3006000.po |  923 +-
 .../po/rw-RW-i-staff-t-prog-v-3006000.po           | 3592 ++----
 misc/translator/po/rw-RW-opac-bootstrap.po         | 1253 +-
 misc/translator/po/rw-RW-opac-ccsr.po              |   23 +-
 misc/translator/po/rw-RW-pref.po                   |    3 +-
 misc/translator/po/rw-RW-staff-help.po             | 5952 ++-------
 .../translator/po/sd-PK-i-opac-t-prog-v-3006000.po |  873 +-
 .../po/sd-PK-i-staff-t-prog-v-3006000.po           | 3592 ++----
 misc/translator/po/sd-PK-opac-bootstrap.po         | 1256 +-
 misc/translator/po/sd-PK-opac-ccsr.po              |   26 +-
 misc/translator/po/sd-PK-pref.po                   |    3 +-
 misc/translator/po/sd-PK-staff-help.po             | 5952 ++-------
 .../translator/po/sk-SK-i-opac-t-prog-v-3006000.po |    1 -
 .../po/sk-SK-i-staff-t-prog-v-3006000.po           | 1163 +-
 misc/translator/po/sk-SK-opac-bootstrap.po         |  349 +-
 misc/translator/po/sk-SK-opac-ccsr.po              |    1 -
 misc/translator/po/sk-SK-pref.po                   |    5 +-
 misc/translator/po/sk-SK-staff-help.po             |    1 -
 .../translator/po/sl-SI-i-opac-t-prog-v-3006000.po |  873 +-
 .../po/sl-SI-i-staff-t-prog-v-3006000.po           | 3592 ++----
 misc/translator/po/sl-SI-opac-bootstrap.po         | 1256 +-
 misc/translator/po/sl-SI-opac-ccsr.po              |   26 +-
 misc/translator/po/sl-SI-pref.po                   |    3 +-
 misc/translator/po/sl-SI-staff-help.po             | 5952 ++-------
 .../translator/po/sq-AL-i-opac-t-prog-v-3006000.po | 1595 +--
 .../po/sq-AL-i-staff-t-prog-v-3006000.po           | 3767 ++----
 misc/translator/po/sq-AL-opac-bootstrap.po         | 1253 +-
 misc/translator/po/sq-AL-opac-ccsr.po              |   23 +-
 misc/translator/po/sq-AL-pref.po                   |    5 +-
 misc/translator/po/sq-AL-staff-help.po             | 5952 ++-------
 .../po/sr-Cyrl-i-opac-t-prog-v-3006000.po          |  988 +-
 .../po/sr-Cyrl-i-staff-t-prog-v-3006000.po         | 3592 ++----
 misc/translator/po/sr-Cyrl-opac-bootstrap.po       | 1371 +--
 misc/translator/po/sr-Cyrl-opac-ccsr.po            |   23 +-
 misc/translator/po/sr-Cyrl-pref.po                 |    3 +-
 misc/translator/po/sr-Cyrl-staff-help.po           | 5952 ++-------
 .../translator/po/sv-SE-i-opac-t-prog-v-3006000.po | 1663 +--
 .../po/sv-SE-i-staff-t-prog-v-3006000.po           | 5995 +++------
 misc/translator/po/sv-SE-opac-bootstrap.po         | 2169 +---
 misc/translator/po/sv-SE-opac-ccsr.po              |   47 +-
 misc/translator/po/sv-SE-pref.po                   |    5 +-
 misc/translator/po/sv-SE-staff-help.po             |11574 ++++--------------
 .../translator/po/sw-KE-i-opac-t-prog-v-3006000.po | 1011 +-
 .../po/sw-KE-i-staff-t-prog-v-3006000.po           | 3592 ++----
 misc/translator/po/sw-KE-opac-bootstrap.po         | 1253 +-
 misc/translator/po/sw-KE-opac-ccsr.po              |   23 +-
 misc/translator/po/sw-KE-pref.po                   |    3 +-
 misc/translator/po/sw-KE-staff-help.po             | 5952 ++-------
 .../translator/po/ta-LK-i-opac-t-prog-v-3006000.po |  870 +-
 .../po/ta-LK-i-staff-t-prog-v-3006000.po           | 3592 ++----
 misc/translator/po/ta-LK-opac-bootstrap.po         | 1253 +-
 misc/translator/po/ta-LK-opac-ccsr.po              |   23 +-
 misc/translator/po/ta-LK-pref.po                   |    3 +-
 misc/translator/po/ta-LK-staff-help.po             | 5952 ++-------
 misc/translator/po/ta-i-opac-t-prog-v-3006000.po   |  958 +-
 misc/translator/po/ta-i-staff-t-prog-v-3006000.po  | 3600 ++----
 misc/translator/po/ta-opac-bootstrap.po            | 1284 +-
 misc/translator/po/ta-opac-ccsr.po                 |   48 +-
 misc/translator/po/ta-pref.po                      |    3 +-
 misc/translator/po/ta-staff-help.po                | 5952 ++-------
 misc/translator/po/tet-i-opac-t-prog-v-3006000.po  | 1681 +--
 misc/translator/po/tet-i-staff-t-prog-v-3006000.po | 4804 +++-----
 misc/translator/po/tet-opac-bootstrap.po           | 1977 +--
 misc/translator/po/tet-opac-ccsr.po                |   39 +-
 misc/translator/po/tet-pref.po                     |    3 +-
 misc/translator/po/tet-staff-help.po               | 6491 +++-------
 .../translator/po/th-TH-i-opac-t-prog-v-3006000.po | 1301 +-
 .../po/th-TH-i-staff-t-prog-v-3006000.po           | 3592 ++----
 misc/translator/po/th-TH-opac-bootstrap.po         | 1687 +--
 misc/translator/po/th-TH-opac-ccsr.po              |   26 +-
 misc/translator/po/th-TH-pref.po                   |    3 +-
 misc/translator/po/th-TH-staff-help.po             | 5952 ++-------
 .../translator/po/tl-PH-i-opac-t-prog-v-3006000.po |  915 +-
 .../po/tl-PH-i-staff-t-prog-v-3006000.po           | 3762 ++----
 misc/translator/po/tl-PH-opac-bootstrap.po         | 1303 +-
 misc/translator/po/tl-PH-opac-ccsr.po              |   23 +-
 misc/translator/po/tl-PH-pref.po                   |    3 +-
 misc/translator/po/tl-PH-staff-help.po             | 5952 ++-------
 .../translator/po/tr-TR-i-opac-t-prog-v-3006000.po |    1 -
 .../po/tr-TR-i-staff-t-prog-v-3006000.po           | 1150 +-
 misc/translator/po/tr-TR-opac-bootstrap.po         |  340 +-
 misc/translator/po/tr-TR-opac-ccsr.po              |    1 -
 misc/translator/po/tr-TR-pref.po                   |    5 +-
 misc/translator/po/tr-TR-staff-help.po             |    1 -
 .../translator/po/uk-UA-i-opac-t-prog-v-3006000.po | 2105 +---
 .../po/uk-UA-i-staff-t-prog-v-3006000.po           | 6138 +++-------
 misc/translator/po/uk-UA-opac-bootstrap.po         | 2523 +---
 misc/translator/po/uk-UA-opac-ccsr.po              |   54 +-
 misc/translator/po/uk-UA-pref.po                   |    5 +-
 misc/translator/po/uk-UA-staff-help.po             | 7013 +++--------
 .../po/ur-Arab-i-opac-t-prog-v-3006000.po          |  873 +-
 .../po/ur-Arab-i-staff-t-prog-v-3006000.po         | 3592 ++----
 misc/translator/po/ur-Arab-opac-bootstrap.po       | 1256 +-
 misc/translator/po/ur-Arab-opac-ccsr.po            |   26 +-
 misc/translator/po/ur-Arab-pref.po                 |    3 +-
 misc/translator/po/ur-Arab-staff-help.po           | 5952 ++-------
 .../translator/po/vi-VN-i-opac-t-prog-v-3006000.po | 1846 +--
 .../po/vi-VN-i-staff-t-prog-v-3006000.po           | 6751 +++--------
 misc/translator/po/vi-VN-opac-bootstrap.po         | 2189 +---
 misc/translator/po/vi-VN-pref.po                   |    5 +-
 misc/translator/po/vi-VN-staff-help.po             |11979 +++++-------------
 .../po/zh-Hans-CN-i-opac-t-prog-v-3006000.po       | 1382 +--
 .../po/zh-Hans-CN-i-staff-t-prog-v-3006000.po      | 4717 +++-----
 misc/translator/po/zh-Hans-CN-opac-bootstrap.po    | 1788 +--
 misc/translator/po/zh-Hans-CN-opac-ccsr.po         |   32 +-
 misc/translator/po/zh-Hans-CN-pref.po              |    5 +-
 misc/translator/po/zh-Hans-CN-staff-help.po        | 7729 +++---------
 .../po/zh-Hans-TW-i-opac-t-prog-v-3006000.po       | 1375 +--
 .../po/zh-Hans-TW-i-staff-t-prog-v-3006000.po      | 4716 +++-----
 misc/translator/po/zh-Hans-TW-opac-bootstrap.po    | 1799 +--
 misc/translator/po/zh-Hans-TW-opac-ccsr.po         |   32 +-
 misc/translator/po/zh-Hans-TW-pref.po              |    5 +-
 misc/translator/po/zh-Hans-TW-staff-help.po        | 7720 +++---------
 435 files changed, 247807 insertions(+), 723696 deletions(-)
 create mode 100644 misc/release_notes/release_notes_3_16_13.html
 copy misc/release_notes/{release_notes_3_16_8.txt => release_notes_3_16_13.txt} (50%)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Thu Jul 30 07:26:48 2015
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Thu, 30 Jul 2015 05:26:48 +0000
Subject: [koha-commits] main Koha release repository annotated tag v3.16.13
	created. v3.16.13
Message-ID: <E1ZKgMi-00067M-Kq@git.koha-community.org>

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 annotated tag, v3.16.13 has been created
        at  7162160e66523b65a3db8dea095a1d913bd4093b (tag)
   tagging  71a69181b1ea37df86cbeeafd34e9704104a22b5 (commit)
  replaces  v3.16.12
 tagged by  Mason James
        on  Thu Jul 30 17:26:43 2015 +1200

- Log -----------------------------------------------------------------
Koha Release 3.16.13

Aleisha (3):
      Bug 14186: Undefined $reservedfor causes warn in opac-reserve.pl
      Bug 14185: Undefined $limit causes warn in opac/opac-readingrecord.pl
      Bug 14184: Undefined $term causes noisy warns in C4/CourseReserves.pm

Barton Chittenden (1):
      Bug 14324: Set "adultborrower" regardless of guarantor status.

Bernardo Gonzalez Kriegel (3):
      Bug 14275: Remove CGI::scrolling_list from guided_reports.pl
      Bug 14173: Paging on 'recent comments' page in OPAC is not displaying correctly
      Translation updates for Koha 3.16.13 release

David Cook (3):
      Replace trim() with $.trim() in opac-shareshelf.tt
      Bug 14366 - Units doesn't get saved usefully for patroncards
      Bug 14521 - SQL injection in local use system preferences

Eivin Giske Skaaren (1):
      Bug 14421: Corrected example in SMS.pm to working version with hashref.

Fridolin Somers (6):
      Bug 14440: get_template_and_user can not have an empty template_name (updatesupplier.pl)
      ?Bug 14440: get_template_and_user can not have an empty template_name (opac-ratings.pl)
      Bug 14440: get_template_and_user can not have an empty template_name (opac-ratings.pl)
      Bug 14440: get_template_and_user can not have an empty template_name (opac-ratings.pl)
      Bug 14453: kohaidx is missing for id in authority-koha-indexdefs.xml
      Bug 14485 - HTML comment disables translation in cataloguing/addbooks.tt

Indranil Das Gupta (3):
      Bug 14186 [QA Followup]: Undefined $reservedfor causes warn in opac-reserve.pl
      Bug 14203 - Message for non-existent lang removal
      Bug 14135: Adds 'Free' to variabletypes in systempreferences.tt

Jonathan Druart (10):
      Bug 14266: Trim the email address in the pl script
      Bug 11790: Remove dependency C4::Context from C4::Charset
      Bug 10355: paramater 'object' lost on the road
      Bug 14426: Escape or use placeholders for sql parameters
      ?Bug 14440: get_template_and_user can not have an empty template_name (quote*_ajax.pl)
      Bug 10866: Hide patron's history if intranetreadinghistory is set to not allow
      Bug 8802: On editing a library group category type is not set
      Bug 14324: Display "Add Child" for Organisations on circ/circulation.pl
      Bug 14524: Don't escape query_cgi with uri
      Bug 12411: Preferences values should be utf8 encoded

Julian FIOL (1):
      Bug 14496 : Improving opac-detail.pl performances

Katrin Fischer (8):
      Bug 14130: Update columns.def
      Bug 13946: Change order status 'Pending' to 'Ordered'
      Bug 8686: Raise required version of URI::Escape to 3.31
      Bug 13427: jQuery Timepicker is not translated on returns page
      Bug 14215: Change the 'delimiter' syspref description for its wider use
      Bug 14401: Zebra index configuration doesn't allow exact search for C.
      Bug 13874: 'Rotating collections' are a circulation tool
      Bug 14356: Improvements to the 'Transfers to receive' page

Kyle M Hall (3):
      Bug 12066: New renew page in staff client doesn't record branch in statistics
      Bug 14467 - Security updates break some Koha plugins
      Bug 14338 - Unable to delete patron images [3.16.x]

Liz Rea (1):
      Bug 14389 - Editing a syspref in a textarea does not enable the Save button

Marc V?ron (1):
      Bug 11929: patron modification error shows borrowernumber

Marcel de Rooy (2):
      Bug 14276: Keep highlight on the active item in item editor
      Bug 14329: Useless copy/pasta from Template::Plugin::HtmlToText

Mark Tompsett (4):
      Bug 14112 - Silence warnings in t/Charset.t
      Bug 14422: Typo in updatedatabase.pl
      Bug 14001 - Inventory has bad $_ references
      Bug 4925: Remove Smithsonian as a delivered z39.50 target [3.16.x]

Mason James (4):
      Bug 14602 - Fix failing t/Creators.t test
      Revert "Bug 14602 - Fix failing t/Creators.t test"
      Add release notes
      Bumping version number for release

Mirko Tietgen (1):
      Bug 14453: (followup) Fix shipped XSLT files

Tomas Cohen Arazi (1):
      Bug 12647: PQF QueryParser driver and unit tests fixes

Winona Salesky (1):
      Bug 14326 - XSLT Syntax error in MARC21slimOPACResults.xsl

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


hooks/post-receive
-- 
main Koha release repository