[koha-commits] main Koha release repository branch 3.6.x-rmaint/testing updated. v3.06.04-241-g634f83a
Git repo owner
gitmaster at git.koha-community.org
Sat Jul 14 01:58:14 CEST 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-rmaint/testing has been updated
via 634f83acebfdd8d344325d141af8e546d39a5bee (commit)
via a30aeeaa53f42664bc8ba935948aa481f9e50662 (commit)
via 87ca800708198ac54fa755c262ab2af7ac475fc4 (commit)
via 69c3f794a9356e32b16cb5b7936918c678038120 (commit)
via 6b9680b21210ff23c9e0460a34445361ec5c9cb5 (commit)
via 7656f3dc7d431fbf55930309f66b46432d677338 (commit)
via 6b1ca78dd373a192b6c660eba7c5df8944971fb2 (commit)
via 645783c253cc31d308802847a79b8811c4022236 (commit)
via bda0612fcc71c39b9512bcbb10188cfd9ad64a28 (commit)
via 18c047f4e4e84579e88c2b849eb8a05fa51a5658 (commit)
via 8bde392a5660fd07cdaf2d85a4d8e2ecbfcf7763 (commit)
via 13cc8c20a1688d351e15a67e07fed7411b60895e (commit)
via 7715c3e97f83b831cafc23115c8fdb45c1fd7b4f (commit)
via 29c50ccbf00ca8013e62286b3547a039039bd536 (commit)
via b79a3e1b3f2e2d27dc175b9618b1954ab27ea9e8 (commit)
via 64dce5ac621b006361c68b15a386fb3eca27a2aa (commit)
via 97c0183f1e38d63864cda6472762f2b4482e32d0 (commit)
via 282097dec00f52690a896ec8170fa57c83b8da3a (commit)
via f449571a28fa7e9fa65aedc15e896633c5aa7d59 (commit)
via e7b43c6ff9dbf2ee2db89507c06f2f8b716da430 (commit)
via f5b75e4a85e888add73d8c45fdc317e739881da9 (commit)
via f74fa05eced7e74e35932c9e3009c7ce9b5f6255 (commit)
via 89fe898ffeb60c6a903ad2eeccd8b6e7baea7257 (commit)
via 9afc11a9ebb94bd303c8c3205516b5a3b08b6e6e (commit)
via 556eb39c497f1abc98ed62cffb413d55531767d3 (commit)
via 8a2f03dc92536cdd738388d923c622427cdced22 (commit)
via cbadc3ff963757be6db7dc277e681163eaabd51f (commit)
via e80a0c31531336dd87a7613bf710340d8a9f9b06 (commit)
via ecdb741b2b78ad56a0554a7e78e1b4bb7494635c (commit)
via 80e2b59231cae68632818e11b7ea01fc9d86a560 (commit)
via cdd02693ae37264e8f458b1052c27b5a475cfb53 (commit)
via 18ae223635e07ab3b80c3c504343f95cc945772d (commit)
via bf74135b6e67071bb74adf2a1b7052feb43875d9 (commit)
via e975e6ee73e530d49799bb4de65532945d9a05bb (commit)
via 03b7218a95fe28f9b27007457850fecb46061b0b (commit)
via 5a6fba297d8bceed829ea5bcc19feb77a7bc9a21 (commit)
via ffb1f1ec6d23cb7256a21bc617d8697f3e3d6cdf (commit)
via a02f63d8361a82bb04f5cf667a12dfd52f214afe (commit)
via 00b01876f84b5d03fdf3e89655c7ff1f94b80498 (commit)
via 51c8f852e72cc01fa64bad75888bdadaa68784ee (commit)
via 45d64dcb63eb0a40e274cb39a6db6587b5591471 (commit)
via b98b90bd2a90f598a89856605de58bd2e2fcac95 (commit)
via 1f894a5f99bb10c4062de4f36769f124ff8ca2b7 (commit)
via cc7f5145c6d91e9069008dc5ec43408d79499781 (commit)
via 11ebeb419ac4c7d2b335ebc3b61750b9cc6a43c9 (commit)
via 59b1c2ef403c7645b7064bb9c2d558f485dfd70c (commit)
via 4bc63c0aebc62ecf4f8a660baea868697bc4ea81 (commit)
via 22f8009386eafc04c0e3b3b3f3121b4a2c1d1431 (commit)
via 213f5d7710fa6d75962a9718b3fca0cbda8cf04f (commit)
via 572ca29e63d0928980c36241dae37decfa80de19 (commit)
via 4fb87d4e2fa51cf86eed1a7211b9c924f6213d6b (commit)
via 0eb9464aa1e4a3b4616f6ae4d28916d89b6639ea (commit)
from a76c4b1aad345af1e603c067fb51011bc952fa9a (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 634f83acebfdd8d344325d141af8e546d39a5bee
Author: Jared Camins-Esakov <jcamins at cpbibliography.com>
Date: Fri Jul 13 09:09:45 2012 -0400
Don't run testcritic on directories that can't pass
commit a30aeeaa53f42664bc8ba935948aa481f9e50662
Author: Paul Poulain <paul.poulain at biblibre.com>
Date: Fri Jun 29 16:52:20 2012 +0200
bug 6350 (history.txt) fixing typo
decmember is not a month afaik ;-)
(cherry picked from commit 9285b2899f4814d3e47f7ff6c1f9dc86bc62b750)
commit 87ca800708198ac54fa755c262ab2af7ac475fc4
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date: Sat Jun 23 19:35:55 2012 +1200
Bug 6350 : Updating history
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
Conflicts:
docs/history.txt
(cherry picked from commit 42a46b481a3ad6cba36211ade81faf83fb214427)
commit 69c3f794a9356e32b16cb5b7936918c678038120
Author: Mason James <mtj at kohaaloha.com>
Date: Tue Jun 26 15:58:30 2012 +1200
Bug 8315 - fix 'C4::Output 3.02' errors in Koha
modified: opac/opac-ratings-ajax.pl
modified: opac/opac-tags.pl
modified: tags/review.pl
Signed-off-by: Robin Sheat <robin at catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com>
commit 6b9680b21210ff23c9e0460a34445361ec5c9cb5
Author: Sophie Meynieux <sophie.meynieux at biblibre.com>
Date: Tue Jun 5 17:44:25 2012 +0200
Bug 8191 : Adding a new value to 8 position of coded data field 100
From july 2012, unimarc norm evolves and the value k "monograph with both publication date and print date" must be added for this position.
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
Checked the new value shows up and is correctly copied into the field.
Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
(cherry picked from commit 83874c62142b99f3a09ec9a7384e4ac6bfe8a1c2)
commit 7656f3dc7d431fbf55930309f66b46432d677338
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Thu Jun 21 11:01:15 2012 +0200
Bug 7143 Followup for timeline
Fixes few tabs within date; adds a regex to fix mistakes with spaces.
Signed-off-by: Marc Veron <veron at veron.ch>
Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
(cherry picked from commit ee53a0c6fae18ca247a589e485455dfc6d333d04)
commit 6b1ca78dd373a192b6c660eba7c5df8944971fb2
Author: Matthias Meusburger <matthias.meusburger at biblibre.com>
Date: Thu Jun 21 15:41:54 2012 +0200
Bug 8282: Bug in modules list in about.pl
Last modules were not displayed if the number of modules did not match the number of rows of the table (when $number_of_modules % 4 != 0)
Signed-off-by: Marc Veron <veron at veron.ch>
Added some code to about.tt to have empty the last remaining cells, not sure if an other signoff is needed.
Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
(cherry picked from commit 7d237f22adc9b8f3b2ba927995dc307e58e6a1e1)
commit 645783c253cc31d308802847a79b8811c4022236
Author: Paul Poulain <paul.poulain at biblibre.com>
Date: Fri Jun 22 11:10:18 2012 +0200
Bug 8289 Upgrading from 2.2 does not work anymore
The updatedatabase22to30.pl script update the engine from MyISAM to InnoDB for most tables.
However, the TYPE=InnoDB was deprecated, and is not removed.
The correct syntax is now ENGINE=InnoDB
Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
(cherry picked from commit 4cb0aa5d30dd044f50b9caacb59cd7bf39226070)
commit bda0612fcc71c39b9512bcbb10188cfd9ad64a28
Author: Maxime Pelletier <maxime.pelletier at libeo.com>
Date: Wed Mar 28 17:26:01 2012 -0400
Bug 6634 : 3 more cases of manager_id not populated
Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
(cherry picked from commit d43ec92b6cb3fe33fe8dbd626aec2a005a212c5d)
commit 18c047f4e4e84579e88c2b849eb8a05fa51a5658
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date: Sat Jun 23 19:24:58 2012 +1200
Fixing whitespace issues. Note to Paul, docs/history.txt is a tab
separated text file.
(cherry picked from commit e4acd9e24f186ce5fc5cf629c672fba26d74ee54)
commit 8bde392a5660fd07cdaf2d85a4d8e2ecbfcf7763
Author: Paul Poulain <paul.poulain at biblibre.com>
Date: Wed Jun 20 21:49:40 2012 +0200
Adding Claire Hernandez as contributor + adding missing contributors in about.tt
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com>
commit 13cc8c20a1688d351e15a67e07fed7411b60895e
Author: Claire Hernandez <claire.hernandez at biblibre.com>
Date: Mon Jun 11 15:52:10 2012 +0200
Bug 7994: Fix pref yaml errors
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com>
commit 7715c3e97f83b831cafc23115c8fdb45c1fd7b4f
Author: Claire Hernandez <claire.hernandez at biblibre.com>
Date: Mon Apr 23 15:11:46 2012 +0200
Bug 7994: scripts to check yaml files
$ prove yaml_valid.t
checks a closed list of files
$ perl yaml_valid.pl -f myfile.yaml
try to load a yaml file with YAML::LoadFile and show errors
(both files pertidied)
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
(cherry picked from commit 5cb8c9f6e44aa9874231bae5a909cb4a4f3473b5)
commit 29c50ccbf00ca8013e62286b3547a039039bd536
Author: Colin Campbell <colin.campbell at ptfs-europe.com>
Date: Sat Jun 9 10:40:19 2012 +0100
Bug 8216: Allow SIP modules to pass critic tests
Add C4/SIP to perlcritic tests. Fix those issues that were
generating perlcritic errors
Signed-off-by: Stacey Walker <stacey at catalyst-eu.net>
Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com>
commit b79a3e1b3f2e2d27dc175b9618b1954ab27ea9e8
Author: Jared Camins-Esakov <jcamins at cpbibliography.com>
Date: Fri Jun 15 10:40:59 2012 -0400
Bug 6720: show authority type in auth details
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
Authority type on detail page in staff now shows correctly.
Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
(cherry picked from commit 4b38fb0d4346480f7acefaf3d6976952bb2307c3)
commit 64dce5ac621b006361c68b15a386fb3eca27a2aa
Author: Katrin Fischer <Katrin.Fischer.83 at web.de>
Date: Mon Jun 11 15:09:00 2012 +0100
Bug 8232: Comments in OPAC contain untranslatable javascript messages
To test:
- add a new comment to a record in the OPAC
- Your comment (preview, pending approval) is not translatable
- update po files by running 'perl translate update <language>'
- Open po file and check if strings are there, translate
- install language again by running 'perl translate install <language>'
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com>
commit 97c0183f1e38d63864cda6472762f2b4482e32d0
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Thu Jun 14 08:31:46 2012 +0200
Bug 7367 Followup for opac-suggestions template
This small typo was found by Albert Oller.
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Very trivial fix.
Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
(cherry picked from commit 89e115c4d9f5ae55d824200464e9541ece2eec0e)
commit 282097dec00f52690a896ec8170fa57c83b8da3a
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Mon Jun 11 14:18:02 2012 +0200
Bug 7368 Followup for history.txt Only correcting whitespace for correct placement in about form
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Very trivial.
Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
Conflicts:
docs/history.txt
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
commit f449571a28fa7e9fa65aedc15e896633c5aa7d59
Author: Robin Sheat <robin at catalyst.net.nz>
Date: Sun Jun 10 15:56:21 2012 +0100
Bug 8222 - make the zipcode no longer mandatory
Having the zipcode field mandatory by default is a bit annoying for
places where no one cares about it. This patch stops it being the case
on new installs.
Signed-off-by: Michael Davis <m.r.davis at cranfield.ac.uk>
Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
(cherry picked from commit fe5214ba5e326d23a2b689cd945012325107b9e0)
commit e7b43c6ff9dbf2ee2db89507c06f2f8b716da430
Author: Mason James <mtj at kohaaloha.com>
Date: Mon Jun 11 16:40:04 2012 +1200
patch for Bug 8226 - 'OpacFooter' markup/css improvements
Signed-off-by: Michael Davis <m.r.davis at cranfield.ac.uk>
Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
(cherry picked from commit 4b1666e0bd4038e05a45acd42982a0f55f97be31)
commit f5b75e4a85e888add73d8c45fdc317e739881da9
Author: christophe croullebois <christophe.croullebois at biblibre.com>
Date: Tue May 22 13:59:33 2012 +0200
Bug 8136 Changes the expected lenght of 100$a in rebuild_zebra.pl
In rebuild_zebra.pl, if we are in "unimarc" ("marcflavour" syspref), the sub "fix_unimarc_100" is called and checks if 100$a lenght is equal to 35.
If it is not the case, the sub inserts the localtime and more, so we loose the datas in reindexing.
The standart lenght is 36.
I have just changed 35 to 36.
Signed-off-by: Sophie Meynieux <sophie.meynieux at biblibre.com>
Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
(cherry picked from commit 68c6e00f1659e66a3fcf60752d5ed7a67688b119)
commit f74fa05eced7e74e35932c9e3009c7ce9b5f6255
Author: Sophie Meynieux <sophie.meynieux at biblibre.com>
Date: Sun Jun 10 17:01:26 2012 +0200
Bug 7329 [Followup] : when reverting an import, keep matching biblionumber in batch table, if items are not deleted because they are issued.
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
(cherry picked from commit d92874095256058756b08aec4fcaf7b4316bca7f)
commit 89fe898ffeb60c6a903ad2eeccd8b6e7baea7257
Author: Sophie Meynieux <sophie.meynieux at biblibre.com>
Date: Sun Jun 10 12:23:20 2012 +0200
Bug 7329 [Followup] : when reverting an import, keep matching biblionumber in batch table, if items are not deleted beacause on loan.
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 45784a7183095bc9bbe4761fd26e385386d822d1)
commit 9afc11a9ebb94bd303c8c3205516b5a3b08b6e6e
Author: Christophe Croullebois <christophe.croullebois at biblibre.com>
Date: Wed Dec 7 11:54:29 2011 +0100
Bug 7329: Items onloan are deleted when undoing import into catalog
this patch checks the "on loan" and "reserved" status before deleting item, and
do noting in this case, so the record can't be deleted due to existing item.
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 0b39f30a69da728586d9cb27ed6f50983e3336d9)
commit 556eb39c497f1abc98ed62cffb413d55531767d3
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Sat Jun 9 07:04:48 2012 -0400
Bug 6141 - html glitches causing problems to translator - 3.8.x
* opac-topissue.pl = untranslatable string removed
* authorities.pl missing _() in javascript
Rewrite of patch authored by Julian Maurice.
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
(cherry picked from commit 8403c9d2c74694dd482b1d020d847defb8e8c4f7)
commit 8a2f03dc92536cdd738388d923c622427cdced22
Author: Dobrica Pavlinusic <dpavlin at rot13.org>
Date: Thu Jun 14 14:00:16 2012 +0200
Bug 7952 - followup to fix t/Creators.t
Since we are now using temporary file, we are creating test.pdf
at end of test and checking if it exists and have non-zero size.
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
(cherry picked from commit 7526cc10421aed4f11a6583f6f627096a9559d0c)
commit cbadc3ff963757be6db7dc277e681163eaabd51f
Author: Dobrica Pavlinusic <dpavlin at rot13.org>
Date: Fri Apr 13 00:20:00 2012 +0200
Bug 7952 - PDF::Reuse under plack writes to console STDOUT instead to browser
Without name option to prFile, PDF::Reuse opens '-' file which is real
console STDOUT on plack so pdf file gets emited to terminal instead of
sending it to browser.
This change creates temporary file using File::Temp, pass it to PDF::Reuse
and then reads it back and prints it out for plack (or CGI) to pick up.
Test secenario:
1. Home › Tools › Patron Card Creator › Manage Card Batches
2. select batch checkbox and click Export
3. select template and click Export
4. click on pdf file to download it
Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
(cherry picked from commit e2e80737d354323be820e4176c2a965440ff089b)
commit e80a0c31531336dd87a7613bf710340d8a9f9b06
Author: Owen Leonard <oleonard at myacpl.org>
Date: Mon Jun 4 15:23:30 2012 -0400
Bug 8171 - Improper escaping of quotes during z39.50 queries leads to broken html
Implementing fix as suggested by Chris Cormack:
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=8171#c4
Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com>
Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
(cherry picked from commit dc0cf0b3290e642b33f44ff465976ac915d952d7)
commit ecdb741b2b78ad56a0554a7e78e1b4bb7494635c
Author: Frédéric Demians <f.demians at tamil.fr>
Date: Tue Jun 5 12:06:23 2012 +0200
Bug 4838 Fix repeated authorities selection
How to test:
Create an authority, with more than one heading, for example a
UNIMARC multilingual author:
200 $7 da
$a 原
$b 純輔
200 $7 ba
$a Hara
$b Junsuke
In data entry form, on 700 field, you click on ... Search for the above author.
In auhtority search result page, you just have a 'Choose' link, and so you just
can select the first heading (in Chinesse writing).
Apply the patch. Repeat. Now you have, on result page, you have two links, and
can select one heading or the other.
Signed-off-by: François Charbonnier <francois.charbonnier at biblibre.com>
Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
(cherry picked from commit c215ba8117e727ed8b91e55dde30f5256c0f3064)
commit 80e2b59231cae68632818e11b7ea01fc9d86a560
Author: Amit Gupta <amit.gupta at osslabs.biz>
Date: Wed May 30 12:37:33 2012 +0530
Bug 8166 - Adding new currencies & exchange rates
if not fill any field it save blank record
To Test:
1) Go to Currencies & Exchange rates.
2) Create New currency
3) If you not fill any field for ex: (Currency, rate, symbol)
it will not save the record.
Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com>
Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
(cherry picked from commit 42dbe025d953ef9809a1330be4517e393d49ea4a)
commit cdd02693ae37264e8f458b1052c27b5a475cfb53
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date: Thu Jun 14 18:39:53 2012 +1200
Fixing tabs in docs/history.txt
NOTE: This is a tab separated file, please do not switch tabs for
spaces
(cherry picked from commit 4688e3df3777795c3ed70cd8cd4192841d4aadd3)
commit 18ae223635e07ab3b80c3c504343f95cc945772d
Author: Paul Poulain <paul.poulain at biblibre.com>
Date: Sun Jun 10 13:56:26 2012 +0200
Adding Shari Perkins as contributor
(she submitted some patches for online help)
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
(cherry picked from commit e844ce66504ba950746d174947bfb6ce0d2cc2e6)
commit bf74135b6e67071bb74adf2a1b7052feb43875d9
Author: Sophie Meynieux <sophie.meynieux at biblibre.com>
Date: Fri Mar 23 15:02:22 2012 +0100
Bug 7815 : Order pickup libraries list by name rather than by code
Signed-off-by: Marijana Glavica <mglavica at ffzg.hr>
Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
(cherry picked from commit 317479ff433b7098a10a02a37a70353e57e645f9)
commit e975e6ee73e530d49799bb4de65532945d9a05bb
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date: Tue May 15 16:29:46 2012 +0200
Bug 8009: Followup Item descriptive data not populated on pay.pl
Separation of title from the description.
Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com>
Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
(cherry picked from commit c3b69a6f9ce800e999cc9e1276bb402863953c85)
commit 03b7218a95fe28f9b27007457850fecb46061b0b
Author: D Ruth Bavousett <ruth at bywatersolutions.com>
Date: Wed Apr 25 06:06:31 2012 -0700
Bug 8009: Item descriptive data not populated on pay.pl
GetBorNotifyAcctRecord was not populating the {title} element of the
hash, which pay.tt will use.
Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
(cherry picked from commit 985e89fc09f36707f562dba68e1dfb4f55ed804e)
commit 5a6fba297d8bceed829ea5bcc19feb77a7bc9a21
Author: christophe croullebois <christophe.croullebois at biblibre.com>
Date: Wed Jun 6 15:14:15 2012 +0200
Bug 8197 : Software error when you have cleaned cookies and try to past the url to opac-topissues.pl
Try to delete cookies and paste the url to opac-topissues.pl.
Without the patch we have a Software error.
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
(cherry picked from commit fa00315b2b61c3c1824b7af185317c1b3503c66f)
commit ffb1f1ec6d23cb7256a21bc617d8697f3e3d6cdf
Author: Fridolyn SOMERS <fridolyn.somers at progilone.fr>
Date: Mon Aug 22 15:14:24 2011 +0200
BUG5312 XHTML correction in authority summary
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
(cherry picked from commit fd2a52bda95b54d94df6fc870d002baff0d5f27b)
commit a02f63d8361a82bb04f5cf667a12dfd52f214afe
Author: Marc Veron <veron at veron.ch>
Date: Fri Jun 8 13:40:31 2012 +0200
Bug 7586 - Search: Language restriction does NOT show expected results (no items shown)
modified: etc/zebradb/marc_defs/marc21/biblios/record.abs
Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
(cherry picked from commit 57ff55a84dfcf1c7b4d9851ccafe842ff074e4e0)
commit 00b01876f84b5d03fdf3e89655c7ff1f94b80498
Author: Frédéric Demians <f.demians at tamil.fr>
Date: Mon Jun 4 10:06:22 2012 +0200
Bug 8062 [SIGNED-OFF] Perl module dependency Template::Plugin::HtmlToText
Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
(cherry picked from commit ee3ffc006cd574eae85c8cd20d885133a9ffde3a)
commit 51c8f852e72cc01fa64bad75888bdadaa68784ee
Author: Frédéric Demians <f.demians at tamil.fr>
Date: Mon May 14 09:57:50 2012 +0200
Bug 8062 [SIGNED-OFF] Cart email broken for non english templates
Fix basket email sent from OPAC. The email body is now generated HTML
(to be translatable), and converted into TEXT before beeing sent by
email.
To test that it works in other language than English, you have to update
your language .po file:
perl translate update de-DE
Then, translated strings coming from opac-sendbasket.tt, and install the
translation:
perl translate install de-DE
New dependency: Template::Plugin::HtmlToText
Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com>
(Conflicts in koha-tmpl/opac-tmpl/prog/en/modules/opac-sendbasket.tt
resolved by replacing the file with the version from 3.8.x)
commit 45d64dcb63eb0a40e274cb39a6db6587b5591471
Author: Srdjan <srdjan at catalyst.net.nz>
Date: Mon May 28 12:12:34 2012 +1200
bug_8138: added 773$t field to search results
Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
commit b98b90bd2a90f598a89856605de58bd2e2fcac95
Author: Katrin Fischer <Katrin.Fischer.83 at web.de>
Date: Mon Apr 9 09:48:46 2012 +0200
Bug 7834: order search at the top of acq does nothing
Entering a search term for 'title' or 'vendor' at the top search
form in acq (tab 'Orders search') did redirect to the advanced
search form, but didn't start the search.
After applying the patch the search will bring back results immediately
or redirect to the form, when there are no results.
To test:
- Check all searches still work as expected by searching for title,
vendor, order name and invoice number
- Check advanced search still has the search terms prepopulated
- Check searches with and without results are ok
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
(cherry picked from commit d55cde8ae5b09bce0d93c2bfac26de6d27a4507a)
commit 1f894a5f99bb10c4062de4f36769f124ff8ca2b7
Author: Paul Poulain <paul.poulain at biblibre.com>
Date: Tue Apr 10 15:08:47 2012 +0200
Bug 2505 follow-up: C4::Ris not ready for use strict;use warnings;
The patch pushed a few hours ago is a good 1st step in the right direction.
however, many things are still to do to have the script OK with strict/warning, so commenting them
Errors if you have them:
Global symbol "$utf" requires explicit package name at C4/Ris.pm line 111.
Global symbol "$intype" requires explicit package name at C4/Ris.pm line 350.
Global symbol "$intype" requires explicit package name at C4/Ris.pm line 350.
Global symbol "$intype" requires explicit package name at C4/Ris.pm line 353.
Global symbol "$marcprint" requires explicit package name at C4/Ris.pm line 363.
Global symbol "$marcprint" requires explicit package name at C4/Ris.pm line 389.
Global symbol "$intype" requires explicit package name at C4/Ris.pm line 431.
Global symbol "$marcprint" requires explicit package name at C4/Ris.pm line 438.
Global symbol "$marcprint" requires explicit package name at C4/Ris.pm line 439.
Global symbol "$marcprint" requires explicit package name at C4/Ris.pm line 440.
Global symbol "$marcprint" requires explicit package name at C4/Ris.pm line 441.
Global symbol "$marcprint" requires explicit package name at C4/Ris.pm line 442.
Global symbol "$intype" requires explicit package name at C4/Ris.pm line 443.
Global symbol "$marcprint" requires explicit package name at C4/Ris.pm line 464.
Global symbol "$marcprint" requires explicit package name at C4/Ris.pm line 465.
Global symbol "$marcprint" requires explicit package name at C4/Ris.pm line 466.
Global symbol "$marcprint" requires explicit package name at C4/Ris.pm line 479.
Global symbol "$marcprint" requires explicit package name at C4/Ris.pm line 480.
Global symbol "$marcprint" requires explicit package name at C4/Ris.pm line 483.
Global symbol "$marcprint" requires explicit package name at C4/Ris.pm line 484.
Global symbol "$marcprint" requires explicit package name at C4/Ris.pm line 485.
Global symbol "$intype" requires explicit package name at C4/Ris.pm line 501.
Global symbol "$intype" requires explicit package name at C4/Ris.pm line 505.
Global symbol "$marcprint" requires explicit package name at C4/Ris.pm line 527.
Global symbol "$marcprint" requires explicit package name at C4/Ris.pm line 530.
Global symbol "$intype" requires explicit package name at C4/Ris.pm line 539.
Global symbol "$marcprint" requires explicit package name at C4/Ris.pm line 540.
Global symbol "$marcprint" requires explicit package name at C4/Ris.pm line 556.
Global symbol "$marcprint" requires explicit package name at C4/Ris.pm line 557.
Global symbol "$marcprint" requires explicit package name at C4/Ris.pm line 561.
Global symbol "$marcprint" requires explicit package name at C4/Ris.pm line 562.
Global symbol "$marcprint" requires explicit package name at C4/Ris.pm line 578.
Global symbol "$marcprint" requires explicit package name at C4/Ris.pm line 579.
Global symbol "$marcprint" requires explicit package name at C4/Ris.pm line 583.
Global symbol "$marcprint" requires explicit package name at C4/Ris.pm line 584.
Global symbol "$marcprint" requires explicit package name at C4/Ris.pm line 613.
Global symbol "$marcprint" requires explicit package name at C4/Ris.pm line 614.
Global symbol "$marcprint" requires explicit package name at C4/Ris.pm line 629.
Global symbol "$marcprint" requires explicit package name at C4/Ris.pm line 630.
Global symbol "$marcprint" requires explicit package name at C4/Ris.pm line 645.
Global symbol "$marcprint" requires explicit package name at C4/Ris.pm line 646.
Global symbol "$intype" requires explicit package name at C4/Ris.pm line 674.
Global symbol "$protoyear" requires explicit package name at C4/Ris.pm line 706.
Global symbol "$protoyear" requires explicit package name at C4/Ris.pm line 707.
Global symbol "$marcprint" requires explicit package name at C4/Ris.pm line 707.
Global symbol "$protoyear" requires explicit package name at C4/Ris.pm line 710.
Global symbol "$protoyear" requires explicit package name at C4/Ris.pm line 715.
Global symbol "$protoyear" requires explicit package name at C4/Ris.pm line 721.
Global symbol "$protoyear" requires explicit package name at C4/Ris.pm line 725.
Global symbol "$marcprint" requires explicit package name at C4/Ris.pm line 729.
Global symbol "$protoyear" requires explicit package name at C4/Ris.pm line 730.
Global symbol "$protoyear" requires explicit package name at C4/Ris.pm line 730.
Global symbol "$marcprint" requires explicit package name at C4/Ris.pm line 731.
Global symbol "$protoyear" requires explicit package name at C4/Ris.pm line 734.
Global symbol "$protoyear" requires explicit package name at C4/Ris.pm line 735.
Global symbol "$protoyear" requires explicit package name at C4/Ris.pm line 738.
Global symbol "$marcprint" requires explicit package name at C4/Ris.pm line 772.
Global symbol "@kwsubfields" requires explicit package name at C4/Ris.pm line 776.
Global symbol "@kwsubfields" requires explicit package name at C4/Ris.pm line 779.
Global symbol "$marcprint" requires explicit package name at C4/Ris.pm line 789.
Global symbol "@notesubfields" requires explicit package name at C4/Ris.pm line 892.
Global symbol "@notesubfields" requires explicit package name at C4/Ris.pm line 895.
Global symbol "$marcprint" requires explicit package name at C4/Ris.pm line 901.
Global symbol "$marcprint" requires explicit package name at C4/Ris.pm line 935.
Global symbol "$utf" requires explicit package name at C4/Ris.pm line 962.
Global symbol "$uniout" requires explicit package name at C4/Ris.pm line 966.
C4/Ris.pm had compilation errors.
(cherry picked from commit 5d9c7dfe040ca0302095a5641060388b14b9e984)
commit cc7f5145c6d91e9069008dc5ec43408d79499781
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date: Thu Apr 5 15:40:46 2012 +1200
Bug 6679 :[SIGNED-OFF] Fixing some perlcritic violations in the opac
signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
(cherry picked from commit 6f3123bbc65b1087e18bd8212d1ca01ed1087181)
commit 11ebeb419ac4c7d2b335ebc3b61750b9cc6a43c9
Author: Julian Maurice <julian.maurice at biblibre.com>
Date: Thu Mar 22 17:20:01 2012 +0100
Bug 7807: [SIGNED-OFF] Fix call to GetSuggestionFromBiblionumber
This sub only takes one parameter
signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
(cherry picked from commit 680e92115f109bec50562de7043df17add8b26eb)
commit 59b1c2ef403c7645b7064bb9c2d558f485dfd70c
Author: Paul Poulain <paul.poulain at biblibre.com>
Date: Tue Apr 10 11:53:15 2012 +0200
Bug 7886 follow-up DBRev number
commit 4bc63c0aebc62ecf4f8a660baea868697bc4ea81
Author: Dobrica Pavlinusic <dpavlin at rot13.org>
Date: Thu Apr 5 01:03:30 2012 +0200
Bug 7886 - C4/ShelfBrowser slow SQL performance
ShelfBrowser uses two SQL queries with syntax
WHERE ((cn_sort = ? AND itemnumber < ?) OR cn_sort < ?)
AND homebranch = ? AND location = ? AND ccode = ?
homebranch already has index, and adding indexes on ccode and location
improves performance by 30% for each query since MySQL is able to use
index_merge intersect(items_ccode,homebranch,items_location)
Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
(cherry picked from commit d8e702dd25dfb09f99620ea9f5d3251033d16864)
commit 22f8009386eafc04c0e3b3b3f3121b4a2c1d1431
Author: Katrin Fischer <Katrin.Fischer.83 at web.de>
Date: Fri Apr 6 17:09:30 2012 +0200
Bug 7900: Link to vendor from subscription detail is broken
To test:
- Add a serial subscription with a link to a vendor
- Check the subscription detail page for the name and link to the vendor
- Check that the link works correctly
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
(cherry picked from commit bd52531d69e0f86093a16101f87743a9f8b0c892)
commit 213f5d7710fa6d75962a9718b3fca0cbda8cf04f
Author: Colin Campbell <colin.campbell at ptfs-europe.com>
Date: Wed Jun 15 12:15:14 2011 +0100
Bug 2505 : Switch on warnings in circ/returns.pl
Removed a compile time warning caused by a void context
in a bit of too clever obscure code
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
(cherry picked from commit e7971380e8ff699b57d0c02b2406eca254dfd04a)
commit 572ca29e63d0928980c36241dae37decfa80de19
Author: Colin Campbell <colin.campbell at ptfs-europe.com>
Date: Tue Jun 7 14:34:18 2011 +0100
Bug 2505 : use warnings in smart_rules.pl
Fix some careless code redeclaring a variable
declaring a variable in a condition
so that these don't generate errors
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
(cherry picked from commit 6078c1acf699f51c127e853203e35cadae99005d)
commit 4fb87d4e2fa51cf86eed1a7211b9c924f6213d6b
Author: Mason James <mtj at kohaaloha.com>
Date: Thu Mar 15 21:06:22 2012 +1300
Bug 2505 - enable Perl warnings in all modules and scripts
enable warnings, and correct perlcritic's 'Loop iterator is not lexical' errors in C4/Ris.pm
modified: C4/Ris.pm
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
commit 0eb9464aa1e4a3b4616f6ae4d28916d89b6639ea
Author: Jared Camins-Esakov <jcamins at cpbibliography.com>
Date: Wed Jul 11 08:10:10 2012 -0400
Add sponsor list to 3.6.x
Sponsored-by: Los Gatos Public Library
Sponsored-by: NEKLS
Sponsored-by: East Brunswick Public Library
Sponsored-by: Athens County Public Libraries
Sponsored-by: Horowhenua Library Trust
Sponsored-by: Halton Borough Council
Sponsored-by: South Taranaki District Council
Sponsored-by: Arcadia Public Library
-----------------------------------------------------------------------
Summary of changes:
C4/Accounts.pm | 24 +++--
C4/Acquisition.pm | 2 +-
C4/AuthoritiesMarc.pm | 2 +-
C4/Creators/PDF.pm | 15 +++-
C4/ImportBatch.pm | 22 +++--
C4/Installer/PerlDependencies.pm | 7 +-
C4/Members.pm | 5 +
C4/Ris.pm | 36 +++---
C4/SIP/ILS/Item.pm | 25 +++--
C4/SIP/ILS/Patron.pm | 9 +-
C4/SIP/ILS/Transaction/Checkout.pm | 3 +-
C4/SIP/ILS/Transaction/Hold.pm | 3 +-
C4/SIP/ILS/Transaction/Renew.pm | 5 +-
C4/SIP/ILS/Transaction/RenewAll.pm | 3 +-
C4/SIP/SIPServer.pm | 2 +-
C4/SIP/Sip/Checksum.pm | 6 -
C4/SIP/Sip/Configuration.pm | 9 --
C4/SIP/Sip/MsgType.pm | 10 +-
C4/SIP/t/SIPtest.pm | 20 ++--
about.pl | 10 ++
admin/smart-rules.pl | 4 +-
authorities/detail.pl | 3 +-
circ/returns.pl | 5 +-
docs/history.txt | 43 +++++---
etc/zebradb/marc_defs/marc21/biblios/record.abs | 2 +-
installer/data/mysql/sysprefs.sql | 2 +-
installer/data/mysql/update22to30.pl | 2 +-
installer/data/mysql/updatedatabase.pl | 8 ++
.../prog/en/includes/acquisitions-search.inc | 4 +-
koha-tmpl/intranet-tmpl/prog/en/modules/about.tt | 23 +++-
.../prog/en/modules/admin/currency.tt | 2 +-
.../en/modules/admin/preferences/acquisitions.pref | 70 ++++++------
.../en/modules/admin/preferences/circulation.pref | 4 +-
.../en/modules/admin/preferences/searching.pref | 2 +-
.../modules/authorities/searchresultlist-auth.tt | 8 ++-
.../cataloguing/value_builder/unimarc_field_100.tt | 6 +
.../prog/en/modules/cataloguing/z3950_search.tt | 2 +-
.../intranet-tmpl/prog/en/modules/members/pay.tt | 2 +-
.../prog/en/modules/serials/subscription-detail.tt | 2 +-
koha-tmpl/opac-tmpl/prog/en/css/opac.css | 6 +-
.../opac-tmpl/prog/en/includes/opac-bottom.inc | 13 ++-
koha-tmpl/opac-tmpl/prog/en/modules/opac-review.tt | 6 +-
.../opac-tmpl/prog/en/modules/opac-sendbasket.tt | 110 ++++++++++++++------
.../opac-tmpl/prog/en/modules/opac-suggestions.tt | 2 +-
.../opac-tmpl/prog/en/modules/opac-topissues.tt | 4 +-
.../prog/en/xslt/MARC21slim2OPACResults.xsl | 11 ++
kohaversion.pl | 2 +-
misc/migration_tools/rebuild_zebra.pl | 4 +-
opac/opac-search.pl | 2 +-
opac/opac-sendbasket.pl | 22 ++---
opac/opac-showmarc.pl | 2 +-
opac/opac-showreviews.pl | 6 +-
opac/opac-tags.pl | 4 +-
opac/opac-topissues.pl | 9 +-
opac/unapi | 2 +-
reserve/request.pl | 2 +-
t/00-testcritic.t | 2 +-
t/Creators.t | 12 ++-
tags/review.pl | 2 +-
xt/yaml_valid.pl | 67 ++++++++++++
.../cancel_expired_holds.pl => xt/yaml_valid.t | 40 ++++++--
61 files changed, 490 insertions(+), 252 deletions(-)
create mode 100755 xt/yaml_valid.pl
copy misc/cronjobs/holds/cancel_expired_holds.pl => xt/yaml_valid.t (59%)
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list