[koha-commits] main Koha release repository branch, 3.2.x, updated. v3.02.07-36-ge88a1ec
Git repo owner
gitmaster at git.koha-community.org
Sat Apr 16 18:36:43 CEST 2011
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.2.x has been updated
via e88a1ec4b8e00cde21935fa0378b9c5fb20f8bd9 (commit)
via a4f80b7ab9cb9067332ab6f9cfa02d176ef39d89 (commit)
via 82d26a17db08611d74b12e33f42d342c8e0a52c6 (commit)
via 4f6c0e21b36ef6351e781909596fc373d3636241 (commit)
via 193270e71892576965bf6426ce1e4a03e81f7158 (commit)
via 2dfc86812a39c00b84110390cf720d67dafd541a (commit)
via 2c7ba6e16ca9130b64606d0048ff5793890f00be (commit)
via 857df73f0e47cd14198c9e4d63e340394bdda093 (commit)
via c12f3ac9d92b4149bfe6041c9af5de6ce8e2d030 (commit)
via 3eaad57668343502f3c3b1d1bb2564b16b4a9b6e (commit)
via 3d87734ce6f0630ebdbaf2022745e08e0c0315c8 (commit)
via 708dcb3e3fc2bc46f5271c4981c6b3141c1eb2f6 (commit)
via 2fb003a7c0e8ec22510501500d47778cdf2ad5d5 (commit)
via 6b6ff91b9a3cee81efbe11a1c37d3bda087001e0 (commit)
via 7fbca96ce98098047c64bfeddf5b1c37e4335d7b (commit)
via 644b085876e896188fa9df9e2a292429f1595fe9 (commit)
via 84ebbe6a89e15c3ec349dadf4680563cb2018879 (commit)
via 21eacc51ce0b8eecaab8859fa3f352f266114ffa (commit)
via be91c069657787dd70b52a974269b5259ab57e41 (commit)
via 717dca51c38964b0be1292ba9b83f5c421ac7330 (commit)
via 693d2df66b2db8478ff05b1493b72d5b4ca98ce9 (commit)
via a1ae89288784e88e600293c136f57c680fd0c174 (commit)
via d23950de6066cb2baf7027908c4ba6bb320194a1 (commit)
via 7b3388580ee9f44747686e96a0377ffc22da78c6 (commit)
via 078a6432ba57757433d7abab47e3b0768131bb33 (commit)
via 4b1fe0e50f91bd29e3e4fc9fe879d4243a2479d1 (commit)
via c701fd1f7ad71f581ba5c3798d0be545466fc043 (commit)
via 5b8db92f5cd574a4535737fa5bdc60604e26c388 (commit)
via ca697139e50d72f31e52f110a0dd01fa14fe32d0 (commit)
via 281a6e1d271e549fe5e3e033e2d339e81741039b (commit)
via 8bb38b31f1a46a93d33dd133164aabb229371644 (commit)
via 5977b58434bfb4023f05aebef92582ba6bc7377e (commit)
via 66161de2e79805fe0105dfb07c548e68ed8e7a2e (commit)
via 55ac4b043b6f03bed068f8ad09576bf3f28ca0a5 (commit)
via bf7ce90ed58852950b97a6d6be0d8d133bec3b47 (commit)
via 11155dbf29f3d1c5b18c3b59f2ac5b35b2e2b404 (commit)
from 9d5ab23d7c7bbbf2c83f9cddd15d730a62bb651a (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 e88a1ec4b8e00cde21935fa0378b9c5fb20f8bd9
Author: Henri-Damien LAURENT <henridamien.laurent at biblibre.com>
Date: Wed Apr 6 17:28:45 2011 +0200
Bug 6014 : MT3138 Adding some permission management to viewlog
If user can not access reports, then form to search the logs is not displayed.
It also improves the presentation.
C4/Log.pm
- adds the fact that we can enter multiple actions
- fixes the fact that user information was truncated
circ-menu.inc:
Fixing information passed to the viewlog from circ-menu
Signed-off-by: fdurand <frederic.durand at univ-lyon2.fr>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
(cherry picked from commit 99b49e2b1aa2e5d2629f1167e2b63c3b3158ffe8)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit a4f80b7ab9cb9067332ab6f9cfa02d176ef39d89
Author: Nicole Engard <nengard at bywatersolutions.com>
Date: Tue Apr 5 15:30:07 2011 +0200
bug 4837 make circ print page show item type description
Signed-off-by: Guillaume Hatt <guillaume.hatt@€nc.sorbonne.fr>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
(cherry picked from commit fcbcdcf4cebdb32544a545d8ef91de1bbe67f457)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit 82d26a17db08611d74b12e33f42d342c8e0a52c6
Author: fdurand <frederic.durand at univ-lyon2.fr>
Date: Tue Apr 5 17:07:31 2011 +0200
Bug 4196 -Followup : Defintion of popularity index into Unimarc setup
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 ecbeafff07fa32918d552bbf4ba9cd8410207633)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit 4f6c0e21b36ef6351e781909596fc373d3636241
Author: Alex Arnaud <alex.arnaud at biblibre.com>
Date: Tue Apr 5 09:54:11 2011 +0200
Bug 5941 : (MT4425) Replace search 'an' by 'an, phr' in searchresultlist.tmpl
Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
(cherry picked from commit 99f49c1108dad5ef7548929b23d4a3815ae1a166)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit 193270e71892576965bf6426ce1e4a03e81f7158
Author: Paul Poulain <paul.poulain at biblibre.com>
Date: Tue Apr 5 14:54:48 2011 +0200
BZ6065: confirmation when deleting an order
when clicking on "delete order", there is no confirmation box, the order line is
deleted without any question !
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
(cherry picked from commit 2a28b30a3c5a02475d59d4beab9c3b67cfc666e3)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit 2dfc86812a39c00b84110390cf720d67dafd541a
Author: Stéphane Delaune <stephane.delaune at biblibre.com>
Date: Mon Apr 4 15:22:37 2011 +0200
Bug 5942, sql for UNIMARC Authorities
(MT #4339) init default UNIMARC sql structure
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 132743f66bc07f6b8799835aac6cf440430bd44e)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit 2c7ba6e16ca9130b64606d0048ff5793890f00be
Author: Katrin Fischer <Katrin.Fischer.83 at web.de>
Date: Tue Apr 5 13:42:57 2011 +0200
Bug 6056: Notes were not shown when modifying order line
To test:
- add a new order in acquisitions with some content in the notes field
- save order
- modify order - Notes field will be shown as empty
The template variable for notes is missing from the template.
Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
(cherry picked from commit 9cab9be3d6114898e0b8354d784fb8d56ad51fbc)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit 857df73f0e47cd14198c9e4d63e340394bdda093
Author: Christophe Croullebois <christophe.croullebois at biblibre.com>
Date: Mon Apr 4 12:29:36 2011 +0200
Bug 5949 : Popup alert when deleting items from basket, also change planning value to statistics
(MT #2391) : acqui/neworderempty.pl
Multiple fixes in neworderempty.pl, mainly about Modify order line page, link to edit catalog, user can delete items with popup information and can't add items also with popup explanation.
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
- changed the the link from 'Edit Catalog' to 'Edit record' (like on result list)
- changed position of 'Edit record' to be shown behind the label 'Catalog details' instead of showing behind the Title.
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
(cherry picked from commit 1f323c00a14673ae83ae24b2502aa172d7949781)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit c12f3ac9d92b4149bfe6041c9af5de6ce8e2d030
Author: Alex Arnaud <alex.arnaud at biblibre.com>
Date: Mon Apr 4 17:17:35 2011 +0200
Bug 5947 Suggestions : add date to the search query
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
Fixes searching by dates, like 'Suggested on:'
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
(cherry picked from commit 3603ae6274da149370fd38ce642848738b11fcdc)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit 3eaad57668343502f3c3b1d1bb2564b16b4a9b6e
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Mon Apr 4 12:04:30 2011 +0200
Bug 3628: opacSerialDefaultTab
This partial fix makes this existing pref visible in the interface.
It should work for UNIMARC. Some work still needs to be done at the MARC side.
Signed-off-by: Claire Hernandez <claire.hernandez at biblibre.com>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
(cherry picked from commit 0dba0e0d3c687ffa0c8ba64ddf5c5f217c68aa0a)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit 3d87734ce6f0630ebdbaf2022745e08e0c0315c8
Author: Chris Nighswonger <chris.nighswonger at gmail.com>
Date: Sat Apr 16 11:52:21 2011 -0400
Updating Version Number to 3.02.07.001
commit 708dcb3e3fc2bc46f5271c4981c6b3141c1eb2f6
Author: Katrin Fischer <Katrin.Fischer.83 at web.de>
Date: Mon Apr 4 11:20:20 2011 +0000
Bug 5860: Adding duplicate stocknumber fails silently
When adding a duplicate stocknumber the duplicate was not saved to the database.
This happened, because the field stocknumber in table items was declared to be unique.
Discussion on bug suggests to lift this restriction.
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Tested. Corrected typo in updatedatabase script. Version 3.01.00.095 introduced the index with double s, although structure had only one s in index name.
Unaware of this bug, I entered the more general bug 6041 for similar problems with modifying items.
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
(cherry picked from commit a8ffb2273b63c398492a7cbd08394adedb2aeadb)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit 2fb003a7c0e8ec22510501500d47778cdf2ad5d5
Author: koha-preprod <koha-preprod at sys-tech.net>
Date: Mon Feb 7 11:12:49 2011 -0500
Adding a javascript function to check the validation of a record with a budget.
Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
(cherry picked from commit 9dc69cf47fb374b64dcc2ee3716cffa3b15cfb7c)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit 6b6ff91b9a3cee81efbe11a1c37d3bda087001e0
Author: Christophe Croullebois <christophe.croullebois at biblibre.com>
Date: Mon Apr 4 11:21:18 2011 +0200
Bug 5948 : Creation of a quantity column in receipt summary
In receipt summary the quantity did'nt appear in already received table, this patch fixes the omission
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
Patch tested on current master. Works like advertised.
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
(cherry picked from commit b9d434c18f3ff5a4d168cf24454d51ede1523fde)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit 7fbca96ce98098047c64bfeddf5b1c37e4335d7b
Author: Robin Sheat <robin at catalyst.net.nz>
Date: Tue Mar 29 17:01:38 2011 +1300
Small patch to make myself feel important
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
(cherry picked from commit dc37fe9730f00d8dcc1c97029da816f66a0f9a02)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit 644b085876e896188fa9df9e2a292429f1595fe9
Author: Frédérick Capovilla <frederick.capovilla at sys-tech.net>
Date: Fri Apr 1 09:16:51 2011 +0200
Escape the double quotes in authority search queries to prevent errors.
Before this fix, any search with double-quotes would return an error
500.
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
(cherry picked from commit 21993ab00a853d2cf7afb314bd2b6bacb0439ecc)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit 84ebbe6a89e15c3ec349dadf4680563cb2018879
Author: Ian Walls <ian.walls at bywatersolutions.com>
Date: Wed Mar 30 13:39:53 2011 -0400
Bug 5990: Lists and Cart show LOC code not Location Authorized value
Lists in the OPAC, and Cart on both sides, show the LOC code for items, rather
than the appropriate Description from Authorised Values. This is because the
code uses GetItemInfo, which is a very heavy-weight call to only retrieve some
of the desired information.
This patch introduces a new subroutine in C4::Items, GetItemsLocationInfo, which
returns the branch names for both home- and holdingbranches, the location code,
both opac and intranet location descriptions, itemcallnumber and cn_sort. This
should be used instead of GetItemsInfo in any case where the locational
information is all that's required, as it's much more streamlined and efficient.
In the OPAC Lists, this only applies if OPACXSLTResultsDisplay is 'off' (set to
'normal').
Signed-off-by: Jared Camins-Esakov <jcamins at bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
(cherry picked from commit 90392c19cc343ada611c1f06e4b5c20f3dd6dc93)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit 21eacc51ce0b8eecaab8859fa3f352f266114ffa
Author: root <root at lists.nekls.org>
Date: Wed Mar 30 10:44:59 2011 -0400
Bug 6005: Fixes Transit slips cause FF4 to display "prevent this page from opening additional dialogs"
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
(cherry picked from commit 5d707b5e9b7f18351d9b996f5f73a1ae53066080)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit be91c069657787dd70b52a974269b5259ab57e41
Author: Owen Leonard <oleonard at myacpl.org>
Date: Wed Mar 30 15:34:25 2011 +0200
Fix for Bug 3523 - Menu of existing lists limited to 10
- adding "more" option to the search results dropdown
- offering a scrolling list on the add-to-list popup
- lists add popup shows the full list of all
the patron's lists, divided into groups of private and
public lists.
Can be improved by a fix for Bug 5529
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
(cherry picked from commit 731b933d51367489422b90fa7021cfc42c747584)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit 717dca51c38964b0be1292ba9b83f5c421ac7330
Author: Henri-Damien LAURENT <henridamien.laurent at biblibre.com>
Date: Sun Apr 11 20:40:57 2010 +0200
MT3289 : check_sysprefs.pl case sensitive variable names
Variable names for systempreferences are now case sensitive.
Changing check_sysprefs in relation with this change
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
(cherry picked from commit 641616ef7fd43600864d46f39b938ef3cd8cd4f3)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit 693d2df66b2db8478ff05b1493b72d5b4ca98ce9
Author: Magnus Enger <magnus at enger.priv.no>
Date: Fri Mar 5 11:58:14 2010 +0100
Bug 3644 Add support for NORMARC
- XSLT for the OPAC
- Value_builders for lesder, 007 and 008
- Default NORMARC framework
- Reverse MARC logic of some subs, so MARC21 is default (and works for NORMARC)
- Add NORMARC as an option to the syspref marcflavour
- Add record.abs for NORMARC
- Add NORMARC and nb as options to Makefile.PL
- Add etc/zebradb/lang_defs/nb/sort-string-utf.chr
- Copy MARC21slim2OAIDC.xsl to NORMARCslim2OAIDC.xsl
Some things are still missing, e.g.:
- XSLT for Intranet
- More MARC21slim2*.xsl transformations
(cherry picked from commit edf8ad5d5da9c11e0dc61c1df40ce977e9e6a125)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit a1ae89288784e88e600293c136f57c680fd0c174
Author: Magnus Enger <magnus at enger.priv.no>
Date: Tue Mar 29 21:15:08 2011 +0200
Another wrong encoding in installer/data/mysql/nb-NO/2-Valgfritt/
Signed-off-by: Magnus Enger <magnus at enger.priv.no>
(cherry picked from commit 759499d6e829fad122c7a98668603598e9cea768)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit d23950de6066cb2baf7027908c4ba6bb320194a1
Author: Magnus Enger <magnus at enger.priv.no>
Date: Tue Mar 29 21:13:41 2011 +0200
Fix wrong encodings in installer/data/mysql/nb-NO/2-Valgfritt/
Signed-off-by: Magnus Enger <magnus at enger.priv.no>
(cherry picked from commit d5608708c179b5377794129f76fb0e6e6115448f)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit 7b3388580ee9f44747686e96a0377ffc22da78c6
Author: Magnus Enger <magnus at enger.priv.no>
Date: Tue Mar 29 21:11:28 2011 +0200
A couple of missing translations in installer/data/mysql/nb-NO/2-Valgfritt/
Signed-off-by: Magnus Enger <magnus at enger.priv.no>
(cherry picked from commit a299f54a9f4dce47530f90176a96bc6abaeb0cd8)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit 078a6432ba57757433d7abab47e3b0768131bb33
Author: Magnus Enger <magnus at enger.priv.no>
Date: Tue Mar 29 21:06:47 2011 +0200
Fix typo in installer/data/mysql/nb-NO/2-Valgfritt/sample_patrons.txt
Signed-off-by: Magnus Enger <magnus at enger.priv.no>
(cherry picked from commit 93d968cb30d26dbc3aa2933eb49f74f25611b2d4)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit 4b1fe0e50f91bd29e3e4fc9fe879d4243a2479d1
Author: Magnus Enger <magnus at enger.priv.no>
Date: Tue Mar 29 16:26:47 2011 +0200
Add files to installer/data/mysql/nb-NO/2-Valgfritt/
Signed-off-by: Magnus Enger <magnus at enger.priv.no>
(cherry picked from commit 4a5f1ec49a081319fdc1f00311900119df90eeae)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit c701fd1f7ad71f581ba5c3798d0be545466fc043
Author: Magnus Enger <magnus at enger.priv.no>
Date: Tue Mar 29 13:32:25 2011 +0200
Translate OPACSearchForTitleIn in installer/data/mysql/nb-NO/1-Obligatorisk/sysprefs.sql
Signed-off-by: Magnus Enger <magnus at enger.priv.no>
(cherry picked from commit 1564cd0d004aef5b0494fd4eb9a4b4ebc78fa082)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit 5b8db92f5cd574a4535737fa5bdc60604e26c388
Author: Magnus Enger <magnus at enger.priv.no>
Date: Tue Mar 29 12:31:42 2011 +0200
Add files in installer/data/mysql/nb-NO/1-Obligatorisk/
Signed-off-by: Magnus Enger <magnus at enger.priv.no>
(cherry picked from commit e69c01faf6da651fb9ea0eded69a6679e71876df)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit ca697139e50d72f31e52f110a0dd01fa14fe32d0
Author: Magnus Enger <magnus at enger.priv.no>
Date: Mon Mar 28 23:00:56 2011 +0200
Add a copy of MARC21 data
Copy installer/data/mysql/en/marcflavour/marc21
to installer/data/mysql/nb-no/marcflavour/marc21
Signed-off-by: Magnus Enger <magnus at enger.priv.no>
(cherry picked from commit 7af27271272d11872ced646f2a1f72616095b56d)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit 281a6e1d271e549fe5e3e033e2d339e81741039b
Author: Magnus Enger <magnus at enger.priv.no>
Date: Tue Mar 9 12:38:23 2010 +0100
Add sample Z39.50 servers
Signed-off-by: Magnus Enger <magnus at enger.priv.no>
(cherry picked from commit f086d7e1bf402c4a9fe341421a566abb444fe7f8)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit 8bb38b31f1a46a93d33dd133164aabb229371644
Author: Colin Campbell <colin.campbell at ptfs-europe.com>
Date: Tue Mar 29 09:57:41 2011 -0400
Bug 5708 : Get Correct Discount when levying rentalcharge
Branch can be a parameter so it should be included in the rule retrieval
Need to select the most appropriate rule from those returned
(was defaulting to first returned!)
Try to make what's happening a bit less opaque
null fields are returned as undefined not 'NULL' by DBI
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
(cherry picked from commit 88cb47339a8eab4ff4b95956207bf2d1dcdffeff)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit 5977b58434bfb4023f05aebef92582ba6bc7377e
Author: Paul POULAIN <paul.poulain at biblibre.com>
Date: Sat Mar 26 18:17:58 2011 -0400
Bug 5982 : OPAC Serials Minor change in description
Signed-off-by: Nicole C. Engard <nengard at bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
(cherry picked from commit 268f860e24171f3c5fe5f4b2c4a752e7c5abd5c1)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit 66161de2e79805fe0105dfb07c548e68ed8e7a2e
Author: Owen Leonard <oleonard at myacpl.org>
Date: Sat Mar 26 11:06:51 2011 -0400
Fix for Bug 5972 - DisplayClearScreenButton preference introduces invalid markup
Signed-off-by: Nicole C. Engard <nengard at bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
(cherry picked from commit 735d986a0c976a888948ddd912917ad091267b7e)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit 55ac4b043b6f03bed068f8ad09576bf3f28ca0a5
Author: Owen Leonard <oleonard at myacpl.org>
Date: Sat Mar 26 14:26:47 2011 -0400
Fix for Bug 5971, Minor markup error in holds queue report
Signed-off-by: Nicole C. Engard <nengard at bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
(cherry picked from commit 84e43e06155e107e3965f06ea5ba37cc5d1b7d30)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit bf7ce90ed58852950b97a6d6be0d8d133bec3b47
Author: Jared Camins-Esakov <jcamins at bywatersolutions.com>
Date: Sat Mar 26 06:01:51 2011 -0400
Bug 4393: Scan Indexes results cannot be sorted
Because of the way Scan Indexes works, the results cannot be sorted. Previously
when any sort other than relevance (or in some cases popularity) was used, the
search failed. This patch disables sorting on Scan results. This patch also
fixes the index selection dropdown on the results page, which was not being
populated correctly from the Advanced Search screen.
Signed-off-by: Nicole C. Engard <nengard at bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
(cherry picked from commit 51604b548756fbf74620061a779d0182167c36f3)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit 11155dbf29f3d1c5b18c3b59f2ac5b35b2e2b404
Author: Henri-Damien LAURENT <henridamien.laurent at biblibre.com>
Date: Tue Mar 29 12:04:21 2011 -0400
Bug 5964 : Translation problem on aqbudgets.tmpl
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
(cherry picked from commit 813f5c3f5164707041fcaa90839f4368355eb8e9)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
-----------------------------------------------------------------------
Summary of changes:
C4/AuthoritiesMarc.pm | 1 +
C4/Biblio.pm | 36 +-
C4/Charset.pm | 8 +-
C4/Circulation.pm | 87 +-
C4/Items.pm | 67 +
C4/Koha.pm | 49 +-
C4/Log.pm | 24 +-
C4/Search.pm | 2 +-
C4/Suggestions.pm | 13 +-
C4/VirtualShelves.pm | 25 +-
C4/VirtualShelves/Page.pm | 2 +-
Makefile.PL | 4 +-
acqui/parcel.pl | 1 +
catalogue/search.pl | 2 +-
cataloguing/value_builder/normarc_field_007.pl | 162 +
cataloguing/value_builder/normarc_field_008.pl | 184 +
cataloguing/value_builder/normarc_leader.pl | 106 +
etc/zebradb/lang_defs/nb/sort-string-utf.chr | 43 +
etc/zebradb/marc_defs/normarc/biblios/record.abs | 327 +
etc/zebradb/marc_defs/unimarc/biblios/record.abs | 2 +-
.../Obligatoire/autorite_default.sql | 454 +
.../Obligatoire/autorite_default.txt | 1 +
.../mysql/nb-NO/1-Obligatorisk/class_sources.sql | 36 +
.../mysql/nb-NO/1-Obligatorisk/class_sources.txt | 1 +
.../1-Obligatorisk/message_transport_types.sql | 28 +
.../1-Obligatorisk/message_transport_types.txt | 1 +
.../mysql/nb-NO/1-Obligatorisk/sample_notices.sql | 39 +
.../mysql/nb-NO/1-Obligatorisk/sample_notices.txt | 1 +
.../data/mysql/nb-NO/1-Obligatorisk/stopwords.sql | 26 +
.../data/mysql/nb-NO/1-Obligatorisk/stopwords.txt | 1 +
.../mysql/nb-NO/1-Obligatorisk/subtag_registry.sql | 777 +
.../mysql/nb-NO/1-Obligatorisk/subtag_registry.txt | 1 +
.../data/mysql/nb-NO/1-Obligatorisk/sysprefs.sql | 322 +
.../data/mysql/nb-NO/1-Obligatorisk/sysprefs.txt | 1 +
.../data/mysql/nb-NO/1-Obligatorisk/userflags.sql | 38 +
.../data/mysql/nb-NO/1-Obligatorisk/userflags.txt | 1 +
.../mysql/nb-NO/1-Obligatorisk/userpermissions.sql | 70 +
.../mysql/nb-NO/1-Obligatorisk/userpermissions.txt | 1 +
.../data/mysql/nb-NO/2-Valgfritt/auth_val.sql | 78 +
.../data/mysql/nb-NO/2-Valgfritt/auth_val.txt | 1 +
.../2-Valgfritt}/marc21_holdings_coded_values.sql | 0
.../2-Valgfritt/marc21_holdings_coded_values.txt | 2 +
.../data/mysql/nb-NO/2-Valgfritt/parameters.sql | 26 +
.../data/mysql/nb-NO/2-Valgfritt/parameters.txt | 1 +
.../mysql/nb-NO/2-Valgfritt/patron_categories.sql | 44 +
.../mysql/nb-NO/2-Valgfritt/patron_categories.txt | 25 +
.../2-Valgfritt}/sample_creator_data.sql | 0
.../nb-NO/2-Valgfritt/sample_creator_data.txt | 1 +
.../mysql/nb-NO/2-Valgfritt/sample_holidays.sql | 28 +
.../mysql/nb-NO/2-Valgfritt/sample_holidays.txt | 1 +
.../mysql/nb-NO/2-Valgfritt/sample_itemtypes.sql | 29 +
.../mysql/nb-NO/2-Valgfritt/sample_itemtypes.txt | 1 +
.../2-Valgfritt}/sample_libraries.sql | 0
.../mysql/nb-NO/2-Valgfritt/sample_libraries.txt | 1 +
.../data/mysql/nb-NO/2-Valgfritt/sample_news.sql | 2 +
.../data/mysql/nb-NO/2-Valgfritt/sample_news.txt | 1 +
.../sample_notices_message_attributes.sql | 0
.../sample_notices_message_attributes.txt | 1 +
.../sample_notices_message_transports.sql | 0
.../sample_notices_message_transports.txt | 1 +
.../2-Valgfritt}/sample_patrons.sql | 0
.../mysql/nb-NO/2-Valgfritt/sample_patrons.txt | 1 +
.../data/mysql/nb-NO/2-Valgfritt/z3950servers.sql | 6 +
.../data/mysql/nb-NO/2-Valgfritt/z3950servers.txt | 1 +
.../marc21/mandatory/authorities_normal_marc21.sql | 0
.../marc21/mandatory/authorities_normal_marc21.txt | 0
.../marc21/mandatory/marc21_framework_DEFAULT.sql | 3997 +++
.../marc21/mandatory/marc21_framework_DEFAULT.txt | 0
.../optional/marc21_default_matching_rules.sql | 0
.../optional/marc21_default_matching_rules.txt | 0
.../marc21/optional/marc21_fastadd_framework.sql | 0
.../marc21/optional/marc21_fastadd_framework.txt | 0
.../optional/marc21_simple_bib_frameworks.sql |31474 ++++++++++++++++++++
.../optional/marc21_simple_bib_frameworks.txt | 0
.../marcflavour/normarc/Obligatorisk/normarc.sql | 991 +
.../marcflavour/normarc/Obligatorisk/normarc.txt | 1 +
installer/data/mysql/updatedatabase.pl | 8 +
.../intranet-tmpl/prog/en/includes/circ-menu.inc | 2 +-
koha-tmpl/intranet-tmpl/prog/en/modules/about.tmpl | 1 +
.../prog/en/modules/acqui/basket.tmpl | 9 +-
.../prog/en/modules/acqui/neworderempty.tmpl | 43 +-
.../prog/en/modules/acqui/parcel.tmpl | 17 +-
.../prog/en/modules/admin/aqbudgets.tmpl | 4 +-
.../en/modules/admin/preferences/cataloguing.pref | 1 +
.../prog/en/modules/admin/preferences/serials.pref | 10 +-
.../en/modules/authorities/searchresultlist.tmpl | 2 +-
.../value_builder/normarc_field_007.tmpl | 2825 ++
.../value_builder/normarc_field_008.tmpl | 4519 +++
.../cataloguing/value_builder/normarc_leader.tmpl | 223 +
.../prog/en/modules/circ/circulation.tmpl | 2 +-
.../prog/en/modules/circ/hold-transfer-slip.tmpl | 6 +-
.../prog/en/modules/circ/view_holdsqueue.tmpl | 4 +-
.../prog/en/modules/members/moremember-print.tmpl | 4 +-
.../prog/en/modules/tools/viewlog.tmpl | 73 +
...{MARC21slim2OAIDC.xsl => NORMARCslim2OAIDC.xsl} | 0
koha-tmpl/opac-tmpl/prog/en/includes/masthead.inc | 2 +-
.../prog/en/modules/opac-addbybiblionumber.tmpl | 15 +-
.../opac-tmpl/prog/en/modules/opac-basket.tmpl | 4 +-
.../opac-tmpl/prog/en/modules/opac-detail.tmpl | 2 +-
.../opac-tmpl/prog/en/modules/opac-results.tmpl | 13 +-
.../opac-tmpl/prog/en/modules/opac-shelves.tmpl | 2 +-
.../prog/en/xslt/NORMARCslim2OPACDetail.xsl | 528 +
.../prog/en/xslt/NORMARCslim2OPACResults.xsl | 871 +
.../opac-tmpl/prog/en/xslt/NORMARCslimUtils.xsl | 205 +
kohaversion.pl | 2 +-
misc/check_sysprefs.pl | 50 +-
opac/opac-addbybiblionumber.pl | 48 +-
opac/opac-basket.pl | 2 +-
tools/viewlog.pl | 22 +-
109 files changed, 48987 insertions(+), 190 deletions(-)
mode change 100644 => 100755 C4/Biblio.pm
create mode 100755 cataloguing/value_builder/normarc_field_007.pl
create mode 100755 cataloguing/value_builder/normarc_field_008.pl
create mode 100755 cataloguing/value_builder/normarc_leader.pl
create mode 100644 etc/zebradb/lang_defs/nb/sort-string-utf.chr
create mode 100644 etc/zebradb/marc_defs/normarc/biblios/record.abs
create mode 100644 installer/data/mysql/fr-FR/marcflavour/unimarc_complet/Obligatoire/autorite_default.sql
create mode 100644 installer/data/mysql/fr-FR/marcflavour/unimarc_complet/Obligatoire/autorite_default.txt
create mode 100644 installer/data/mysql/nb-NO/1-Obligatorisk/class_sources.sql
create mode 100644 installer/data/mysql/nb-NO/1-Obligatorisk/class_sources.txt
create mode 100644 installer/data/mysql/nb-NO/1-Obligatorisk/message_transport_types.sql
create mode 100644 installer/data/mysql/nb-NO/1-Obligatorisk/message_transport_types.txt
create mode 100644 installer/data/mysql/nb-NO/1-Obligatorisk/sample_notices.sql
create mode 100644 installer/data/mysql/nb-NO/1-Obligatorisk/sample_notices.txt
create mode 100644 installer/data/mysql/nb-NO/1-Obligatorisk/stopwords.sql
create mode 100644 installer/data/mysql/nb-NO/1-Obligatorisk/stopwords.txt
create mode 100644 installer/data/mysql/nb-NO/1-Obligatorisk/subtag_registry.sql
create mode 100644 installer/data/mysql/nb-NO/1-Obligatorisk/subtag_registry.txt
create mode 100644 installer/data/mysql/nb-NO/1-Obligatorisk/sysprefs.sql
create mode 100644 installer/data/mysql/nb-NO/1-Obligatorisk/sysprefs.txt
create mode 100644 installer/data/mysql/nb-NO/1-Obligatorisk/userflags.sql
create mode 100644 installer/data/mysql/nb-NO/1-Obligatorisk/userflags.txt
create mode 100644 installer/data/mysql/nb-NO/1-Obligatorisk/userpermissions.sql
create mode 100644 installer/data/mysql/nb-NO/1-Obligatorisk/userpermissions.txt
create mode 100644 installer/data/mysql/nb-NO/2-Valgfritt/auth_val.sql
create mode 100644 installer/data/mysql/nb-NO/2-Valgfritt/auth_val.txt
copy installer/data/mysql/{de-DE/optional => nb-NO/2-Valgfritt}/marc21_holdings_coded_values.sql (100%)
create mode 100644 installer/data/mysql/nb-NO/2-Valgfritt/marc21_holdings_coded_values.txt
create mode 100644 installer/data/mysql/nb-NO/2-Valgfritt/parameters.sql
create mode 100644 installer/data/mysql/nb-NO/2-Valgfritt/parameters.txt
create mode 100644 installer/data/mysql/nb-NO/2-Valgfritt/patron_categories.sql
create mode 100644 installer/data/mysql/nb-NO/2-Valgfritt/patron_categories.txt
copy installer/data/mysql/{de-DE/optional => nb-NO/2-Valgfritt}/sample_creator_data.sql (100%)
create mode 100644 installer/data/mysql/nb-NO/2-Valgfritt/sample_creator_data.txt
create mode 100644 installer/data/mysql/nb-NO/2-Valgfritt/sample_holidays.sql
create mode 100644 installer/data/mysql/nb-NO/2-Valgfritt/sample_holidays.txt
create mode 100644 installer/data/mysql/nb-NO/2-Valgfritt/sample_itemtypes.sql
create mode 100644 installer/data/mysql/nb-NO/2-Valgfritt/sample_itemtypes.txt
copy installer/data/mysql/{de-DE/optional => nb-NO/2-Valgfritt}/sample_libraries.sql (100%)
create mode 100644 installer/data/mysql/nb-NO/2-Valgfritt/sample_libraries.txt
create mode 100644 installer/data/mysql/nb-NO/2-Valgfritt/sample_news.sql
create mode 100644 installer/data/mysql/nb-NO/2-Valgfritt/sample_news.txt
copy installer/data/mysql/{en/optional => nb-NO/2-Valgfritt}/sample_notices_message_attributes.sql (100%)
create mode 100644 installer/data/mysql/nb-NO/2-Valgfritt/sample_notices_message_attributes.txt
copy installer/data/mysql/{de-DE/optional => nb-NO/2-Valgfritt}/sample_notices_message_transports.sql (100%)
create mode 100644 installer/data/mysql/nb-NO/2-Valgfritt/sample_notices_message_transports.txt
copy installer/data/mysql/{de-DE/optional => nb-NO/2-Valgfritt}/sample_patrons.sql (100%)
create mode 100644 installer/data/mysql/nb-NO/2-Valgfritt/sample_patrons.txt
create mode 100644 installer/data/mysql/nb-NO/2-Valgfritt/z3950servers.sql
create mode 100644 installer/data/mysql/nb-NO/2-Valgfritt/z3950servers.txt
copy installer/data/mysql/{en => nb-NO}/marcflavour/marc21/mandatory/authorities_normal_marc21.sql (100%)
copy installer/data/{Pg/en => mysql/nb-NO}/marcflavour/marc21/mandatory/authorities_normal_marc21.txt (100%)
create mode 100644 installer/data/mysql/nb-NO/marcflavour/marc21/mandatory/marc21_framework_DEFAULT.sql
copy installer/data/{Pg/en => mysql/nb-NO}/marcflavour/marc21/mandatory/marc21_framework_DEFAULT.txt (100%)
copy installer/data/mysql/{de-DE => nb-NO}/marcflavour/marc21/optional/marc21_default_matching_rules.sql (100%)
copy installer/data/mysql/{en => nb-NO}/marcflavour/marc21/optional/marc21_default_matching_rules.txt (100%)
copy installer/data/mysql/{en => nb-NO}/marcflavour/marc21/optional/marc21_fastadd_framework.sql (100%)
copy installer/data/mysql/{en => nb-NO}/marcflavour/marc21/optional/marc21_fastadd_framework.txt (100%)
create mode 100644 installer/data/mysql/nb-NO/marcflavour/marc21/optional/marc21_simple_bib_frameworks.sql
copy installer/data/{Pg/en => mysql/nb-NO}/marcflavour/marc21/optional/marc21_simple_bib_frameworks.txt (100%)
create mode 100644 installer/data/mysql/nb-NO/marcflavour/normarc/Obligatorisk/normarc.sql
create mode 100644 installer/data/mysql/nb-NO/marcflavour/normarc/Obligatorisk/normarc.txt
create mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/normarc_field_007.tmpl
create mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/normarc_field_008.tmpl
create mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/normarc_leader.tmpl
copy koha-tmpl/intranet-tmpl/prog/en/xslt/{MARC21slim2OAIDC.xsl => NORMARCslim2OAIDC.xsl} (100%)
create mode 100644 koha-tmpl/opac-tmpl/prog/en/xslt/NORMARCslim2OPACDetail.xsl
create mode 100644 koha-tmpl/opac-tmpl/prog/en/xslt/NORMARCslim2OPACResults.xsl
create mode 100644 koha-tmpl/opac-tmpl/prog/en/xslt/NORMARCslimUtils.xsl
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list