From gitmaster at git.koha-community.org  Mon Aug  3 16:59:50 2015
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Mon, 03 Aug 2015 14:59:50 +0000
Subject: [koha-commits] main Koha release repository branch master updated.
	v3.20.00-363-g6056382
Message-ID: <E1ZMHDR-0003mL-VK@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  605638243aa6d3db8784f54a4687a850646f6f54 (commit)
       via  b7e40ce3fba6a6bcfbb6694bf5875a315b3f6e53 (commit)
       via  db6bd7965d67b743cdaa8f47dc1b071208d4e8d3 (commit)
       via  7e7785ac76d751051d869dbf62cb6713b90f51bb (commit)
       via  3e9b80e0a510715d6d571beb162955c77dd47fb7 (commit)
      from  04d09249a650056cc9cfb9fe0441bf3d80e6ae4a (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 605638243aa6d3db8784f54a4687a850646f6f54
Author: Hector Castro <hector.hecaxmmx at gmail.com>
Date:   Thu Jul 16 15:40:14 2015 -0600

    Bug 14548: Typo in help file for 3.20 (batch_record_modification.tt)
    
    Typo found in batch_record_modification.tt file for Koha help in 3.20
    
    Test plan:
    1) Go to url 'koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/batch_record_modification.tt:20' and check the typo "critera" or go to Tools ? Batch record modification, 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: Aleisha <aleishaamohia at hotmail.com>
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>

commit b7e40ce3fba6a6bcfbb6694bf5875a315b3f6e53
Author: Hector Castro <hector.hecaxmmx at gmail.com>
Date:   Thu Jul 16 14:35:52 2015 -0600

    Bug 14547: Typo in help file for 3.20 (basket.tt)
    
    Typo found in basket.tt file for Koha help in 3.20
    
    Test plan:
    1) Go to url 'koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/basket.tt:24' and check the typo "susbscription" or go to Acqusitions > create or view an existing basket, 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: Aleisha <aleishaamohia at hotmail.com>
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>

commit db6bd7965d67b743cdaa8f47dc1b071208d4e8d3
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date:   Sun Jul 26 19:07:19 2015 +1200

    Bug 7143: New developers
    
    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 7e7785ac76d751051d869dbf62cb6713b90f51bb
Author: Tomas Cohen Arazi <tomascohen at gmail.com>
Date:   Wed May 27 14:49:09 2015 -0300

    Bug 7143: Add missing people to history.txt
    
    Indranil Das Gupta needs to be included. Emmanuele Somma was
    missed a while back, so adding ad shifting numbers for people after her.
    
    Some tab fixes too, I don't have the time to fix them all.
    
    Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
    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 theke.io>

commit 3e9b80e0a510715d6d571beb162955c77dd47fb7
Author: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Date:   Thu May 8 15:48:42 2014 +0000

    Bug 12216: One should be able to override zebra config
    
    One should be able to override zebra configuration on a per instance
    basis.  This patch adds /etc/koha/sites/instance to the 'profilePath'
    in the zebra config files such that that location is sources first
    for any override config files.
    
    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
    Great catch Martin. I thought this was already pushed by the way.
    
    Signed-off-by: Robin Sheat <robin at catalyst.net.nz>
    This will be useful.
    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>

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

Summary of changes:
 debian/templates/zebra-authorities-dom-site.cfg.in |    2 +-
 debian/templates/zebra-authorities-site.cfg.in     |    2 +-
 debian/templates/zebra-biblios-dom-site.cfg.in     |    2 +-
 debian/templates/zebra-biblios-site.cfg.in         |    2 +-
 docs/history.txt                                   |   43 ++++++++++++--------
 koha-tmpl/intranet-tmpl/prog/en/modules/about.tt   |    5 +++
 .../prog/en/modules/help/acqui/basket.tt           |    2 +-
 .../help/tools/batch_record_modification.tt        |    2 +-
 8 files changed, 36 insertions(+), 24 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Tue Aug  4 03:04:40 2015
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Tue, 04 Aug 2015 01:04:40 +0000
Subject: [koha-commits] main Koha release repository branch 3.18.x updated.
	v3.18.09-3-g5e58767
Message-ID: <E1ZMQel-00034V-Uh@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  5e587672d2601c34326c81e888512b67008ec971 (commit)
       via  e81c07bd5161b6966897d207a04f37e782066469 (commit)
      from  6d6c6c1d9f3ab7126415d9695068656b9e98ccb9 (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 5e587672d2601c34326c81e888512b67008ec971
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>
    Signed-off-by: Liz Rea <wizzyrea at gmail.com>

commit e81c07bd5161b6966897d207a04f37e782066469
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>
    Signed-off-by: Liz Rea <wizzyrea at gmail.com>

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

Summary of changes:
 C4/Circulation.pm |   32 +++++++++++++-------------------
 1 file changed, 13 insertions(+), 19 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Tue Aug  4 03:38:41 2015
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Tue, 04 Aug 2015 01:38:41 +0000
Subject: [koha-commits] main Koha release repository branch 3.18.x updated.
	v3.18.09-4-gcab3bc9
Message-ID: <E1ZMRBh-000489-4V@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  cab3bc91ddb9aa3644a9c71a607ba1b724f958cc (commit)
      from  5e587672d2601c34326c81e888512b67008ec971 (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 cab3bc91ddb9aa3644a9c71a607ba1b724f958cc
Author: Jonathan Druart <jonathan.druart at koha-community.org>
Date:   Sun May 24 18:00:57 2015 +0200

    Bug 14263: Fix export of item search results when translated
    
    This csv does not use the correct way to display headers.
    They should be put in a separate file to get a correct display.
    Without this patch, the first line of the generated file contains the
    headers + data
    
    Test plan:
    1/ choose a language and update + translate the templates
    for instance:
      cd misc/translate;
      ./translate update es-ES; ./translate install es-ES
    2/ Go to the item search form using this language
    3/ Launch a search and select CSV to display the results.
    The CSV headers should be correct
    
    Signed-off-by: Frederic Demians <f.demians at tamil.fr>
      Seen the bug. Works as described.
    
    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 ece2b02a57fdb692c02f00540df436af1f5ba971)
    Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
    Signed-off-by: Liz Rea <wizzyrea at gmail.com>

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

Summary of changes:
 catalogue/itemsearch.pl                                           |    5 ++++-
 .../prog/en/includes/catalogue/itemsearch_item.csv.inc            |    2 +-
 .../csv_headers/catalogue/itemsearch.tt}                          |    3 ---
 .../intranet-tmpl/prog/en/modules/catalogue/itemsearch_csv.tt     |    2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)
 copy koha-tmpl/intranet-tmpl/prog/en/{modules/catalogue/itemsearch_csv.tt => includes/csv_headers/catalogue/itemsearch.tt} (59%)
 create mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/empty_line.inc


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Tue Aug  4 23:11:34 2015
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Tue, 04 Aug 2015 21:11:34 +0000
Subject: [koha-commits] main Koha release repository branch 3.20.x updated.
	v3.20.02-6-gb0cf008
Message-ID: <E1ZMjUk-00012N-8j@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  b0cf008cf2cdc18e5622b21efa89a29d02ba4a28 (commit)
       via  ff428414633db7db9024d2468f4daafdf2a23132 (commit)
      from  7abf1d9a184dd7cc2805f05e921a883871092b33 (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 b0cf008cf2cdc18e5622b21efa89a29d02ba4a28
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>
    (cherry picked from commit 7098a36b19c35a06a51361bd381416a1204de38d)
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

commit ff428414633db7db9024d2468f4daafdf2a23132
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>
    (cherry picked from commit fe3a49e61133e1e66d0075f3300cd3a99e691890)
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

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

Summary of changes:
 koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tt |    6 +++---
 tools/letter.pl                                         |    4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Wed Aug  5 05:01:54 2015
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Wed, 05 Aug 2015 03:01:54 +0000
Subject: [koha-commits] main Koha release repository branch 3.20.x updated.
	v3.20.02-10-g8273c56
Message-ID: <E1ZMoxm-0002wK-7k@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  8273c561842756efa89296a40eead4416e33091f (commit)
       via  bc668cb1fb2c90bf5e91d74616e005afc444eb63 (commit)
       via  e3b5e751fb37a6b0917f2fd54258dbbcdf57ff9f (commit)
       via  cb69ce69c8facfdf979477a5d803660e90954c33 (commit)
      from  b0cf008cf2cdc18e5622b21efa89a29d02ba4a28 (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 8273c561842756efa89296a40eead4416e33091f
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>
    (cherry picked from commit fa54a6f04d5e84f8747d268efc2e0e1d175a1ecb)
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

commit bc668cb1fb2c90bf5e91d74616e005afc444eb63
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>
    (cherry picked from commit 7d4e7e4e525fc99cb4452de135e161a0e0866753)
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

commit e3b5e751fb37a6b0917f2fd54258dbbcdf57ff9f
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>
    (cherry picked from commit 0183cc0223678f6b3f0885213c7223ddb31acf5d)
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

commit cb69ce69c8facfdf979477a5d803660e90954c33
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>
    (cherry picked from commit e9061028c1ba95b310be5e9333b224e735e64f40)
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

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

Summary of changes:
 C4/Members/Attributes.pm                              |    2 +-
 installer/data/mysql/kohastructure.sql                |    4 ++--
 .../prog/en/modules/help/tools/stage-marc-import.tt   |    5 +++--
 .../opac-tmpl/bootstrap/en/modules/sco/sco-main.tt    |   17 ++++++++++++++---
 4 files changed, 20 insertions(+), 8 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Wed Aug  5 23:23:09 2015
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Wed, 05 Aug 2015 21:23:09 +0000
Subject: [koha-commits] main Koha release repository branch 3.18.x updated.
	v3.18.09-5-g1277854
Message-ID: <E1ZN69V-0002qh-51@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  1277854315c99dc9f9238aa5a92706ce011d6fb1 (commit)
      from  cab3bc91ddb9aa3644a9c71a607ba1b724f958cc (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 1277854315c99dc9f9238aa5a92706ce011d6fb1
Author: Liz Rea <wizzyrea at gmail.com>
Date:   Wed Jul 22 06:40:35 2015 +0000

    Bug 14586 - Update about page with new 3.18 release team
    
    To test:
    
    Look at more -> about koha in the staff client, Koha team tab. It should list the correct names for the release maintainers.
    
    Signed-off-by: Mirko Tietgen <mirko at abunchofthings.net>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    Signed-off-by: Liz Rea <wizzyrea at gmail.com>

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

Summary of changes:
 koha-tmpl/intranet-tmpl/prog/en/modules/about.tt |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Sun Aug  9 23:28:47 2015
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Sun, 09 Aug 2015 21:28:47 +0000
Subject: [koha-commits] main Koha release repository branch 3.20.x updated.
	v3.20.02-14-g0b03b75
Message-ID: <E1ZOY99-000874-3i@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  0b03b756f9f6aebcbdfe169a57de6c7fe9e97855 (commit)
       via  f5b38743c5676254d15801bac1529be4d6d2361a (commit)
       via  8ffe9410af465e618ddf4e59c97c3797cfdd4866 (commit)
       via  795f31107ebd90951169177541daa1fe7590a375 (commit)
      from  8273c561842756efa89296a40eead4416e33091f (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 0b03b756f9f6aebcbdfe169a57de6c7fe9e97855
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>
    (cherry picked from commit 2eded5f165eb1cc175bc61a93c1b5b7c8f5ac02f)
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

commit f5b38743c5676254d15801bac1529be4d6d2361a
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>
    (cherry picked from commit fa5104a6a1c7e3b0bcb232e4d888066dd20eebe8)
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

commit 8ffe9410af465e618ddf4e59c97c3797cfdd4866
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>
    (cherry picked from commit f3a8b7a0e1e1bf112628c6215105ab80f25ed94f)
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

commit 795f31107ebd90951169177541daa1fe7590a375
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>
    (cherry picked from commit 5e1474836024a9ccd1a9fb4eef91641fba6f8598)
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

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

Summary of changes:
 C4/Items.pm                                        |    8 ++--
 Koha/Filter/MARC/EmbedSeeFromHeadings.pm           |    5 ++
 t/db_dependent/Items.t                             |    5 +-
 .../RecordProcessor_EmbedSeeFromHeadings.t         |   48 ++++++++++++++++++++
 4 files changed, 61 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Sun Aug  9 23:35:36 2015
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Sun, 09 Aug 2015 21:35:36 +0000
Subject: [koha-commits] main Koha release repository branch 3.20.x updated.
	v3.20.02-15-g5f3315c
Message-ID: <E1ZOYFk-0008Ir-7w@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  5f3315c1fb3e558f650c09e012087949c177eba3 (commit)
      from  0b03b756f9f6aebcbdfe169a57de6c7fe9e97855 (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 5f3315c1fb3e558f650c09e012087949c177eba3
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>
    (cherry picked from commit f7ed250d618c57a3fc00728bbb93460b25ceda52)
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

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

Summary of changes:
 opac/opac-memberentry.pl         |    2 ++
 opac/opac-registration-verify.pl |    2 ++
 2 files changed, 4 insertions(+)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Mon Aug 10 22:59:34 2015
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Mon, 10 Aug 2015 20:59:34 +0000
Subject: [koha-commits] main Koha release repository branch 3.20.x updated.
	v3.20.02-16-g2dec35f
Message-ID: <E1ZOuAQ-0000sR-MB@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  2dec35f6fdce7a6138fb1bbcc2f41aede1b103e5 (commit)
      from  5f3315c1fb3e558f650c09e012087949c177eba3 (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 2dec35f6fdce7a6138fb1bbcc2f41aede1b103e5
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>
    (cherry picked from commit ee7666a5fdd1b04f1bf50aa89900488e1a01402b)
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

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

Summary of changes:
 authorities/merge.pl |   11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Mon Aug 10 23:04:50 2015
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Mon, 10 Aug 2015 21:04:50 +0000
Subject: [koha-commits] main Koha release repository branch 3.20.x updated.
	v3.20.02-18-gf88d0f1
Message-ID: <E1ZOuFW-0000vU-NP@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  f88d0f1cff5a07a9a082194ddc6a57c536d72e88 (commit)
       via  c0af19301accafb5346b67aa0dae8f33ef1e458a (commit)
      from  2dec35f6fdce7a6138fb1bbcc2f41aede1b103e5 (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 f88d0f1cff5a07a9a082194ddc6a57c536d72e88
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>
    (cherry picked from commit beef8534724900e5777fc7b6d163763712decb1f)
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

commit c0af19301accafb5346b67aa0dae8f33ef1e458a
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>
    (cherry picked from commit 0d632a606f499c31afb8a08f81625c4dfbddb445)
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

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

Summary of changes:
 circ/returns.pl |    7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Mon Aug 10 23:06:49 2015
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Mon, 10 Aug 2015 21:06:49 +0000
Subject: [koha-commits] main Koha release repository branch 3.20.x updated.
	v3.20.02-20-g7fe64b0
Message-ID: <E1ZOuHR-0000xI-1d@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  7fe64b0d0270f1cc4fc8829d4629f461b21f2338 (commit)
       via  d0b989a673af3794de410e92a4018ca59462d75b (commit)
      from  f88d0f1cff5a07a9a082194ddc6a57c536d72e88 (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 7fe64b0d0270f1cc4fc8829d4629f461b21f2338
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>
    (cherry picked from commit 62dc6b0ca15a9de99a1cb41809e6c9c016e6b0d0)
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

commit d0b989a673af3794de410e92a4018ca59462d75b
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>
    (cherry picked from commit 298c4c76a5f231d9cc0935b6f14a5f191b727804)
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

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

Summary of changes:
 C4/Biblio.pm            |    8 +++++---
 t/db_dependent/Biblio.t |   19 ++++++++++++++++---
 2 files changed, 21 insertions(+), 6 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Mon Aug 10 23:19:49 2015
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Mon, 10 Aug 2015 21:19:49 +0000
Subject: [koha-commits] main Koha release repository branch 3.20.x updated.
	v3.20.02-22-g4e0440c
Message-ID: <E1ZOuU1-00012l-6f@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  4e0440c8a981125e244fe7a8f83bd1c5c0c0a764 (commit)
       via  cea4c5325c0e6764afb928ca1c62202ca8e5a6e7 (commit)
      from  7fe64b0d0270f1cc4fc8829d4629f461b21f2338 (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 4e0440c8a981125e244fe7a8f83bd1c5c0c0a764
Author: Hector Castro <hector.hecaxmmx at gmail.com>
Date:   Thu Jul 16 15:40:14 2015 -0600

    Bug 14548: Typo in help file for 3.20 (batch_record_modification.tt)
    
    Typo found in batch_record_modification.tt file for Koha help in 3.20
    
    Test plan:
    1) Go to url 'koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/batch_record_modification.tt:20' and check the typo "critera" or go to Tools ? Batch record modification, 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: Aleisha <aleishaamohia at hotmail.com>
    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 605638243aa6d3db8784f54a4687a850646f6f54)
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

commit cea4c5325c0e6764afb928ca1c62202ca8e5a6e7
Author: Hector Castro <hector.hecaxmmx at gmail.com>
Date:   Thu Jul 16 14:35:52 2015 -0600

    Bug 14547: Typo in help file for 3.20 (basket.tt)
    
    Typo found in basket.tt file for Koha help in 3.20
    
    Test plan:
    1) Go to url 'koha-tmpl/intranet-tmpl/prog/en/modules/help/acqui/basket.tt:24' and check the typo "susbscription" or go to Acqusitions > create or view an existing basket, 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: Aleisha <aleishaamohia at hotmail.com>
    
    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 b7e40ce3fba6a6bcfbb6694bf5875a315b3f6e53)
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

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

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


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Tue Aug 11 03:56:04 2015
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Tue, 11 Aug 2015 01:56:04 +0000
Subject: [koha-commits] main Koha release repository branch 3.18.x updated.
	v3.18.09-17-gee61307
Message-ID: <E1ZOynM-0002YF-Qm@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  ee61307cafca5445cd7ce9149b1537641d523e61 (commit)
       via  5c091650485e133c980d941365d8f1dcb5828e7f (commit)
       via  e298d5c83d8cbbad88c1bcebd4e49eac0efca10b (commit)
       via  3494e9783432f07ae855dc655807f36cbf0c32c8 (commit)
       via  bbf39af949d59a6b90412843f7bf0377e54d9813 (commit)
       via  688f95d893aa8d08bf098328cf3527e2a9a83a50 (commit)
       via  e64d9b63a7c6f7af5b8c0ba1a2a663fd255d0535 (commit)
       via  f79dc020899c4e9c998281e3c06b508cc0fa882e (commit)
       via  05b29e605b5032713e2b10653a18120ca7974d27 (commit)
       via  2b4f984203857dadecdaa1e14ab71a45209b3c21 (commit)
       via  625abf61544863084cffcf77399463d363155cbd (commit)
       via  2ec7d2864f1e25511ca2ff52456adecc3b37f339 (commit)
      from  1277854315c99dc9f9238aa5a92706ce011d6fb1 (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 ee61307cafca5445cd7ce9149b1537641d523e61
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>
    (cherry picked from commit 62dc6b0ca15a9de99a1cb41809e6c9c016e6b0d0)
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    Signed-off-by: Liz Rea <wizzyrea at gmail.com>

commit 5c091650485e133c980d941365d8f1dcb5828e7f
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>
    (cherry picked from commit 298c4c76a5f231d9cc0935b6f14a5f191b727804)
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    Signed-off-by: Liz Rea <wizzyrea at gmail.com>

commit e298d5c83d8cbbad88c1bcebd4e49eac0efca10b
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>
    (cherry picked from commit beef8534724900e5777fc7b6d163763712decb1f)
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    Signed-off-by: Liz Rea <wizzyrea at gmail.com>

commit 3494e9783432f07ae855dc655807f36cbf0c32c8
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>
    (cherry picked from commit 0d632a606f499c31afb8a08f81625c4dfbddb445)
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    Signed-off-by: Liz Rea <wizzyrea at gmail.com>

commit bbf39af949d59a6b90412843f7bf0377e54d9813
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>
    (cherry picked from commit ee7666a5fdd1b04f1bf50aa89900488e1a01402b)
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    Signed-off-by: Liz Rea <wizzyrea at gmail.com>

commit 688f95d893aa8d08bf098328cf3527e2a9a83a50
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>
    (cherry picked from commit f7ed250d618c57a3fc00728bbb93460b25ceda52)
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    Signed-off-by: Liz Rea <wizzyrea at gmail.com>

commit e64d9b63a7c6f7af5b8c0ba1a2a663fd255d0535
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>
    (cherry picked from commit f3a8b7a0e1e1bf112628c6215105ab80f25ed94f)
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    Signed-off-by: Liz Rea <wizzyrea at gmail.com>

commit f79dc020899c4e9c998281e3c06b508cc0fa882e
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>
    (cherry picked from commit 7d4e7e4e525fc99cb4452de135e161a0e0866753)
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    Signed-off-by: Liz Rea <wizzyrea at gmail.com>

commit 05b29e605b5032713e2b10653a18120ca7974d27
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>
    (cherry picked from commit 0183cc0223678f6b3f0885213c7223ddb31acf5d)
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    Signed-off-by: Liz Rea <wizzyrea at gmail.com>

commit 2b4f984203857dadecdaa1e14ab71a45209b3c21
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>
    (cherry picked from commit e9061028c1ba95b310be5e9333b224e735e64f40)
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    Signed-off-by: Liz Rea <wizzyrea at gmail.com>

commit 625abf61544863084cffcf77399463d363155cbd
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>
    (cherry picked from commit 7098a36b19c35a06a51361bd381416a1204de38d)
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    Signed-off-by: Liz Rea <wizzyrea at gmail.com>

commit 2ec7d2864f1e25511ca2ff52456adecc3b37f339
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>
    (cherry picked from commit fe3a49e61133e1e66d0075f3300cd3a99e691890)
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    Signed-off-by: Liz Rea <wizzyrea at gmail.com>

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

Summary of changes:
 C4/Biblio.pm                                        |    8 +++++---
 C4/Members/Attributes.pm                            |    2 +-
 Koha/Filter/MARC/EmbedSeeFromHeadings.pm            |    5 +++++
 authorities/merge.pl                                |   11 +++++++----
 circ/returns.pl                                     |    7 +++++--
 installer/data/mysql/kohastructure.sql              |    4 ++--
 .../intranet-tmpl/prog/en/modules/tools/letter.tt   |    6 +++---
 .../opac-tmpl/bootstrap/en/modules/sco/sco-main.tt  |   17 ++++++++++++++---
 opac/opac-memberentry.pl                            |    2 ++
 opac/opac-registration-verify.pl                    |    2 ++
 t/db_dependent/Biblio.t                             |   19 ++++++++++++++++---
 tools/letter.pl                                     |    4 ++--
 12 files changed, 64 insertions(+), 23 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Tue Aug 11 17:56:21 2015
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Tue, 11 Aug 2015 15:56:21 +0000
Subject: [koha-commits] main Koha release repository branch master updated.
	v3.20.00-383-g8fa214b
Message-ID: <E1ZPBuX-0000c8-7G@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  8fa214bfa5cc0d46a3e34f4c09bb7635132b0b04 (commit)
       via  03ae8f70c23c0ba5e07e6aa6fdb3c65dafec946e (commit)
       via  7fe69d8e5d09cadbdd26ffd563852ecb497c544a (commit)
       via  cef2dd180f9770e3b2f8d28c8357fab8851bf1c2 (commit)
       via  7f797b3244c4252fedcdd046d3c659843347a197 (commit)
       via  d7cdb6e15eb5488554e030a98f028d9e874f9b8b (commit)
       via  b113318bb203d71845f6127f63b88247639537d7 (commit)
       via  b36f4674a0ba2f4b6e76481dec2905494a3e2b78 (commit)
       via  a6408148bac38b8ed782e944c7ad68dc8882df2a (commit)
       via  98ccd548ee4affcd1516584b34c7ae45a2761155 (commit)
       via  64079ccaa3284f9bf12945aad082e22c1fe4d90d (commit)
       via  79168c011bb32439f487832231e7dac8335b669c (commit)
       via  094092b111b022bf6c6d27a50083e1aa826e4ca2 (commit)
       via  9f0546f003b7729da63ec2b8e0df05ab7ec0bff0 (commit)
       via  209faec18305eb570bda377c1db03425cd53f087 (commit)
       via  bfe568018637afad544f38b538ef9f6d9aad068f (commit)
       via  2def11d678c3f15b63de3f4980cf9c59b40ff718 (commit)
       via  d873ed3b5d97f825c52dc53c2f72bd5a1ef03647 (commit)
       via  fb17640c032f0ba0d6594076a71b8b37fda8b373 (commit)
       via  2fcc02321f0f56760cfdbd67a29917e4f0ba278b (commit)
      from  605638243aa6d3db8784f54a4687a850646f6f54 (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 8fa214bfa5cc0d46a3e34f4c09bb7635132b0b04
Author: Tom?s Cohen Arazi <tomascohen at theke.io>
Date:   Fri Aug 7 16:04:46 2015 -0300

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

commit 03ae8f70c23c0ba5e07e6aa6fdb3c65dafec946e
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date:   Fri Aug 7 16:07:08 2015 -0300

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

commit 7fe69d8e5d09cadbdd26ffd563852ecb497c544a
Author: Tomas Cohen Arazi <tomascohen at unc.edu.ar>
Date:   Tue Aug 11 10:54:18 2015 -0300

    Bug 6874: (QA followup) upload_path missing in koha-conf.xml.in
    
    Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>

commit cef2dd180f9770e3b2f8d28c8357fab8851bf1c2
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date:   Fri Aug 7 16:22:22 2015 -0300

    Bug 6874: (QA followup) Warnings in about page
    
    This patch introduces checks on the about.pl page so the user is warned
    for a deficient configuration.
    
    Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>

commit 7f797b3244c4252fedcdd046d3c659843347a197
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date:   Thu May 28 11:54:56 2015 +0200

    Bug 6874: [QA Follow-up] Last adjustments for future developments
    
    This patch does:
    
    [1] Some trivial template changes. Modified some comments (POD lines).
    [2] Converted plugin to new style.
    [3] Table updates: renames id to hashvalue, adds a autoincrement id,
        adds filesize, timestamp, owner and category.
        RM: This db rev is in a separate sql file in atomicupdate.
    [4] Code references to computed hash renamed to hashvalue instead of id.
    [5] Removed some code pertaining to exposing upload dir structure. The user
        now may choose a category; the uploader takes care of storage.
        The list of upload categories is now taken from authorised values; this
        might become a separate table in the future. (If there are none,
        the upload process creates one default fallback.)
        We can add e.g. permissions later, subdir structure, etc. (So dir will
        not necessarily be category anymore.)
    
    Test plan:
    [1] Run the db revision.
    [2] Upload new file. Check the record in the table. Delete it again; check.
    [3] Run t/db../UploadedFiles.t.
    [4] Run t/db../FrameworkPlugins.t -incl cataloguing/value_builder/upload.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 d7cdb6e15eb5488554e030a98f028d9e874f9b8b
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date:   Wed May 27 13:52:25 2015 +0200

    Bug 6874: [QA Follow-up] Adjustments for opac-retrieve
    
    Adds httpheaders sub to UploadedFiles; this will be extended on a new
    report. (Idea is to add configurable headers for file extensions.)
    Trivial unit test added.
    Small cosmetic changes to opac-retrieve-file.
    
    Test plan:
    Run test UploadedFiles.t
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>

commit b113318bb203d71845f6127f63b88247639537d7
Author: Mark Tompsett <mtompset at hotmail.com>
Date:   Sat Apr 11 23:57:43 2015 -0400

    Bug 6874: Catch warnings for clean tests.
    
    I hate noisy tests, so I cleaned them up.
    
    MEGA TEST PLAN
    --------------
    git checkout -b bug_6874 origin/master
    git bz apply 6874
    -- yes, it should all apply smoothly.
    I intentionally restored an old backup from a couple months ago to force the upgrade.
    staff client:
    -- upgrade
    -- login
    Koha administration
    MARC Bibliographic framework
    MARC structure (for BKS)
    Search for 856
    Subfields
    Edit (for u)
    Other options
    Plugin: upload.pl
    Save changes
    Search the catalog tab
    {choose a word, any word. I used fancy, because I knew we had a cookbook}
    click first link
    Edit
    Edit record
    8 (that's the tab name)
    click the name for 856
    scroll down to u and click the plugin icon
    -- Correctly got a configuration error message.
    
    At a command prompt:
    vi ~/koha-dev/etc/koha-conf.xml
    /enable_plug
    -- add in:
    <upload_path>{appropriate path. I used /home/mtompset/uploads}</upload_path>
    :wq
    mkdir {appropriate path used}
    -- I even added some subdirectories
    sudo chown -R -v www-data.www-data {appropriate path used}
    
    Back in staff client:
    click the plugin icon again
    -- this time an upload screen pops up
    click the 'Upload file' button
    -- message about no file or destination
    browse for a file, select one
    click the 'Upload file' button
    -- message about no destination
    click the 'Cancel' button
    click the plugin icon
    click a destination radio button
    click the 'Upload file' button
    -- message about no file
    browse for a file, select one
    click the 'Upload file' button
    -- message about success
    click the 'close' button.
    -- the text box has been filled in with a nice URL
    click the plugin icon
    click cancel
    click the plugin icon
    click delete
    -- the test box should be blanked, and a success message given
    click Close
    -- reupload a file properly
    click the plugin icon
    click delete
    click upload file
    browse for a file, select a destination, click upload file
    click close on success message
    click 'Clone this subfield'
    click the second plugin icon
    click delete
    click close
    click the first plugin icon
    -- Nice error message about a URL which points to nothing.
    click cancel
    In the second 856$u type in a URL (eg. www.google.com)
    click the second plugin icon
    -- this jumps immediately to the upload screen, but does not give an error message, because the URL does not have opac-retrieve-file in it.
    click save (we need to save the bibliographic record)
    
    In OPAC:
    search for the same word (I used fancy)
    find the entry you just updated with links
    click the two links. The dangling entry should give you a 500 error, and the other link should work just fine.
    get back to the detail page
    
    In staff client:
    edit
    edit record
    8
    change the 856$u to a valid file in the first link.
    save
    
    In OPAC:
    refresh the detail page, and click the first link again
    this time it should get downloaded nicely.
    
    From a command line:
    prove -v t/db_dependent/UploadedFiles.t
    perldoc C4::Biblio
    perldoc C4::UploadedFiles
    
    One more round of tests tomorrow, and this should be ready. :)
    
    Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
    
    Tested on top of 5010
    
    Followed mostly mega test plan, seems to work :)
    Can upload, delete, modify, etc
    Test runs Ok
    No koha-qa errors
    
    I view this as valuable addition, dangling since 2011!
    As with 5010, I consider this can be pushed (for 3.22)
    and we can fix anything wrong later.
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>

commit b36f4674a0ba2f4b6e76481dec2905494a3e2b78
Author: Mark Tompsett <mtompset at hotmail.com>
Date:   Wed Apr 16 20:49:02 2014 -0400

    Bug 6874: id based on contents, filename, and directory.
    
    This patch corrects the inability to upload the same file to a
    different directory, or even a renamed file to the same
    directory. By including the filename and directory as part of
    the $id SHA generation, only identical files in the same
    directory with the same file name will generate the same $id.
    
    Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>

commit a6408148bac38b8ed782e944c7ad68dc8882df2a
Author: Mark Tompsett <mtompset at hotmail.com>
Date:   Wed Apr 16 00:23:40 2014 -0400

    Bug 6874: Clean up file URL generation
    
    This adds a dependency on bug 5010, in that the protocol is
    assumed in the OpacBaseURL system preference. It also adds
    improved error handling.
    
    Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>

commit 98ccd548ee4affcd1516584b34c7ae45a2761155
Author: Mark Tompsett <mtompset at hotmail.com>
Date:   Mon Apr 14 23:54:07 2014 -0400

    Bug 6874: License Text Update
    
    This updates the license text for
    - C4/UploadedFiles.pm
    - cataloguing/value_builder/upload.pl
    - opac/opac-retrieve-file.pl
    to GPL v3 as per the
    http://wiki.koha-community.org/wiki/Coding_Guidelines#Licence
    text.
    
    TEST PLAN
    ---------
    1) Don't apply this patch as part of 6874.
    2) Run the koha qa test tool.
       -- It will FAIL for those three file.
    3) Apply this patch
    4) Run the koha qa test tool.
       -- License problem is corrected, no FAILs.
    
    Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>

commit 64079ccaa3284f9bf12945aad082e22c1fe4d90d
Author: Mark Tompsett <mtompset at hotmail.com>
Date:   Thu Sep 26 11:45:19 2013 -0400

    Bug 6874: kohastructure.sql, jquery.js, refocus, and more
    
    Two problems were discovered while doing a fresh install
    of Koha. These problems in the kohastructure.sql file are
    addressed with this patch.
    
    Clicking the plug-in icon should cause the popup window
    to refocus.  This adds the refocus code to the upload.pl file.
    
    The path to the jquery.js script was wrong in the
    upload_delete_file.tt file. Changed [% themelang %] to
    [% interface %].
    
    If a user clones 856$u after uploading a file, deletes the file,
    and then clicks the plugin icon on the first 856$u, this will go
    immediately to the upload screen with an informative error
    message.
    
    After some validation was added, it was extended to include
    other cases. This serves to patch 6874 to a state where sign
    off should be possible.
    
    Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>

commit 79168c011bb32439f487832231e7dac8335b669c
Author: Julian Maurice <julian.maurice at biblibre.com>
Date:   Mon Sep 30 09:34:01 2013 +0200

    Bug 6874: Force user to select a directory
    
    This patch adds a javascript and a server-side checks
    
    Test plan:
    1/ Choose a file, leave the radios not selected and submit
    2/ You have a javascript alert which prevents form to be submitted
    3/ Disable javascript and repeat step 1
    4/ Form is submitted but form is redisplayed with an error message
    telling you to choose a directory.
    
    Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
    Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>

commit 094092b111b022bf6c6d27a50083e1aa826e4ca2
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date:   Wed Sep 25 09:07:44 2013 +0200

    Bug 6874: (QA followup) Attach files to bibliographic records
    
    * Renames uploadPath to upload_path to follow the standard naming
      conventions in koha-conf which use underscores rather than camel case
    * Remove reference to intranet-tmpl and replace with [% interface %]
      required to pass qa
    
    Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
    Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>

commit 9f0546f003b7729da63ec2b8e0df05ab7ec0bff0
Author: Julian Maurice <julian.maurice at biblibre.com>
Date:   Wed Jun 12 13:12:51 2013 +0000

    Bug 6874: Move uploadPath syspref to koha-conf.xml
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
    Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>

commit 209faec18305eb570bda377c1db03425cd53f087
Author: Julian Maurice <julian.maurice at biblibre.com>
Date:   Thu Apr 11 12:36:27 2013 +0000

    Bug 6874: Add unit tests for C4::UploadedFiles
    
    Add unit tests for C4::UploadedFiles and move a variable
    declaration at subroutine level instead of file level.
    Add dependency to Test::CGI::Multipart
    
    Still works, and the newly-provided unit tests have good test
    coverage:
    C4/UploadedFiles.pm 90.7    65.0    66.7    100.0   100.0    0.2    86.4
    
    Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com>
    Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
    Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>

commit bfe568018637afad544f38b538ef9f6d9aad068f
Author: Paul Poulain <paul.poulain at biblibre.com>
Date:   Tue Mar 19 10:48:08 2013 +0100

    Bug 6874: QA follow-up
    
    Squash of the following commits:
      return with explicit undef removed
      Follow-up for PBP fixes
      follow-up fix POD syntax
      follow-up jquery has moved
    
    Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
    Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com>
    Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
    Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    Amended: removed POD changes in Biblio.pm while rebasing.
    Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>

commit 2def11d678c3f15b63de3f4980cf9c59b40ff718
Author: Julian Maurice <julian.maurice at biblibre.com>
Date:   Wed Jul 18 16:47:54 2012 +0200

    Bug 6874: Attach files to bibliographic records
    
    New cataloging plugin upload.pl and new system preference 'uploadPath'.
    
    upload.pl provide a way to upload files on the server and store a link
    (url) to it in MARC
    uploadPath is the absolute path on the server where the files will be
    stored. It's possible to have a hierarchy of directories under this path
    and the plugin will allow to choose in which directory to store the
    file.
    Stored value in MARC subfield looks like this:
    <OPACBaseURL>/cgi-bin/koha/opac-retrieve-file.pl?id=<SHA-1 of the file>
    So both 'uploadPath' and 'OPACBaseURL' sysprefs have to be set for this
    plugin to work correctly
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
    Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com>
    Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
    
    Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    Slightly amended/simplified the patch during QA: The changes to
    GetMarcUrls are not really needed, and would have needed some
    attention. Another link text can be supplied by the plugin too.
    
    This also reduces the need for changes in basket.pl,
    MARCdetail.pl, detail.pl, opac-basket.pl and opac-detail.pl.
    Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>
    
    Edit: more meaninfull commit subject

commit d873ed3b5d97f825c52dc53c2f72bd5a1ef03647
Author: Ulrich Kleiber <ulrich.kleiber at bsz-bw.de>
Date:   Wed Jul 15 08:35:13 2015 +0200

    Bug 14534: Stop overdue_notices.pl from issuing the warning: Use of uninitialized value $borrowernumber
    
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    
    To test:
    
    1/ Run the overdue_notices.pl script (don't do this on production
    obviously :))
    2/ Notice the warns
    3/ Apply patch
    4/ Run again
    5/ Notice no warns, but notices are still generated ok
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>

commit fb17640c032f0ba0d6594076a71b8b37fda8b373
Author: Indranil Das Gupta <indradg at gmail.com>
Date:   Sun Jun 14 14:52:04 2015 +0530

    Bug 13663: (followup) fixes tab char QA test fails
    
    Fixes the tab char qa test suite fails in the following files:
    
    1/ tools/upload-file-progress.pl
    2/ tools/upload-file.pl
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    Amended patch: tidy whitespaces
    Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>

commit 2fcc02321f0f56760cfdbd67a29917e4f0ba278b
Author: Alex Arnaud <alex.arnaud at biblibre.com>
Date:   Thu Jun 11 10:55:35 2015 +0200

    Bug 13663: Fix permissions in upload-file.pl and upload-file-progress.pl
    
    Test plan:
    Verify that the circulate_remaining_permissions perm is enough to upload
    .koc file.
    
    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>

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

Summary of changes:
 C4/Installer/PerlDependencies.pm                   |    5 +
 C4/UploadedFiles.pm                                |  323 ++++++++++++++++++++
 Koha.pm                                            |    2 +-
 .../Result/{ActionLog.pm => UploadedFile.pm}       |   77 ++---
 about.pl                                           |   14 +
 cataloguing/value_builder/upload.pl                |  164 ++++++++++
 debian/templates/koha-conf-site.xml.in             |    1 +
 etc/koha-conf.xml                                  |    1 +
 installer/data/mysql/kohastructure.sql             |   17 ++
 installer/data/mysql/updatedatabase.pl             |   22 ++
 koha-tmpl/intranet-tmpl/prog/en/modules/about.tt   |   15 +
 .../en/modules/cataloguing/value_builder/upload.tt |  103 +++++++
 .../value_builder/upload_delete_file.tt            |   63 ++++
 misc/cronjobs/overdue_notices.pl                   |    2 +-
 .../opac-retrieve-file.pl                          |   24 +-
 t/db_dependent/UploadedFiles.t                     |   61 ++++
 tools/upload-file-progress.pl                      |   21 +-
 tools/upload-file.pl                               |   20 +-
 18 files changed, 884 insertions(+), 51 deletions(-)
 create mode 100644 C4/UploadedFiles.pm
 copy Koha/Schema/Result/{ActionLog.pm => UploadedFile.pm} (52%)
 create mode 100755 cataloguing/value_builder/upload.pl
 create mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/upload.tt
 create mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/upload_delete_file.tt
 copy cataloguing/plugin_launcher.pl => opac/opac-retrieve-file.pl (63%)
 create mode 100644 t/db_dependent/UploadedFiles.t


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Tue Aug 11 20:14:53 2015
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Tue, 11 Aug 2015 18:14:53 +0000
Subject: [koha-commits] main Koha release repository branch master updated.
	v3.20.00-393-g62f3fd6
Message-ID: <E1ZPE4b-0001K4-Fb@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  62f3fd6a8f935e61af9199d175ece23baad40878 (commit)
       via  cb1ac9f36a207a51f8292d96fb4ed52dfe4442b9 (commit)
       via  43fadbadea9a4504e519dfb0b915e57fd811e0ad (commit)
       via  dcb5bf00aac12642052b21fe9dbb4d50bb5458a4 (commit)
       via  ae82953138aad2b07c6191ab5014b1abdb04aeda (commit)
       via  7135bae0bbf17405cc5b543830599e9b5742db73 (commit)
       via  47be5cafefbd7841e6792d0d0dede654f3afff96 (commit)
       via  82ce53c8b7d5f40f6ff1e7c661bc0c4ba15fe88b (commit)
       via  f081063d72e7e03de179b096f2bbe425ed264505 (commit)
       via  78d83e06410739bf731cccee30c6cec446196609 (commit)
      from  8fa214bfa5cc0d46a3e34f4c09bb7635132b0b04 (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 62f3fd6a8f935e61af9199d175ece23baad40878
Author: Tomas Cohen Arazi <tomascohen at unc.edu.ar>
Date:   Tue Aug 11 15:09:54 2015 -0300

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

commit cb1ac9f36a207a51f8292d96fb4ed52dfe4442b9
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Wed Aug 5 12:52:12 2015 +0100

    Bug 13485: Use the Koha template plugin to access syspref values
    
    And remove the useless use of the KohaDates plugin
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>

commit 43fadbadea9a4504e519dfb0b915e57fd811e0ad
Author: Simith D'Oliveira <simith at inlibro.com>
Date:   Fri Dec 19 14:44:48 2014 -0500

    Bug 13485: Add a page to display links to restricted sites
    
    To test:
    
    I) Apply the patch
    II) Run updatedatabase.pl
    
    scenario I)
    
    1) Add some content in RestrictedPageContent and RestrictedPageTitle sysprefs.
    2) Add your machine ip (ex. 127.0.0)
    3) Validate cgi-bin/koha/opac-proxypage.pl shows a page with RestrictedPageContent and RestrictedPageTitle contents.
    
    scenario II)
    
    1) Logout opac page
    2) Add some content in RestrictedPageContent and RestrictedPageTitle sysprefs.
    3) Add other ip that your machine ip.
    4) Validate: cgi-bin/koha/opac-proxypage.pl shows a login page.
    5) Validate: cgi-bin/koha/opac-proxypage.pl shows a page with RestrictedPageContent and RestrictedPageTitle contents after login.
    
    Followed both scenarios, works as expected.
    Signed-off-by: Marc Veron <veron at veron.ch>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    
    Bug 13485 [QA Followup]
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    
    Bug 13485 - Atomic Update + Rename Proxy page to Restricted page
    
    Test plan:
    
    I) Apply the patch
    II) Run updatedatabase.pl
    
    scenario I)
    
    1) Add some content in RestrictedPageContent and RestrictedPageTitle sysprefs.
    2) Add your machine ip (ex. 127.0.0)
    3) Validate cgi-bin/koha/opac-restrictedpage.pl shows a page with RestrictedPageContent and RestrictedPageTitle contents.
    
    scenario II)
    
    1) Logout opac page
    2) Add some content in RestrictedPageContent and RestrictedPageTitle sysprefs.
    3) Add a diffrent ip.
    4) Validate: cgi-bin/koha/opac-restrictedpage.pl shows a login page.
    5) Validate: cgi-bin/koha/opac-restrictedpage.pl shows a page with RestrictedPageContent and RestrictedPageTitle contents after login.
    
    	new file:   installer/data/mysql/atomicupdate/Bug13485_RestrictedSitesPage.sql
    	modified:   installer/data/mysql/sysprefs.sql
    	modified:   koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref
    	renamed:    koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-proxypage.tt -> koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-restrictedpage.tt
    	renamed:    opac/opac-proxypage.pl -> opac/opac-restrictedpage.pl
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>

commit dcb5bf00aac12642052b21fe9dbb4d50bb5458a4
Author: Jonathan Druart <jonathan.druart at koha-community.org>
Date:   Thu Jul 2 10:20:13 2015 +0100

    Bug 13853: (follow-up) unit tests
    
    Specify the reference, we should receive Koha::Object.
    
    Signed-off-by: Jonathan Druart <jonathan.druart at koha-community.org>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>

commit ae82953138aad2b07c6191ab5014b1abdb04aeda
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date:   Thu Jun 25 14:56:18 2015 -0400

    Bug 13853: (QA followup) Add unit tests for branch getting methods
    
    Signed-off-by: Jonathan Druart <jonathan.druart at koha-community.org>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>

commit 7135bae0bbf17405cc5b543830599e9b5742db73
Author: Jonathan Druart <jonathan.druart at koha-community.org>
Date:   Fri Jun 19 18:16:27 2015 +0200

    Bug 13853: Add tests for is_waiting
    
    Signed-off-by: Jonathan Druart <jonathan.druart at koha-community.org>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>

commit 47be5cafefbd7841e6792d0d0dede654f3afff96
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date:   Tue Mar 17 10:09:28 2015 -0400

    Bug 13853: Show waiting hold expiration date for waiting holds in holds ajax datatable
    
    We should show the expiration date for waiting holds in the holds
    datatable that appears in circulation.pl and moremember.pl
    
    Test Plan:
    1) Ensure ReservesMaxPickUpDelay is set
    2) Place a hold on a record
    3) Place a second hold and set it to waiting by checking it in
    4) Place a third hold with an expiration date
    5) View the holds tab on circulation.pl and moremember.pl
    6) Note the first hold has no expiration date
    7) Note the second hold has an expiration date of today + ReservesMaxPickUpDelay days
    8) Note the thrid hold has an expiration date of whatever you set it to
    
    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 unc.edu.ar>

commit 82ce53c8b7d5f40f6ff1e7c661bc0c4ba15fe88b
Author: Jonathan Druart <jonathan.druart at koha-community.org>
Date:   Fri Jun 19 18:05:37 2015 +0200

    Bug 13030: Remove the unnecessary double call
    
    Signed-off-by: Jonathan Druart <jonathan.druart at koha-community.org>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>

commit f081063d72e7e03de179b096f2bbe425ed264505
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date:   Wed Oct 8 12:04:35 2014 -0400

    Bug 13030: Show waiting hold expiration date for waiting holds on circulation.pl
    
    We should show the date a waiting hold is set to expire for each hold in
    the list of waiting holds in circulation.pl
    
    Test Plan:
    1) Apply this patch
    2) Find a waiting hold for a patron, browser to circulation.pl
       for that patron
    3) Set system preference ReservesMaxPickUpDelay to 5
    4) Refresh circulation.pl, note the waiting holds now display a
       "waiting until" part with the waiting date plus 5 days
    5) Set system preference ReservesMaxPickUpDelay to 0 ( or empty
       string )
    6) Refresh circulation.pl, note the waiting hols no longer have a
       "waiting until" line.
    
    Signed-off-by: Owen Leonard <oleonard at myacpl.org>
    Followed test plan successfully. Automated tests successful.
    
    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>
    
    Bug 13030 [QA Followup] - Fix unit tests
    
    Signed-off-by: Jonathan Druart <jonathan.druart at koha-community.org>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>

commit 78d83e06410739bf731cccee30c6cec446196609
Author: Fridolin Somers <fridolin.somers at biblibre.com>
Date:   Tue Jun 16 09:40:41 2015 +0200

    Bug 11325: Focus not on "Add Item" in Lists
    
    When viewing a list, the focus/cursor is no longer on the "add items" field below the list.
    
    This patch moves the "Add Item" form at left part of page so that it is always shown (usefull when there are a lot of items). And adds focus to barcode input so you can enter several items with a barcode scanner.
    
    Test instructions:
    1. Create a list
    2. Make sure you have an object with an assigned barcode
    3. Go to the list
    => The barcode entry interface should be at left and has the focus
    4. Enter the barcode and press enter (or use a scanner)
    => The item is added to the list
    
    Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
    I like the new position.
    Works well, focus on input box
    No errors
    
    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:
 Koha.pm                                            |    2 +-
 Koha/Hold.pm                                       |   37 +++++++++++++
 Koha/Item.pm                                       |   27 ++++++++++
 installer/data/mysql/sysprefs.sql                  |    3 ++
 installer/data/mysql/updatedatabase.pl             |   13 +++++
 .../prog/en/modules/admin/preferences/opac.pref    |   15 ++++++
 .../prog/en/modules/circ/circulation.tt            |    3 +-
 .../prog/en/modules/virtualshelves/shelves.tt      |   50 +++++++++--------
 .../bootstrap/en/modules/opac-restrictedpage.tt    |   49 +++++++++++++++++
 opac/opac-restrictedpage.pl                        |   48 +++++++++++++++++
 svc/holds                                          |   23 ++++----
 t/db_dependent/Hold.t                              |   57 ++++++++++++++++++++
 t/db_dependent/Items.t                             |   30 ++++++++++-
 13 files changed, 323 insertions(+), 34 deletions(-)
 create mode 100644 koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-restrictedpage.tt
 create mode 100755 opac/opac-restrictedpage.pl
 create mode 100755 t/db_dependent/Hold.t


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Tue Aug 11 22:22:33 2015
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Tue, 11 Aug 2015 20:22:33 +0000
Subject: [koha-commits] main Koha release repository branch 3.20.x updated.
	v3.20.02-24-gd26146a
Message-ID: <E1ZPG49-0001wQ-Uk@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  d26146ab18b3146a7a5f74143b7401e296ccc863 (commit)
       via  178d1ec8b3bdbbbb1ab8902e74ec1579de52a80f (commit)
      from  4e0440c8a981125e244fe7a8f83bd1c5c0c0a764 (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 d26146ab18b3146a7a5f74143b7401e296ccc863
Author: Indranil Das Gupta <indradg at gmail.com>
Date:   Sun Jun 14 14:52:04 2015 +0530

    Bug 13663: (followup) fixes tab char QA test fails
    
    Fixes the tab char qa test suite fails in the following files:
    
    1/ tools/upload-file-progress.pl
    2/ tools/upload-file.pl
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    Amended patch: tidy whitespaces
    Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>
    
    (cherry picked from commit fb17640c032f0ba0d6594076a71b8b37fda8b373)
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

commit 178d1ec8b3bdbbbb1ab8902e74ec1579de52a80f
Author: Alex Arnaud <alex.arnaud at biblibre.com>
Date:   Thu Jun 11 10:55:35 2015 +0200

    Bug 13663: Fix permissions in upload-file.pl and upload-file-progress.pl
    
    Test plan:
    Verify that the circulate_remaining_permissions perm is enough to upload
    .koc file.
    
    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 2fcc02321f0f56760cfdbd67a29917e4f0ba278b)
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

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

Summary of changes:
 tools/upload-file-progress.pl |   21 ++++++++++++++++++---
 tools/upload-file.pl          |   20 +++++++++++++++++---
 2 files changed, 35 insertions(+), 6 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Tue Aug 11 22:24:26 2015
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Tue, 11 Aug 2015 20:24:26 +0000
Subject: [koha-commits] main Koha release repository branch 3.20.x updated.
	v3.20.02-25-gd14d01d
Message-ID: <E1ZPG5y-0001y7-Qm@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  d14d01d7604a349377c3a02cbc5879e597b06895 (commit)
      from  d26146ab18b3146a7a5f74143b7401e296ccc863 (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 d14d01d7604a349377c3a02cbc5879e597b06895
Author: Ulrich Kleiber <ulrich.kleiber at bsz-bw.de>
Date:   Wed Jul 15 08:35:13 2015 +0200

    Bug 14534: Stop overdue_notices.pl from issuing the warning: Use of uninitialized value $borrowernumber
    
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    
    To test:
    
    1/ Run the overdue_notices.pl script (don't do this on production
    obviously :))
    2/ Notice the warns
    3/ Apply patch
    4/ Run again
    5/ Notice no warns, but notices are still generated ok
    
    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 d873ed3b5d97f825c52dc53c2f72bd5a1ef03647)
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

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

Summary of changes:
 misc/cronjobs/overdue_notices.pl |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Sun Aug 16 23:47:52 2015
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Sun, 16 Aug 2015 21:47:52 +0000
Subject: [koha-commits] main Koha release repository branch 3.18.x updated.
	v3.18.09-20-g6a8871e
Message-ID: <E1ZR5mR-0004eW-V8@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  6a8871e26d0b32aee73e5d7389e99c3b7e333f8e (commit)
       via  e0eb495948cc7ea2ad39781f8f639e1680ee7f8c (commit)
       via  3958f9a79bf773157fa1a19660835dfa234849b8 (commit)
      from  ee61307cafca5445cd7ce9149b1537641d523e61 (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 6a8871e26d0b32aee73e5d7389e99c3b7e333f8e
Author: Ulrich Kleiber <ulrich.kleiber at bsz-bw.de>
Date:   Wed Jul 15 08:35:13 2015 +0200

    Bug 14534: Stop overdue_notices.pl from issuing the warning: Use of uninitialized value $borrowernumber
    
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    
    To test:
    
    1/ Run the overdue_notices.pl script (don't do this on production
    obviously :))
    2/ Notice the warns
    3/ Apply patch
    4/ Run again
    5/ Notice no warns, but notices are still generated ok
    
    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 d873ed3b5d97f825c52dc53c2f72bd5a1ef03647)
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    Signed-off-by: Liz Rea <wizzyrea at gmail.com>

commit e0eb495948cc7ea2ad39781f8f639e1680ee7f8c
Author: Liz Rea <wizzyrea at gmail.com>
Date:   Mon Aug 17 09:47:27 2015 +1200

    Bug 13663 - QA Followup, removing tab chars

commit 3958f9a79bf773157fa1a19660835dfa234849b8
Author: Alex Arnaud <alex.arnaud at biblibre.com>
Date:   Thu Jun 11 10:55:35 2015 +0200

    Bug 13663: Fix permissions in upload-file.pl and upload-file-progress.pl
    
    Test plan:
    Verify that the circulate_remaining_permissions perm is enough to upload
    .koc file.
    
    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 2fcc02321f0f56760cfdbd67a29917e4f0ba278b)
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    Signed-off-by: Liz Rea <wizzyrea at gmail.com>

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

Summary of changes:
 misc/cronjobs/overdue_notices.pl |    2 +-
 tools/upload-file-progress.pl    |   21 ++++++++++++++++++---
 tools/upload-file.pl             |   20 +++++++++++++++++---
 3 files changed, 36 insertions(+), 7 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Mon Aug 17 15:47:40 2015
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Mon, 17 Aug 2015 13:47:40 +0000
Subject: [koha-commits] main Koha release repository branch master updated.
	v3.20.00-394-gdfe07fa
Message-ID: <E1ZRKlI-0003O9-HL@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  dfe07fa410eb48241c218abcc156c466576dcc9a (commit)
      from  62f3fd6a8f935e61af9199d175ece23baad40878 (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 dfe07fa410eb48241c218abcc156c466576dcc9a
Author: Fr?d?ric Demians <f.demians at tamil.fr>
Date:   Thu Jul 23 09:47:15 2015 +0200

    Bug 14592: Export data bad encoding
    
    Tools > Export data produces a file badly encoded, when marc/xml file
    format is chosen. It works with CSV.
    
    To test:
    
    1. Tools > Export data
    2. Choose a limited interval of biblionumber
    3. Export in marc/xml/csv.
    4. Check files exported at 3: csv file is ok. marc/xml files are
       corrupted, ie badly encoded.
    5. Apply the patch
    6. Repeat steps 3&4, and confirm that all file formats are valid.
    
    Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>

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

Summary of changes:
 tools/export.pl |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Tue Aug 18 18:16:51 2015
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Tue, 18 Aug 2015 16:16:51 +0000
Subject: [koha-commits] main Koha release repository branch master updated.
	v3.20.00-402-g75d123d
Message-ID: <E1ZRjZD-0005Kh-Di@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  75d123d760d86f0e0d9f58d65874b40f6816008d (commit)
       via  75c70d42a5df526c8bed8633d65721696a0fa176 (commit)
       via  748b212cf9a21440f62acc3dec29a93132795082 (commit)
       via  3ec6c88ae10868fcab17b5b29c3b84f159323e25 (commit)
       via  4a738888adfaca7ab5935c320e14a12309797334 (commit)
       via  e1319963d618968cb61a5c86a0c793fc613354ee (commit)
       via  a90a7202c31cbb353741b5c563945e58923cd319 (commit)
       via  a145b437852542c5314e5cc1d5576b4eb050525c (commit)
      from  dfe07fa410eb48241c218abcc156c466576dcc9a (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 75d123d760d86f0e0d9f58d65874b40f6816008d
Author: Aleisha <aleishaamohia at hotmail.com>
Date:   Tue Jul 21 00:29:52 2015 +0000

    Bug 14574: Fixing error messages on staff client so they make more sense
    
    To test:
    1) Go to cgi-bin/koha/errors/errornumber.pl to see the error messages which currently don't make sense (ie cgi-bin/koha/errors/401.pl etc). Have only made changes to 401, 403 and 404
    2) Apply patch
    3) Go to cgi-bin/koha/errors/401.pl --> Check that it now says "This error means that you aren't authorized to view this page." and "Please log in and try again.". Check that 'log in' redirects to the log in page (mainpage.pl).
    4) Go to cgi-bin/koha/errors/403.pl --> Check that it now says "This error means that you are forbidden to view this page."
    5) Go to cgi-bin/koha/errors/404.pl --> This page should be very different. Check that the 'Error 404' is now in italics and not bold. Check that the page gives a list of reasons the user may have been given this error and some options for their next step.
    
    Signed-off-by: Catherine <cnorthcott.work at gmail.com>
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    Amended patch: replace tab with 4 spaces.
    Note: I am not sure the em tag is useful here.
    Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>

commit 75c70d42a5df526c8bed8633d65721696a0fa176
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Tue Jul 14 16:26:36 2015 +0100

    Bug 14517: List shelves list is broken for translated interfaces
    
    The translation script adds quotes ("") around translated string (Edit
    for instance).
    Which breaks the json structure.
    
    Example:
    "dt_action": "<a style=\"cursor:pointer\"><form action='shelves.pl'
    method='get'><input class="editshelf" value="Editar" type="submit"
    /></form></a>"
    
    Test plan:
    1/ On the staff interface create a private list
    2/ Go to More > Lists ('Your lists' tab)
    3/ Translate the templates to any language like:
      $ cd misc/translator/
      $ perl translate install es-ES
    4/ Enable the translated templates on the sysprefs
    5/ Switch to the translated language
    6/ Go to the lists page (Mas > Listas in es-ES)
    The list should be displayed correctly.
    
    Note: There is a limitation. If a translated string contains a simple
    quote ('), it will also break the json.
    
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>

commit 748b212cf9a21440f62acc3dec29a93132795082
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Tue Aug 18 12:43:27 2015 +0100

    Bug 14529: The new list permission is 'lists', not 'shelves'
    
    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 unc.edu.ar>

commit 3ec6c88ae10868fcab17b5b29c3b84f159323e25
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Mon Jul 13 17:53:06 2015 +0100

    Bug 14529: Allow user to delete lists
    
    Bug 13417 allows a librarian to delete any lists if he has the
    permission (delete_public_lists).
    
    There is a mismatch in the perm check.
    A user can delete a list with the ability to edit (manage) it.
    
    Test plan:
    1/ Create a list A with user A
    2/ Create a list B with user B
    3/ A should be able to manage and delete the list A.
    He cans delete B only if he is superlibrarian or has the
    delete_public_lists permission.
    
    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 unc.edu.ar>

commit 4a738888adfaca7ab5935c320e14a12309797334
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Tue Aug 18 16:51:19 2015 +0100

    Bug 11229: Make the tests pass even if issues exist in the DB
    
    This is not introduced by the previous patches of this patchset.
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>

commit e1319963d618968cb61a5c86a0c793fc613354ee
Author: Tomas Cohen Arazi <tomascohen at unc.edu.ar>
Date:   Thu Aug 13 12:03:15 2015 -0300

    Bug 11229: (followup) makepartialpayment fix
    
    makepartialpayment() wasn't logging the branch either. This patch
    fixes that too.
    
    To test:
    - Run (with the regression tests applied)
      $ prove t/db_dependent/Accounts.t
    => FAIL: tests fail because makepartialpayment is not logging the branch code
    - Apply the patch
    - Run
      $ prove t/db_dependent/Accounts.t
    => SUCCESS: tests pass
    - Sign off :-D
    
    Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>

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

    Bug 11229: makepayment doesn't log branch in statistics correctly
    
    This patch fixes makepayment() so it correctly logs the branch code
    to the statistics table.
    
    To test:
    - Run (with the regression tests applied)
      $ prove t/db_dependent/Accounts.t
    => FAIL: makepayment() tests fail because logging is wrong
    - Apply the patch
    - Run
      $ prove t/db_dependent/Accounts.t
    => SUCCESS: tests for makepayment now pass
    (Note: makepartialpayment tests still fail as they need the next patch)
    
    Original commit message relying on the UI to test:
    
    There are several ways of paying fines, not all of them
    recorded the branch the payment was made at correctly:
    
    1) Pay button next to an individual fine
    2) Checkbox + pay amount
    3) Checkbox + pay selected
    
    For each of those, check if the payment registered in
    the table statistics contains the branchcode before
    and after the patch.
    
    The patch should fix 1).
    2) and 3) are ok with and without the patch.
    
    Important: Don't change the amount, pay individual fines.
    
    Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>
    Note: i fixed the commit message, because this is a fix for makepayment
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>

commit a145b437852542c5314e5cc1d5576b4eb050525c
Author: Tomas Cohen Arazi <tomascohen at unc.edu.ar>
Date:   Thu Aug 13 11:32:49 2015 -0300

    Bug 11229: (regression tests) makepayment and makepartialpayment should log correctly
    
    This patch introduces tests for makepayment and makepartialpayment to check
    they are correctly logging to the statistics table.
    
    To test:
    - Run
      $ prove t/db_dependent/Accounts.t
    => FAIL: tests fail because statistics are not correctly logged.
    
    Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>

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

Summary of changes:
 C4/Accounts.pm                                     |   24 +-
 C4/VirtualShelves.pm                               |    2 +-
 .../intranet-tmpl/prog/en/modules/errors/401.tt    |    3 +-
 .../intranet-tmpl/prog/en/modules/errors/403.tt    |    2 +-
 .../intranet-tmpl/prog/en/modules/errors/404.tt    |   17 +-
 .../virtualshelves/tables/shelves_results.tt       |   35 +-
 t/db_dependent/Accounts.t                          |  395 +++++++++++++-------
 7 files changed, 311 insertions(+), 167 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Thu Aug 20 18:44:14 2015
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Thu, 20 Aug 2015 16:44:14 +0000
Subject: [koha-commits] main Koha release repository branch master updated.
	v3.20.00-412-g490c388
Message-ID: <E1ZSSwn-0002FY-Rc@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  490c3882ac423e842e787ed8c157719dcf33a040 (commit)
       via  56a2607c46db30c318eda9dc44ae3c58731e23fe (commit)
       via  406098b20b5385d2df588520abecefc868f4c0c0 (commit)
       via  91e9cafa7a7348753337e711013ed7d0ab7c0541 (commit)
       via  d5a5e9576e3161e4b591ac910c88e7c703b89ee0 (commit)
       via  260dbd1c70ecd8cf76b452ec2f3c59365c9860e1 (commit)
       via  1dc947b18c86e4e07fe12d0b70c0f2a135b43080 (commit)
       via  85d27f6d9f310002f65dbc17b9c22e9976032cf8 (commit)
       via  5f227b42c183f961e83f537a9f84f13e32f4424e (commit)
       via  3ec8b27185f0c8600bc931c5284a5d73d0a42aac (commit)
      from  75d123d760d86f0e0d9f58d65874b40f6816008d (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 490c3882ac423e842e787ed8c157719dcf33a040
Author: Aleisha <aleishaamohia at hotmail.com>
Date:   Wed Aug 12 00:00:35 2015 +0000

    Bug 14484: warns when changing patron pw
    
    To test:
    1) Go to any patron's page, click Change password
    2) Notice warns in error log
    3) Apply patch, reload page
    4) Click Change password
    5) Notice warns are gone and page still works correctly
    
    Signed-off-by: Joonas Kylm?l? <j.kylmala 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 56a2607c46db30c318eda9dc44ae3c58731e23fe
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date:   Wed Aug 5 16:10:19 2015 -0300

    Bug 14646: Koha::RecordProcessor should accept more than one filter
    
    The docs say that Koha::RecordProcessor accepts more than one filter
    at a time. But as the regression tests show it doesn't.
    
    This is really important to extend its usage in record processing
    (either to enforce policy, transform, etc).
    
    This patch makes ->new evaluate the reference type of the passed filters
    and builds an array with a single item if a scalar has been passed. The
    loop now explicitly casts the filters as an array.
    
    To test:
    - Apply the test patch
    - Run
      $ prove t/RecordProcessor.t
    => FAIL: tests fail because Koha::RecordProcessor doesn't hanlde
             more than one filter at a time.
    - Apply this patch
    - Run
      $ prove t/RecordProcessor.t
    => SUCCESS: tests now pass
    - Easy, right? Sign off :-D
    
    NOTE: Read code. Don't like the ? operator logic, but it is
          functional despite readability issues.
    
    Signed-off-by: Mark Tompsett <mtompset at hotmail.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 406098b20b5385d2df588520abecefc868f4c0c0
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date:   Tue Aug 4 18:43:01 2015 -0300

    Bug 14646: (regression test) Koha::RecordProcessor only accepts one filter at a time
    
    This patch introduces new tests to t/RecordProcessor.t so it tests for
    creating processors with more than one filter. It does so by running
    
        my $processor = new Koha::RecordProcessor({
                                filters => ['Null','Dummy']
                            });
    
    and testing the results.
    
    To test:
    - Apply the patch
    - Run:
      $ prove t/RecordProcessor.t
    => FAIL: tests related to multiple filters fail.
    
    Signed-off-by: Mark Tompsett <mtompset at hotmail.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 91e9cafa7a7348753337e711013ed7d0ab7c0541
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date:   Mon Jun 1 15:21:32 2015 +0200

    Bug 3333: Confusing item status for not-for-loans
    
    This patch makes a tiny change in C4::Search::searchResults as to the
    handling of not-for-loans. This should make the display of status and
    availability of items more consistent in opac and staff.
    
    Additionally, a Place hold link should disappear in the opac, when it is
    not possible to place a hold on any item of one biblio.
    
    The following spots need special attention; the display should be
    corrected by this patch:
    [A] Location column showing number of available items in catalogue/search.
    [B] Location column of Cataloging Search (addbooks.pl)
    [C] OPAC Search results list in non-XSLT view.
    
    NOTE
    The forms opac-MARCdetail and MARCdetail also include an Items table with
    column Not for loan. The information in this column might still be somewhat
    confusing but is actually correct. The column only contains Not for loan if
    the item field is set. So it is empty when only the item type is nfl.
    Since a correction here is arguable, I am not including it on this report.
    
    Test plan:
    [1] Have at least two item types. Mark one item type (X) as not for loan.
    [2] Use at least two biblios with two items each. Mark one item of the first
        biblio as not for loan at item level (via item editor).
        Change one item of the second biblio to the item type of step 1 (X).
    [3] Set pref item-level_itypes==item and set all four xslt prefs (for opac
        and staff, results and detail) to default.
    [4] Check spots A, B and C as mentioned above. Also check:
        [D] OPAC Detail, Holdings table, Status column
        [E] Staff Detail, Holdings, Status.
    [5] Make all four xslt prefs now empty. Check spots A to E again.
        Especially observe C here.
    [6] Set pref item-level_itypes==biblio. Change your second biblio to item
        type of step 1 (X) in the cataloguing editor (MARC 942c).
        Check spots A to E again.
    [7] Set all four xslt prefs again to default. Check spots A to E again.
    [8] Run the unit test t/db_dependent/Search.t.
    
    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 unc.edu.ar>

commit d5a5e9576e3161e4b591ac910c88e7c703b89ee0
Author: Martin Stenberg <martin at xinxidi.net>
Date:   Tue Aug 18 16:41:42 2015 +0200

    Bug 14675: Don't update details if no changes made
    
    if no changes has been made for personal details, bring user back to details
    page and inform them that no changes has been made.
    
    Signed-off-by: Aleisha <aleishaamohia at hotmail.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 260dbd1c70ecd8cf76b452ec2f3c59365c9860e1
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date:   Mon Jul 6 11:00:38 2015 -0400

    Bug 14498: uri_escape error triggered by duplicate accountno's for patron
    
    If a patron has duplicate accountno's for two different fines in Koha this will trigger the error
    usi_escape: Unmatched [ in regex; marked by <-- HERE in m/([ <-- HERE ])/ at (eval 133) line 1.
    upon attempt to pay. How those accountno's get duplicated is unknown, but considering accountno
    is somewhat vestigial at this point in time, it would be much more sensible to use accountlines_id
    which is has guaranteed uniqueness at the database level.
    
    Test Plan:
    1) Create a patron with 2 fines
    2) Edit the accountno's for those fines and set them to 0
    3) Attempt to pay one, note the error
    4) Apply this patch
    5) Refesh the page
    6) Attempt to pay one, no error this time!
    7) Test Pay, Write off, Pay amount, Write off all, and Pay selected
    
    Signed-off-by: Deborah Duce <deborah.duce at huntsvillelibrary.ca>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>

commit 1dc947b18c86e4e07fe12d0b70c0f2a135b43080
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Wed Aug 19 09:12:04 2015 +0100

    Bug 14660: Fix 3 other cataloguing plugins
    
    These 3 should use C4::Output not to explode.
    
    Test plan:
    Link the plugins with the correct fields
    They should not log an error when calling them
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>

commit 85d27f6d9f310002f65dbc17b9c22e9976032cf8
Author: Katrin Fischer <Katrin.Fischer.83 at web.de>
Date:   Fri Aug 7 00:33:54 2015 +0200

    Bug 14660: Fix stocknumberam123.pl cataloguing plugin
    
    The cataloguing plugin stocknumberam123.pl is broken and no
    longer generating numbers - this patch fixes it.
    
    To test:
     - Link a subfield to the plugin - usually it's 952$i or the UNIMARC
       equivalent in your MARC frameworks
     - Create a new item, set the inventory number to: A 0000000002
     - Start to catalog another item, enter A into inventory and
     - Enter A as stocknumber and activate the plugin by clicking on
       ... at the end of the field
     - The number will not get added - Firebug shows an error:
       Undefined subroutine CGI::output_html_with_http_headers
     - Apply patch
     - Verify numbers are now generated and no errors are shown
    
    Signed-off-by: Josef Moravec <josef.moravec 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 5f227b42c183f961e83f537a9f84f13e32f4424e
Author: Katrin Fischer <Katrin.Fischer.83 at web.de>
Date:   Fri Aug 7 00:20:09 2015 +0200

    Bug 14660: Fix stocknumberAV.pl cataloguing plugin
    
    The cataloguing plugin stocknumberAV.pl is broken and no
    longer generating numbers - this patch fixes it.
    
    To test:
    - Link a subfield to the plugin - usually it's 952$i or the UNIMARC
      equivalent in your MARC frameworks
    - Set up a new authorised value INVENTORY, the code is an uppercase
      prefix - "B"
    - The Descriptions is your starting number - 1
    - The OPAC description remains empty
    - Catalalog an item
    - Enter B as stocknumber and activate the plugin by clicking on
      ... at the end of the field
    - The number will not get added - Firebug shows an error:
      Undefined subroutine CGI::output_html_with_http_headers
    - Apply patch
    - Verify numbers are now generated and no errors are shown
    
    Signed-off-by: Josef Moravec <josef.moravec 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 3ec8b27185f0c8600bc931c5284a5d73d0a42aac
Author: Galen Charlton <gmc at esilibrary.com>
Date:   Tue Aug 4 15:59:39 2015 +0000

    Bug 14644: unbreak SIP2 terminal login when using telnet transport
    
    This patch fixes breakage introduced by the patch for bug 13506
    that prevented SIP2 clients from authenticating themselves over
    the telnet transport. Attempts to do so would manifest by the
    SIPServer backend crashing and the connection getting closed.
    
    To test:
    
    [1] Use the stock SIPServer config, etc/SIPconfig.xml, and ensure
        that the database contains a staff user whose username is 'term1'
        and password is 'term1' that has the circulate permission.
    [2] Start SIPServer, telnet to port 8023, and attempt to log in.  The
        connection will be aborted:
    
        $ telnet localhost 8023
        Trying 127.0.0.1...
        Connected to localhost.
        Escape character is '^]'.
        login: term1
        password: term1
        Connection closed by foreign host.
    
    [3] Apply the patch and restart SIPSever, then repeat step 2.  This time,
        the login should succeed:
    
        $ telnet localhost 8023
        Trying 127.0.0.1...
        Connected to localhost.
        Escape character is '^]'.
        login: term1
        password: term1
        Login OK.  Initiating SIP
    
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>
    Signed-off-by: Colin Campbell <colin.campbell at ptfs-europe.com>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>

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

Summary of changes:
 C4/SIP/SIPServer.pm                                |    2 +-
 C4/Search.pm                                       |    2 +
 Koha/RecordProcessor.pm                            |   13 ++++--
 cataloguing/value_builder/callnumber-KU.pl         |    1 +
 cataloguing/value_builder/callnumber.pl            |    1 +
 cataloguing/value_builder/stocknumberAV.pl         |    1 +
 cataloguing/value_builder/stocknumberam123.pl      |    1 +
 cataloguing/value_builder/unimarc_field_010.pl     |    1 +
 .../intranet-tmpl/prog/en/modules/members/pay.tt   |   29 +++++++-------
 .../bootstrap/en/modules/opac-memberentry.tt       |    3 ++
 members/member-password.pl                         |    2 +-
 members/pay.pl                                     |    6 +--
 opac/opac-memberentry.pl                           |   42 ++++++++++++--------
 t/RecordProcessor.t                                |   37 ++++++++++++++++-
 14 files changed, 97 insertions(+), 44 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Thu Aug 20 18:48:10 2015
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Thu, 20 Aug 2015 16:48:10 +0000
Subject: [koha-commits] main Koha release repository branch master updated.
	v3.20.00-413-g3cbed1e
Message-ID: <E1ZST0c-0002Hq-VV@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  3cbed1e65e7fb62ef8460ba64b810b4038e6d70e (commit)
      from  490c3882ac423e842e787ed8c157719dcf33a040 (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 3cbed1e65e7fb62ef8460ba64b810b4038e6d70e
Author: Winona Salesky <wsalesky at gmail.com>
Date:   Mon May 11 10:47:36 2015 -0400

    Bug 14181: MARC21 773 -- Display when ind1 = 0 or blank
    
    Display 773 in opac and staff details when ind1 !=1
    
    Test plan
    =========
    
    1/ Add a new record which uses the 773 field to an instance running
       master code. (the selected MARC framework should have the 773's
       relevant sub-fields enabled and visible on staff client, opac and
       the editor).
    2/ Set ind1 as '0' (zero). The note should be displayed both on OPAC
       as well as the staff client.
    3/ Reset ind1 with a non-zero value or leave it blank. The display
       note should no longer be visible from either client or opac.
    4/ Apply the patch.
    5/ Repeat step #1 and #2. The note is displayed on staff and opac.
    6/ Repeat step #3. The display note should be visible on both staff
       and opac.
    7/ run koha-qa.pl -c 1 -v 2
    
    Note : For #1 above, the following LoC record was used:
           http://www.loc.gov/marc/bibliographic/examples.html#monographic
    
           The patch applied cleanly and performed as expected.
    
           The koha-qa.pl gave OK as results.
    
    Signed-off-by: Indranil Das Gupta  <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>

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

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


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Fri Aug 21 15:21:03 2015
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Fri, 21 Aug 2015 13:21:03 +0000
Subject: [koha-commits] main Koha release repository branch master updated.
	v3.20.00-422-ga6539ea
Message-ID: <E1ZSmFj-0002HL-MT@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  a6539ea73d87fbfcd0343ec17e705e198ac24b93 (commit)
       via  9eee8b90d72bf8d0bcbd10fe214b29518895798a (commit)
       via  183169fe8fe7e6c2ba5f786982f993328ebb527d (commit)
       via  c6d24b15ce4de1983fa1ccd6cb00d9131b195a62 (commit)
       via  a1359d8b8308e42a0f6bbede4c7c932875f6d037 (commit)
       via  b1eb5f2e444a0923cf9c19e3f8829abdb142ac2c (commit)
       via  44ef5c65a898fe8b5d71928b4fa0279d1f740728 (commit)
       via  4ce29452ad4839b6672126204ee867b10c28ca61 (commit)
       via  bb6277ffcc593685554112d770ac273c9efeda33 (commit)
      from  3cbed1e65e7fb62ef8460ba64b810b4038e6d70e (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 a6539ea73d87fbfcd0343ec17e705e198ac24b93
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date:   Wed Jul 22 14:19:09 2015 +0200

    Bug 14588: Simplify merge_ajax.pl
    
    This script does not need a few modules:
        IO::File; CGI::Session; C4::UploadedFile.
    Warnings can be enabled (with Modern::Perl).
    Indirect object syntax replaced for CGI and CGI::Cookie.
    Moved the $reply line upwards (not needed twice anymore).
    
    Test plan:
    [1] Log in as staff user. Run the URL cataloguing/merge_ajax.pl.
        You should see the JSON reponse in the browser.
    [2] Logout. Run the URL again. Blank screen.
    [3] Go to addbooks.pl (Cataloging Search). Search something, select two
        biblios and click Merge selected, etc.
    
    Signed-off-by: Joonas Kylmala <j.kylmala at gmail.com>
    
    Signed-off-by: Mark Tompsett <mtompset at hotmail.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 9eee8b90d72bf8d0bcbd10fe214b29518895798a
Author: David Cook <dcook at prosentient.com.au>
Date:   Tue Apr 21 10:34:52 2015 +1000

    Bug 14031: Itemnumber should be a numeric search in ccl.properties
    
    This patch changes the "itemnumber" alias so that it acts like
    "itemnumber,st-numeric". That is, it always does a numeric search.
    
    _TEST PLAN_
    
    The best way to test this patch is to apply the patch and then run
    "make upgrade", I suspect. As this will refresh your "ccl.properties".
    
    However, this patch is actually really small, so you can just apply
    it manually to an existing "ccl.properties" if you rather save time.
    
    Basically, you just need to do the following steps:
    
    0) Do a search for "itemnumber:<insert real indexed itemnumber here>"
    1) Note that you can't retrieve any results
    2) Change your ccl.properties to say "itemnumber 1=8010 4=109"
    3) Repeat the search for "itemnumber:<X>"
    4) Note that you now retrieve your result
    
    Signed-off-by: Magnus Enger <magnus at libriotech.no>
    Tested on a gitified package install. Made the change to
    /etc/koha/zebradb/ccl.properties manually. After this change
    I can successfully search for "itemnumber:1".
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>

commit 183169fe8fe7e6c2ba5f786982f993328ebb527d
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Wed Aug 19 08:45:00 2015 +0100

    Bug 14652: Change one more occurrence of N/A.
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>

commit c6d24b15ce4de1983fa1ccd6cb00d9131b195a62
Author: Liz Rea <liz at catalyst.net.nz>
Date:   Thu Aug 6 11:03:43 2015 +1200

    Bug 14652: change gender specification from "N/A" to "None specified"
    
    To test:
    
    Edit a patron in the intranet, note that the gender options are "Female," "Male," and "None specified"
    
    Setting "None specified" should result in the gender not being shown on the patron detail page (unchanged functionality)
    
    In the opac, log in and click the "your personal details" tab, and note that the gender options are "Female," "Male," and "None specified"
    
    Signed-off-by: Mirko Tietgen <mirko at abunchofthings.net>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>

commit a1359d8b8308e42a0f6bbede4c7c932875f6d037
Author: Winona Salesky <wsalesky at gmail.com>
Date:   Tue Apr 28 22:11:57 2015 -0400

    Bug 13734: RDA: Display 33xs
    
        Test Plan:
        1) Apply this patch
        2) Ensure you are using the default XSLT setting for the staff and opac search results and record details
        3) Find or create a record with MARC tags 336,337,338
        4) Perform an opac search that would show the record in the search results.
        5) Click title to review record.
        6) Adds fields 336, 337 and 338 to staff and opac details. Adds comma between multiple subfields and | with class='separator' between multiple datafields (e.g. two 336 fields)
        7) Repeat steps 4 - 6 for the staff interface
    
    Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
    Works, no errors
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>

commit b1eb5f2e444a0923cf9c19e3f8829abdb142ac2c
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date:   Fri Aug 7 08:39:19 2015 -0700

    Bug 14661: space needed in added to staff side cart message, if items added are already in cart
    
    There is a missing space in the "added to cart" message on the staff side, when you are adding 2 or more items to the cart, where 1+ is already in the cart and 1+ is not in the cart. I verified that this is not an issue in the OPAC cart function.
    
    Test:
    
    1. Search for records in your system.
    2. In search results, select the first two records and choose Add to Cart.
    3. Message returned, "2 item(s) added to your cart", as expected.
    4. Keep those 2 records selected, and select 2 additional records (so 4 total records selected), and choose Add to Cart again.
    5. Message returned, "2 item(s) added to your cart2 already in your cart".
    6. Apply this patch
    7. Repeat steps 1 through 4
    8. Note the two phrases are on separate lines
    
    Signed-off-by: Heather Braum <hbraum at nekls.org>
    Signed-off-by: Joonas Kylm?l? <j.kylmala 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 44ef5c65a898fe8b5d71928b4fa0279d1f740728
Author: Tomas Cohen Arazi <tomascohen at unc.edu.ar>
Date:   Fri Aug 21 09:47:08 2015 -0300

    Bug 6874: (QA followup) fix templates
    
    Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>

commit 4ce29452ad4839b6672126204ee867b10c28ca61
Author: Jesse Weaver <pianohacker at gmail.com>
Date:   Tue Jul 7 13:02:18 2015 -0600

    Bug 14464: (QA followup) add unit tests
    
    This followup adds several tests to t/db_dependent/Reserves.t.
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>

commit bb6277ffcc593685554112d770ac273c9efeda33
Author: Jesse Weaver <pianohacker at gmail.com>
Date:   Tue Jun 9 16:22:05 2015 -0600

    Bug 14464: Add ability to cancel waiting holds from checkin screen
    
    Test plan:
    
        1. Ensure that ExpireReservesMaxPickUpDelayCharge is set to 0.
        2. Place a hold (doesn't matter whether it's a bib/item-level hold),
           then confirm the hold by checking it in.
        3. Check in the item again, and hit Cancel.
        4. The reserve in question should be cancelled.
        5. Repeat steps 2-4 twice, once after setting
           ExpireReservesMaxPickUpDelayCharge to a nonzero value and again
           after clicking the "Forgive fees for manually expired holds"
           checkbox.
    
    A fine should only be applied when the syspref is enabled and the
    checkbox is not checked. Also, the checkbox should only appear after
    enabling the syspref. And finally, the checkbox should remember whether
    it is checked across multiple checkins, same as the "Forgive overdue
    charges" and "Book drop mode" checkboxes.
    
    Signed-off-by: Jason Burds <jburds at dubuque.lib.ia.us>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    Amended patch: Removed 2 debugging lines.
    Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>

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

Summary of changes:
 C4/Reserves.pm                                     |   23 +++---
 cataloguing/merge_ajax.pl                          |   22 +++---
 circ/returns.pl                                    |   19 ++++-
 etc/zebradb/ccl.properties                         |    2 +-
 koha-tmpl/intranet-tmpl/prog/en/js/basket.js       |    1 +
 .../en/modules/cataloguing/value_builder/upload.tt |    2 +-
 .../value_builder/upload_delete_file.tt            |    2 +-
 .../intranet-tmpl/prog/en/modules/circ/returns.tt  |   30 ++++++++
 .../prog/en/modules/members/memberentrygen.tt      |    6 +-
 .../prog/en/xslt/MARC21slim2intranetDetail.xsl     |   41 ++++++++++
 .../bootstrap/en/modules/opac-memberentry.tt       |    2 +-
 .../bootstrap/en/xslt/MARC21slim2OPACDetail.xsl    |   43 +++++++++++
 t/db_dependent/Reserves.t                          |   81 +++++++++++++++++++-
 13 files changed, 239 insertions(+), 35 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Fri Aug 21 20:36:51 2015
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Fri, 21 Aug 2015 18:36:51 +0000
Subject: [koha-commits] main Koha release repository branch master updated.
	v3.20.00-424-g16f382e
Message-ID: <E1ZSrBL-0003zz-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, master has been updated
       via  16f382e7ecb0a7d817da59c45dcd58655e3949ee (commit)
       via  e2ad507500bf36b7c8ea1d16f31e8155940e1909 (commit)
      from  a6539ea73d87fbfcd0343ec17e705e198ac24b93 (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 16f382e7ecb0a7d817da59c45dcd58655e3949ee
Author: Winona Salesky <wsalesky at gmail.com>
Date:   Tue Apr 28 21:41:52 2015 -0400

    Bug 13387: Uniform titles (130 / 240 / 730) Display in XSLT
    
    Test Plan:
    1) Apply this patch
    2) Ensure you are using the default XSLT setting for the staff and opac record details
    3) Find or create a record with MARC tags 130/240/730
    4) Perform an opac search that would show the record in the search results.
    5) Click title to review record.
    6) Fields show subfields a,d,f,g,h,k,l,m,n,o,p,r,s,t with multiple fields separated by span class=separator |
    7) Repeat steps 4 - 6 for the staff interface
    
    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 e2ad507500bf36b7c8ea1d16f31e8155940e1909
Author: Tomas Cohen Arazi <tomascohen at unc.edu.ar>
Date:   Wed Aug 19 11:01:32 2015 -0300

    Bug 14693: Contract.t should generate dates based on current date
    
    The current test for still-active contracts fails because it was written
    with fixed dates, which already passed :-D
    
    This patch calculates the current date, and uses it to generate a future
    one, so the tests serve their purpose no matter what the current date is.
    
    To test:
    - Run:
      $ prove t/db_dependent/Contract.t
    => FAIL: activeonly compares contractenddate with now(), and fails
             because a fixed 2015-07-31 is writteng on the test data
    - Apply the patch
    - Run:
      $ prove t/db_dependent/Contract.t
    => SUCCESS: the sample data has been calculated using the current date
                and the tests pass.
    - Sign off :-D
    
    Edit: added missing use DateTime::Duration,
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>

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

Summary of changes:
 .../prog/en/xslt/MARC21slim2intranetDetail.xsl     |   30 ++++++---------
 .../bootstrap/en/xslt/MARC21slim2OPACDetail.xsl    |   40 +++++++++-----------
 t/db_dependent/Contract.t                          |   10 ++++-
 3 files changed, 37 insertions(+), 43 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Sun Aug 23 08:09:18 2015
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Sun, 23 Aug 2015 06:09:18 +0000
Subject: [koha-commits] main Koha release repository branch 3.20.x updated.
	v3.20.02-28-g5310bad
Message-ID: <E1ZTOT0-0003J3-HR@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  5310bad63f53f4b0b6da1b7e79c6299fcbb3ac0e (commit)
       via  9c98d166644b0388c013d489393a00627b1d1c4b (commit)
       via  c0f40ce040245f4e3dc238e682dd250ee3c6d478 (commit)
      from  d14d01d7604a349377c3a02cbc5879e597b06895 (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 5310bad63f53f4b0b6da1b7e79c6299fcbb3ac0e
Author: Galen Charlton <gmc at esilibrary.com>
Date:   Tue Aug 4 15:59:39 2015 +0000

    Bug 14644: unbreak SIP2 terminal login when using telnet transport
    
    This patch fixes breakage introduced by the patch for bug 13506
    that prevented SIP2 clients from authenticating themselves over
    the telnet transport. Attempts to do so would manifest by the
    SIPServer backend crashing and the connection getting closed.
    
    To test:
    
    [1] Use the stock SIPServer config, etc/SIPconfig.xml, and ensure
        that the database contains a staff user whose username is 'term1'
        and password is 'term1' that has the circulate permission.
    [2] Start SIPServer, telnet to port 8023, and attempt to log in.  The
        connection will be aborted:
    
        $ telnet localhost 8023
        Trying 127.0.0.1...
        Connected to localhost.
        Escape character is '^]'.
        login: term1
        password: term1
        Connection closed by foreign host.
    
    [3] Apply the patch and restart SIPSever, then repeat step 2.  This time,
        the login should succeed:
    
        $ telnet localhost 8023
        Trying 127.0.0.1...
        Connected to localhost.
        Escape character is '^]'.
        login: term1
        password: term1
        Login OK.  Initiating SIP
    
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>
    Signed-off-by: Colin Campbell <colin.campbell at ptfs-europe.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 3ec8b27185f0c8600bc931c5284a5d73d0a42aac)
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

commit 9c98d166644b0388c013d489393a00627b1d1c4b
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Tue Jul 14 16:26:36 2015 +0100

    Bug 14517: List shelves list is broken for translated interfaces
    
    The translation script adds quotes ("") around translated string (Edit
    for instance).
    Which breaks the json structure.
    
    Example:
    "dt_action": "<a style=\"cursor:pointer\"><form action='shelves.pl'
    method='get'><input class="editshelf" value="Editar" type="submit"
    /></form></a>"
    
    Test plan:
    1/ On the staff interface create a private list
    2/ Go to More > Lists ('Your lists' tab)
    3/ Translate the templates to any language like:
      $ cd misc/translator/
      $ perl translate install es-ES
    4/ Enable the translated templates on the sysprefs
    5/ Switch to the translated language
    6/ Go to the lists page (Mas > Listas in es-ES)
    The list should be displayed correctly.
    
    Note: There is a limitation. If a translated string contains a simple
    quote ('), it will also break the json.
    
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    
    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 75c70d42a5df526c8bed8633d65721696a0fa176)
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

commit c0f40ce040245f4e3dc238e682dd250ee3c6d478
Author: Fr?d?ric Demians <f.demians at tamil.fr>
Date:   Thu Jul 23 09:47:15 2015 +0200

    Bug 14592: Export data bad encoding
    
    Tools > Export data produces a file badly encoded, when marc/xml file
    format is chosen. It works with CSV.
    
    To test:
    
    1. Tools > Export data
    2. Choose a limited interval of biblionumber
    3. Export in marc/xml/csv.
    4. Check files exported at 3: csv file is ok. marc/xml files are
       corrupted, ie badly encoded.
    5. Apply the patch
    6. Repeat steps 3&4, and confirm that all file formats are valid.
    
    Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>
    
    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 dfe07fa410eb48241c218abcc156c466576dcc9a)
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

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

Summary of changes:
 C4/SIP/SIPServer.pm                                |    2 +-
 .../virtualshelves/tables/shelves_results.tt       |   35 ++++++++++++++++----
 tools/export.pl                                    |    3 +-
 3 files changed, 32 insertions(+), 8 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Mon Aug 24 00:13:15 2015
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Sun, 23 Aug 2015 22:13:15 +0000
Subject: [koha-commits] main Koha release repository branch 3.20.x updated.
	v3.20.02-32-gec2297d
Message-ID: <E1ZTdVr-0008H2-IA@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  ec2297d075dbed0837c766db768defec173b4001 (commit)
       via  13385111dcd98af10f06593461e8225a0ced5b97 (commit)
       via  d478dc915915a74000bd053b87e25a1700b06030 (commit)
       via  8538cc03f1cffb5b5eeabb06bf6c82e579f5528f (commit)
      from  5310bad63f53f4b0b6da1b7e79c6299fcbb3ac0e (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 ec2297d075dbed0837c766db768defec173b4001
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Wed Aug 19 15:42:10 2015 +0100

    Bug 14566: Fix permissions in patronimage.pl
    
    There is no permission needed to access the patronimage.pl script.
    This means anybody cans access to the patron's images.
    
    Test plan:
    Add an image to borrowernumber 42 and call
    /cgi-bin/koha/members/patronimage.pl?borrowernumber=42
    
    If you are logged in with borrowers permissions, you will see the image,
    otherwise you will get a blank page with a 403 header.
    
    Signed-off-by: Indranil Das Gupta (L2C2 Technologies) <indradg at gmail.com>
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

commit 13385111dcd98af10f06593461e8225a0ced5b97
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Wed Aug 19 09:12:04 2015 +0100

    Bug 14660: Fix 3 other cataloguing plugins
    
    These 3 should use C4::Output not to explode.
    
    Test plan:
    Link the plugins with the correct fields
    They should not log an error when calling them
    
    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 1dc947b18c86e4e07fe12d0b70c0f2a135b43080)
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

commit d478dc915915a74000bd053b87e25a1700b06030
Author: Katrin Fischer <Katrin.Fischer.83 at web.de>
Date:   Fri Aug 7 00:33:54 2015 +0200

    Bug 14660: Fix stocknumberam123.pl cataloguing plugin
    
    The cataloguing plugin stocknumberam123.pl is broken and no
    longer generating numbers - this patch fixes it.
    
    To test:
     - Link a subfield to the plugin - usually it's 952$i or the UNIMARC
       equivalent in your MARC frameworks
     - Create a new item, set the inventory number to: A 0000000002
     - Start to catalog another item, enter A into inventory and
     - Enter A as stocknumber and activate the plugin by clicking on
       ... at the end of the field
     - The number will not get added - Firebug shows an error:
       Undefined subroutine CGI::output_html_with_http_headers
     - Apply patch
     - Verify numbers are now generated and no errors are shown
    
    Signed-off-by: Josef Moravec <josef.moravec 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 85d27f6d9f310002f65dbc17b9c22e9976032cf8)
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

commit 8538cc03f1cffb5b5eeabb06bf6c82e579f5528f
Author: Katrin Fischer <Katrin.Fischer.83 at web.de>
Date:   Fri Aug 7 00:20:09 2015 +0200

    Bug 14660: Fix stocknumberAV.pl cataloguing plugin
    
    The cataloguing plugin stocknumberAV.pl is broken and no
    longer generating numbers - this patch fixes it.
    
    To test:
    - Link a subfield to the plugin - usually it's 952$i or the UNIMARC
      equivalent in your MARC frameworks
    - Set up a new authorised value INVENTORY, the code is an uppercase
      prefix - "B"
    - The Descriptions is your starting number - 1
    - The OPAC description remains empty
    - Catalalog an item
    - Enter B as stocknumber and activate the plugin by clicking on
      ... at the end of the field
    - The number will not get added - Firebug shows an error:
      Undefined subroutine CGI::output_html_with_http_headers
    - Apply patch
    - Verify numbers are now generated and no errors are shown
    
    Signed-off-by: Josef Moravec <josef.moravec 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 5f227b42c183f961e83f537a9f84f13e32f4424e)
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

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

Summary of changes:
 cataloguing/value_builder/callnumber-KU.pl     |    1 +
 cataloguing/value_builder/callnumber.pl        |    1 +
 cataloguing/value_builder/stocknumberAV.pl     |    1 +
 cataloguing/value_builder/stocknumberam123.pl  |    1 +
 cataloguing/value_builder/unimarc_field_010.pl |    1 +
 members/patronimage.pl                         |   23 ++++++++++++++++-------
 6 files changed, 21 insertions(+), 7 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Mon Aug 24 01:16:58 2015
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Sun, 23 Aug 2015 23:16:58 +0000
Subject: [koha-commits] main Koha release repository branch 3.18.x updated.
	v3.18.09-23-g46c979d
Message-ID: <E1ZTeVW-0000E5-Hi@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  46c979d0c970c079702ed872ab318192393b7815 (commit)
       via  c68fc8ad3e5069e52b9bd0487faa3094e9eee4cc (commit)
       via  79938f2bcc495631992c030022279532ea7ca278 (commit)
      from  6a8871e26d0b32aee73e5d7389e99c3b7e333f8e (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 46c979d0c970c079702ed872ab318192393b7815
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Wed Aug 19 15:42:10 2015 +0100

    Bug 14566: Fix permissions in patronimage.pl
    
    There is no permission needed to access the patronimage.pl script.
    This means anybody cans access to the patron's images.
    
    Test plan:
    Add an image to borrowernumber 42 and call
    /cgi-bin/koha/members/patronimage.pl?borrowernumber=42
    
    If you are logged in with borrowers permissions, you will see the image,
    otherwise you will get a blank page with a 403 header.
    
    Signed-off-by: Indranil Das Gupta (L2C2 Technologies) <indradg at gmail.com>
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    Signed-off-by: Liz Rea <wizzyrea at gmail.com>
    
    Conflicts:
    	members/patronimage.pl

commit c68fc8ad3e5069e52b9bd0487faa3094e9eee4cc
Author: Galen Charlton <gmc at esilibrary.com>
Date:   Tue Aug 4 15:59:39 2015 +0000

    Bug 14644: unbreak SIP2 terminal login when using telnet transport
    
    This patch fixes breakage introduced by the patch for bug 13506
    that prevented SIP2 clients from authenticating themselves over
    the telnet transport. Attempts to do so would manifest by the
    SIPServer backend crashing and the connection getting closed.
    
    To test:
    
    [1] Use the stock SIPServer config, etc/SIPconfig.xml, and ensure
        that the database contains a staff user whose username is 'term1'
        and password is 'term1' that has the circulate permission.
    [2] Start SIPServer, telnet to port 8023, and attempt to log in.  The
        connection will be aborted:
    
        $ telnet localhost 8023
        Trying 127.0.0.1...
        Connected to localhost.
        Escape character is '^]'.
        login: term1
        password: term1
        Connection closed by foreign host.
    
    [3] Apply the patch and restart SIPSever, then repeat step 2.  This time,
        the login should succeed:
    
        $ telnet localhost 8023
        Trying 127.0.0.1...
        Connected to localhost.
        Escape character is '^]'.
        login: term1
        password: term1
        Login OK.  Initiating SIP
    
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>
    Signed-off-by: Colin Campbell <colin.campbell at ptfs-europe.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 3ec8b27185f0c8600bc931c5284a5d73d0a42aac)
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    Signed-off-by: Liz Rea <wizzyrea at gmail.com>

commit 79938f2bcc495631992c030022279532ea7ca278
Author: Owen Leonard <oleonard at myacpl.org>
Date:   Tue Dec 2 13:01:21 2014 -0500

    Bug 14690 - [3.18.x] Patron import tool page missing extra search patron options
    
    To test, apply the patch and navigate to the Patrons home page. Expand
    the hidden search fields in the search header and confirm that the
    layout looks correct. Perform some searches and check that the results
    are correct and that the modified search fields retain their state.
    
    Also please be sure to check the patron import page.
    
    Owen is listed as the author of this, because that's mostly true - I just resolved the conflict for 3.18.x (LR)

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

Summary of changes:
 C4/SIP/SIPServer.pm                                |    2 +-
 .../prog/en/includes/patron-search.inc             |  217 ++++++++++----------
 members/patronimage.pl                             |   21 +-
 3 files changed, 127 insertions(+), 113 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Mon Aug 24 01:19:37 2015
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Sun, 23 Aug 2015 23:19:37 +0000
Subject: [koha-commits] main Koha release repository branch 3.18.x updated.
	v3.18.09-24-gde5bf00
Message-ID: <E1ZTeY5-0000Gg-Ig@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  de5bf00e8b9ffc18896e7cff4c2d753ac894def9 (commit)
      from  46c979d0c970c079702ed872ab318192393b7815 (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 de5bf00e8b9ffc18896e7cff4c2d753ac894def9
Author: Liz Rea <wizzyrea at gmail.com>
Date:   Mon Aug 24 11:21:11 2015 +1200

    Revert "Bug 14644: unbreak SIP2 terminal login when using telnet transport"
    
    This reverts commit c68fc8ad3e5069e52b9bd0487faa3094e9eee4cc.
    
    Realised just a bit too late that this didn't apply to 3.18

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

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


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Mon Aug 24 01:21:19 2015
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Sun, 23 Aug 2015 23:21:19 +0000
Subject: [koha-commits] main Koha release repository branch 3.20.x updated.
	v3.20.02-33-gb0cbdfe
Message-ID: <E1ZTeZj-0000IQ-BO@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  b0cbdfe7e57f6c0b88088456dbfb3f2c5a75f450 (commit)
      from  ec2297d075dbed0837c766db768defec173b4001 (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 b0cbdfe7e57f6c0b88088456dbfb3f2c5a75f450
Author: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
Date:   Sun Aug 23 19:51:11 2015 -0300

    Translation updates for Koha 3.20.3 release

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

Summary of changes:
 misc/translator/po/am-Ethi-opac-bootstrap.po    |   43 +-
 misc/translator/po/am-Ethi-staff-help.po        |    8 +-
 misc/translator/po/am-Ethi-staff-prog.po        |    4 +-
 misc/translator/po/ar-Arab-opac-bootstrap.po    |  309 +-
 misc/translator/po/ar-Arab-pref.po              |   24 +-
 misc/translator/po/ar-Arab-staff-help.po        |  479 +-
 misc/translator/po/ar-Arab-staff-prog.po        |  101 +-
 misc/translator/po/az-AZ-opac-bootstrap.po      |   43 +-
 misc/translator/po/az-AZ-staff-help.po          |    8 +-
 misc/translator/po/az-AZ-staff-prog.po          |    4 +-
 misc/translator/po/be-BY-opac-bootstrap.po      |   43 +-
 misc/translator/po/be-BY-staff-help.po          |    8 +-
 misc/translator/po/be-BY-staff-prog.po          |    4 +-
 misc/translator/po/bg-Cyrl-opac-bootstrap.po    |   43 +-
 misc/translator/po/bg-Cyrl-staff-help.po        |    8 +-
 misc/translator/po/bg-Cyrl-staff-prog.po        |    4 +-
 misc/translator/po/bn-IN-opac-bootstrap.po      |   43 +-
 misc/translator/po/bn-IN-staff-help.po          |    8 +-
 misc/translator/po/bn-IN-staff-prog.po          |    4 +-
 misc/translator/po/ca-ES-opac-bootstrap.po      |   43 +-
 misc/translator/po/ca-ES-staff-help.po          |    8 +-
 misc/translator/po/ca-ES-staff-prog.po          |    4 +-
 misc/translator/po/cs-CZ-opac-bootstrap.po      |   57 +-
 misc/translator/po/cs-CZ-pref.po                |   17 +-
 misc/translator/po/cs-CZ-staff-help.po          |   12 +-
 misc/translator/po/cs-CZ-staff-prog.po          |   24 +-
 misc/translator/po/da-DK-marc-MARC21.po         |   44 +-
 misc/translator/po/da-DK-opac-bootstrap.po      |  350 +-
 misc/translator/po/da-DK-staff-help.po          |    8 +-
 misc/translator/po/da-DK-staff-prog.po          |  131 +-
 misc/translator/po/de-CH-opac-bootstrap.po      |  365 +-
 misc/translator/po/de-CH-pref.po                |   36 +-
 misc/translator/po/de-CH-staff-help.po          |  560 +-
 misc/translator/po/de-CH-staff-prog.po          |  175 +-
 misc/translator/po/de-DE-opac-bootstrap.po      |   57 +-
 misc/translator/po/de-DE-pref.po                |   16 +-
 misc/translator/po/de-DE-staff-help.po          |   24 +-
 misc/translator/po/de-DE-staff-prog.po          |   24 +-
 misc/translator/po/el-GR-opac-bootstrap.po      | 1878 ++---
 misc/translator/po/el-GR-staff-help.po          |    8 +-
 misc/translator/po/el-GR-staff-prog.po          |    4 +-
 misc/translator/po/en-GB-opac-bootstrap.po      |   43 +-
 misc/translator/po/en-GB-staff-help.po          |    8 +-
 misc/translator/po/en-GB-staff-prog.po          |    4 +-
 misc/translator/po/en-NZ-opac-bootstrap.po      |   73 +-
 misc/translator/po/en-NZ-pref.po                |   14 +-
 misc/translator/po/en-NZ-staff-help.po          |   42 +-
 misc/translator/po/en-NZ-staff-prog.po          |   34 +-
 misc/translator/po/eo-opac-bootstrap.po         |   43 +-
 misc/translator/po/eo-staff-help.po             |    8 +-
 misc/translator/po/eo-staff-prog.po             |    4 +-
 misc/translator/po/es-ES-marc-MARC21.po         |   13 +-
 misc/translator/po/es-ES-marc-UNIMARC.po        |   19 +-
 misc/translator/po/es-ES-opac-bootstrap.po      |   86 +-
 misc/translator/po/es-ES-pref.po                |   38 +-
 misc/translator/po/es-ES-staff-help.po          |  103 +-
 misc/translator/po/es-ES-staff-prog.po          |  103 +-
 misc/translator/po/eu-opac-bootstrap.po         |   43 +-
 misc/translator/po/eu-staff-help.po             |    8 +-
 misc/translator/po/eu-staff-prog.po             |    4 +-
 misc/translator/po/fa-Arab-opac-bootstrap.po    |   43 +-
 misc/translator/po/fa-Arab-staff-help.po        |    8 +-
 misc/translator/po/fa-Arab-staff-prog.po        |    4 +-
 misc/translator/po/fi-FI-opac-bootstrap.po      |   43 +-
 misc/translator/po/fi-FI-staff-help.po          |    8 +-
 misc/translator/po/fi-FI-staff-prog.po          |    4 +-
 misc/translator/po/fo-FO-opac-bootstrap.po      |   43 +-
 misc/translator/po/fo-FO-staff-help.po          |    8 +-
 misc/translator/po/fo-FO-staff-prog.po          |    4 +-
 misc/translator/po/fr-CA-marc-MARC21.po         |   25 +-
 misc/translator/po/fr-CA-opac-bootstrap.po      |  198 +-
 misc/translator/po/fr-CA-pref.po                |   24 +-
 misc/translator/po/fr-CA-staff-help.po          |    8 +-
 misc/translator/po/fr-CA-staff-prog.po          | 3130 ++++----
 misc/translator/po/fr-FR-opac-bootstrap.po      |  135 +-
 misc/translator/po/fr-FR-pref.po                |   36 +-
 misc/translator/po/fr-FR-staff-help.po          |  260 +-
 misc/translator/po/fr-FR-staff-prog.po          |  359 +-
 misc/translator/po/gl-opac-bootstrap.po         |   43 +-
 misc/translator/po/gl-staff-help.po             |    8 +-
 misc/translator/po/gl-staff-prog.po             |    4 +-
 misc/translator/po/he-Hebr-opac-bootstrap.po    |   43 +-
 misc/translator/po/he-Hebr-staff-help.po        |    8 +-
 misc/translator/po/he-Hebr-staff-prog.po        |    4 +-
 misc/translator/po/hi-opac-bootstrap.po         |   43 +-
 misc/translator/po/hi-staff-help.po             |    8 +-
 misc/translator/po/hi-staff-prog.po             |    4 +-
 misc/translator/po/hr-HR-opac-bootstrap.po      |   43 +-
 misc/translator/po/hr-HR-staff-help.po          |    8 +-
 misc/translator/po/hr-HR-staff-prog.po          |    4 +-
 misc/translator/po/hu-HU-opac-bootstrap.po      |   43 +-
 misc/translator/po/hu-HU-staff-help.po          |    8 +-
 misc/translator/po/hu-HU-staff-prog.po          |    4 +-
 misc/translator/po/hy-Armn-opac-bootstrap.po    |  321 +-
 misc/translator/po/hy-Armn-pref.po              |   14 +-
 misc/translator/po/hy-Armn-staff-help.po        |  548 +-
 misc/translator/po/hy-Armn-staff-prog.po        |   50 +-
 misc/translator/po/id-ID-opac-bootstrap.po      |   43 +-
 misc/translator/po/id-ID-staff-help.po          |    8 +-
 misc/translator/po/id-ID-staff-prog.po          |    4 +-
 misc/translator/po/is-IS-opac-bootstrap.po      |   43 +-
 misc/translator/po/is-IS-staff-help.po          |    8 +-
 misc/translator/po/is-IS-staff-prog.po          |    4 +-
 misc/translator/po/it-IT-opac-bootstrap.po      |   65 +-
 misc/translator/po/it-IT-pref.po                |   15 +-
 misc/translator/po/it-IT-staff-help.po          |  102 +-
 misc/translator/po/it-IT-staff-prog.po          |    8 +-
 misc/translator/po/ja-Jpan-JP-opac-bootstrap.po |   43 +-
 misc/translator/po/ja-Jpan-JP-staff-help.po     |    8 +-
 misc/translator/po/ja-Jpan-JP-staff-prog.po     |    4 +-
 misc/translator/po/ka-opac-bootstrap.po         |   43 +-
 misc/translator/po/ka-staff-help.po             |    8 +-
 misc/translator/po/ka-staff-prog.po             |    4 +-
 misc/translator/po/km-KH-opac-bootstrap.po      |   43 +-
 misc/translator/po/km-KH-staff-help.po          |    8 +-
 misc/translator/po/km-KH-staff-prog.po          |    4 +-
 misc/translator/po/kn-Knda-opac-bootstrap.po    |   43 +-
 misc/translator/po/kn-Knda-staff-help.po        |    8 +-
 misc/translator/po/kn-Knda-staff-prog.po        |    4 +-
 misc/translator/po/ko-Kore-KP-marc-MARC21.po    | 4922 ++++++-------
 misc/translator/po/ko-Kore-KP-marc-UNIMARC.po   |   28 +-
 misc/translator/po/ko-Kore-KP-opac-bootstrap.po |  389 +-
 misc/translator/po/ko-Kore-KP-staff-help.po     | 2049 ++++--
 misc/translator/po/ko-Kore-KP-staff-prog.po     | 8719 +++++++++++------------
 misc/translator/po/ku-Arab-opac-bootstrap.po    |   43 +-
 misc/translator/po/ku-Arab-staff-help.po        |    8 +-
 misc/translator/po/ku-Arab-staff-prog.po        |    4 +-
 misc/translator/po/lo-Laoo-opac-bootstrap.po    |   43 +-
 misc/translator/po/lo-Laoo-staff-help.po        |    8 +-
 misc/translator/po/lo-Laoo-staff-prog.po        |    4 +-
 misc/translator/po/mi-NZ-opac-bootstrap.po      |   43 +-
 misc/translator/po/mi-NZ-staff-help.po          |    8 +-
 misc/translator/po/mi-NZ-staff-prog.po          |    4 +-
 misc/translator/po/mon-opac-bootstrap.po        |   43 +-
 misc/translator/po/mon-staff-help.po            |    8 +-
 misc/translator/po/mon-staff-prog.po            |    4 +-
 misc/translator/po/mr-opac-bootstrap.po         |   43 +-
 misc/translator/po/mr-staff-help.po             |    8 +-
 misc/translator/po/mr-staff-prog.po             |    4 +-
 misc/translator/po/ms-MY-opac-bootstrap.po      |   43 +-
 misc/translator/po/ms-MY-staff-help.po          |    8 +-
 misc/translator/po/ms-MY-staff-prog.po          |    4 +-
 misc/translator/po/nb-NO-opac-bootstrap.po      |   43 +-
 misc/translator/po/nb-NO-staff-help.po          |    8 +-
 misc/translator/po/nb-NO-staff-prog.po          |    4 +-
 misc/translator/po/ne-NE-opac-bootstrap.po      |   43 +-
 misc/translator/po/ne-NE-staff-help.po          |    8 +-
 misc/translator/po/ne-NE-staff-prog.po          |    4 +-
 misc/translator/po/nl-BE-opac-bootstrap.po      |   61 +-
 misc/translator/po/nl-BE-staff-help.po          |    8 +-
 misc/translator/po/nl-BE-staff-prog.po          |   28 +-
 misc/translator/po/nl-NL-opac-bootstrap.po      |   43 +-
 misc/translator/po/nl-NL-staff-help.po          |    8 +-
 misc/translator/po/nl-NL-staff-prog.po          |    4 +-
 misc/translator/po/nn-NO-opac-bootstrap.po      |   43 +-
 misc/translator/po/nn-NO-staff-help.po          |    8 +-
 misc/translator/po/nn-NO-staff-prog.po          |    4 +-
 misc/translator/po/pbr-opac-bootstrap.po        |   43 +-
 misc/translator/po/pbr-staff-help.po            |    8 +-
 misc/translator/po/pbr-staff-prog.po            |    4 +-
 misc/translator/po/pl-PL-marc-UNIMARC.po        |  444 +-
 misc/translator/po/pl-PL-opac-bootstrap.po      |  336 +-
 misc/translator/po/pl-PL-pref.po                |   59 +-
 misc/translator/po/pl-PL-staff-help.po          | 2161 ++++--
 misc/translator/po/pl-PL-staff-prog.po          | 1689 ++---
 misc/translator/po/prs-opac-bootstrap.po        |   43 +-
 misc/translator/po/prs-staff-help.po            |    8 +-
 misc/translator/po/prs-staff-prog.po            |    4 +-
 misc/translator/po/pt-BR-opac-bootstrap.po      |   43 +-
 misc/translator/po/pt-BR-staff-help.po          |    8 +-
 misc/translator/po/pt-BR-staff-prog.po          |    4 +-
 misc/translator/po/pt-PT-opac-bootstrap.po      |  320 +-
 misc/translator/po/pt-PT-pref.po                |   14 +-
 misc/translator/po/pt-PT-staff-help.po          |   22 +-
 misc/translator/po/pt-PT-staff-prog.po          |   54 +-
 misc/translator/po/ro-RO-opac-bootstrap.po      |   43 +-
 misc/translator/po/ro-RO-staff-help.po          |    8 +-
 misc/translator/po/ro-RO-staff-prog.po          |    4 +-
 misc/translator/po/ru-RU-opac-bootstrap.po      |   56 +-
 misc/translator/po/ru-RU-staff-help.po          |    8 +-
 misc/translator/po/ru-RU-staff-prog.po          |    4 +-
 misc/translator/po/rw-RW-opac-bootstrap.po      |   43 +-
 misc/translator/po/rw-RW-staff-help.po          |    8 +-
 misc/translator/po/rw-RW-staff-prog.po          |    4 +-
 misc/translator/po/sd-PK-opac-bootstrap.po      |   43 +-
 misc/translator/po/sd-PK-staff-help.po          |    8 +-
 misc/translator/po/sd-PK-staff-prog.po          |    4 +-
 misc/translator/po/sk-SK-opac-bootstrap.po      |   43 +-
 misc/translator/po/sk-SK-staff-help.po          |    8 +-
 misc/translator/po/sk-SK-staff-prog.po          |    4 +-
 misc/translator/po/sl-SI-opac-bootstrap.po      |   43 +-
 misc/translator/po/sl-SI-staff-help.po          |    8 +-
 misc/translator/po/sl-SI-staff-prog.po          |    4 +-
 misc/translator/po/sq-AL-opac-bootstrap.po      |   43 +-
 misc/translator/po/sq-AL-staff-help.po          |    8 +-
 misc/translator/po/sq-AL-staff-prog.po          |    4 +-
 misc/translator/po/sr-Cyrl-opac-bootstrap.po    |   43 +-
 misc/translator/po/sr-Cyrl-staff-help.po        |    8 +-
 misc/translator/po/sr-Cyrl-staff-prog.po        |    4 +-
 misc/translator/po/sv-SE-opac-bootstrap.po      |   43 +-
 misc/translator/po/sv-SE-staff-help.po          |    8 +-
 misc/translator/po/sv-SE-staff-prog.po          |    4 +-
 misc/translator/po/sw-KE-opac-bootstrap.po      |   43 +-
 misc/translator/po/sw-KE-staff-help.po          |    8 +-
 misc/translator/po/sw-KE-staff-prog.po          |    4 +-
 misc/translator/po/ta-LK-opac-bootstrap.po      |   43 +-
 misc/translator/po/ta-LK-staff-help.po          |    8 +-
 misc/translator/po/ta-LK-staff-prog.po          |    4 +-
 misc/translator/po/ta-opac-bootstrap.po         |   43 +-
 misc/translator/po/ta-staff-help.po             |    8 +-
 misc/translator/po/ta-staff-prog.po             |    4 +-
 misc/translator/po/tet-opac-bootstrap.po        |   43 +-
 misc/translator/po/tet-staff-help.po            |    8 +-
 misc/translator/po/tet-staff-prog.po            |    4 +-
 misc/translator/po/th-TH-opac-bootstrap.po      |   47 +-
 misc/translator/po/th-TH-staff-help.po          |    8 +-
 misc/translator/po/th-TH-staff-prog.po          |    4 +-
 misc/translator/po/tl-PH-opac-bootstrap.po      |   43 +-
 misc/translator/po/tl-PH-staff-help.po          |    8 +-
 misc/translator/po/tl-PH-staff-prog.po          |    4 +-
 misc/translator/po/tr-TR-opac-bootstrap.po      |  147 +-
 misc/translator/po/tr-TR-staff-help.po          |    8 +-
 misc/translator/po/tr-TR-staff-prog.po          |    4 +-
 misc/translator/po/uk-UA-opac-bootstrap.po      |   43 +-
 misc/translator/po/uk-UA-staff-help.po          |    8 +-
 misc/translator/po/uk-UA-staff-prog.po          |    4 +-
 misc/translator/po/ur-Arab-opac-bootstrap.po    |   43 +-
 misc/translator/po/ur-Arab-staff-help.po        |    8 +-
 misc/translator/po/ur-Arab-staff-prog.po        |    4 +-
 misc/translator/po/vi-VN-opac-bootstrap.po      |   43 +-
 misc/translator/po/vi-VN-staff-help.po          |    8 +-
 misc/translator/po/vi-VN-staff-prog.po          |    4 +-
 misc/translator/po/zh-Hans-CN-opac-bootstrap.po |   43 +-
 misc/translator/po/zh-Hans-CN-staff-help.po     |    8 +-
 misc/translator/po/zh-Hans-CN-staff-prog.po     |    4 +-
 misc/translator/po/zh-Hans-TW-opac-bootstrap.po |   57 +-
 misc/translator/po/zh-Hans-TW-pref.po           |    5 +-
 misc/translator/po/zh-Hans-TW-staff-help.po     |  546 +-
 misc/translator/po/zh-Hans-TW-staff-prog.po     |   12 +-
 239 files changed, 18999 insertions(+), 16651 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Mon Aug 24 01:36:39 2015
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Sun, 23 Aug 2015 23:36:39 +0000
Subject: [koha-commits] main Koha release repository branch 3.18.x updated.
	v3.18.09-27-g7f8e093
Message-ID: <E1ZTeoZ-0000P6-3t@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  7f8e09391cf57291094ae3f5adcd3c8a501800c3 (commit)
       via  fe0cdc40a36e0bd74adf1ee75647e557a2abde21 (commit)
       via  a6fe2c52b544fa966a194730a8f7d5f92601d03f (commit)
      from  de5bf00e8b9ffc18896e7cff4c2d753ac894def9 (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 7f8e09391cf57291094ae3f5adcd3c8a501800c3
Author: Liz Rea <wizzyrea at gmail.com>
Date:   Mon Aug 24 11:31:07 2015 +1200

    Increment version for 3.18.10 release
    
    Signed-off-by: Liz Rea <wizzyrea at gmail.com>

commit fe0cdc40a36e0bd74adf1ee75647e557a2abde21
Merge: de5bf00 a6fe2c5
Author: Liz Rea <wizzyrea at gmail.com>
Date:   Mon Aug 24 11:27:32 2015 +1200

    Merge remote-tracking branch 'translation/3.18.10'
    
    Signed-off-by: Liz Rea <wizzyrea at gmail.com>

commit a6fe2c52b544fa966a194730a8f7d5f92601d03f
Author: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
Date:   Sun Aug 23 20:02:39 2015 -0300

    Translation updates for Koha 3.18.10 release

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

Summary of changes:
 installer/data/mysql/updatedatabase.pl             |    9 +
 kohaversion.pl                                     |    2 +-
 .../po/am-Ethi-i-staff-t-prog-v-3006000.po         |  372 +++--
 misc/translator/po/am-Ethi-opac-bootstrap.po       |   43 +-
 misc/translator/po/am-Ethi-staff-help.po           |    2 +-
 .../po/ar-Arab-i-staff-t-prog-v-3006000.po         |  511 ++++---
 misc/translator/po/ar-Arab-opac-bootstrap.po       |   75 +-
 misc/translator/po/ar-Arab-pref.po                 |   18 +-
 misc/translator/po/ar-Arab-staff-help.po           |    2 +-
 .../po/az-AZ-i-staff-t-prog-v-3006000.po           |  372 +++--
 misc/translator/po/az-AZ-opac-bootstrap.po         |   43 +-
 misc/translator/po/az-AZ-staff-help.po             |    2 +-
 .../po/be-BY-i-staff-t-prog-v-3006000.po           |  372 +++--
 misc/translator/po/be-BY-opac-bootstrap.po         |   43 +-
 misc/translator/po/be-BY-staff-help.po             |    2 +-
 .../po/bg-Cyrl-i-staff-t-prog-v-3006000.po         |  372 +++--
 misc/translator/po/bg-Cyrl-opac-bootstrap.po       |   43 +-
 misc/translator/po/bg-Cyrl-staff-help.po           |    2 +-
 .../po/bn-IN-i-staff-t-prog-v-3006000.po           |  372 +++--
 misc/translator/po/bn-IN-opac-bootstrap.po         |   43 +-
 misc/translator/po/bn-IN-staff-help.po             |    2 +-
 .../po/ca-ES-i-staff-t-prog-v-3006000.po           |  372 +++--
 misc/translator/po/ca-ES-opac-bootstrap.po         |   43 +-
 misc/translator/po/ca-ES-staff-help.po             |    2 +-
 .../po/cs-CZ-i-staff-t-prog-v-3006000.po           |  384 +++--
 misc/translator/po/cs-CZ-opac-bootstrap.po         |   43 +-
 misc/translator/po/cs-CZ-staff-help.po             |    2 +-
 .../po/da-DK-i-staff-t-prog-v-3006000.po           |  374 +++--
 misc/translator/po/da-DK-opac-bootstrap.po         |   43 +-
 misc/translator/po/da-DK-staff-help.po             |    2 +-
 .../po/de-CH-i-staff-t-prog-v-3006000.po           |  376 +++--
 misc/translator/po/de-CH-opac-bootstrap.po         |   43 +-
 misc/translator/po/de-CH-staff-help.po             |    2 +-
 .../po/de-DE-i-staff-t-prog-v-3006000.po           |  446 +++---
 misc/translator/po/de-DE-opac-bootstrap.po         |   70 +-
 misc/translator/po/de-DE-pref.po                   |   26 +-
 misc/translator/po/de-DE-staff-help.po             |    2 +-
 .../po/el-GR-i-staff-t-prog-v-3006000.po           |  372 +++--
 misc/translator/po/el-GR-opac-bootstrap.po         |   43 +-
 misc/translator/po/el-GR-staff-help.po             |    2 +-
 .../po/en-GB-i-staff-t-prog-v-3006000.po           |  374 +++--
 misc/translator/po/en-GB-opac-bootstrap.po         |   43 +-
 misc/translator/po/en-GB-staff-help.po             |    2 +-
 .../po/en-NZ-i-staff-t-prog-v-3006000.po           |  374 +++--
 misc/translator/po/en-NZ-opac-bootstrap.po         |   43 +-
 misc/translator/po/en-NZ-staff-help.po             |    2 +-
 misc/translator/po/eo-i-staff-t-prog-v-3006000.po  |  374 +++--
 misc/translator/po/eo-opac-bootstrap.po            |   43 +-
 misc/translator/po/eo-staff-help.po                |    2 +-
 .../po/es-ES-i-staff-t-prog-v-3006000.po           |  476 +++---
 misc/translator/po/es-ES-opac-bootstrap.po         |   67 +-
 misc/translator/po/es-ES-pref.po                   |   30 +-
 misc/translator/po/es-ES-staff-help.po             |   74 +-
 misc/translator/po/eu-i-staff-t-prog-v-3006000.po  |  372 +++--
 misc/translator/po/eu-opac-bootstrap.po            |   43 +-
 misc/translator/po/eu-staff-help.po                |    2 +-
 .../po/fa-Arab-i-staff-t-prog-v-3006000.po         |  372 +++--
 misc/translator/po/fa-Arab-opac-bootstrap.po       |   43 +-
 misc/translator/po/fa-Arab-staff-help.po           |    2 +-
 .../po/fi-FI-i-staff-t-prog-v-3006000.po           |  372 +++--
 misc/translator/po/fi-FI-opac-bootstrap.po         |   43 +-
 misc/translator/po/fi-FI-staff-help.po             |    2 +-
 .../po/fo-FO-i-staff-t-prog-v-3006000.po           |  372 +++--
 misc/translator/po/fo-FO-opac-bootstrap.po         |   43 +-
 misc/translator/po/fo-FO-staff-help.po             |    2 +-
 .../po/fr-CA-i-staff-t-prog-v-3006000.po           |  376 +++--
 misc/translator/po/fr-CA-opac-bootstrap.po         |   43 +-
 misc/translator/po/fr-CA-staff-help.po             |    2 +-
 .../po/fr-FR-i-staff-t-prog-v-3006000.po           |  384 +++--
 misc/translator/po/fr-FR-opac-bootstrap.po         |   43 +-
 misc/translator/po/fr-FR-staff-help.po             |    2 +-
 misc/translator/po/gl-i-staff-t-prog-v-3006000.po  |  372 +++--
 misc/translator/po/gl-opac-bootstrap.po            |   43 +-
 misc/translator/po/gl-staff-help.po                |    2 +-
 .../po/he-Hebr-i-staff-t-prog-v-3006000.po         |  372 +++--
 misc/translator/po/he-Hebr-opac-bootstrap.po       |   43 +-
 misc/translator/po/he-Hebr-staff-help.po           |    2 +-
 misc/translator/po/hi-i-staff-t-prog-v-3006000.po  |  372 +++--
 misc/translator/po/hi-opac-bootstrap.po            |   43 +-
 misc/translator/po/hi-staff-help.po                |    2 +-
 .../po/hr-HR-i-staff-t-prog-v-3006000.po           |  374 +++--
 misc/translator/po/hr-HR-opac-bootstrap.po         |   43 +-
 misc/translator/po/hr-HR-staff-help.po             |    2 +-
 .../po/hu-HU-i-staff-t-prog-v-3006000.po           |  372 +++--
 misc/translator/po/hu-HU-opac-bootstrap.po         |   43 +-
 misc/translator/po/hu-HU-staff-help.po             |    2 +-
 .../po/hy-Armn-i-staff-t-prog-v-3006000.po         |  441 +++---
 misc/translator/po/hy-Armn-opac-bootstrap.po       |   66 +-
 misc/translator/po/hy-Armn-pref.po                 |   16 +-
 misc/translator/po/hy-Armn-staff-help.po           |    2 +-
 .../po/id-ID-i-staff-t-prog-v-3006000.po           |  372 +++--
 misc/translator/po/id-ID-opac-bootstrap.po         |   43 +-
 misc/translator/po/id-ID-staff-help.po             |    2 +-
 .../po/is-IS-i-staff-t-prog-v-3006000.po           |  372 +++--
 misc/translator/po/is-IS-opac-bootstrap.po         |   43 +-
 misc/translator/po/is-IS-staff-help.po             |    2 +-
 .../po/it-IT-i-staff-t-prog-v-3006000.po           |  382 +++--
 misc/translator/po/it-IT-opac-bootstrap.po         |   49 +-
 misc/translator/po/it-IT-pref.po                   |   19 +-
 misc/translator/po/it-IT-staff-help.po             |    2 +-
 .../po/ja-Jpan-JP-i-staff-t-prog-v-3006000.po      |  372 +++--
 misc/translator/po/ja-Jpan-JP-opac-bootstrap.po    |   43 +-
 misc/translator/po/ja-Jpan-JP-staff-help.po        |    2 +-
 misc/translator/po/ka-i-staff-t-prog-v-3006000.po  |  372 +++--
 misc/translator/po/ka-opac-bootstrap.po            |   43 +-
 misc/translator/po/ka-staff-help.po                |    2 +-
 .../po/km-KH-i-staff-t-prog-v-3006000.po           |  372 +++--
 misc/translator/po/km-KH-opac-bootstrap.po         |   43 +-
 misc/translator/po/km-KH-staff-help.po             |    2 +-
 .../po/kn-Knda-i-staff-t-prog-v-3006000.po         |  372 +++--
 misc/translator/po/kn-Knda-opac-bootstrap.po       |   43 +-
 misc/translator/po/kn-Knda-staff-help.po           |    2 +-
 .../po/ko-Kore-KP-i-staff-t-prog-v-3006000.po      |  372 +++--
 misc/translator/po/ko-Kore-KP-opac-bootstrap.po    |   43 +-
 misc/translator/po/ko-Kore-KP-staff-help.po        |    2 +-
 .../po/ku-Arab-i-staff-t-prog-v-3006000.po         |  372 +++--
 misc/translator/po/ku-Arab-opac-bootstrap.po       |   43 +-
 misc/translator/po/ku-Arab-staff-help.po           |    2 +-
 .../po/lo-Laoo-i-staff-t-prog-v-3006000.po         |  372 +++--
 misc/translator/po/lo-Laoo-opac-bootstrap.po       |   43 +-
 misc/translator/po/lo-Laoo-staff-help.po           |    2 +-
 .../po/mi-NZ-i-staff-t-prog-v-3006000.po           |  372 +++--
 misc/translator/po/mi-NZ-opac-bootstrap.po         |   43 +-
 misc/translator/po/mi-NZ-staff-help.po             |    2 +-
 misc/translator/po/mon-i-staff-t-prog-v-3006000.po |  372 +++--
 misc/translator/po/mon-opac-bootstrap.po           |   43 +-
 misc/translator/po/mon-staff-help.po               |    2 +-
 misc/translator/po/mr-i-staff-t-prog-v-3006000.po  |  372 +++--
 misc/translator/po/mr-opac-bootstrap.po            |   43 +-
 misc/translator/po/mr-staff-help.po                |    2 +-
 .../po/ms-MY-i-staff-t-prog-v-3006000.po           |  372 +++--
 misc/translator/po/ms-MY-opac-bootstrap.po         |   43 +-
 misc/translator/po/ms-MY-staff-help.po             |    2 +-
 .../po/nb-NO-i-staff-t-prog-v-3006000.po           |  374 +++--
 misc/translator/po/nb-NO-opac-bootstrap.po         |   43 +-
 misc/translator/po/nb-NO-staff-help.po             |    2 +-
 .../po/ne-NE-i-staff-t-prog-v-3006000.po           |  372 +++--
 misc/translator/po/ne-NE-opac-bootstrap.po         |   43 +-
 misc/translator/po/ne-NE-staff-help.po             |    2 +-
 .../po/nl-BE-i-staff-t-prog-v-3006000.po           |  372 +++--
 misc/translator/po/nl-BE-opac-bootstrap.po         |   43 +-
 misc/translator/po/nl-BE-staff-help.po             |    2 +-
 .../po/nl-NL-i-staff-t-prog-v-3006000.po           |  372 +++--
 misc/translator/po/nl-NL-opac-bootstrap.po         |   43 +-
 misc/translator/po/nl-NL-staff-help.po             |    2 +-
 .../po/nn-NO-i-staff-t-prog-v-3006000.po           |  372 +++--
 misc/translator/po/nn-NO-opac-bootstrap.po         |   43 +-
 misc/translator/po/nn-NO-staff-help.po             |    2 +-
 misc/translator/po/pbr-i-staff-t-prog-v-3006000.po |  372 +++--
 misc/translator/po/pbr-opac-bootstrap.po           |   43 +-
 misc/translator/po/pbr-staff-help.po               |    2 +-
 .../po/pl-PL-i-staff-t-prog-v-3006000.po           |  384 +++--
 misc/translator/po/pl-PL-opac-bootstrap.po         |   43 +-
 misc/translator/po/pl-PL-staff-help.po             |    2 +-
 misc/translator/po/prs-i-staff-t-prog-v-3006000.po |  372 +++--
 misc/translator/po/prs-opac-bootstrap.po           |   43 +-
 misc/translator/po/prs-staff-help.po               |    2 +-
 .../po/pt-BR-i-staff-t-prog-v-3006000.po           | 1544 ++++++++++----------
 misc/translator/po/pt-BR-opac-bootstrap.po         |  162 +-
 misc/translator/po/pt-BR-pref.po                   |   16 +-
 misc/translator/po/pt-BR-staff-help.po             |   22 +-
 .../po/pt-PT-i-staff-t-prog-v-3006000.po           |  442 +++---
 misc/translator/po/pt-PT-opac-bootstrap.po         |   66 +-
 misc/translator/po/pt-PT-pref.po                   |   16 +-
 misc/translator/po/pt-PT-staff-help.po             |    2 +-
 .../po/ro-RO-i-staff-t-prog-v-3006000.po           |  372 +++--
 misc/translator/po/ro-RO-opac-bootstrap.po         |   43 +-
 misc/translator/po/ro-RO-staff-help.po             |    2 +-
 .../po/ru-RU-i-staff-t-prog-v-3006000.po           |  372 +++--
 misc/translator/po/ru-RU-opac-bootstrap.po         |   43 +-
 misc/translator/po/ru-RU-staff-help.po             |    2 +-
 .../po/rw-RW-i-staff-t-prog-v-3006000.po           |  372 +++--
 misc/translator/po/rw-RW-opac-bootstrap.po         |   43 +-
 misc/translator/po/rw-RW-staff-help.po             |    2 +-
 .../po/sd-PK-i-staff-t-prog-v-3006000.po           |  372 +++--
 misc/translator/po/sd-PK-opac-bootstrap.po         |   43 +-
 misc/translator/po/sd-PK-staff-help.po             |    2 +-
 .../po/sk-SK-i-staff-t-prog-v-3006000.po           |  376 +++--
 misc/translator/po/sk-SK-opac-bootstrap.po         |   43 +-
 misc/translator/po/sk-SK-staff-help.po             |    2 +-
 .../po/sl-SI-i-staff-t-prog-v-3006000.po           |  372 +++--
 misc/translator/po/sl-SI-opac-bootstrap.po         |   43 +-
 misc/translator/po/sl-SI-staff-help.po             |    2 +-
 .../po/sq-AL-i-staff-t-prog-v-3006000.po           |  372 +++--
 misc/translator/po/sq-AL-opac-bootstrap.po         |   43 +-
 misc/translator/po/sq-AL-staff-help.po             |    2 +-
 .../po/sr-Cyrl-i-staff-t-prog-v-3006000.po         |  372 +++--
 misc/translator/po/sr-Cyrl-opac-bootstrap.po       |   43 +-
 misc/translator/po/sr-Cyrl-staff-help.po           |    2 +-
 .../po/sv-SE-i-staff-t-prog-v-3006000.po           |  372 +++--
 misc/translator/po/sv-SE-opac-bootstrap.po         |   43 +-
 misc/translator/po/sv-SE-staff-help.po             |    2 +-
 .../po/sw-KE-i-staff-t-prog-v-3006000.po           |  372 +++--
 misc/translator/po/sw-KE-opac-bootstrap.po         |   43 +-
 misc/translator/po/sw-KE-staff-help.po             |    2 +-
 .../po/ta-LK-i-staff-t-prog-v-3006000.po           |  372 +++--
 misc/translator/po/ta-LK-opac-bootstrap.po         |   43 +-
 misc/translator/po/ta-LK-staff-help.po             |    2 +-
 misc/translator/po/ta-i-staff-t-prog-v-3006000.po  |  372 +++--
 misc/translator/po/ta-opac-bootstrap.po            |   43 +-
 misc/translator/po/ta-staff-help.po                |    2 +-
 misc/translator/po/tet-i-staff-t-prog-v-3006000.po |  397 +++--
 misc/translator/po/tet-opac-bootstrap.po           |   43 +-
 misc/translator/po/tet-staff-help.po               |    2 +-
 .../po/th-TH-i-staff-t-prog-v-3006000.po           |  372 +++--
 misc/translator/po/th-TH-opac-bootstrap.po         |   43 +-
 misc/translator/po/th-TH-staff-help.po             |    2 +-
 .../po/tl-PH-i-staff-t-prog-v-3006000.po           |  372 +++--
 misc/translator/po/tl-PH-opac-bootstrap.po         |   43 +-
 misc/translator/po/tl-PH-staff-help.po             |    2 +-
 .../po/tr-TR-i-staff-t-prog-v-3006000.po           |  376 +++--
 misc/translator/po/tr-TR-opac-bootstrap.po         |   43 +-
 misc/translator/po/tr-TR-staff-help.po             |    2 +-
 .../po/uk-UA-i-staff-t-prog-v-3006000.po           |  372 +++--
 misc/translator/po/uk-UA-opac-bootstrap.po         |   43 +-
 misc/translator/po/uk-UA-staff-help.po             |    2 +-
 .../po/ur-Arab-i-staff-t-prog-v-3006000.po         |  372 +++--
 misc/translator/po/ur-Arab-opac-bootstrap.po       |   43 +-
 misc/translator/po/ur-Arab-staff-help.po           |    2 +-
 .../po/vi-VN-i-staff-t-prog-v-3006000.po           |  372 +++--
 misc/translator/po/vi-VN-opac-bootstrap.po         |   43 +-
 misc/translator/po/vi-VN-staff-help.po             |    2 +-
 .../po/zh-Hans-CN-i-staff-t-prog-v-3006000.po      |  372 +++--
 misc/translator/po/zh-Hans-CN-opac-bootstrap.po    |   43 +-
 misc/translator/po/zh-Hans-CN-staff-help.po        |    2 +-
 .../po/zh-Hans-TW-i-staff-t-prog-v-3006000.po      |  376 +++--
 misc/translator/po/zh-Hans-TW-opac-bootstrap.po    |   43 +-
 misc/translator/po/zh-Hans-TW-staff-help.po        |    2 +-
 228 files changed, 16471 insertions(+), 16199 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Mon Aug 24 01:39:20 2015
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Sun, 23 Aug 2015 23:39:20 +0000
Subject: [koha-commits] main Koha release repository branch 3.20.x updated.
	v3.20.02-34-g546047f
Message-ID: <E1ZTerA-0000Qt-RY@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  546047f5cd9afcd977f81030cec15e19da65c19a (commit)
      from  b0cbdfe7e57f6c0b88088456dbfb3f2c5a75f450 (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 546047f5cd9afcd977f81030cec15e19da65c19a
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date:   Mon Aug 24 11:36:58 2015 +1200

    Updating version for 3.20.3 release

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

Summary of changes:
 Koha.pm                                |    2 +-
 installer/data/mysql/updatedatabase.pl |    7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Mon Aug 24 01:51:20 2015
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Sun, 23 Aug 2015 23:51:20 +0000
Subject: [koha-commits] main Koha release repository branch 3.20.x updated.
	v3.20.02-36-gf38f8b8
Message-ID: <E1ZTf2m-0000WI-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, 3.20.x has been updated
       via  f38f8b8758654108386ac2ffa2446515c5f1b041 (commit)
       via  7e81e366f4849437568cae465401a3466d83af58 (commit)
      from  546047f5cd9afcd977f81030cec15e19da65c19a (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 f38f8b8758654108386ac2ffa2446515c5f1b041
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date:   Mon Aug 24 11:53:07 2015 +1200

    Fixing release notes

commit 7e81e366f4849437568cae465401a3466d83af58
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date:   Mon Aug 24 11:42:58 2015 +1200

    Release notes for 3.20.3

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

Summary of changes:
 misc/release_notes/release_notes_3_20_3.html |  352 ++++++++++++++++++++++++++
 misc/release_notes/release_notes_3_20_3.txt  |  308 ++++++++++++++++++++++
 2 files changed, 660 insertions(+)
 create mode 100644 misc/release_notes/release_notes_3_20_3.html
 create mode 100644 misc/release_notes/release_notes_3_20_3.txt


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Mon Aug 24 01:57:22 2015
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Sun, 23 Aug 2015 23:57:22 +0000
Subject: [koha-commits] main Koha release repository annotated tag v3.20.03
	created. v3.20.03
Message-ID: <E1ZTf8c-0000a1-FO@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.03 has been created
        at  b3d2363dad55f60fd8fb362499b7808a488c35c1 (tag)
   tagging  f38f8b8758654108386ac2ffa2446515c5f1b041 (commit)
  replaces  v3.20.02
 tagged by  Chris Cormack
        on  Mon Aug 24 11:59:08 2015 +1200

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

iQIcBAABCAAGBQJV2l5MAAoJEG5T+NVYEYs1xG8P/1WbWRs8ERfwwlgwPfrHXjn3
9LK8srL3Mwvw0dj1a6oLgOgdnorY9Q9mBTJGuMbE1m9eeKDI3gVP11JfkVkB576b
jYkCrzwpu3RE3cEVtthF/7jK8dAD+NwW2bjuhXbs7iymtlS+QFZ018GpiPJB9/LH
PdF0yRKaNN0XyLD4AF4OjbOBGu/8DQTazmIkCRweeYp5hV1WqKsRmOrcyfWF+WPZ
RduHwxj5ZJiz1ySZMKIeWZOFyWRwVCvfHhfMFjNjjx5Sc0W5UGAGVIPCOo5/f8fV
XIrT9Us0ZT4sEeHjEIrPX4KHt+4Lq1wabo1DtNpNc5VScfYgq60SQd1tn+SCIWfu
2suJH37DAEo62C16Kva0YfBeDHA/A5c+4AqEBJpWL4GvyCwbpAxStpI9MiDKY1Kb
gCTJ3Mz8mNS3l4P9hghiQkKFqF4v8s82iIRzLWCaSwkchA8FLCMxDdiRq8UUFKUm
n62kEwuPR9nMWqYtgIncH6MVaGfrMZ7GAhCIH1w9qMkgLNe6Zsw6A5itVf9barS6
8iFXGAH4m9e/H+WX3HehRKg7YNTavWJgsyMs6guHf3jafaXqXZ3mORA60qCLQCRE
RpJ2npMXSD9xu0gYKcZuzuL5Wm5TtDs9Vy2Kw0zr677FjsssvzFYYkiK1QfVT0i2
fxyrN5s1ofWDDCWO3ZCO
=Sg04
-----END PGP SIGNATURE-----

Aleisha (2):
      Bug 14445: Silences warn in letter.pl
      Bug 14445: Silences warns in letter.tt

Alex Arnaud (1):
      Bug 13663: Fix permissions in upload-file.pl and upload-file-progress.pl

Bernardo Gonzalez Kriegel (1):
      Translation updates for Koha 3.20.3 release

Chris Cormack (3):
      Updating version for 3.20.3 release
      Release notes for 3.20.3
      Fixing release notes

Fr?d?ric Demians (1):
      Bug 14592: Export data bad encoding

Galen Charlton (1):
      Bug 14644: unbreak SIP2 terminal login when using telnet transport

Hector Castro (3):
      Bug 14545: Typo in help file (stage-marc-import.tt)
      Bug 14547: Typo in help file for 3.20 (basket.tt)
      Bug 14548: Typo in help file for 3.20 (batch_record_modification.tt)

Indranil Das Gupta (2):
      Bug 14487: silence warns during checkin
      Bug 13663: (followup) fixes tab char QA test fails

Jacek Ablewicz (1):
      Bug 14456: EmbedSeeFromHeadings record filter shouldn't process MARC holding fields

Jonathan Druart (8):
      Bug 14494: Prevent slow checkout if the patron does not have an expiry date
      Bug 14494: Unit tests for CanBookBeIssued related to dateexpiry
      Bug 14404: Rename class no-show to noshow for consistency with nosort
      Bug 8684: Fix duplicate check on creating items in the acquisition module
      Bug 8684: Add regression tests for SearchItemsByField
      Bug 14517: List shelves list is broken for translated interfaces
      Bug 14660: Fix 3 other cataloguing plugins
      Bug 14566: Fix permissions in patronimage.pl

Katrin Fischer (2):
      Bug 14660: Fix stocknumberAV.pl cataloguing plugin
      Bug 14660: Fix stocknumberam123.pl cataloguing plugin

Kyle M Hall (2):
      Bug 14404: Checkouts default sort order for Self Checkout (SCO) confusing for patrons
      Bug 10961: Error in GetMarcBiblio can cause severe data loss

Marcel de Rooy (4):
      Bug 14494: Terribly slow checkout caused by DateTime->new in far future
      Bug 14494: Add some unit tests too for CalcDateDue
      Bug 14569: Typo borroewr|borow
      Bug 11693: Default emailing preferences not loaded for self registering patron

Mark Tompsett (1):
      Bug 14487: Noise best detected under Debian 8

St?phane Delaune (1):
      Bug 10961: (followup) Make query fields explicit and add regression tests

Tomas Cohen Arazi (1):
      Bug 14456: (regression test) Holdings fields should be skipped by EmbedSeeFromHeadings

Ulrich Kleiber (1):
      Bug 14534: Stop overdue_notices.pl from issuing the warning: Use of uninitialized value $borrowernumber

mxbeaulieu (1):
      Bug 14387: Merge reference selection has no effect when merging authorities.

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


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Mon Aug 24 03:45:05 2015
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Mon, 24 Aug 2015 01:45:05 +0000
Subject: [koha-commits] main Koha release repository branch 3.18.x updated.
	v3.18.09-27-gf9adbd8
Message-ID: <E1ZTgor-0001UK-NQ@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
  discards  7f8e09391cf57291094ae3f5adcd3c8a501800c3 (commit)
  discards  fe0cdc40a36e0bd74adf1ee75647e557a2abde21 (commit)
  discards  a6fe2c52b544fa966a194730a8f7d5f92601d03f (commit)
       via  f9adbd885ac9295bcdb301955e7fc785a8aa07da (commit)
       via  000d31361fb5f965bf43e8044d90553493faa633 (commit)
       via  3b0829199d75b8c5b1fa5c628ed18364abb33983 (commit)

This update added new revisions after undoing existing revisions.  That is
to say, the old revision is not a strict subset of the new revision.  This
situation occurs when you --force push a change and generate a repository
containing something like this:

 * -- * -- B -- O -- O -- O (7f8e09391cf57291094ae3f5adcd3c8a501800c3)
            \
             N -- N -- N (f9adbd885ac9295bcdb301955e7fc785a8aa07da)

When this happens we assume that you've already had alert emails for all
of the O revisions, and so we here report only the revisions in the N
branch from the common base, B.

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 f9adbd885ac9295bcdb301955e7fc785a8aa07da
Author: Liz Rea <wizzyrea at gmail.com>
Date:   Mon Aug 24 13:40:13 2015 +1200

    3.18.10 Release Notes
    
    Signed-off-by: Liz Rea <wizzyrea at gmail.com>

commit 000d31361fb5f965bf43e8044d90553493faa633
Author: Liz Rea <wizzyrea at gmail.com>
Date:   Mon Aug 24 11:31:07 2015 +1200

    Increment version for 3.18.10 release
    
    Signed-off-by: Liz Rea <wizzyrea at gmail.com>

commit 3b0829199d75b8c5b1fa5c628ed18364abb33983
Author: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
Date:   Sun Aug 23 20:02:39 2015 -0300

    Translation updates for Koha 3.18.10 release

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

Summary of changes:
 ..._notes_3_18_1.txt => release_notes_3_18_10.txt} |  173 +++++++++++---------
 1 file changed, 99 insertions(+), 74 deletions(-)
 copy misc/release_notes/{release_notes_3_18_1.txt => release_notes_3_18_10.txt} (59%)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Mon Aug 24 04:20:41 2015
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Mon, 24 Aug 2015 02:20:41 +0000
Subject: [koha-commits] main Koha release repository annotated tag v3.18.10
	created. v3.18.10
Message-ID: <E1ZThNJ-0001hU-I2@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.10 has been created
        at  f68952f6ac771309c511270c34b648b72b817c8b (tag)
   tagging  f9adbd885ac9295bcdb301955e7fc785a8aa07da (commit)
  replaces  v3.18.09
 tagged by  Liz Rea
        on  Mon Aug 24 13:49:40 2015 +1200

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

iQIcBAABAgAGBQJV2ng0AAoJEBuNTiU1Z9kH74gP/j4k4beHca/wLal+ywpIoUbI
4Ya+6VX2lOMeNp5UgDZf2IR0CwKhjuwVF0e52oc3NKb2s58C83xa+e8xfMBe65L4
AtFVx4OjSFVaw+M0OvsBOXgOwa6aQCVwV4B2kzZDaWF03aFh4cdJR9cbQoOQ7+Z1
vvbh/SHsqP+uB26+MXE00qIh/q2qSFYE4kyOUfXzI8I3ltkGTzO2pRQUIpHTm/ZY
kugfwBWrPmryOQHKmdaJFSo1AwZZl1fYi8adRFwrfo8Yp/CwBaTUaaHH6BDCJk0v
LVnTbb0PX9nr381gZdPYqGVZVfZnWFce4GUH+uDJkDLWtHTwRuKhGP+yJmtxGlmx
h3KwldOdyblzMOb0VEkT/c9UzLh0E/6follZBn9uDmxiRbX+z+nZMeh/ruF8PRRC
OpoExlAH8tXwXfbli475/OZAxGaw8giajUyG4oWowEvDgii4GPefGW9SU7DdnFJ6
naY+X7NUOwF+EEoPekn7I8U8nDH+h9TxqtZ9qi54nX70f+rf9ZKFckVtJp420itu
8EAY0buXjvDneWQWMlBrlRgNLvL5pF31SDXpRJw+P8fbHTTliKFyn4B/XYQ2EwWh
nVFy+AjXMTI9mSoQMK6HROF2m4jZ/EV5JCOsCPzSVVzYsKZbIEJPX+GzNUes+ico
9eDmso+zJTtR41yui5cw
=vcWb
-----END PGP SIGNATURE-----

Aleisha (2):
      Bug 14445: Silences warn in letter.pl
      Bug 14445: Silences warns in letter.tt

Alex Arnaud (1):
      Bug 13663: Fix permissions in upload-file.pl and upload-file-progress.pl

Bernardo Gonzalez Kriegel (1):
      Translation updates for Koha 3.18.10 release

Galen Charlton (1):
      Bug 14644: unbreak SIP2 terminal login when using telnet transport

Indranil Das Gupta (1):
      Bug 14487: silence warns during checkin

Jacek Ablewicz (1):
      Bug 14456: EmbedSeeFromHeadings record filter shouldn't process MARC holding fields

Jonathan Druart (4):
      Bug 14494: Prevent slow checkout if the patron does not have an expiry date
      Bug 14263: Fix export of item search results when translated
      Bug 14404: Rename class no-show to noshow for consistency with nosort
      Bug 14566: Fix permissions in patronimage.pl

Kyle M Hall (3):
      Bug 14465 - Broken umlauts/diacritics in feedback of last checkout
      Bug 14404: Checkouts default sort order for Self Checkout (SCO) confusing for patrons
      Bug 10961: Error in GetMarcBiblio can cause severe data loss

Liz Rea (5):
      Bug 14586 - Update about page with new 3.18 release team
      Bug 13663 - QA Followup, removing tab chars
      Revert "Bug 14644: unbreak SIP2 terminal login when using telnet transport"
      Increment version for 3.18.10 release
      3.18.10 Release Notes

Marcel de Rooy (3):
      Bug 14494: Terribly slow checkout caused by DateTime->new in far future
      Bug 14569: Typo borroewr|borow
      Bug 11693: Default emailing preferences not loaded for self registering patron

Mark Tompsett (1):
      Bug 14487: Noise best detected under Debian 8

Owen Leonard (1):
      Bug 14690 - [3.18.x] Patron import tool page missing extra search patron options

St?phane Delaune (1):
      Bug 10961: (followup) Make query fields explicit and add regression tests

Ulrich Kleiber (1):
      Bug 14534: Stop overdue_notices.pl from issuing the warning: Use of uninitialized value $borrowernumber

mxbeaulieu (1):
      Bug 14387: Merge reference selection has no effect when merging authorities.

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


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Mon Aug 24 18:11:08 2015
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Mon, 24 Aug 2015 16:11:08 +0000
Subject: [koha-commits] main Koha release repository branch master updated.
	v3.20.00-432-g58b2965
Message-ID: <E1ZTuKy-0008SO-4z@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  58b29655dda0ca4d4935a6b886a1a39d249a8780 (commit)
       via  76f3c5794c16385b629b70b123e935ef5eb0802e (commit)
       via  dc742ec9b505586c1b6ba9b11eb614b46662e17f (commit)
       via  d863757fa749ef7d20da5e6195112bc42c676528 (commit)
       via  bc208d16e646262c93ceca89af61ea23d80fc006 (commit)
       via  4182a0805219d0d1793cf3a80f63ec095aeb3716 (commit)
       via  4adc4ee5f8d3e113b62094552be6c80942289c3e (commit)
       via  b35dd15a4a64cc13e4c7c9c24e32a56f4cd43c66 (commit)
      from  16f382e7ecb0a7d817da59c45dcd58655e3949ee (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 58b29655dda0ca4d4935a6b886a1a39d249a8780
Author: Tomas Cohen Arazi <tomascohen at unc.edu.ar>
Date:   Mon Aug 24 13:03:05 2015 -0300

    Bug 13791: (QA followup) Plack support requires Apache 2.4.8+
    
    The Apache 2.4 documentation says UDS support for ProxyPass has been
    introduced in Apache 2.4.7. That's what is shipped by Koha's supported
    Debian / Ubuntu versions.
    But it is not true, empiric tests and even the changelog for the apache
    project says the feature got introduced in 2.4.8. So to avoid breakages
    I raised the version number test on the apache files to 2.4.8.
    
    New bugs will be filled for dealing with this if we find it necessary.
    
    Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>

commit 76f3c5794c16385b629b70b123e935ef5eb0802e
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date:   Fri Aug 14 18:24:20 2015 -0300

    Bug 13791: tab-completion for koha-plack in bash
    
    This patch adds tab-completion in bash for the koha-plack command.
    
    After the --start, --stop, --restart and --disable switches it only offers
    plack-enabled instances.  And disabled instances to --enable.
    
    --help and -h just finish end the completion.
    
    --quiet and -q are trickier to implement. They will work (be offered)
    only before the action switches.
    
    Signed-off-by: Josef Moravec <josef.moravec 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 dc742ec9b505586c1b6ba9b11eb614b46662e17f
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date:   Thu Aug 13 14:54:58 2015 -0300

    Bug 13791: make koha-common init script aware of plack
    
    This patch makes the packages' koha-common script aware of plack.
    It does so by relying on koha-list --plack to know which instances
    have Plack configured, and uses the koha-plack script to manage
    the running daemons.
    
    It also introduces a plack_status function to check the status of
    the Plack daemon when called:
    
       $ servive koha-common status
    
    Regards
    
    Signed-off-by: Josef Moravec <josef.moravec 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 d863757fa749ef7d20da5e6195112bc42c676528
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date:   Thu Aug 13 14:49:01 2015 -0300

    Bug 13791: make koha-list aware of plack
    
    This patch adds the --plack and --noplack option switches to koha-list
    for filtering instances to be listed.
    
    This is particularly important for init scripts and cronjobs.
    
    To test:
    - Play with koha-list --plack and koha-plack --enable/--disable and verify that
    koha-list returns the expected results.
    
    Signed-off-by: Josef Moravec <josef.moravec 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 bc208d16e646262c93ceca89af61ea23d80fc006
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date:   Thu Aug 13 14:13:19 2015 -0300

    Bug 13791: koha-plack documentation
    
    Signed-off-by: Josef Moravec <josef.moravec 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 4182a0805219d0d1793cf3a80f63ec095aeb3716
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date:   Thu Aug 13 14:02:42 2015 -0300

    Bug 13791: Apache configuration files
    
    This patch adds an include to each VirtualHost definition (OPAC and Intranet)
    and a variable definition, taking advantage of Apache 2.4.x features.
    
    The instance name is reused inside the includes providing a simple way of
    dealing with the apache <-> plack configuration.
    
    A check for the right apache version is introduced, in the for of an IfVersion block:
    
    <IfVersion >= 2.4>
      --- Plack configuration here ---
    </IfVersion>
    
    Signed-off-by: Josef Moravec <josef.moravec 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 4adc4ee5f8d3e113b62094552be6c80942289c3e
Author: Tom?s Cohen Arazi <tomascohen at theke.io>
Date:   Wed Mar 4 00:19:40 2015 +0100

    Bug 13791: Plack out-of-the-box support on packages
    
    This patch introduces a koha-plack script that controls running Plack
    processes for each instance. They are run using 'starman', listening
    on a Unix Domain Socket (UDS):
    
      /var/run/koha/<instancename>/plack.sock
    
    The plack configuration file[1] is expected to be on:
    
      /etc/koha/plack.psgi
    
    and is installed by the package.
    
    It also adds the following helper functions to koha-functions.sh:
    
     - is_plack_enabled
     - is_plack_running
    
    Done:
    - koha-plack script
    - suitable psgi file
    
    To test this patches you will need to install
    - starman
    - libplack-middleware-reverseproxy-perl
    
    [1] Yeah, a single file. Because we will be relying on multiple mount
    points for each "app" (i.e. 'opac' and 'intranet', and 'api' ;-) )
    
    Signed-off-by: Josef Moravec <josef.moravec 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 b35dd15a4a64cc13e4c7c9c24e32a56f4cd43c66
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Wed Aug 19 15:42:10 2015 +0100

    Bug 14566: Fix permissions in patronimage.pl
    
    There is no permission needed to access the patronimage.pl script.
    This means anybody cans access to the patron's images.
    
    Test plan:
    Add an image to borrowernumber 42 and call
    /cgi-bin/koha/members/patronimage.pl?borrowernumber=42
    
    If you are logged in with borrowers permissions, you will see the image,
    otherwise you will get a blank page with a 403 header.
    
    Signed-off-by: Indranil Das Gupta (L2C2 Technologies) <indradg at gmail.com>
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>

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

Summary of changes:
 debian/docs/{koha-indexer.xml => koha-plack.xml}   |   48 +++-
 debian/koha-common.bash-completion                 |   59 +++-
 debian/koha-common.init                            |   67 +++--
 debian/koha-common.install                         |    1 +
 debian/scripts/koha-foreach                        |    5 +
 debian/scripts/koha-functions.sh                   |   31 ++
 debian/scripts/koha-list                           |   61 +++-
 debian/scripts/koha-plack                          |  302 ++++++++++++++++++++
 debian/templates/apache-shared-intranet-plack.conf |   25 ++
 debian/templates/apache-shared-opac-plack.conf     |   25 ++
 debian/templates/apache-site.conf.in               |    8 +
 debian/templates/plack.psgi                        |   71 +++++
 members/patronimage.pl                             |   23 +-
 13 files changed, 659 insertions(+), 67 deletions(-)
 copy debian/docs/{koha-indexer.xml => koha-plack.xml} (52%)
 create mode 100755 debian/scripts/koha-plack
 create mode 100644 debian/templates/apache-shared-intranet-plack.conf
 create mode 100644 debian/templates/apache-shared-opac-plack.conf
 create mode 100644 debian/templates/plack.psgi


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Mon Aug 24 20:56:52 2015
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Mon, 24 Aug 2015 18:56:52 +0000
Subject: [koha-commits] main Koha release repository branch master updated.
	v3.20.00-435-g72372e3
Message-ID: <E1ZTwvM-0001DK-Om@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  72372e389566442c5022959a567df24ea0a4034d (commit)
       via  c30985920de7fc327ba653c538d6f57502d5a304 (commit)
       via  553b277492685b0fad24ca393081b6a8960e3143 (commit)
      from  58b29655dda0ca4d4935a6b886a1a39d249a8780 (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 72372e389566442c5022959a567df24ea0a4034d
Author: Barton Chittenden <barton at bywatersolutions.com>
Date:   Thu Jul 30 15:17:02 2015 -0700

    Bug 12372: Updated man pages for koha-mysql
    
    http://bugs.koha-community.org/show_bug.cgi?id=12372
    Signed-off-by: Liz Rea <liz at catalyst.net.nz>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>

commit c30985920de7fc327ba653c538d6f57502d5a304
Author: Barton Chittenden <barton at bywatersolutions.com>
Date:   Tue Jun 23 07:02:10 2015 -0700

    Bug 12372: (QA followup) Standardized argument parsing for koha-mysql.
    
    http://bugs.koha-community.org/show_bug.cgi?id=12372
    Signed-off-by: Liz Rea <liz at catalyst.net.nz>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>

commit 553b277492685b0fad24ca393081b6a8960e3143
Author: Barton Chittenden <barton at bywatersolutions.com>
Date:   Mon Jun 1 15:29:14 2015 -0700

    Bug 12372: koha-mysql: process any mysql args
    
    Signed-off-by: Ian Bays <ian.bays at ptfs-europe.com>
    Signed-off-by: Liz Rea <liz at catalyst.net.nz>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at unc.edu.ar>

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

Summary of changes:
 debian/docs/koha-mysql.xml |   23 ++++++++++++++++++-----
 debian/scripts/koha-mysql  |   21 +++++++++++++++++++--
 2 files changed, 37 insertions(+), 7 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Wed Aug 26 16:06:54 2015
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Wed, 26 Aug 2015 14:06:54 +0000
Subject: [koha-commits] main Koha release repository branch master updated.
	v3.20.00-457-gca341f6
Message-ID: <E1ZUbLq-0003CK-7L@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  ca341f6840ad7eb9170ce49f1ed6869b3e468297 (commit)
       via  cc79ab3cdd42513fa46a7f78c03282625543d6f5 (commit)
       via  a3b7f059a1f95945bcb5bbc1123b8eead17433fc (commit)
       via  55a52c1218a672dc770b9f0cf4e20501f73ba153 (commit)
       via  e09e7152b6af1f2cb3d2e78eff317cdf77cbf5f2 (commit)
       via  34c11ee8eee5a547de3a83c2cba8e6eeedecfa01 (commit)
       via  6f95acd1a6cf5113992d28173dece96e8afc6cef (commit)
       via  3e1282b135cb642e8dac90f810edb5f29889e85e (commit)
       via  c9234cb92ddd9ec1ec19e399c185e1ba9b11a9d9 (commit)
       via  1bf5fb920bc34f44706e837dd1b7441381146eb3 (commit)
       via  eaff67140c5607232b64f29cb3530b3c8655f024 (commit)
       via  64fcab9e518c16613c98095bd6a08d76fda20e8f (commit)
       via  092a7e1b531f4de5218fe7136d4e646a845aaad4 (commit)
       via  031a3196a49dd5fba98aa6c7b7cea299a312005e (commit)
       via  b7119848850c8bb44cb933d7b07d8582a761a181 (commit)
       via  71ce0d96c9d72571e45c568acb7aab321a42009b (commit)
       via  ad3239479db4e5542a6f29bfd1bb1af9187ac67b (commit)
       via  a3795250862da29d32b124bfe18ca37b53888c79 (commit)
       via  76f16b1b42ded69fb9c9672bbeb7a92203783fe5 (commit)
       via  4251d4f8822999d7b5d442d9e4ae86941ae67e06 (commit)
       via  d4edaaada01be2069829afabf63650d6e09b6c61 (commit)
       via  9930b5bf1b0cce46b1c97a5c352542c085ba6320 (commit)
      from  72372e389566442c5022959a567df24ea0a4034d (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 ca341f6840ad7eb9170ce49f1ed6869b3e468297
Author: Fr?d?ric Demians <f.demians at tamil.fr>
Date:   Sun Nov 3 17:05:38 2013 +0100

    Bug 11190: sitemap.pl -- Generate a Catalog sitemap
    
    Add a script sitemap.pl to process all biblio records from a Koha
    instance and generate Sitemap files complying with this protocol as
    described on http://sitemaps.org. The goal of this script is to be able
    to provide to search engines direct access to biblio records. It avoid
    leaving search engine browsing Koha OPAC and so generating a lot of
    traffic, and workload, for a bad result.
    
    Thanks Magnus for testing, and helping to improve the script design.
    
    [2015.04.16] Switch from Moose to Moo.
    
    [2015.08.20] Add complete (more) UT.
    
    Signed-off-by: Magnus Enger <magnus at enger.priv.no>
    All options to the script work as expected and the output looks
    good. Nice enhancement!
    
    Signed-off-by: Frederic Demians <f.demians at tamil.fr>
    
    I signed-of my own patch after fixing various QA errors.
    
    Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    Amended patch: replace tabs with spaces.
    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>

commit cc79ab3cdd42513fa46a7f78c03282625543d6f5
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date:   Fri Jul 17 07:37:33 2015 -0400

    Bug 14557: Add holds count to holds tab
    
    Some librarians have expressed that it would be helpful if the holds tab
    displayed the count of holds for a record.
    
    Test Plan:
    1) Apply this patch
    2) Note the Holds tab for a record now displays the number of holds for that record
    
    Signed-off-by: Jason Robb <jrobb at sekls.org>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>

commit a3b7f059a1f95945bcb5bbc1123b8eead17433fc
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date:   Fri Jul 17 07:35:28 2015 -0400

    Bug 14557: Clean up biblio-view-menu.inc
    
    Signed-off-by: Jason Robb <jrobb at sekls.org>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>

commit 55a52c1218a672dc770b9f0cf4e20501f73ba153
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date:   Mon Aug 24 15:44:22 2015 -0300

    Bug 14714: Add tab-completion to koha-mysql command
    
    This patch introduces tab-completion in bash to the koha-mysql
    command. It completes using valid instance names. It stops completing
    once an instance name is chosen (i.e. it respects the fact that
    koha-mysql accepts only one instance name as parameter).
    
    To test:
    - Have a packages install (kohadevbox works)
    - Run:
      $ . debian/koha-common.bash-completion
    - Type
      koha-mysql <tab>
    => SUCCESS: You are prompted valid instance names for completion.
    - Sign off :-D
    
    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 theke.io>

commit e09e7152b6af1f2cb3d2e78eff317cdf77cbf5f2
Author: Benjamin Rokseth <benjamin.rokseth at kul.oslo.kommune.no>
Date:   Mon Jun 8 11:12:03 2015 +0200

    Bug 14361: koha-restart-zebra fails and probably breaks upgrade
    
    This patch fixes the koha-restart-zebra and koha-stop-zebra scripts
    by adding pidfiles folder to the test is_zebra_running.
    It also adds pidfiles to the test is_indexer_running so that
    koha-rebuild-zebra will work properly.
    
    Test plan:
    1) check if zebrasrv is running, get pid of zebrasrv
       ps ax | grep zebrasrv
    2) In my case, there was also a warning on the about.pl page on a fresh
       install: Error message from Zebra: 1011 (bad credentials)
    3) try to restart zebra
       koha-restart-zebra instancename
       You will get a msg :
       Zebra does not appear to have been running for instancename
       Starting Zebra server for instancename
    4) check again if zebrasrv is running
        ps ax | grep zebrasrv
       and see that pid has not changed, thus it is not restarted
    5) Apply patch
    6) repeat 4) and watch now how pid has changed
       If there was a warning on about.pl it should now be gone
    
    Signed-off-by: Mason James <mtj at kohaaloha.com>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
    Good catch Benjamin! It works as expected with the patch.

commit 34c11ee8eee5a547de3a83c2cba8e6eeedecfa01
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date:   Wed Jan 14 11:42:29 2015 -0500

    Bug 12632: (regression tests) Unit Tests
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>

commit 6f95acd1a6cf5113992d28173dece96e8afc6cef
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date:   Fri Aug 22 13:29:28 2014 -0400

    Bug 12632: Hold limits ignored for record level holds with item level itemtypes
    
    The crux of the issue is that if you are using item level itemtypes, but
    are allowing biblio levels holds, those holds do not have items.
    
    So, in CanItemBeReserved, when Koha counts the number of holds to
    compare against the given rule, it will always give 0 ( except of course
    for found holds, and the occasional item-level hold ).
    
    So the query is saying "link each of these reserves to the reserved
    item, and count the number of reserves this patron where the itemtype is
    DVD". However, since these are all record level reserves, there are no
    items to link to, and so when it looks for all reserves this and item
    whose itemtype is DVD, it finds zero reserves!
    
    This patch solves the problem by looking first at the item level
    itemtype, and if it does not exist, then it looks at the record
    level itemtype. For installations using record level itemtypes, the
    behavior remains unchanged.
    
    Test plan:
    1) Enable item level itemtypes
    2) Create two records with one item each of a given itemtype
    3) Create a single issuing rule and limit the holds allowed for that
       itemtype to 1
    4) Place a record level hold on your first record
    5) Attempt to place a record level hold for the same patron on your
       second record. You should not be able to but you can!
    6) Apply this patch
    7) Repeat step 5, note you can no longer place the hold!
    
    Signed-off-by: Paola Rossi <paola.rossi at cineca.it>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>

commit 3e1282b135cb642e8dac90f810edb5f29889e85e
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date:   Tue Aug 25 11:32:11 2015 -0300

    Bug 7143: Add Benjamin Rokseth to the projects history file and about page
    
    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>

commit c9234cb92ddd9ec1ec19e399c185e1ba9b11a9d9
Author: Liz Rea <liz at catalyst.net.nz>
Date:   Tue Aug 4 10:18:22 2015 +1200

    Bug 7143: spaces in history.txt instead of tabs break display on website
    
    This may be the only place in koha where a tab should be a tab and not 4 spaces.
    
    I'll try to fix the script that does the conversion for the website to handle 4 spaces instead of tabs, but for now can we have this?
    
    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>

commit 1bf5fb920bc34f44706e837dd1b7441381146eb3
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date:   Wed Aug 26 10:37:17 2015 -0300

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

commit eaff67140c5607232b64f29cb3530b3c8655f024
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Tue Aug 25 12:31:09 2015 +0100

    Bug 9809: Remove one more occurrence of reserveconstraints
    
    This file is not updated, but no need to keep on occurrence of an
    nonexistent table in it.
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>

commit 64fcab9e518c16613c98095bd6a08d76fda20e8f
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Tue Aug 25 12:28:09 2015 +0100

    Bug 9809: Fix pod errors
    
     FAIL   C4/Reserves.pm
       FAIL   pod
                     in file C4/Reserves.pm
                    *** ERROR:
                    Spurious =cut command
    
    Test plan:
    perl -e "use Pod::Checker;podchecker('C4/Reserves.pm');"
    Should not return any errors.
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>

commit 092a7e1b531f4de5218fe7136d4e646a845aaad4
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date:   Mon Aug 24 13:50:08 2015 +0200

    Bug 9809: [QA Follow-up] Still found some remains
    
    In the staff client we had still some remains referring to the
    constraint types.
    Also touched one comment line from SIP.
    
    Test plan:
    Add a hold in the staff client.
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>

commit 031a3196a49dd5fba98aa6c7b7cea299a312005e
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date:   Mon Aug 24 08:54:39 2015 +0200

    Bug 9809: [QA Follow-up] Remove constrainttype from 14464 tests
    
    Some additional unit tests of bug 14464 still included a constraint
    in the AddReserve calls.
    
    Test plan:
    Run Reserves.t
    
    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: Tomas Cohen Arazi <tomascohen at theke.io>

commit b7119848850c8bb44cb933d7b07d8582a761a181
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date:   Fri Aug 21 10:47:19 2015 +0200

    Bug 9809: [QA Follow-up] Remove an erroneous call to GetReserveFee
    
    The call to GetReserveFee in opac-reserve.pl is useless in its current
    form. The first parameter undef takes care of receiving 0.
    But note that the user is warned correctly for the charge via param
    variable RESERVE_CHARGE on the opac form.
    
    When the hold is placed, AddReserve calls GetReserveFee. So if the routine
    would work correctly, we would not need this extra call in opac-reserve
    in the whole place. Unfortunately, the routine is not working correctly.
    
    I will submit a fix for GetReserveFee under a new report (14702).
    
    Test plan:
    [1] Add a hold fee to some category.
    [2] Check the warn for placing a hold on such a book in OPAC.
    [3] Observe that the actual fee is not charged. This is a current bug and
        it will be addressed on report 14702.
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>

commit 71ce0d96c9d72571e45c568acb7aab321a42009b
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date:   Fri Aug 21 09:23:53 2015 +0200

    Bug 9809: [QA Follow-up] Remove warnings from Hold.pm
    
    Resolves two warnings on a uninitialized found column:
    holds: Use of uninitialized value in string eq at /home/koha/testclone/Koha/Hold.pm line 53., referer: http://test.rijkskoha.nl:28080/cgi-bin/koha/circ/circulation.pl?borrowernumber=152
    holds: Use of uninitialized value in string eq at /home/koha/testclone/Koha/Hold.pm line 74., referer: http://test.rijkskoha.nl:28080/cgi-bin/koha/circ/circulation.pl?borrowernumber=152
    
    Test plan:
    Run t/db_dependent/Hold.t.
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>

commit ad3239479db4e5542a6f29bfd1bb1af9187ac67b
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date:   Tue Jun 30 08:19:29 2015 -0400

    Bug 9809: Update AddReserve prototype to remove constraint parameter
    
    Test Plan:
    1) Apply this patch set
    2) prove t/db_dependent/Circulation.t
    3) prove t/db_dependent/Holds.t
    4) prove t/db_dependent/Holds/LocalHoldsPriority.t
    5) prove t/db_dependent/Holds/RevertWaitingStatus.t
    6) prove t/db_dependent/HoldsQueue.t
    7) prove t/db_dependent/Reserves.t
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    
    AMENDED: An else branch in reserve/placerequest.pl was removed. This had
    the effect of making it no longer possible to place an any hold in the
    staff client.
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    Verified placing a biblio level and an item level hold.
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>

commit a3795250862da29d32b124bfe18ca37b53888c79
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date:   Tue Jun 30 07:30:32 2015 -0400

    Bug 9809: Remove reserveconstraints references from C4::Reserves
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>

commit 76f16b1b42ded69fb9c9672bbeb7a92203783fe5
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date:   Tue Jun 30 08:25:29 2015 -0400

    Bug 9809: Update unit tests
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>

commit 4251d4f8822999d7b5d442d9e4ae86941ae67e06
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date:   Tue Jun 30 07:32:56 2015 -0400

    Bug 9809: Remove DBIC module for reserveconstraints
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>

commit d4edaaada01be2069829afabf63650d6e09b6c61
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date:   Tue Jun 30 08:51:55 2015 -0400

    Bug 9809: Update Schema files
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>

commit 9930b5bf1b0cce46b1c97a5c352542c085ba6320
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date:   Tue Jun 30 07:34:35 2015 -0400

    Bug 9809: DB Updates
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>

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

Summary of changes:
 C4/ILSDI/Services.pm                               |    4 +-
 C4/Installer/PerlDependencies.pm                   |   10 +
 C4/Reserves.pm                                     |  142 ++++----------
 C4/SIP/ILS/Item.pm                                 |    1 -
 C4/SIP/ILS/Transaction/Hold.pm                     |   60 +++---
 INSTALL.fedora7                                    |    3 +-
 Koha.pm                                            |    2 +-
 Koha/Hold.pm                                       |    6 +-
 Koha/Schema/Result/OldReserve.pm                   |   12 +-
 Koha/Schema/Result/Reserve.pm                      |   12 +-
 Koha/Schema/Result/Reserveconstraint.pm            |   82 ---------
 Koha/Sitemapper.pm                                 |   89 +++++++++
 Koha/Sitemapper/Writer.pm                          |  125 +++++++++++++
 t/Message.t => Koha/Template/Plugin/Biblio.pm      |   20 +-
 debian/koha-common.bash-completion                 |   18 ++
 debian/scripts/koha-functions.sh                   |    2 +
 docs/history.txt                                   |   57 +++---
 installer/data/mysql/kohastructure.sql             |   15 --
 installer/data/mysql/updatedatabase.pl             |   15 ++
 .../prog/en/includes/biblio-view-menu.inc          |   22 ++-
 koha-tmpl/intranet-tmpl/prog/en/modules/about.tt   |    1 +
 .../prog/en/modules/reserve/request.tt             |    6 -
 misc/cronjobs/sitemap.pl                           |  127 +++++++++++++
 opac/opac-reserve.pl                               |    9 +-
 reserve/placerequest.pl                            |   18 +-
 reserve/request.pl                                 |    2 -
 serials/routing-preview.pl                         |    3 +-
 t/db_dependent/Circulation.t                       |    5 +-
 t/db_dependent/Holds.t                             |   44 +++--
 t/db_dependent/Holds/LocalHoldsPriority.t          |    1 -
 t/db_dependent/Holds/RevertWaitingStatus.t         |    1 -
 t/db_dependent/HoldsQueue.t                        |    3 +-
 t/db_dependent/Reserves.t                          |   38 ++--
 t/db_dependent/Sitemapper.t                        |  193 ++++++++++++++++++++
 34 files changed, 770 insertions(+), 378 deletions(-)
 delete mode 100644 Koha/Schema/Result/Reserveconstraint.pm
 create mode 100644 Koha/Sitemapper.pm
 create mode 100644 Koha/Sitemapper/Writer.pm
 copy t/Message.t => Koha/Template/Plugin/Biblio.pm (68%)
 mode change 100755 => 100644
 create mode 100755 misc/cronjobs/sitemap.pl
 create mode 100755 t/db_dependent/Sitemapper.t


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Thu Aug 27 18:24:26 2015
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Thu, 27 Aug 2015 16:24:26 +0000
Subject: [koha-commits] main Koha release repository branch master updated.
	v3.20.00-460-g255d133
Message-ID: <E1ZUzyU-0005O1-GS@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  255d133acac24a675dca0106ede20359257d0701 (commit)
       via  4bb888281dec7de676fc6546746a88835a822c62 (commit)
       via  63970ff4a2c8abc5d277d252574336cbf048a0da (commit)
      from  ca341f6840ad7eb9170ce49f1ed6869b3e468297 (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 255d133acac24a675dca0106ede20359257d0701
Author: Joonas Kylm?l? <j.kylmala at gmail.com>
Date:   Wed Aug 19 11:00:27 2015 +0000

    Bug 14579: 'You are not logged in' should link to log in page
    
    To test:
    1) Go to any page on the staff client and make sure you are not logged in (ie an error page, cgi-bin/koha/errors/400.pl)
    2) Try click on 'You are not logged in |'
    3) Notice it is not really a link and doesn't take you anywhere
    4) Apply patch
    5) Refresh page
    6) Click on what now says 'Log in |'
    7) Confirm that you are redirected to the intranet log in page
    
    Signed-off-by: Aleisha <aleishaamohia at hotmail.com>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>

commit 4bb888281dec7de676fc6546746a88835a822c62
Author: Aleisha <aleishaamohia at hotmail.com>
Date:   Mon Aug 3 02:23:29 2015 +0000

    Bug 14634: Warns when placing hold on record with no items
    
    To test:
    
    1) Create a new record in Cataloguing
    2) When done, instead of adding an item to the record, click on the Holds tab in the left nav
    3) Notice warns
    4) Apply patch and refresh page
    5) Click on Holds tab again
    6) Notice warns are gone and page still works
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    Warns disappear; note that the display of the error message is still ugly.
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>

commit 63970ff4a2c8abc5d277d252574336cbf048a0da
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date:   Thu Aug 27 13:13:38 2015 -0300

    Bug 13791: (RM followup) Add new dependencies for packaging
    
    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>

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

Summary of changes:
 C4/Installer/PerlDependencies.pm                   |    5 +++++
 debian/control                                     |   22 ++++++++++++++++----
 debian/control.in                                  |    2 ++
 .../intranet-tmpl/prog/en/css/staff-global.css     |    2 +-
 .../intranet-tmpl/prog/en/includes/header.inc      |   19 +++++++++++------
 reserve/request.pl                                 |    1 +
 6 files changed, 40 insertions(+), 11 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Fri Aug 28 05:14:13 2015
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Fri, 28 Aug 2015 03:14:13 +0000
Subject: [koha-commits] main Koha release repository branch 3.16.x updated.
	v3.16.13-15-g29181da
Message-ID: <E1ZVA7J-0004g1-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.16.x has been updated
       via  29181dae407a1828ae9e29775aefbb0c72f860e1 (commit)
       via  0a52185f110ac99b1ef326b6e1d548271e563f54 (commit)
       via  9cdc595c67bedc82dbd7344c27ee46978f74db77 (commit)
       via  97ce5fe66b5033d102f78ddc03619c73458020a4 (commit)
       via  5a6a263d8f2482074fe187b124af6a4008924a3a (commit)
       via  34e69a4a9eb8449c400cf928d9c3701cc8eab45f (commit)
       via  e0c37b2b6b3409cc39773a62cc45c4102d27a1dc (commit)
       via  13ee28896d90eb0493443cd30a8d3197b520f482 (commit)
       via  5ef25fed154172b3237e317f8257d75a3b5002b1 (commit)
       via  ec57f1c8b6982b662c6e444333837030a2cf1201 (commit)
       via  e55819cad9bee00c63f4eeb88d8d08feb657e820 (commit)
       via  710a470e0bb1a320f60046facc8389b42ab9525b (commit)
       via  8b3e00d9b9c6f007f15df6c337260db45855ca4b (commit)
       via  e124a8c94c25b376e654d5e0812060f6f7f78135 (commit)
       via  05503f137a884620d39e86dc6365c207a3d99733 (commit)
      from  71a69181b1ea37df86cbeeafd34e9704104a22b5 (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 29181dae407a1828ae9e29775aefbb0c72f860e1
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Wed Aug 19 15:42:10 2015 +0100

    Bug 14566: Fix permissions in patronimage.pl
    
    There is no permission needed to access the patronimage.pl script.
    This means anybody cans access to the patron's images.
    
    Test plan:
    Add an image to borrowernumber 42 and call
    /cgi-bin/koha/members/patronimage.pl?borrowernumber=42
    
    If you are logged in with borrowers permissions, you will see the image,
    otherwise you will get a blank page with a 403 header.
    
    Signed-off-by: Indranil Das Gupta (L2C2 Technologies) <indradg at gmail.com>
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    Signed-off-by: Liz Rea <wizzyrea at gmail.com>
    
    Conflicts:
    	members/patronimage.pl

commit 0a52185f110ac99b1ef326b6e1d548271e563f54
Author: Liz Rea <wizzyrea at gmail.com>
Date:   Mon Aug 17 09:47:27 2015 +1200

    Bug 13663 - QA Followup, removing tab chars

commit 9cdc595c67bedc82dbd7344c27ee46978f74db77
Author: Alex Arnaud <alex.arnaud at biblibre.com>
Date:   Thu Jun 11 10:55:35 2015 +0200

    Bug 13663: Fix permissions in upload-file.pl and upload-file-progress.pl
    
    Test plan:
    Verify that the circulate_remaining_permissions perm is enough to upload
    .koc file.
    
    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 2fcc02321f0f56760cfdbd67a29917e4f0ba278b)
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    Signed-off-by: Liz Rea <wizzyrea at gmail.com>

commit 97ce5fe66b5033d102f78ddc03619c73458020a4
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>
    (cherry picked from commit 62dc6b0ca15a9de99a1cb41809e6c9c016e6b0d0)
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    Signed-off-by: Liz Rea <wizzyrea at gmail.com>
    
    Conflicts:
    	t/db_dependent/Biblio.t

commit 5a6a263d8f2482074fe187b124af6a4008924a3a
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>
    (cherry picked from commit 298c4c76a5f231d9cc0935b6f14a5f191b727804)
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    Signed-off-by: Liz Rea <wizzyrea at gmail.com>

commit 34e69a4a9eb8449c400cf928d9c3701cc8eab45f
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>
    (cherry picked from commit ee7666a5fdd1b04f1bf50aa89900488e1a01402b)
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    Signed-off-by: Liz Rea <wizzyrea at gmail.com>

commit e0c37b2b6b3409cc39773a62cc45c4102d27a1dc
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>
    (cherry picked from commit f7ed250d618c57a3fc00728bbb93460b25ceda52)
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    Signed-off-by: Liz Rea <wizzyrea at gmail.com>

commit 13ee28896d90eb0493443cd30a8d3197b520f482
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>
    (cherry picked from commit f3a8b7a0e1e1bf112628c6215105ab80f25ed94f)
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    Signed-off-by: Liz Rea <wizzyrea at gmail.com>

commit 5ef25fed154172b3237e317f8257d75a3b5002b1
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>
    (cherry picked from commit 7d4e7e4e525fc99cb4452de135e161a0e0866753)
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    Signed-off-by: Liz Rea <wizzyrea at gmail.com>

commit ec57f1c8b6982b662c6e444333837030a2cf1201
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>
    (cherry picked from commit 0183cc0223678f6b3f0885213c7223ddb31acf5d)
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    Signed-off-by: Liz Rea <wizzyrea at gmail.com>

commit e55819cad9bee00c63f4eeb88d8d08feb657e820
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>
    (cherry picked from commit e9061028c1ba95b310be5e9333b224e735e64f40)
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    Signed-off-by: Liz Rea <wizzyrea at gmail.com>

commit 710a470e0bb1a320f60046facc8389b42ab9525b
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>
    (cherry picked from commit 7098a36b19c35a06a51361bd381416a1204de38d)
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    Signed-off-by: Liz Rea <wizzyrea at gmail.com>
    
    Conflicts:
    	koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tt

commit 8b3e00d9b9c6f007f15df6c337260db45855ca4b
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>
    (cherry picked from commit fe3a49e61133e1e66d0075f3300cd3a99e691890)
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    Signed-off-by: Liz Rea <wizzyrea at gmail.com>

commit e124a8c94c25b376e654d5e0812060f6f7f78135
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>
    Signed-off-by: Liz Rea <wizzyrea at gmail.com>

commit 05503f137a884620d39e86dc6365c207a3d99733
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>
    Signed-off-by: Liz Rea <wizzyrea at gmail.com>

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

Summary of changes:
 C4/Biblio.pm                                       |    8 +++--
 C4/Circulation.pm                                  |   32 ++++++++------------
 C4/Members/Attributes.pm                           |    2 +-
 Koha/Filter/MARC/EmbedSeeFromHeadings.pm           |    5 +++
 authorities/merge.pl                               |   11 ++++---
 installer/data/mysql/kohastructure.sql             |    4 +--
 .../intranet-tmpl/prog/en/modules/tools/letter.tt  |    8 ++---
 .../opac-tmpl/bootstrap/en/modules/sco/sco-main.tt |   17 +++++++++--
 members/patronimage.pl                             |   21 +++++++++----
 opac/opac-memberentry.pl                           |    2 ++
 opac/opac-registration-verify.pl                   |    2 ++
 t/db_dependent/Biblio.t                            |   22 ++++++++++++--
 tools/letter.pl                                    |    4 +--
 tools/upload-file-progress.pl                      |   21 +++++++++++--
 tools/upload-file.pl                               |   20 ++++++++++--
 15 files changed, 126 insertions(+), 53 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Fri Aug 28 07:12:40 2015
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Fri, 28 Aug 2015 05:12:40 +0000
Subject: [koha-commits] main Koha release repository branch 3.16.x updated.
	v3.16.13-17-gf0673e7
Message-ID: <E1ZVBxw-0007nv-B7@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  f0673e738b02fde26f8192009c2ee5d7398bbe7e (commit)
       via  ef48b139cfd72ae2ddba0d8b6a30b27fdabff71b (commit)
      from  29181dae407a1828ae9e29775aefbb0c72f860e1 (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 f0673e738b02fde26f8192009c2ee5d7398bbe7e
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date:   Tue Sep 16 13:15:57 2014 +0200

    Bug 12669: Centralize the timezone handle into Koha::DateUtils
    
    This patch adds unit tests for the previous changes and centralize the
    timezone handle into the Koha::DateUtils module.
    Like that the behavior will affect all date manipulations using this
    module (should be all dates in Koha).
    
    Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    Signed-off-by: Mason James <mtj at kohaaloha.com>

commit ef48b139cfd72ae2ddba0d8b6a30b27fdabff71b
Author: Rolando Isidoro <rolando.isidoro at gmail.com>
Date:   Fri Aug 1 09:42:30 2014 +0100

    Bug 12669: Use floating timezone when handling dates without hours, minutes and seconds.
    
    Test plan:
    
    1. Create a new serial record or pick an existing one;
    2. Add a "New subscription" and set the "First issue publication date"
       and "Frequency" values so that the "Planned date" for a given issue
       hits a day where a transition to Daylight Saving Time (DST) occurs
    
       ex:. 1979-04-01 in Europe/Lisbon (http://www.timeanddate.com/time/change/portugal/lisbon?year=1979)
       ... use this website page as a source http://www.timeanddate.com/time/dst/2014.html
       to find a suitable transition to DST in your timezone in the current year.
    
    3. From the "Subscription detail" page in Koha for the given record click
       the "Serial collection" link on the left side context menu.
    
    Expected result:
    Prior to applying the patch the error described in this bug report should occur.
    After the patch is applied the "Serial collection" page should load correctly.
    
    Signed-off-by: Colin Campbell <colin.campbell at ptfs-europe.com>
    Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    Signed-off-by: Mason James <mtj at kohaaloha.com>

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

Summary of changes:
 Koha/DateUtils.pm                               |   34 ++++++++++++++++++-----
 Koha/Template/Plugin/KohaDates.pm               |    2 ++
 t/DateUtils.t                                   |   25 ++++++++++++++++-
 t/db_dependent/Koha_template_plugin_KohaDates.t |   30 ++++++++++++++++----
 4 files changed, 78 insertions(+), 13 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Fri Aug 28 07:59:36 2015
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Fri, 28 Aug 2015 05:59:36 +0000
Subject: [koha-commits] main Koha release repository branch 3.16.x updated.
	v3.16.13-18-gb1b4a1a
Message-ID: <E1ZVChM-000838-Q5@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  b1b4a1afea18aa70a547fb2f60918d0cb2428a56 (commit)
      from  f0673e738b02fde26f8192009c2ee5d7398bbe7e (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 b1b4a1afea18aa70a547fb2f60918d0cb2428a56
Author: Mason James <mtj at kohaaloha.com>
Date:   Fri Aug 28 17:56:41 2015 +1200

    Bug 14494: correct typo in ./t/DateUtils.t

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

Summary of changes:
 t/DateUtils.t |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Fri Aug 28 08:55:20 2015
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Fri, 28 Aug 2015 06:55:20 +0000
Subject: [koha-commits] main Koha release repository branch 3.16.x updated.
	v3.16.13-20-gdbee39e
Message-ID: <E1ZVDZI-0008Iw-Mb@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  dbee39e74b8d0a4b8690446194960bcd72bc55de (commit)
       via  a94dead1eb5892af0e0ada8155c76f8afa3e2d13 (commit)
      from  b1b4a1afea18aa70a547fb2f60918d0cb2428a56 (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 dbee39e74b8d0a4b8690446194960bcd72bc55de
Author: Mason James <mtj at kohaaloha.com>
Date:   Fri Aug 28 17:50:48 2015 +1200

    Bump version to 3.16.14

commit a94dead1eb5892af0e0ada8155c76f8afa3e2d13
Author: Mason James <mtj at kohaaloha.com>
Date:   Fri Aug 28 17:51:34 2015 +1200

    Add release notes

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

Summary of changes:
 installer/data/mysql/updatedatabase.pl             |    5 +
 kohaversion.pl                                     |    2 +-
 ...tes_3_16_12.html => release_notes_3_16_14.html} |  134 +++++++++++++-------
 ...notes_3_16_12.txt => release_notes_3_16_14.txt} |  120 +++++++++++-------
 4 files changed, 170 insertions(+), 91 deletions(-)
 copy misc/release_notes/{release_notes_3_16_12.html => release_notes_3_16_14.html} (59%)
 copy misc/release_notes/{release_notes_3_16_12.txt => release_notes_3_16_14.txt} (68%)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Fri Aug 28 15:22:44 2015
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Fri, 28 Aug 2015 13:22:44 +0000
Subject: [koha-commits] main Koha release repository branch master updated.
	v3.20.00-470-gf9e24c8
Message-ID: <E1ZVJcC-0002VB-R3@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  f9e24c8d4f2de5dd697a2d99c6e36cb59463920e (commit)
       via  1f0ff90360c21e5e24df9f455681b1bf4ae92031 (commit)
       via  15338b7cd5247f900ce4363059a14d3d60333002 (commit)
       via  b39e01a349292cc17cfcab0e33dfa206a98ac924 (commit)
       via  d1c41cda5bd4e1c36fd785015d08d21f6398430a (commit)
       via  bf67f19ffb26ac34966c3294addb4d8308c25265 (commit)
       via  079de81c104441e1e87799affb7ab8eaef0f91f4 (commit)
       via  8749411abd8ba46cf7dba31ab9ff847be0b91638 (commit)
       via  b348c07f969a5bd17f25e5ced681ad44aa351c0e (commit)
       via  b18f86e75cc2ac06dac787c68049bc0935debbc7 (commit)
      from  255d133acac24a675dca0106ede20359257d0701 (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 f9e24c8d4f2de5dd697a2d99c6e36cb59463920e
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date:   Fri Aug 28 10:21:44 2015 -0300

    Bug 13791: (QA followup) fix perlcritic warning
    
    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>

commit 1f0ff90360c21e5e24df9f455681b1bf4ae92031
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date:   Fri Apr 24 10:02:19 2015 +0200

    Bug 11880: Select what has been selected before
    
    The previous patch wants to select the barcode option when the user is
    on the item search for label, in all cases.
    So even if 'title' is selected, a search done, and there is no result,
    the barcode index is selected anyway.
    In this case, the title option should be kept.
    
    Test plan:
    Confirm that the barcode option is the default choice, but other values
    are kept if the search does not return any result.
    
    Followed test plan, behaves as expected. Tested with all choices.
    Signed-off-by: Marc Veron <veron at veron.ch>
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>

commit 15338b7cd5247f900ce4363059a14d3d60333002
Author: Fr?d?rick <frederick.capovilla at libeo.com>
Date:   Fri Feb 28 16:21:46 2014 -0500

    Bug 11880: Select the barcode index by default then searching for label items.
    
    Test case:
    * Go to "Tools -> Label creator -> Manage batches"
    * Click on the "New batch" button
    * Click on the "Add item(s)" button
    * A search window should open. The "Barcode" value should be selected in the the selectbox.
    
    Followed test case. Patch behaves as expected.
    Signed-off-by: Marc Veron <veron at veron.ch>
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>

commit b39e01a349292cc17cfcab0e33dfa206a98ac924
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date:   Fri Aug 28 10:02:21 2015 -0300

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

commit d1c41cda5bd4e1c36fd785015d08d21f6398430a
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date:   Fri Aug 28 09:59:01 2015 -0300

    Bug 13697: (QA followup) idiomatic fix add > charge
    
    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>

commit bf67f19ffb26ac34966c3294addb4d8308c25265
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date:   Fri Mar 20 10:48:20 2015 -0400

    Bug 13697: (QA followup) Add Unit Test

commit 079de81c104441e1e87799affb7ab8eaef0f91f4
Author: Christophe Croullebois <christophe.croullebois at biblibre.com>
Date:   Wed Feb 11 14:46:47 2015 +0100

    Bug 13697: Syspref to not add a fee when a patron changes to a category with enrolment fee
    
    By default this syspref is "Do" to keep the previous behaviour.
    
    Test plan :
    
    1/ create 2 categories (A & B). B with enrolment fee
    2/ create a patron in category A
    3/ change the patron category from A to B
    4/ check that the patron has an enrolment fee to pay
    
    Apply the patch
    
    1/ create a new patron in category A
    2/ change the patron category from A to B.
    3/ check that the patron has an enrolment fee to pay
    4/ change the system preference 'FeeOnChangePatronCategory' to 'Don't';
    5/ create a new patron in category A
    6/ change the patron category from A to B
    7/ check that the patron has no enrolment fee to pay
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>

commit 8749411abd8ba46cf7dba31ab9ff847be0b91638
Author: Winona Salesky <wsalesky at gmail.com>
Date:   Thu Jun 4 22:30:49 2015 -0400

    Bug 13383: 100/110/111 changes to XSLT
    
    Test plan:
    1) Apply this patch
    2) Ensure you are using the default XSLT setting for the staff and opac search results and record details
    3) Find or create a record with MARC tags 100,110,111
    4) Perform an opac search that would show the record in the search results.
    5) Click title to review record.
    6) Note the fields updates 100,110,111 to show subfields a,b,c,d,q and t.Multiple fields are separated by span class=separator |. Includes 100$j and handles multiple relator terms/codes.
    7) Repeat steps 4 - 6 for the staff interface
    
    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 theke.io>

commit b348c07f969a5bd17f25e5ced681ad44aa351c0e
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date:   Thu Aug 27 11:31:42 2015 -0300

    Bug 14737: wrong permissions required for cn_browser.pl plugin
    
    The cn_browser.pl cataloguing plugin only searches for used callnumbers
    on the bibliographic database. There is no need for this plugin to
    require special permissions besides access to the catalog.
    
    To test:
    - Link the cb_browser.pl cataloguing plugin to 952$o in your favourite cataloguing framework
    - Login with a superlibrarian user
    - Try the plugin
    => SUCCESS: you can use it
    - Login with a user that has the full 'tools' permission
    - Try the plugin
    => SUCCSES: you can use it
    - Login with a user that doesn't have full 'tools' permission
      but has the normal catalogue and cataloguing permissions.
    - Try the plugin
    => FAIL: you are requested to login with a different user
    - Apply the patch
    - Retry
    => SUCCESS: you can use it
    - Sign off :-D
    
    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 theke.io>

commit b18f86e75cc2ac06dac787c68049bc0935debbc7
Author: Robin Sheat <robin at catalyst.net.nz>
Date:   Fri Aug 28 14:28:56 2015 +1200

    Bug 13791: (PM followup) Dependency normalisation for master
    
    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>

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

Summary of changes:
 C4/Members.pm                                      |    4 +-
 Koha.pm                                            |    2 +-
 cataloguing/value_builder/cn_browser.pl            |    2 +-
 debian/control                                     |   10 +-
 debian/templates/plack.psgi                        |    2 +
 installer/data/mysql/sysprefs.sql                  |    1 +
 installer/data/mysql/updatedatabase.pl             |   10 ++
 .../prog/en/modules/admin/preferences/patrons.pref |    6 +
 .../intranet-tmpl/prog/en/modules/labels/search.tt |   28 ++---
 .../prog/en/xslt/MARC21slim2intranetDetail.xsl     |   84 +++++++++----
 .../prog/en/xslt/MARC21slim2intranetResults.xsl    |  128 ++++++++++++--------
 .../bootstrap/en/xslt/MARC21slim2OPACDetail.xsl    |   55 +++++++--
 .../bootstrap/en/xslt/MARC21slim2OPACResults.xsl   |  111 ++++++++++-------
 labels/label-item-search.pl                        |    3 +-
 t/db_dependent/Members/AddEnrolmentFeeIfNeeded.t   |   12 +-
 15 files changed, 301 insertions(+), 157 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Fri Aug 28 15:41:11 2015
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Fri, 28 Aug 2015 13:41:11 +0000
Subject: [koha-commits] main Koha release repository branch master updated.
	v3.20.00-480-g9f01706
Message-ID: <E1ZVJu3-0002eD-LX@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  9f0170668c628fb9119495891c67fe1358a93609 (commit)
       via  a2844a8a5c8ae39a82a0d876a2d5ef02ca237089 (commit)
       via  3389e03035dc6b187045e279dc34916b005afbfb (commit)
       via  991a8181b29c2fec4fe50b45328a27c78a60f3c4 (commit)
       via  fa1311894906821e2b6bc9e4e3a831a855a20bca (commit)
       via  9b2e4d966684d509ac64b4d83835c1d6d8992dd2 (commit)
       via  16a83aa7a64db6c9c28bb3d11817aaf4e51bdee7 (commit)
       via  acc8de8214c6f8c342eb170c9ddd2be63c16354b (commit)
       via  a5beeb365e21e8417b456f013b4bcdf3e21b1aa3 (commit)
       via  6d73e951beb376d47245a8a0dbc35db82a158fee (commit)
      from  f9e24c8d4f2de5dd697a2d99c6e36cb59463920e (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 9f0170668c628fb9119495891c67fe1358a93609
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Tue Aug 25 12:47:57 2015 +0100

    Bug 14337: Add 2 more tests to be complete
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>

commit a2844a8a5c8ae39a82a0d876a2d5ef02ca237089
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Tue Aug 25 12:39:33 2015 +0100

    Bug 14337: Fix conflict with bug 9809
    
    The reserves.constrainttype does not exist anymore, it has been removed
    by bug 9809.
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>

commit 3389e03035dc6b187045e279dc34916b005afbfb
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date:   Fri Jun 5 07:50:26 2015 -0400

    Bug 14337: AllowRenewalIfOtherItemsAvailable counts holdable not for loan items when checking renewability
    
    AllowRenewalIfOtherItemsAvailable checks
    C4::Reserves::IsAvailableForItemLevelRequest to see if the item is
    holdable, which catches not for loan values less than 0 ( i.e. holdable,
    but not circ-able ). However, since this feature is about
    actually checking out items to patrons, we should not count *any* not
    for loan items when deciding if the available items will satisfy all
    current holds.
    
    Test Plan:
     1) Enable AllowRenewalIfOtherItemsAvailable
     2) Create a record with two items
     3) Check out one item to a patron
     4) Ensure the item is renewable
     5) Place a hold on the record
     6) The item should now be non-renewable
     7) Add a second item to the record, but with a not for loan value < 0
     8) Note the checkout is still renewable
     9) Apply this patch
    10) Note the checkout is now non-renewable
    
    Works ok.
    
    Signed-off-by: Amit Gupta <amit.gupta at informaticsglobal.com>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>

commit 991a8181b29c2fec4fe50b45328a27c78a60f3c4
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date:   Thu Aug 20 06:46:51 2015 -0400

    Bug 14337: Add Unit Tests
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>

commit fa1311894906821e2b6bc9e4e3a831a855a20bca
Author: Joonas Kylm?l? <j.kylmala at gmail.com>
Date:   Tue Aug 25 07:24:54 2015 +0000

    Bug 14703: Holidays description shows \r\n for every new line
    
    Adds a new line for the holiday's description instead of the string
    \r\n.
    
    Test plan:
    1. In tools -> Calendar look at some holiday's description
       (Do a new holiday with description of multiple lines if
       there is not already)
    2. Notice that there is characters \r\n if someone has put
       a newline in the holiday's description
    3. Apply patch
    4. See that the new lines show there now nicely
    
    Sponsored-by: Vaara-kirjastot
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    Amended slightly: no need to replace title.
    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>

commit 9b2e4d966684d509ac64b4d83835c1d6d8992dd2
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date:   Fri Aug 28 10:36:11 2015 -0300

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

commit 16a83aa7a64db6c9c28bb3d11817aaf4e51bdee7
Author: Martin Persson <xarragon at gmail.com>
Date:   Mon Aug 17 00:01:05 2015 +0200

    Bug 11584: Syspref WYSIWYG, dropdown added
    
    This patch adds the 'Htmlarea' type to the dropdown box
    introduced by bug 14268, commit 6e3bcc38.
    
    Sponsored-By: Halmstad County Library
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>

commit acc8de8214c6f8c342eb170c9ddd2be63c16354b
Author: David Cook <dcook at prosentient.com.au>
Date:   Tue Jul 14 17:02:17 2015 +1000

    Bug 11584: Introduce UseWYSIWYGinSystemPreferences syspref
    
    This patch adds a system preference "UseWYSIWYGinSystemPreferences" to the Staff Client tab.
    
    By default, it is off, which means that the TinyMCE WYSIWYG editor won't be shown for system
    preferences with a type of "htmlarea".
    
    However, when it's on, it will show the editor for "Local Use" preferences with a "htmlarea"
    type, and for other system preferences in the "Opac", "Circulation", and "Staff Client" tabs,
    which I have re-assigned. (Basically, I grepped for HTML and changed the type for all
    the system preferences I found except for "IntranetNav", "OpacCustomSearch", and "OPACSearchForTitleIn",
    as a WYSIWYG editor would potentially break the output for these system preferences or
    add no value to them...)
    
    _TEST PLAN_
    
    0) Run `perl installer/data/mysql/updatedatabase.pl` after setting your environmental variables
    1) Check the Opac tab to make sure that the WYSIWYG is nowhere to be seen
    2) Change the "UseWYSIWYGinSystemPreferences" preference in "Staff Client" to "Show"
    3) Refresh the Opac tab and notice that many system preferences now have a WYSIWYG editor
    
    4) Try typing some text into these fields
    5) Note that it gets marked as "modified"
    6) Save the preference, and refresh the page
    7) Note that the content has been saved
    8) Take a look at how it's rendered on the actual webpage!
    
    Signed-off-by: Martin Persson <xarragon at gmail.com>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>

commit a5beeb365e21e8417b456f013b4bcdf3e21b1aa3
Author: David Cook <dcook at prosentient.com.au>
Date:   Tue Jul 14 14:17:48 2015 +1000

    Bug 11584: Add TinyMCE license to about.pl
    
    This patch adds the TinyMCE license info to about.pl
    
    Signed-off-by: Martin Persson <xarragon at gmail.com>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>

commit 6d73e951beb376d47245a8a0dbc35db82a158fee
Author: David Cook <dcook at prosentient.com.au>
Date:   Tue Jun 23 17:36:58 2015 +1000

    Bug 11584: Add wysiwyg editor to system preferences dealing with HTML
    
    This patch adds the ability to use a WYSIWYG editor for system preferences.
    
    The key files that I touch are:
    
    1) admin/systempreferences.pl
    2) koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences.tt
    3) koha-tmpl/intranet-tmpl/prog/en/modules/admin/systempreferences.tt
    
    I also add:
    
    4) koha-tmpl/intranet-tmpl/prog/en/includes/wysiwyg-systempreferences.inc
    
    and
    
    5) koha-tmpl/intranet-tmpl/lib/tiny_mce/plugins/advimage
    
    This plugin is part of the TinyMCE distribution. It used to be in Koha, but
    then someone removed it. It's useful for preferences like "opacheader" though.
    
    *If you're using anything except IE, this should work super well. If
    you're using IE, it'll probably only work for keyboard input and dragging
    text within the editor box but not from outside of it. IE has worse
    security, so you can probably paste using the context menu paste.
    
    *While I think a WYSIWYG editor can be useful, there might be times
    where the content is displayed differently than it is in the editor
    because of higher level CSS and Javascript.
    
    Signed-off-by: Martin Persson <xarragon at gmail.com>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>

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

Summary of changes:
 C4/Circulation.pm                                  |    1 +
 Koha.pm                                            |    2 +-
 admin/systempreferences.pl                         |    5 +
 installer/data/mysql/sysprefs.sql                  |    1 +
 installer/data/mysql/updatedatabase.pl             |   12 +-
 .../lib/tiny_mce/plugins/advimage/css/advimage.css |   13 +
 .../lib/tiny_mce/plugins/advimage/editor_plugin.js |    1 +
 .../tiny_mce/plugins/advimage/editor_plugin_src.js |   50 +++
 .../lib/tiny_mce/plugins/advimage/image.htm        |  235 ++++++++++
 .../lib/tiny_mce/plugins/advimage/img/sample.gif   |  Bin 0 -> 1624 bytes
 .../lib/tiny_mce/plugins/advimage/js/image.js      |  464 ++++++++++++++++++++
 .../lib/tiny_mce/plugins/advimage/langs/en_dlg.js  |    1 +
 .../prog/en/includes/wysiwyg-systempreferences.inc |   61 +++
 koha-tmpl/intranet-tmpl/prog/en/modules/about.tt   |    2 +
 .../prog/en/modules/admin/preferences.tt           |   13 +-
 .../en/modules/admin/preferences/circulation.pref  |    2 +-
 .../prog/en/modules/admin/preferences/opac.pref    |   22 +-
 .../en/modules/admin/preferences/staff_client.pref |    8 +-
 .../prog/en/modules/admin/systempreferences.tt     |   24 +-
 .../prog/en/modules/tools/holidays.tt              |    2 +-
 t/db_dependent/Circulation.t                       |   97 +++-
 21 files changed, 990 insertions(+), 26 deletions(-)
 create mode 100644 koha-tmpl/intranet-tmpl/lib/tiny_mce/plugins/advimage/css/advimage.css
 create mode 100644 koha-tmpl/intranet-tmpl/lib/tiny_mce/plugins/advimage/editor_plugin.js
 create mode 100644 koha-tmpl/intranet-tmpl/lib/tiny_mce/plugins/advimage/editor_plugin_src.js
 create mode 100644 koha-tmpl/intranet-tmpl/lib/tiny_mce/plugins/advimage/image.htm
 create mode 100644 koha-tmpl/intranet-tmpl/lib/tiny_mce/plugins/advimage/img/sample.gif
 create mode 100644 koha-tmpl/intranet-tmpl/lib/tiny_mce/plugins/advimage/js/image.js
 create mode 100644 koha-tmpl/intranet-tmpl/lib/tiny_mce/plugins/advimage/langs/en_dlg.js
 create mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/wysiwyg-systempreferences.inc


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Mon Aug 31 11:46:31 2015
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Mon, 31 Aug 2015 09:46:31 +0000
Subject: [koha-commits] main Koha release repository branch 3.16.x updated.
	v3.16.13-21-g6edb2c2
Message-ID: <E1ZWLfb-00058r-C4@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  6edb2c2ab6147a0d4e60c600c6d9b37572736637 (commit)
      from  dbee39e74b8d0a4b8690446194960bcd72bc55de (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 6edb2c2ab6147a0d4e60c600c6d9b37572736637
Author: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
Date:   Sun Aug 30 22:30:02 2015 -0300

    Translation updates for Koha 3.16.14 release

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

Summary of changes:
 .../po/am-Ethi-i-staff-t-prog-v-3006000.po         |    2 +-
 misc/translator/po/am-Ethi-opac-bootstrap.po       |    2 +-
 .../po/ar-Arab-i-staff-t-prog-v-3006000.po         |    2 +-
 misc/translator/po/ar-Arab-opac-bootstrap.po       |    2 +-
 .../po/az-AZ-i-staff-t-prog-v-3006000.po           |    2 +-
 misc/translator/po/az-AZ-opac-bootstrap.po         |    2 +-
 .../po/be-BY-i-staff-t-prog-v-3006000.po           |    2 +-
 misc/translator/po/be-BY-opac-bootstrap.po         |    2 +-
 .../po/bg-Cyrl-i-staff-t-prog-v-3006000.po         |    2 +-
 misc/translator/po/bg-Cyrl-opac-bootstrap.po       |    2 +-
 .../po/bn-IN-i-staff-t-prog-v-3006000.po           |    2 +-
 misc/translator/po/bn-IN-opac-bootstrap.po         |    2 +-
 .../po/ca-ES-i-staff-t-prog-v-3006000.po           |    2 +-
 misc/translator/po/ca-ES-opac-bootstrap.po         |    2 +-
 .../po/cs-CZ-i-staff-t-prog-v-3006000.po           |    2 +-
 misc/translator/po/cs-CZ-opac-bootstrap.po         |    2 +-
 .../po/da-DK-i-staff-t-prog-v-3006000.po           |    2 +-
 misc/translator/po/da-DK-opac-bootstrap.po         |    2 +-
 .../po/de-CH-i-staff-t-prog-v-3006000.po           |    2 +-
 misc/translator/po/de-CH-opac-bootstrap.po         |    2 +-
 .../po/de-DE-i-staff-t-prog-v-3006000.po           |  109 +++++++---------
 misc/translator/po/de-DE-opac-bootstrap.po         |    2 +-
 misc/translator/po/de-DE-pref.po                   |   10 +-
 .../po/el-GR-i-staff-t-prog-v-3006000.po           |    2 +-
 misc/translator/po/el-GR-opac-bootstrap.po         |    2 +-
 .../po/en-GB-i-staff-t-prog-v-3006000.po           |    2 +-
 misc/translator/po/en-GB-opac-bootstrap.po         |    2 +-
 .../po/en-NZ-i-staff-t-prog-v-3006000.po           |    2 +-
 misc/translator/po/en-NZ-opac-bootstrap.po         |    2 +-
 misc/translator/po/eo-i-staff-t-prog-v-3006000.po  |    2 +-
 misc/translator/po/eo-opac-bootstrap.po            |    2 +-
 .../po/es-ES-i-staff-t-prog-v-3006000.po           |  113 ++++++++---------
 misc/translator/po/es-ES-opac-bootstrap.po         |    2 +-
 misc/translator/po/es-ES-pref.po                   |    6 +-
 misc/translator/po/eu-i-staff-t-prog-v-3006000.po  |    2 +-
 misc/translator/po/eu-opac-bootstrap.po            |    2 +-
 .../po/fa-Arab-i-staff-t-prog-v-3006000.po         |    2 +-
 misc/translator/po/fa-Arab-opac-bootstrap.po       |    2 +-
 .../po/fi-FI-i-staff-t-prog-v-3006000.po           |    2 +-
 misc/translator/po/fi-FI-opac-bootstrap.po         |    2 +-
 .../po/fo-FO-i-staff-t-prog-v-3006000.po           |    2 +-
 misc/translator/po/fo-FO-opac-bootstrap.po         |    2 +-
 .../po/fr-CA-i-staff-t-prog-v-3006000.po           |    2 +-
 misc/translator/po/fr-CA-opac-bootstrap.po         |    2 +-
 .../po/fr-FR-i-staff-t-prog-v-3006000.po           |    2 +-
 misc/translator/po/fr-FR-opac-bootstrap.po         |    2 +-
 misc/translator/po/gl-i-staff-t-prog-v-3006000.po  |    2 +-
 misc/translator/po/gl-opac-bootstrap.po            |    2 +-
 .../po/he-Hebr-i-staff-t-prog-v-3006000.po         |    2 +-
 misc/translator/po/he-Hebr-opac-bootstrap.po       |    2 +-
 misc/translator/po/hi-i-staff-t-prog-v-3006000.po  |    2 +-
 misc/translator/po/hi-opac-bootstrap.po            |    2 +-
 .../po/hr-HR-i-staff-t-prog-v-3006000.po           |    2 +-
 misc/translator/po/hr-HR-opac-bootstrap.po         |    2 +-
 .../po/hu-HU-i-staff-t-prog-v-3006000.po           |    2 +-
 misc/translator/po/hu-HU-opac-bootstrap.po         |    2 +-
 .../po/hy-Armn-i-staff-t-prog-v-3006000.po         |    2 +-
 misc/translator/po/hy-Armn-opac-bootstrap.po       |    2 +-
 misc/translator/po/hy-Armn-pref.po                 |    1 -
 .../po/id-ID-i-staff-t-prog-v-3006000.po           |    2 +-
 misc/translator/po/id-ID-opac-bootstrap.po         |    2 +-
 .../po/is-IS-i-staff-t-prog-v-3006000.po           |    2 +-
 misc/translator/po/is-IS-opac-bootstrap.po         |    2 +-
 .../po/it-IT-i-staff-t-prog-v-3006000.po           |  113 ++++++++---------
 misc/translator/po/it-IT-opac-bootstrap.po         |    2 +-
 misc/translator/po/it-IT-pref.po                   |    8 +-
 .../po/ja-Jpan-JP-i-staff-t-prog-v-3006000.po      |    2 +-
 misc/translator/po/ja-Jpan-JP-opac-bootstrap.po    |    2 +-
 .../po/km-KH-i-staff-t-prog-v-3006000.po           |    2 +-
 misc/translator/po/km-KH-opac-bootstrap.po         |    2 +-
 .../po/kn-Knda-i-staff-t-prog-v-3006000.po         |    2 +-
 misc/translator/po/kn-Knda-opac-bootstrap.po       |    2 +-
 .../po/ko-Kore-KP-i-staff-t-prog-v-3006000.po      |    2 +-
 misc/translator/po/ko-Kore-KP-opac-bootstrap.po    |    2 +-
 .../po/ku-Arab-i-staff-t-prog-v-3006000.po         |    2 +-
 misc/translator/po/ku-Arab-opac-bootstrap.po       |    2 +-
 .../po/lo-Laoo-i-staff-t-prog-v-3006000.po         |    2 +-
 misc/translator/po/lo-Laoo-opac-bootstrap.po       |    2 +-
 .../po/mi-NZ-i-staff-t-prog-v-3006000.po           |    2 +-
 misc/translator/po/mi-NZ-opac-bootstrap.po         |    2 +-
 misc/translator/po/mon-i-staff-t-prog-v-3006000.po |    2 +-
 misc/translator/po/mon-opac-bootstrap.po           |    2 +-
 misc/translator/po/mr-i-staff-t-prog-v-3006000.po  |    2 +-
 misc/translator/po/mr-opac-bootstrap.po            |    2 +-
 .../po/ms-MY-i-staff-t-prog-v-3006000.po           |    2 +-
 misc/translator/po/ms-MY-opac-bootstrap.po         |    2 +-
 .../po/nb-NO-i-staff-t-prog-v-3006000.po           |    2 +-
 misc/translator/po/nb-NO-opac-bootstrap.po         |    2 +-
 .../po/ne-NE-i-staff-t-prog-v-3006000.po           |    2 +-
 misc/translator/po/ne-NE-opac-bootstrap.po         |    2 +-
 .../po/nl-BE-i-staff-t-prog-v-3006000.po           |    2 +-
 misc/translator/po/nl-BE-opac-bootstrap.po         |    2 +-
 .../po/nl-NL-i-staff-t-prog-v-3006000.po           |    2 +-
 misc/translator/po/nl-NL-opac-bootstrap.po         |    2 +-
 .../po/nn-NO-i-staff-t-prog-v-3006000.po           |    2 +-
 misc/translator/po/nn-NO-opac-bootstrap.po         |    2 +-
 misc/translator/po/pbr-i-staff-t-prog-v-3006000.po |    2 +-
 misc/translator/po/pbr-opac-bootstrap.po           |    2 +-
 .../po/pl-PL-i-staff-t-prog-v-3006000.po           |  132 +++++++++-----------
 misc/translator/po/pl-PL-opac-bootstrap.po         |    9 +-
 misc/translator/po/pl-PL-pref.po                   |    8 +-
 misc/translator/po/pl-PL-staff-help.po             |   10 +-
 misc/translator/po/prs-i-staff-t-prog-v-3006000.po |    2 +-
 misc/translator/po/prs-opac-bootstrap.po           |    2 +-
 .../po/pt-BR-i-staff-t-prog-v-3006000.po           |    2 +-
 misc/translator/po/pt-BR-opac-bootstrap.po         |    2 +-
 .../po/pt-PT-i-staff-t-prog-v-3006000.po           |    8 +-
 misc/translator/po/pt-PT-opac-bootstrap.po         |    2 +-
 .../po/ro-RO-i-staff-t-prog-v-3006000.po           |    2 +-
 misc/translator/po/ro-RO-opac-bootstrap.po         |    2 +-
 .../po/ru-RU-i-staff-t-prog-v-3006000.po           |    2 +-
 misc/translator/po/ru-RU-opac-bootstrap.po         |    2 +-
 .../po/rw-RW-i-staff-t-prog-v-3006000.po           |    2 +-
 misc/translator/po/rw-RW-opac-bootstrap.po         |    2 +-
 .../po/sd-PK-i-staff-t-prog-v-3006000.po           |    2 +-
 misc/translator/po/sd-PK-opac-bootstrap.po         |    2 +-
 .../po/sk-SK-i-staff-t-prog-v-3006000.po           |    2 +-
 misc/translator/po/sk-SK-opac-bootstrap.po         |    2 +-
 .../po/sl-SI-i-staff-t-prog-v-3006000.po           |    2 +-
 misc/translator/po/sl-SI-opac-bootstrap.po         |    2 +-
 .../po/sq-AL-i-staff-t-prog-v-3006000.po           |    2 +-
 misc/translator/po/sq-AL-opac-bootstrap.po         |    2 +-
 .../po/sr-Cyrl-i-staff-t-prog-v-3006000.po         |    2 +-
 misc/translator/po/sr-Cyrl-opac-bootstrap.po       |    2 +-
 .../po/sv-SE-i-staff-t-prog-v-3006000.po           |    2 +-
 misc/translator/po/sv-SE-opac-bootstrap.po         |    2 +-
 .../po/sw-KE-i-staff-t-prog-v-3006000.po           |    2 +-
 misc/translator/po/sw-KE-opac-bootstrap.po         |    2 +-
 .../po/ta-LK-i-staff-t-prog-v-3006000.po           |    2 +-
 misc/translator/po/ta-LK-opac-bootstrap.po         |    2 +-
 misc/translator/po/ta-i-staff-t-prog-v-3006000.po  |    2 +-
 misc/translator/po/ta-opac-bootstrap.po            |    2 +-
 misc/translator/po/tet-i-staff-t-prog-v-3006000.po |    2 +-
 misc/translator/po/tet-opac-bootstrap.po           |    2 +-
 .../po/th-TH-i-staff-t-prog-v-3006000.po           |    2 +-
 misc/translator/po/th-TH-opac-bootstrap.po         |    2 +-
 .../po/tl-PH-i-staff-t-prog-v-3006000.po           |    2 +-
 misc/translator/po/tl-PH-opac-bootstrap.po         |    2 +-
 .../po/tr-TR-i-staff-t-prog-v-3006000.po           |  111 +++++++---------
 misc/translator/po/tr-TR-opac-bootstrap.po         |    2 +-
 misc/translator/po/tr-TR-pref.po                   |    8 +-
 .../po/uk-UA-i-staff-t-prog-v-3006000.po           |    2 +-
 misc/translator/po/uk-UA-opac-bootstrap.po         |    2 +-
 .../po/ur-Arab-i-staff-t-prog-v-3006000.po         |    2 +-
 misc/translator/po/ur-Arab-opac-bootstrap.po       |    2 +-
 .../po/vi-VN-i-staff-t-prog-v-3006000.po           |    2 +-
 misc/translator/po/vi-VN-opac-bootstrap.po         |    2 +-
 .../po/zh-Hans-CN-i-staff-t-prog-v-3006000.po      |    2 +-
 misc/translator/po/zh-Hans-CN-opac-bootstrap.po    |    2 +-
 .../po/zh-Hans-TW-i-opac-t-prog-v-3006000.po       |    8 +-
 .../po/zh-Hans-TW-i-staff-t-prog-v-3006000.po      |   32 ++---
 misc/translator/po/zh-Hans-TW-opac-bootstrap.po    |   10 +-
 misc/translator/po/zh-Hans-TW-staff-help.po        |   10 +-
 153 files changed, 449 insertions(+), 527 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Mon Aug 31 11:58:50 2015
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Mon, 31 Aug 2015 09:58:50 +0000
Subject: [koha-commits] main Koha release repository annotated tag v3.16.14
	created. v3.16.14
Message-ID: <E1ZWLrW-0005E3-N4@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.14 has been created
        at  27d203ac07fbd36f6b8bb2f31349bb92a74482c1 (tag)
   tagging  6edb2c2ab6147a0d4e60c600c6d9b37572736637 (commit)
  replaces  v3.16.13
 tagged by  Mason James
        on  Mon Aug 31 21:59:18 2015 +1200

- Log -----------------------------------------------------------------
Koha Release 3.16.14

Aleisha (2):
      Bug 14445: Silences warn in letter.pl
      Bug 14445: Silences warns in letter.tt

Alex Arnaud (1):
      Bug 13663: Fix permissions in upload-file.pl and upload-file-progress.pl

Bernardo Gonzalez Kriegel (1):
      Translation updates for Koha 3.16.14 release

Jacek Ablewicz (1):
      Bug 14456: EmbedSeeFromHeadings record filter shouldn't process MARC holding fields

Jonathan Druart (4):
      Bug 14494: Prevent slow checkout if the patron does not have an expiry date
      Bug 14404: Rename class no-show to noshow for consistency with nosort
      Bug 14566: Fix permissions in patronimage.pl
      Bug 12669: Centralize the timezone handle into Koha::DateUtils

Kyle M Hall (2):
      Bug 14404: Checkouts default sort order for Self Checkout (SCO) confusing for patrons
      Bug 10961: Error in GetMarcBiblio can cause severe data loss

Liz Rea (1):
      Bug 13663 - QA Followup, removing tab chars

Marcel de Rooy (3):
      Bug 14494: Terribly slow checkout caused by DateTime->new in far future
      Bug 14569: Typo borroewr|borow
      Bug 11693: Default emailing preferences not loaded for self registering patron

Mason James (3):
      Bug 14494: correct typo in ./t/DateUtils.t
      Add release notes
      Bump version to 3.16.14

Rolando Isidoro (1):
      Bug 12669: Use floating timezone when handling dates without hours, minutes and seconds.

St?phane Delaune (1):
      Bug 10961: (followup) Make query fields explicit and add regression tests

mxbeaulieu (1):
      Bug 14387: Merge reference selection has no effect when merging authorities.

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


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Mon Aug 31 15:31:28 2015
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Mon, 31 Aug 2015 13:31:28 +0000
Subject: [koha-commits] main Koha release repository branch master updated.
	v3.20.00-481-ge9bf684
Message-ID: <E1ZWPBI-0006GV-M5@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  e9bf6846bb6e7c0e95f837b08a1dacf849baffed (commit)
      from  9f0170668c628fb9119495891c67fe1358a93609 (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 e9bf6846bb6e7c0e95f837b08a1dacf849baffed
Author: Fr?d?ric Demians <f.demians at tamil.fr>
Date:   Mon Aug 31 15:26:10 2015 +0200

    Bug 11190: (QA followup) for tests on jenkins
    
    When moving from Moose to Moo we didn't address a minor syntax change
    Moo introduces. This patch fixes that.
    
    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>

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

Summary of changes:
 Koha/Sitemapper.pm        |    8 ++++----
 Koha/Sitemapper/Writer.pm |    6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)


hooks/post-receive
-- 
main Koha release repository

From gitmaster at git.koha-community.org  Mon Aug 31 16:00:18 2015
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Mon, 31 Aug 2015 14:00:18 +0000
Subject: [koha-commits] main Koha release repository branch master updated.
	v3.20.00-482-g208400f
Message-ID: <E1ZWPdC-0006RJ-8Y@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  208400fff2d83836d0c4e068d63b04189ff5d0e8 (commit)
      from  e9bf6846bb6e7c0e95f837b08a1dacf849baffed (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 208400fff2d83836d0c4e068d63b04189ff5d0e8
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date:   Mon Aug 31 10:55:54 2015 -0300

    Bug 13697: (QA followup) fix typo in 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  Mon Aug 31 17:21:22 2015
From: gitmaster at git.koha-community.org (Git repo owner)
Date: Mon, 31 Aug 2015 15:21:22 +0000
Subject: [koha-commits] main Koha release repository branch master updated.
	v3.20.00-483-g6256eac
Message-ID: <E1ZWQte-0006s6-6U@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  6256eac2f672c9ef4e8ec63bfe952af34051d9df (commit)
      from  208400fff2d83836d0c4e068d63b04189ff5d0e8 (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 6256eac2f672c9ef4e8ec63bfe952af34051d9df
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date:   Mon Aug 31 12:22:18 2015 -0300

    Bug 11584: (QA followup) add missing newline at end of YAML file
    
    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>

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

Summary of changes:
 .../prog/en/modules/admin/preferences/staff_client.pref              |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
main Koha release repository