[koha-commits] main Koha release repository branch 3.6.x updated. v3.06.02-134-g048cd82

Git repo owner gitmaster at git.koha-community.org
Wed Jan 18 16:13:44 CET 2012


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.6.x has been updated
       via  048cd82afe8426ae0777700717e44df0d287d7b5 (commit)
       via  3756d185e8d1ba15a083bdfaf865851e6bcd6d06 (commit)
       via  b8e73c00b125344f07db2d72f3b8371399b57fa5 (commit)
       via  eb5c940cd1ca699f94a428f8e7772826f9b97a53 (commit)
       via  e62a1ab95618e9d96cd1a0192cbb0ef408f49db6 (commit)
       via  6a86b550cd79cf0ffc0f21b156cfb8049c2d340d (commit)
       via  19fb959d6bbc162ecd10753169225e2b64885279 (commit)
       via  057b4ae129d460bd18fb81cf2685a29c2ab73d0b (commit)
       via  aac43adb0147bbad1166d0af0028e6124122c135 (commit)
       via  021ea1afd5f8d4e92e81e7643208f4f37dd36548 (commit)
       via  adf2e2551a55c1e2c26394010234a4fdaff01a82 (commit)
       via  f317028fa77e06a1cde2dc20cc6815086269a430 (commit)
       via  e0d88c5d6e2ed015cf1f546f4871cf94ed84e201 (commit)
       via  17b3c7ce9178b34cb2e00dbe82fb9f908289a709 (commit)
       via  c7eda06d9125c521085111a52294d3449441525b (commit)
       via  2dd0af76a4336c5256d17855b89ea09bda769e9f (commit)
       via  c0cdbed5dae327a9e9d15f8ac5b924f7bc4df2be (commit)
       via  d297f4d2674b932922e2562834823e90d86c398c (commit)
       via  e44ed03423b39763439e01efb32b236620d34d30 (commit)
       via  e4d759ff529595cdb3dc477407de4843e3137c64 (commit)
       via  9bcc15b3f103390cc991b388af301d6c330a1c3c (commit)
       via  44f91282663a9b44a7c4d429d34c8369fcb793ee (commit)
       via  c540ff1084e2e0d6bc905fe4db34a36527ff3b8e (commit)
       via  fbbda3fdb639d623837e7f0344c9f4e441793cf0 (commit)
       via  5b08ae38619247598223b5db838e10ba6200620a (commit)
       via  2699ce06a8e17cc811b12228afd990dea10fca38 (commit)
       via  a20888daa974f9f96841b7456c7d2daf0e2f2b6c (commit)
       via  cdadb0993689403a7449e0c03b6d9dd590c6fded (commit)
       via  14720f508d228760a188f87649509d21a4ff911e (commit)
       via  11652d985458abbbe39cbf5dc52a50aa02fdb71c (commit)
       via  dbad13ba5dfb5146ea0a1f90b19d1323f0eb105e (commit)
       via  7d4cc170edf95d3e05ec353070303b15b44cf56b (commit)
       via  bd05f46d12f500c9cd62a7289509e669d4fd7634 (commit)
       via  c6bfb513900beb25bcbcb6ba73ae5a713383382a (commit)
       via  0177ed160250ec08825deb54e1bd194cda07709d (commit)
       via  63ca9460c826a2c28080f323cdc7c0d72a991a39 (commit)
       via  a78f3d15a19b22632b683c81a4bde9eb43ef012f (commit)
       via  a2f375284c342e22d3fcb455f7eb8a0920850121 (commit)
       via  2a10211d90020c461346ef04ddb244a1cf36fba7 (commit)
       via  565ac906e04ee9afa843a31a7392b15fdc777b3f (commit)
       via  fb1a9360c46d9aa33001fc6ea8985b4484a2c532 (commit)
       via  ca741357cb88d4f8308406d4e08cd51ea830f4fe (commit)
       via  da8e62028fab260bbcb065a75e6ca40bee0d167d (commit)
       via  5638111e53fa102328ac4183ad3fc14c406698bb (commit)
       via  6dad2fa2528ac706ee575e7051aa450f6ed34e7b (commit)
       via  919a4502716cc64bc8058f5aa6668875d874a118 (commit)
       via  fed286eeca479d6a2090152b79988bf8901a72d7 (commit)
       via  300bff6312f1025fd892934f70e964de114b8999 (commit)
       via  9dbc4e6aafbaa5ccf1572c4fdefe3fd58df1437d (commit)
       via  c63e93efd573838abac5a58424c2d224ea18501d (commit)
       via  7e68cac97f89e9a2d96dee154f50c1b58e4c8918 (commit)
       via  cd511095a5190ac6bce7da2fb23a30f7ff986ac6 (commit)
       via  d00c44bb2ef62dae5b664458ae8311260dd3b9f6 (commit)
       via  17911a0e7d5f38796067bfa722d165d0c7a71f6d (commit)
       via  9b4fbc486afb6abd12f5f1efd87e691b971fb60a (commit)
       via  6630a6c0310299f30ca4a170fecdbe4f3513ea35 (commit)
       via  6b869da833ec6ba0d7c1282e46acae422cdf4248 (commit)
       via  8adc2a84b01a553b5482e678abf389f4eeb7f3ac (commit)
       via  ffa6d005ff2e4de52a83c0dac2d4a5fd40be6228 (commit)
       via  cbfeca1ec69e8a201443921faf4e67966d3e899a (commit)
       via  54ed58310d806a84f82406abc00f46834bfe3c6e (commit)
       via  a0cccb3967cfab8b9e60298a08542718dee9d394 (commit)
       via  d0de3716ec11208f8250ba37b1b0e30012a66d61 (commit)
       via  8c5189d68dbef6a31f9c51f56b632930740962b1 (commit)
       via  253ffbe2c6598538544328fbb9d3e9894d43870c (commit)
       via  d5f95757c01a79984940b629bf1a696a2b947609 (commit)
       via  5ad6d9a72c8b88df210b2e10fb4c696705f704f7 (commit)
       via  8f163b462a805985e4c5db3b7d72f57fcdda1822 (commit)
      from  22c5dfac7226706ace83b8d33b0815b3ac5a3906 (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 048cd82afe8426ae0777700717e44df0d287d7b5
Author: Chris Nighswonger <chris.nighswonger at gmail.com>
Date:   Wed Jan 18 09:27:44 2012 -0500

    Release Notes for 3.06.03.000 18 Jan 2012 14:25:43 Z

commit 3756d185e8d1ba15a083bdfaf865851e6bcd6d06
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date:   Fri Jan 13 14:40:51 2012 +0100

    Bug 7439 Follow up for mailmap
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit b8e73c00b125344f07db2d72f3b8371399b57fa5
Author: Jared Camins-Esakov <jcamins at cpbibliography.com>
Date:   Thu Jan 12 09:33:57 2012 -0500

    Bug 7439: Add mailmap for jcamins
    
    Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit eb5c940cd1ca699f94a428f8e7772826f9b97a53
Author: Adrien Saurat <adrien.saurat at biblibre.com>
Date:   Wed Jan 11 16:28:02 2012 +0100

    Bug 7435: corrects Fund selectbox in addneworder
    
    Prevent disabled funds to appear in the Fund
    select box.
    
    Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
    Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
    (cherry picked from commit 04400d992619741eb65de5f4976ccb0cdf7ae1a0)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit e62a1ab95618e9d96cd1a0192cbb0ef408f49db6
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date:   Wed Dec 7 11:07:23 2011 +1300

    Bug 7276 : Follow up, adding a sub to clear the cache
    
    Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
    (cherry picked from commit 94516e7f2a4c8ff1026e0a4a4ef9cefb9fe0c23d)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit 6a86b550cd79cf0ffc0f21b156cfb8049c2d340d
Author: Henri-Damien LAURENT <henridamien.laurent at biblibre.com>
Date:   Tue Nov 29 10:57:14 2011 +0100

    Bug 7276 : member entry Performance improvement
    
    Before this patch : 9619 borrowers added in 31 Minutes, After : 68 seconds.
    This adds Hashref to table structure in C4::SQLHelper to speed up bulk edits.
    
    Signed-off-by: Stéphane Delaune <stephane.delaune at biblibre.com>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    (cherry picked from commit 6c38cc23d95b63ae069f7cac2f7d8d97f9c941ae)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit 19fb959d6bbc162ecd10753169225e2b64885279
Author: Frédéric Demians <f.demians at tamil.fr>
Date:   Wed Jan 4 18:09:34 2012 +0100

    Bug 6885 Follow up patch, invert tested condition
    
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    
    Not sure the brackets are nessecary, but I think I remember learning
    bitwise operators have a lower priority than other relational
    operators so wanted to make sure we notted the result of the bitwise
    and, not the flag
    
    Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
    (cherry picked from commit 6fd3635a598f0a38c1ac71e998f4cb799a1b4b3e)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit 057b4ae129d460bd18fb81cf2685a29c2ab73d0b
Author: Adrien Saurat <adrien.saurat at biblibre.com>
Date:   Tue Dec 20 09:33:47 2011 +0100

    Bug 7266: flags debarred, suspended, gonenoaddress in overdue
    
    This patch makes these flags functionnal.
    
    Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
    Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
    (cherry picked from commit 74984f5cf3f12fe96e6d4201016efd9ca582e8b6)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit aac43adb0147bbad1166d0af0028e6124122c135
Author: Ian Walls <ian.walls at bywatersolutions.com>
Date:   Thu Jan 5 13:17:53 2012 -0500

    Bug 7097: HidePatronName not hiding on issue history
    
    HidePatronName wasn't being respected on a titles Checkout History tab.  This patch
    exports the preference to the template (if set), and then toggles the display between
    patron cardnumber (if 'on') or the name (if 'off')
    
    To test:
    
    Enable HidePatronName
    Go to the Checkout History tab of an item that has been checked out before
    You should see the patron's cardnumber instead of their surname, firstname
    
    Signed-off-by: Nicole C. Engard <nengard at bywatersolutions.com>
    Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
    (cherry picked from commit 5fde4694298b96639b935423f873c133e5cef3ef)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit 021ea1afd5f8d4e92e81e7643208f4f37dd36548
Author: Jared Camins-Esakov <jcamins at cpbibliography.com>
Date:   Thu Dec 8 09:18:37 2011 -0500

    Bug 7332: Translated title (MARC21 242) not shown
    
    The cataloger-supplied translated title stored in MARC21 field 242 was not being
    displayed when XSLT was enabled.
    
    Test plan:
    1) Enable XSLT for OPAC Details and Results, and Intranet Details.
    2) Create or add a record with a 242 field
    3) See that the translated title is not displayed in OPAC Details or Results, or
    Intranet Details
    4) Apply patch
    5) See that the translated title is now displayed in OPAC Details and Results,
    and Intranet Details
    
    Signed-off-by: Duncan Tyler <duncan at duncan-SoT.wgtn.cat-it.co.nz>
    Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
    (cherry picked from commit 9156de6384cf2ca0a04f2df7697b0c672781166c)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit adf2e2551a55c1e2c26394010234a4fdaff01a82
Author: Magnus Enger <magnus at enger.priv.no>
Date:   Tue Dec 27 22:49:33 2011 +0100

    Bug 6787 - Fast Add framework for NORMARC
    
    The new framework will be called "Hurtigkatalogisering".
    
    To test:
    - Make sure the nb-NO translation is installed
    - Run through the web installer on an empty database
    - Select nb-NO as the installation language
    - Select NORMARC as the marcflavour
    - Include normarc_fastadd_framework in the installed data
    - Check that the framework looks ok in:
    -- More > Cataloguing
    -- More > Administration > MARC framework
    
    Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
    Works as described, not problems found.
    
    Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
    (cherry picked from commit 629f3f322c7f6c21f1808adc9e5af131c1692b9c)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit f317028fa77e06a1cde2dc20cc6815086269a430
Author: Garry Collum <gcollum at gmail.com>
Date:   Sun Jan 15 17:00:12 2012 -0500

    Bug 7277: Fixes display of subtitles in opac.
    
    Adds comma and space to results display in opac between title and subtitles.
    Also removes extra space before the subtitle in the results display of the staff pac.
    
    Signed-off-by: Nicole C. Engard <nengard at bywatersolutions.com>
    Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
    (cherry picked from commit 0ad771a68b5d60d7592b335934afcec3d7dc6c9e)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit e0d88c5d6e2ed015cf1f546f4871cf94ed84e201
Author: Katrin Fischer <Katrin.Fischer.83 at web.de>
Date:   Mon Jan 16 23:05:42 2012 +0100

    Bug 4300: Fix display of textual holdings (866)
    
    Fixed problems:
    - only $z, but not $a was shown
    - only first $z for each 866 field was shown
    - each 866 field produced a ; even if no $z was present
    
    After patch was applied:
    - OPAC displays 866 $a and $z, separating each field with ;
    - Staff displays 866 $a, $x and $z, separating each field with ;
    
    Example(s) for testing:
    866 $a1-86 (1941-1987)$xbound in 2 v. per year$zSome issues missing
    866 $a1-86 (1941-1987)
    866 $a--86 (1941-1897)$xinternal note
    866 $zfirst note,$zsecond note
    
    Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com>
    Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
    (cherry picked from commit 7caec5a45fbd5f8d0dcf169870a8d64e63c481e7)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit 17b3c7ce9178b34cb2e00dbe82fb9f908289a709
Author: Dobrica Pavlinusic <dpavlin at rot13.org>
Date:   Sat Nov 19 11:49:53 2011 +0100

    Bug 7247 - rebuild_zebra.pl -v should show all Zebra log output
    
    Currently, -v option resets Zebra log output to default system values.
    
    This produce amount of log specified in system defaults which is usually
    too low for debugging.
    
    This change explicitly forces all Zebra log output which create much more
    chatter so it triggers with verbosity level 2
    
    Test scenario:
    1. pick koha site to reindex
    2. use -v -v options to rebuild_zebra.pl to see additional output
    
    Signed-off-by: Liz Rea <wizzyrea at gmail.com>
    Verified help corrections and  loglevel 2 output vs. loglevel 1 output. No issues found.
    
    Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
    (cherry picked from commit 90d68d6f5c1c34ed15ac35672ef5e5994a3b39c8)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit c7eda06d9125c521085111a52294d3449441525b
Author: JAMES Mason <mason at kohaaloha.com>
Date:   Mon Jun 6 16:10:39 2011 +1200

    Bug 6466 - hung socket read causes SIP tests to fail
    
    Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
    Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
    (cherry picked from commit b0a42333666ff136deb478b8debf5b63f83ed298)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit 2dd0af76a4336c5256d17855b89ea09bda769e9f
Author: Ian Walls <ian.walls at bywatersolutions.com>
Date:   Thu Dec 15 08:21:56 2011 -0500

    Bug 5533 followup: reinstate Lost status editing
    
    The original patch for 5533 removed the Lost status from the edit items screen; new items were not affected,
    and batch changes could still be made, so this was not a consistent change.
    
    This patch removes the filter that hid the Lost status dropdown, but then changes the default MARC framework
    to hide this field by default (value -5).  New installations will not see this status in the editor, unless
    they manually activate it.  This will enforce the semantics of using the "mark lost" options by default, but
    provide a workaround for libraries that understand and accept the consequences of manually editing this field.
    
    To test:
    
    1.  on an existing install, edit an item.  you should have the Lost status visible
    2.  on a new install, editing or creating an item should not show the Lost status at all
    
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
    (cherry picked from commit 3062405c0989bfd34422ed6d1118cf8b98a84865)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit c0cdbed5dae327a9e9d15f8ac5b924f7bc4df2be
Author: Ian Walls <ian.walls at bywatersolutions.com>
Date:   Thu Jan 5 14:10:52 2012 -0500

    Bug 7407: HidePatronName not working on 'on hold for' messages
    
    HidePatronName was not working on 'on hold for' messages, only 'checked out to'
    messages.  This resulted in the patrons name showing if the item was on hold for
    them.
    
    T:T scope issue; needs to be within itemloo.  This patch does that.
    Signed-off-by: Nicole C. Engard <nengard at bywatersolutions.com>
    Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
    (cherry picked from commit b08ccda99d23cca5ee9e01bd351cb3605e9201af)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit d297f4d2674b932922e2562834823e90d86c398c
Author: Sam Sanders <sam-sanders at live.com>
Date:   Tue Jan 17 15:37:59 2012 +1300

    bug 5327 add tests for C4/BackgroundJob.pm
    
    Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
    perl t/db_dependent/BackgroundJob.t
    All tests complete successfully.
    
    Note: Test 11 does not tell what it's about, but it has been there before.
    (cherry picked from commit dbb29b4042f3e1785dff1ca5aaa351a6340a8183)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit e44ed03423b39763439e01efb32b236620d34d30
Author: Connor Dewar <connor.dewar at gmail.com>
Date:   Tue Jan 17 15:40:25 2012 +1300

    Bug 5327 Added unit tests for C4/Reports.pm
    
    Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
    perl t/Reports.t b/t/Reports.t
    All tests complete successfully.
    (cherry picked from commit e96c92d077b8fdc4da70781a18c52c2706299254)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit e4d759ff529595cdb3dc477407de4843e3137c64
Author: Connor Dewar <connor.dewar at gmail.com>
Date:   Tue Jan 17 14:32:29 2012 +1300

    Bug 5327 Added unit tests for C4/ClassSortRoutine/Dewey.pm
    
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    (cherry picked from commit f053ca0c22fdc0429fdcb1a7a67fde6171c971a9)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit 9bcc15b3f103390cc991b388af301d6c330a1c3c
Author: Connor Dewar <connor.dewar at gmail.com>
Date:   Tue Jan 17 13:55:03 2012 +1300

    Bug 5327 added unit tests for C4/ClassSortRoutine/Generic
    
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    (cherry picked from commit 995485e57409ec5ffff32aea33f6dda642d75b87)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit 44f91282663a9b44a7c4d429d34c8369fcb793ee
Author: Paul Poulain <paul.poulain at biblibre.com>
Date:   Mon Jan 16 18:47:15 2012 +0100

    Bug 6990 follow up PODDOC & unit test updating
    
    This patch removes the TransformKohaToMarcOneField sub, but there was some remaining POD & unit test about it
    (cherry picked from commit 6456afea959111b3e0cade89e14251ea8abd5f74)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit c540ff1084e2e0d6bc905fe4db34a36527ff3b8e
Author: Frédéric Demians <f.demians at tamil.fr>
Date:   Sat Oct 8 17:03:18 2011 +0200

    TransformKohaToMarc enhancement
    
    TransformKohaToMarc function is called for each biblio and item that has
    to be build. This function execute a DB statement for each Koha field
    that has to be mapped to a MARC tag/letter. This impact deeply
    performances for script like rebuild_zebra, especially since items are
    not anymore in bilio records and have to be rebuild on the fly.
    
    I'm proposing a patch which read Koha field to MARC field mapping just
    one time and cache it. My test show a 30% execution time improvement on
    rebuild_zebra.pl script. It uses already cached mapping in C4::Context.
    
    Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
    
    http://bugs.koha-community.org/show_bug.cgi?id=6990
    Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
    (cherry picked from commit 02d392a502571e14df9373782343cf5e3bbe83b6)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit fbbda3fdb639d623837e7f0344c9f4e441793cf0
Author: D Ruth Bavousett <ruth at bywatersolutions.com>
Date:   Fri Dec 16 10:38:47 2011 -0500

    Bug 7364: Possible to get to FA item add without current branch being defined.
    
    Some paths to the FA item-add screen didn't have a branch defined--if the param is set,
    use it, otherwise, use the user's logged in branch.
    
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    
    Modified for syntax by:  Ian Walls <ian.walls at bywatersolutions.com>
    Signed-off-by: Ian Walls <ian.walls at bywatersolutions.com>
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit 5b08ae38619247598223b5db838e10ba6200620a
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date:   Sat Jan 14 07:28:11 2012 +1300

    Bug 929 : Follow up to allow tests to check plugins too
    
    Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
    perl xt/author/valid-templates.t runs without errors now.
    (cherry picked from commit 2cfb891c83f4e6eab8518c4944c70d751b966cfb)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit 2699ce06a8e17cc811b12228afd990dea10fca38
Author: D Ruth Bavousett <ruth at bywatersolutions.com>
Date:   Fri Dec 16 10:38:47 2011 -0500

    Bug 7364: Possible to get to FA item add without current branch being defined.
    
    Some paths to the FA item-add screen didn't have a branch defined--if the param is set,
    use it, otherwise, use the user's logged in branch.
    
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
    (cherry picked from commit 6f681bec2d71d3d2b88aea5f8e0c15010241d580)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit a20888daa974f9f96841b7456c7d2daf0e2f2b6c
Author: Jesse Maseto <jesse at bywatersolutions.com>
Date:   Fri Jan 13 18:34:00 2012 -0500

    Bug 7143: add Albert Oller to the about.tt
    
    Albert Oller was in the doc/history.txt but not the About page.
    adding him alphabetically
    
    Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
    (cherry picked from commit 3907cf454762a44718c9a2b8d8ec6b8733694e2d)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit cdadb0993689403a7449e0c03b6d9dd590c6fded
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date:   Sat Oct 29 08:49:20 2011 +1300

    Bug 6947 : opac-topissues.pl wasn't respecting item live itemtypes
    
    Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
    The search was only looking for bib level itypes independent
    from the settings for item-level_itypes.
    
    After patch the system preference setting is respected
    and search works accordingly.
    
    Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
    (cherry picked from commit 251d873b82bce4b869d2a6351b832e49e957d2c2)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit 14720f508d228760a188f87649509d21a4ff911e
Author: Julian Maurice <julian.maurice at biblibre.com>
Date:   Mon Jan 2 10:49:28 2012 +0100

    Bug 6132: Add unit test for system preferences
    
    Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
    Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
    (cherry picked from commit 6eac5284ee584ea21988f9639a0d5b47e701937e)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit 11652d985458abbbe39cbf5dc52a50aa02fdb71c
Author: Julian Maurice <julian.maurice at biblibre.com>
Date:   Mon Jan 2 10:45:55 2012 +0100

    Bug 6132: Update sysprefs cache in set_preference
    
    Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
    (cherry picked from commit b867d7d12adb98f42b473bc850927e1535a6ab6c)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit dbad13ba5dfb5146ea0a1f90b19d1323f0eb105e
Author: Paul Poulain <paul.poulain at biblibre.com>
Date:   Fri Jan 13 17:47:16 2012 +0100

    Bug 929 small follow-up (mistake in POD)
    (cherry picked from commit 5dcc27d14caee68a9aa112c7c0db99a0169980b2)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit 7d4cc170edf95d3e05ec353070303b15b44cf56b
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date:   Thu Jan 12 21:23:21 2012 +1300

    Bug 929 : Follow up adding unit tests, discovered C4::Dates cached the syspref with no way to clear it, fixed also.
    (cherry picked from commit 55d0b65522d3caa8d7c819b2cfa7ce8f2483c33e)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit bd05f46d12f500c9cd62a7289509e669d4fd7634
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date:   Thu Jan 12 20:16:52 2012 +1300

    Bug 929: Follow up adding the Koha:: namespace to the list of modules to test
    (cherry picked from commit e6bbb97942c42e5e1a2a4f986264e61aa865558f)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit c6bfb513900beb25bcbcb6ba73ae5a713383382a
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date:   Mon Nov 21 12:21:11 2011 +0100

    Bug 7240: Cleaning up import tables and action_logs
    
    This patch lets cleanup_database also purge older records from the (five) import tables and the action_logs table.
    Two new command line parameters are introduced: --import and --logs.
    If no number of days is specified for --zebraqueue, --import or --logs, it defaults to 30 days, 60 days resp. 180 days.
    I did not add a default for --sessdays, because this parameter cannot be seen separately from parameter --sessions.
    
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    
    Adds new parameters and code, does not change existing behaviour
    
    Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
    (cherry picked from commit 73c5cb327723cdba39e52458a4aff824cc540a52)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit 0177ed160250ec08825deb54e1bd194cda07709d
Author: Ian Walls <ian.walls at bywatersolutions.com>
Date:   Mon Jan 2 11:06:13 2012 -0500

    Bug 7396: Debarred message not showing over SIP2
    
    Corrects typo in list of flags; was DEBARRED, but the actual name of the flag is
    DBARRED (for some reason)
    
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
    (cherry picked from commit 000047769f12c55d59e444041ddcc0aaf5613fe4)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit 63ca9460c826a2c28080f323cdc7c0d72a991a39
Author: Owen Leonard <oleonard at myacpl.org>
Date:   Tue Dec 27 14:46:54 2011 -0500

    Bug 7381 - wrong isbn showing on the staff search results
    
    Outputting the "raw" ISBN. In the case of multiples, ISBNs
    are concatenated with " | " Using a T:T filter to make these
    a comma-separated list.
    
    Signed-off-by: Nicole C. Engard <nengard at bywatersolutions.com>
    
    Added a record and confirmed that the right ISBN shows on the
    search results and that the amazon cover image still works.
    
    Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
    (cherry picked from commit 8deb21a2c02e3d0678c44e37a8501de56228b256)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit a78f3d15a19b22632b683c81a4bde9eb43ef012f
Author: Adrien Saurat <adrien.saurat at biblibre.com>
Date:   Fri Dec 16 16:51:18 2011 +0100

    Bug 7363: allows downloading of lists in CSV format
    
    Getting a list in CSV format was impossible because the
    shelfid parameter was empty in the URL.
    
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
    (cherry picked from commit 5641b90b63e43f2c4eee026c5dc77f6398232872)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit a2f375284c342e22d3fcb455f7eb8a0920850121
Author: Admin User Koha <koha at biblibre.com>
Date:   Wed Dec 14 17:31:00 2011 +0100

    Bug 7360 Import Default framework into other deletes default Framework
    
    Step to reproduce :
    - export default framework as SQL
    - create new framework
    - Import the exported SQL file into this new framework.
    Go to default framework :
    It disappeared.
    
    If some libraries want to share default frameworks, then it is a major bug.
    This patch fixes the test in order to cope with 0 character framework name.
    
    Signed-off-by: François Charbonnier <francois.charbonnier at biblibre.com>
    Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
    (cherry picked from commit a830f46fc73af2281926e4fc83967674f4025ad3)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit 2a10211d90020c461346ef04ddb244a1cf36fba7
Author: Marc Balmer <marc at msys.ch>
Date:   Sun Dec 11 19:00:14 2011 +0100

    Bug 7356 - Fix various typos and mis-spellings
    
    Fix typos: the the -> the, wether -> whether, developper -> developer.
    
    http://bugs.koha-community.org/show_bug.cgi?id=7356
    Signed-off-by: Owen Leonard <oleonard at myacpl.org>
    Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
    (cherry picked from commit c9c6bbdea89e60dc6dc5019cdca512ba8eba4a38)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit 565ac906e04ee9afa843a31a7392b15fdc777b3f
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date:   Thu Oct 20 09:25:23 2011 +0200

    6717 Documenting need_merge_authorities table
    
    Documentation only.
    
    http://bugs.koha-community.org/show_bug.cgi?id=6716
    Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
    (cherry picked from commit d471a79e92126d4d70b70e41013fe366ffbcba6e)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit fb1a9360c46d9aa33001fc6ea8985b4484a2c532
Author: Nicole C. Engard <nengard at bywatersolutions.com>
Date:   Wed Sep 28 08:05:29 2011 -0400

    bug6716 - document the aqbooksellers table
    
    This documents the table that stores vendor info in Koha.
    
    There were 4 unused fields found:
      `accountnumber`
      `othersupplier`
      `currency`
      `booksellerurl`
    
    Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
    Accountnumber is no longer unused and can be managed.
    (cherry picked from commit 378df7aea521435d63b35f6b6c7f8e166d6ff24f)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit ca741357cb88d4f8308406d4e08cd51ea830f4fe
Author: Duncan Tyler <duncan at catalyst.net.nz>
Date:   Tue Dec 13 16:42:17 2011 +1300

    Bug 7348 - Fixed error for serial toolbar buttons in IE7
    
    http://bugs.koha-community.org/show_bug.cgi?id=7348
    Signed-off-by: Owen Leonard <oleonard at myacpl.org>
    Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
    (cherry picked from commit 9faf50a66c842582a4bf74104328095bd607449d)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit da8e62028fab260bbcb065a75e6ca40bee0d167d
Author: Magnus Enger <magnus at enger.priv.no>
Date:   Thu Dec 22 10:20:44 2011 +0100

    Bug 7375 - Update minimum version of Perl to 5.10
    
    - Change the installer script to look for at least 5.10/5.010000
    - Change the template to ask for the correct version
    
    To test:
    - Run through the webinstaller on 5.10 or newer and check that there are
    no errors.
    - Ideally: Run through the webinstaller on an older version than 5.10 and
    check that there *is* an error, asking for 5.10 or newer.
    
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
    (cherry picked from commit 1c04a9840028d65258410f1155a504ffae69fc99)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit 5638111e53fa102328ac4183ad3fc14c406698bb
Author: Katrin Fischer <Katrin.Fischer.83 at web.de>
Date:   Mon Oct 24 14:57:52 2011 +0200

    Bug 7079: [SIGNED-OFF] Default values for German system preferences
    
    Patch adds updates for system preferences to the sql file
    in the installer directory:
    
    - New: AmazonLocale: DE
    - borrowerRelationship: Vater|Mutter
    - BorrowersTitles: Herr|Frau
    - New: CurrencyFormat: FR
    - New: dateformat: metric
    - New: DefaultClassificationSource: z
    - New: OpacMainUserBlock: translated content
    - New: OpacNav: translated content
    - New: OpacNavBottom: translated content
    - New: OPACSearchForTitleIn: translated content
    
    To test:
    A) Do a full installation with German sample files
    B) Run the sql file 'system_preferences.sql' against your database
    
    Verfy values of system preferences have been changed.
    
    Signed-off-by: Magnus Enger <magnus at enger.priv.no>
    Patch applied cleanly. I ran through the webinstaller in German on an empty
    database, and made sure system_preferences were loaded. No complaints from
    the database and the systprefs are set to the right values when I check in the
    staff client.
    
    Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
    (cherry picked from commit c1d824deaa65f0a64071e6925ae2238beb0a0912)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit 6dad2fa2528ac706ee575e7051aa450f6ed34e7b
Author: Paul Poulain <paul.poulain at biblibre.com>
Date:   Wed Nov 9 17:29:17 2011 +0100

    Revert "Bug 6015 : Improving load_testing"
    
    sorry, was not supposed to be pushed (follow-up needed)
    
    This reverts commit 47d74bb3fb4b564a73c6bfb9e4404a1567b5b8fc.
    (cherry picked from commit 93e597b5ea5fc23c737c6e0e8bb42f763e3125d5)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit 919a4502716cc64bc8058f5aa6668875d874a118
Author: Henri-Damien LAURENT <henridamien.laurent at biblibre.com>
Date:   Thu Mar 25 11:37:19 2010 +0100

    Bug 6015 : Improving load_testing
    
    Adding a benchmark for OPAC
    it tests :
     - mainpage
     - search page
     - detail page
    
    Staff :
    Adding a test on member searches
    (cherry picked from commit 47d74bb3fb4b564a73c6bfb9e4404a1567b5b8fc)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit fed286eeca479d6a2090152b79988bf8901a72d7
Author: Nicole C. Engard <nengard at bywatersolutions.com>
Date:   Fri Dec 16 06:17:09 2011 -0500

    Bug 7373 - Add 5 new icons to Bridge Set
    
    This patch adds 5 new icons to the Bridge Set.
    These icons are designed by the Erikson Institute
    in Chicago, IL, USA.
    
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
    (cherry picked from commit 3340456f296d9e0fcdbfb164f6e4b505698b4842)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit 300bff6312f1025fd892934f70e964de114b8999
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date:   Mon Dec 19 13:46:31 2011 +0100

    Bug 7368: Correct spelling of merge authorities job in pref file.
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
    (cherry picked from commit 6768c724404e2e6335b86d1025b5b84d6ed00052)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit 9dbc4e6aafbaa5ccf1572c4fdefe3fd58df1437d
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date:   Mon Dec 19 13:25:42 2011 +0100

    Bug 7367: Add space before display of languages.
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
    I am a bit confused why it does not work without the &nbsp;
    but patch fixes the display problem.
    
    Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
    (cherry picked from commit 30dfb7d0a3376e412fbcb58c0080ff288fc1563b)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit c63e93efd573838abac5a58424c2d224ea18501d
Author: Jared Camins-Esakov <jcamins at cpbibliography.com>
Date:   Mon Jan 9 09:31:07 2012 -0500

    Bug 5226: Add 545 to es-ES and nb-NO
    
    Since the original patches for bug 5226 were submitted, two new translations
    have been added to Koha: es-ES and nb-NO. This patch adds the missing 545 line
    to the frameworks for those languages.
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
    (cherry picked from commit c696bbec658016cc6ef2aeb67d4d50226ff9a854)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit 7e68cac97f89e9a2d96dee154f50c1b58e4c8918
Author: Katrin Fischer <katrin.fischer at bsz-bw.de>
Date:   Mon Dec 6 18:39:38 2010 +0100

    Bug 5226: Follow up to new/awaiting_qa/bug_5226
    
    This patch adds the field definition to
    - it-IT (default and sample frameworks)
    - de-DE, en, fr-FR, pl-PL (sample frameworks)
    
    I am not sure about the database update. If we want to do that, it should perhaps update all frameworks and languages.
    At the moment only en and de-DE default frameworks are updated.
    
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    (cherry picked from commit 442eb72be5bacef4fa263268252d5f0d9e3d938a)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit cd511095a5190ac6bce7da2fb23a30f7ff986ac6
Author: Jared Camins-Esakov <jcamins at cpbibliography.com>
Date:   Mon Nov 1 23:08:24 2010 -0400

    Add MARC21 field 545 to to framework fix bug 5226
    
    Adds MARC21 field 545 to the English, French, German, and Polish MARC21
    frameworks. The labels for the field still need to be translated into
    French and Polish.
    
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    
    Backporting to 3.6.x
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit d00c44bb2ef62dae5b664458ae8311260dd3b9f6
Author: Frédéric Demians <f.demians at tamil.fr>
Date:   Fri May 13 15:24:39 2011 +0200

    Bug 6098 Followup -- doesn't replace NSB/NSE by space
    
    On any page, NSB/NSE characters are replaced by space in Output.pm. It isn't a
    good thing:
    
      - It isn't necessary since Zebra indexer handle properly those characters as
        delimiter.
      - It isn't necessary for display since XSL file already do that.
      - It isn't efficient since a regex is done on every whole page sent by Koha,
        not only on biblio record part.
      - It removes an information that librarian want to keep in their biblio
        records: any record edited in Koha loose its NSB/NSE characters.
    
    Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
    (cherry picked from commit d785d9d57dad2d529b1dd243c6ce3c4ddce3bc80)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit 17911a0e7d5f38796067bfa722d165d0c7a71f6d
Author: Fridolyn SOMERS <fridolyn.somers at progilone.fr>
Date:   Wed Apr 6 17:44:52 2011 +0200

    BUG 6098 zebra conf NSB NSE indexed as space
    
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    (cherry picked from commit 1f0bad091b3e16f278ae14a12ca1a93525ccdfff)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit 9b4fbc486afb6abd12f5f1efd87e691b971fb60a
Author: Albert Oller <root at ThinkPad-W520.localdomain>
Date:   Tue Nov 29 19:16:51 2011 -0500

    Bug 2629 - Diacritics not being ignored when searching
    
    /etc/zebradb/etc/word-phrase-utf.chr
    added Cc miniscule and Cc circumflex; added Kk acute accent.
    
    Signed-off-by: Liz Rea <wizzyrea at gmail.com>
    - imported marc record from the bug with the offending diacritic
    - reindexed
    - searched for the title - result found! Yay!
    (cherry picked from commit 35bc73eca324c371982747f2f0454a71a4f46245)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit 6630a6c0310299f30ca4a170fecdbe4f3513ea35
Author: Paul Poulain <paul.poulain at biblibre.com>
Date:   Tue Jan 10 23:00:04 2012 +0100

    Bug 7278 follow-up DBrev number
    
    Backporting to 3.6.x
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit 6b869da833ec6ba0d7c1282e46acae422cdf4248
Author: Katrin Fischer <Katrin.Fischer.83 at web.de>
Date:   Tue Dec 20 08:40:03 2011 +0100

    Bug 7278: Follow up fixing display of item informaton on detail page
    
    Fixes a display problem in the item table on staff detail page.
    
    To test:
    Add a record with 3 items:
    - 1 with copynumber
    - 1 with materials specified
    - 1 with opac notes
    
    Before patch the table will be broken a bit and the headings
    don't match the contents (wrong sequence).
    
    Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
    Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
    (cherry picked from commit 52098370f51994b4f89f2e2a0dda03a9700aa26f)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit 8adc2a84b01a553b5482e678abf389f4eeb7f3ac
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date:   Thu Dec 1 14:19:44 2011 +1300

    Bug 7278 : Additional Materials
    
    Part 2: This patch shows the message at checkout and checkin
    
    How to test:
    * Add a note in cataloguing
    * Check it displays at checkout and checkin
    * Check items without a note don't display anything
    
    Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
    (cherry picked from commit a9e080a6fbcdd268a03f82138453bb22224f351b)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit ffa6d005ff2e4de52a83c0dac2d4a5fd40be6228
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date:   Thu Dec 1 10:46:52 2011 +1300

    Bug 7728 : Materials Specified field made larger and displayed
    
    This first page makes the database change, and displays the field on
    the detail.pl and moredetail.pl pages in the staff client
    
    How to Test:
    
    * Add a note to the materials specified page in cataloguing (952
    subfield 3 for MARC21, but it shouldn't matter as long as you have a
    field mapped to items.materials
    * Check it displays at catalogue/detail.pl
    * Check it displays at catalogue/moredetail.pl
    
    Patch to follow to have the note display at checkin/checkout
    
    http://bugs.koha-community.org/show_bug.cgi?id=7278
    
    Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
    Fixed conflicts in updatedatabase.pl and kohastructure.sql
    (cherry picked from commit 67c6c95396fcaeca49da68499b0ceb5b6350b4b8)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit cbfeca1ec69e8a201443921faf4e67966d3e899a
Author: Adrien Saurat <adrien.saurat at biblibre.com>
Date:   Tue Jan 3 15:28:50 2012 +0100

    Bug 6374: default value for Size in result pages
    
    When no size info is available, an empty string is
    sent to the TT (if nothing is sent, the TT engine
    will display another information, irrelevant for Koha).
    
    Signed-off-by: Gaetan Boisson <gaetan.boisson at biblibre.com>
    Works beautifully!
    
    Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
    (cherry picked from commit 74506e52deb383589b541848bbb2026aa4991f81)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit 54ed58310d806a84f82406abc00f46834bfe3c6e
Author: Owen Leonard <oleonard at myacpl.org>
Date:   Thu Dec 29 11:47:44 2011 -0500

    Bug 3651 Follow-up, Require patron login to send shelves and baskets
    
    The fix for Bug 4289, "Add a syspref 'OpacPublic', to hide OPAC
    search-bar and force authentication on all OPAC pages" incorrectly
    made some page permissions dependent on the value of the OpacPublic
    setting. Some pages should require authentication no matter what.
    
    This patch returns opac-sendbasket.pl to the state it was in before
    Bug 4289, Bug 4274 notwithstanding. I have added the authentication
    requirement to opac-sendshelf.pl to match.
    
    Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
    1) sending cart requires login
    2) sending shelf requires login
    3) updating personal details requires login
    
    Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
    (cherry picked from commit 9e70695907d97953e097087425ccaaefd3809897)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit a0cccb3967cfab8b9e60298a08542718dee9d394
Author: Chris Hall <chrish at catalyst.net.nz>
Date:   Thu Dec 22 15:43:08 2011 +1300

    Bug 7220 - Add IDs to check-in message dialogs to facilitate CSS customization
    
    Signed-off-by: Owen Leonard <oleonard at myacpl.org>
    Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
    (cherry picked from commit c2837b39a4dede60e6d65e01fdaa02c835067e70)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit d0de3716ec11208f8250ba37b1b0e30012a66d61
Author: Owen Leonard <oleonard at myacpl.org>
Date:   Tue Nov 8 11:43:38 2011 -0500

    Fix for Bug 7194 - OPAC detail and recent comments pages corrections for XHTML validity
    
    - Adding html filter to subtitle output to correct unescaped ampersands
    - Adding missing alt attributes to libravatar output
    - Removing unecessary markup  from comments page
    
    Bonus: Adding html_break filter to output of comments to preserve line breaks
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
    (cherry picked from commit fe9312a1240e58a04b0cd0c322d46c34a4b51891)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit 8c5189d68dbef6a31f9c51f56b632930740962b1
Author: Duncan Tyler <duncan at catalyst.net.nz>
Date:   Mon Dec 19 13:43:21 2011 +1300

    Fix to make date obviously editable - bug 7193
    
    Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
    Patch changes all date fields on subscription entry to be
    obvious input fields. This makes it more obvious that you
    can enter dates manually and is more consistent with how
    we handle dates in other places.
    
    Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
    (cherry picked from commit 0d9309e52020d42d4a75e944b7031c886d1be7ca)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit 253ffbe2c6598538544328fbb9d3e9894d43870c
Author: Duncan Tyler <duncan at catalyst.net.nz>
Date:   Thu Dec 22 14:32:22 2011 +1300

    Bug 7341 - [SIGNED-OFF] Patch to fix error produced when clicking cancel in system preferences search results - bug 7341
    
    Signed-off-by: Magnus Enger <magnus at enger.priv.no>
    Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
    (cherry picked from commit 4f16da0d310c84b6a2fb98adc160a56bb18a0ac0)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit d5f95757c01a79984940b629bf1a696a2b947609
Author: Katrin Fischer <Katrin.Fischer.83 at web.de>
Date:   Mon Dec 12 08:39:39 2011 +0100

    Bug 7338: Follow up: show link only when there is more than 1 subscription
    
    To be tested together with
    http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=6690
    
    1) Create a subscription for a title
    - check the link 'Show any subscription...' doesn't show now
    - check the serials collection page works correctly and shows all
    necessary information
    
    2) Create a second subscription for the same title
    - check a new link 'Show any subscription...' shows up now
    - use links in the issue table to change between viewing the single subscription
    and the overview page
    - check it works correctly and all information shows up
    
    Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
    
    It works. With this patch, on Serials Collection page, the link, 'See any
    subscription attached to this biblio' appears only when there are more than one
    subscription attached to the biblio record.
    (cherry picked from commit 42265ef21758acd6e44eca3a48ab57529628717c)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit 5ad6d9a72c8b88df210b2e10fb4c696705f704f7
Author: Frédéric Demians <f.demians at tamil.fr>
Date:   Fri Dec 9 08:32:01 2011 +0100

    Bug 7338 Links on Serial Collection page
    
    Don't display link to the serial, when the collection page displays just
    one subscription. Display it when several subscriptions. Alway display a
    link for displaying biblio record other subscriptions.
    
    Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
    Patch works nicely, but always shows link to 'any subscriptions'.
    I did a follow-up so the link would only show if there was more
    than 1 subscription for the record.
    
    Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
    (cherry picked from commit 33587674fa85fabfb6183b37bb8c2733ec2b6d6a)
    
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit 8f163b462a805985e4c5db3b7d72f57fcdda1822
Author: Chris Nighswonger <chris.nighswonger at gmail.com>
Date:   Wed Jan 18 09:08:46 2012 -0500

    Revert "Bug 5729 - Add CoinS to intranet"
    
    This reverts commit b05389689590fe1c135b3a6762b899df493a836d.
    
    Removing this enh from 3.6.x

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

Summary of changes:
 .mailmap                                           |    6 +-
 C4/Biblio.pm                                       |   59 ++---
 C4/Context.pm                                      |    6 +-
 C4/Dates.pm                                        |    6 +
 C4/ImportExportFramework.pm                        |    4 +-
 C4/Items.pm                                        |    2 +-
 C4/Labels/Label.pm                                 |    6 +-
 C4/Output.pm                                       |    5 +-
 C4/Record.pm                                       |    2 +-
 C4/SIP/ILS/Patron.pm                               |    2 +-
 C4/SIP/t/SIPtest.pm                                |   12 +-
 C4/SQLHelper.pm                                    |   57 ++++-
 INSTALL.opensuse                                   |    2 +-
 acqui/ordered.pl                                   |    2 +-
 authorities/authorities.pl                         |    2 +-
 catalogue/ISBDdetail.pl                            |    4 +-
 catalogue/MARCdetail.pl                            |    1 -
 catalogue/detail.pl                                |    7 +-
 catalogue/issuehistory.pl                          |    4 +
 catalogue/search.pl                                |   40 ++--
 cataloguing/addbiblio.pl                           |    2 +-
 cataloguing/addbooks.pl                            |    3 +
 cataloguing/additem.pl                             |    7 +-
 cataloguing/plugin_launcher.pl                     |    2 +-
 circ/circulation.pl                                |    1 +
 circ/overdue.pl                                    |   10 +-
 circ/returns.pl                                    |    1 +
 etc/zebradb/ccl.properties                         |    2 +-
 etc/zebradb/etc/word-phrase-utf.chr                |    9 +-
 etc/zebradb/lang_defs/fr/sort-string-utf.chr       |    2 +-
 .../mysql/de-DE/mandatory/system_preferences.sql   |   12 +
 .../marc21/mandatory/marc21_framework_DEFAULT.sql  |    1 +
 .../optional/marc21_simple_bib_frameworks.sql      |    8 +
 .../marc21/mandatory/marc21_framework_DEFAULT.sql  |    3 +-
 .../optional/marc21_simple_bib_frameworks.sql      |    8 +
 .../marc21/mandatory/marc21_framework_DEFAULT.sql  |    1 +
 .../optional/marc21_simple_bib_frameworks.sql      |    8 +
 .../Obligatoire/marc21_framework_DEFAULT.sql       |    1 +
 .../Optionnel/marc21_simple_bib_frameworks.sql     |    8 +
 .../marc21/mandatory/marc21_framework_DEFAULT.sql  |    1 +
 .../optional/marc21_simple_bib_frameworks.sql      |    8 +
 installer/data/mysql/kohastructure.sql             |   80 +++---
 .../marc21/mandatory/marc21_framework_DEFAULT.sql  |    1 +
 .../optional/marc21_simple_bib_frameworks.sql      |    8 +
 .../Valgfritt/normarc_fastadd_framework.sql        |  127 ++++++++++
 .../Valgfritt/normarc_fastadd_framework.txt        |    1 +
 .../marc21/mandatory/marc21_framework_DEFAULT.sql  |    1 +
 .../optional/marc21_simple_bib_frameworks.sql      |    8 +
 installer/data/mysql/updatedatabase.pl             |   21 ++
 installer/install.pl                               |    4 +-
 .../prog/en/includes/serials-toolbar.inc           |    2 +-
 .../prog/en/includes/virtualshelves-toolbar.inc    |    3 +-
 koha-tmpl/intranet-tmpl/prog/en/js/acq.js          |    4 +-
 .../intranet-tmpl/prog/en/js/tinymce/changelog     |   52 ++--
 .../themes/advanced/css/editor_content.css         |   16 +-
 .../prog/en/lib/yui/calendar/calendar-debug.js     |    2 +-
 .../prog/en/lib/yui/calendar/calendar.js           |    2 +-
 .../prog/en/lib/yui/dragdrop/dragdrop-debug.js     |    2 +-
 .../prog/en/lib/yui/dragdrop/dragdrop.js           |    2 +-
 .../prog/en/lib/yui/editor/editor-debug.js         |    2 +-
 .../intranet-tmpl/prog/en/lib/yui/editor/editor.js |    2 +-
 .../prog/en/lib/yui/editor/simpleeditor-debug.js   |    2 +-
 .../prog/en/lib/yui/editor/simpleeditor.js         |    2 +-
 .../intranet-tmpl/prog/en/lib/yui/get/get-debug.js |    2 +-
 koha-tmpl/intranet-tmpl/prog/en/lib/yui/get/get.js |    2 +-
 .../prog/en/lib/yui/menu/menu-debug.js             |    4 +-
 .../intranet-tmpl/prog/en/lib/yui/menu/menu.js     |    4 +-
 .../prog/en/lib/yui/yahoo/yahoo-debug.js           |    2 +-
 .../intranet-tmpl/prog/en/lib/yui/yahoo/yahoo.js   |    2 +-
 .../prog/en/lib/yui/yuiloader/yuiloader-debug.js   |    6 +-
 .../prog/en/lib/yui/yuiloader/yuiloader.js         |    6 +-
 koha-tmpl/intranet-tmpl/prog/en/modules/about.tt   |    1 +
 .../prog/en/modules/acqui/neworderempty.tt         |    5 +-
 .../prog/en/modules/admin/preferences.tt           |    2 +-
 .../en/modules/admin/preferences/authorities.pref  |    2 +-
 .../prog/en/modules/catalogue/ISBDdetail.tt        |    5 +-
 .../prog/en/modules/catalogue/MARCdetail.tt        |    4 -
 .../prog/en/modules/catalogue/detail.tt            |   14 +-
 .../prog/en/modules/catalogue/issuehistory.tt      |    2 +-
 .../prog/en/modules/catalogue/moredetail.tt        |    1 +
 .../prog/en/modules/catalogue/results.tt           |    4 +-
 .../prog/en/modules/circ/circulation.tt            |    7 +
 .../intranet-tmpl/prog/en/modules/circ/returns.tt  |   22 +-
 .../en/modules/help/tools/manage-marc-import.tt    |    2 +-
 .../prog/en/modules/help/tools/overduerules.tt     |    2 +-
 .../prog/en/modules/help/tools/picture-upload.tt   |    4 +-
 .../prog/en/modules/help/tools/scheduler.tt        |    4 +-
 .../prog/en/modules/installer/step1.tt             |    4 +-
 .../prog/en/modules/serials/serials-collection.tt  |   13 +-
 .../prog/en/modules/serials/subscription-add.tt    |   10 +-
 .../prog/en/xslt/MARC21slim2intranetDetail.xsl     |   27 ++
 .../prog/img/itemtypeimg/bridge/7Day_book.gif      |  Bin 0 -> 1833 bytes
 .../prog/img/itemtypeimg/bridge/juvenile_book.gif  |  Bin 0 -> 1869 bytes
 .../prog/img/itemtypeimg/bridge/noncirc_book.gif   |  Bin 0 -> 1887 bytes
 .../prog/img/itemtypeimg/bridge/noncirc_dvd.gif    |  Bin 0 -> 1755 bytes
 .../prog/img/itemtypeimg/bridge/reserve_book.gif   |  Bin 0 -> 1810 bytes
 .../opac-tmpl/prog/en/includes/opac-bottom.inc     |    2 +-
 koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tt |   16 +-
 .../opac-tmpl/prog/en/modules/opac-results.tt      |    2 +-
 .../opac-tmpl/prog/en/modules/opac-showreviews.tt  |   11 +-
 .../prog/en/xslt/MARC21slim2OPACDetail.xsl         |   32 ++-
 .../prog/en/xslt/MARC21slim2OPACResults.xsl        |   11 +
 .../prog/itemtypeimg/bridge/7Day_book.gif          |  Bin 0 -> 1833 bytes
 .../prog/itemtypeimg/bridge/juvenile_book.gif      |  Bin 0 -> 1869 bytes
 .../prog/itemtypeimg/bridge/noncirc_book.gif       |  Bin 0 -> 1887 bytes
 .../prog/itemtypeimg/bridge/noncirc_dvd.gif        |  Bin 0 -> 1755 bytes
 .../prog/itemtypeimg/bridge/reserve_book.gif       |  Bin 0 -> 1810 bytes
 kohaversion.pl                                     |    4 +-
 misc/cronjobs/cleanup_database.pl                  |   62 ++++-
 misc/migration_tools/build6xx.pl                   |    2 +-
 misc/migration_tools/rebuild_zebra.pl              |    9 +-
 misc/release_notes/release_notes_200RC2.txt        |    2 +-
 misc/release_notes/release_notes_200RC3.txt        |    2 +-
 misc/release_notes/release_notes_210.txt           |    8 +-
 misc/release_notes/release_notes_211.txt           |    2 +-
 misc/release_notes/release_notes_220.txt           |    4 +-
 misc/release_notes/release_notes_221.txt           |    4 +-
 misc/release_notes/release_notes_222.txt           |    4 +-
 misc/release_notes/release_notes_223.txt           |    4 +-
 misc/release_notes/release_notes_22RC1.txt         |    2 +-
 misc/release_notes/release_notes_22RC2.txt         |    2 +-
 misc/release_notes/release_notes_22RC3.txt         |    2 +-
 misc/release_notes/release_notes_22RC4.txt         |    2 +-
 misc/release_notes/release_notes_22RC5.txt         |    2 +-
 misc/release_notes/release_notes_3_6_3.txt         |  150 ++++++++----
 opac/opac-search.pl                                |  262 ++++++++++----------
 opac/opac-sendbasket.pl                            |    2 +-
 opac/opac-sendshelf.pl                             |    2 +-
 opac/opac-topissues.pl                             |   10 +-
 opac/opac-userupdate.pl                            |    2 +-
 serials/serials-collection.pl                      |    4 +-
 t/00-load.t                                        |   18 ++
 t/ClassSortRoutine_Dewey.t                         |   16 ++-
 t/ClassSortRoutine_Generic.t                       |   12 +-
 t/Koha_template_plugin_KohaDates.t                 |   42 +++
 t/Reports.t                                        |    4 +-
 t/db_dependent/BackgroundJob.t                     |   13 +-
 t/db_dependent/lib/KohaTest/Biblio.pm              |    1 -
 t/db_dependent/sysprefs.t                          |   14 +
 xt/author/valid-templates.t                        |   19 +-
 140 files changed, 1078 insertions(+), 518 deletions(-)
 create mode 100644 installer/data/mysql/nb-NO/marcflavour/normarc/Valgfritt/normarc_fastadd_framework.sql
 create mode 100644 installer/data/mysql/nb-NO/marcflavour/normarc/Valgfritt/normarc_fastadd_framework.txt
 create mode 100644 koha-tmpl/intranet-tmpl/prog/img/itemtypeimg/bridge/7Day_book.gif
 create mode 100644 koha-tmpl/intranet-tmpl/prog/img/itemtypeimg/bridge/juvenile_book.gif
 create mode 100644 koha-tmpl/intranet-tmpl/prog/img/itemtypeimg/bridge/noncirc_book.gif
 create mode 100644 koha-tmpl/intranet-tmpl/prog/img/itemtypeimg/bridge/noncirc_dvd.gif
 create mode 100644 koha-tmpl/intranet-tmpl/prog/img/itemtypeimg/bridge/reserve_book.gif
 create mode 100644 koha-tmpl/opac-tmpl/prog/itemtypeimg/bridge/7Day_book.gif
 create mode 100644 koha-tmpl/opac-tmpl/prog/itemtypeimg/bridge/juvenile_book.gif
 create mode 100644 koha-tmpl/opac-tmpl/prog/itemtypeimg/bridge/noncirc_book.gif
 create mode 100644 koha-tmpl/opac-tmpl/prog/itemtypeimg/bridge/noncirc_dvd.gif
 create mode 100644 koha-tmpl/opac-tmpl/prog/itemtypeimg/bridge/reserve_book.gif
 create mode 100644 t/Koha_template_plugin_KohaDates.t
 create mode 100755 t/db_dependent/sysprefs.t


hooks/post-receive
-- 
main Koha release repository


More information about the koha-commits mailing list