[koha-commits] main Koha release repository branch 3.6.x-rmaint/testing updated. v3.06.04-277-g04c1f1d
Git repo owner
gitmaster at git.koha-community.org
Fri Aug 3 01:54:13 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 04c1f1db7e5c2ff6c13d0ab443b570f7141c5a35 (commit)
via 92b0f148493f25eccf89e7736e16cb15cf59fd05 (commit)
via 060b78e68f7c36e64dd7cd7f70b134d36b5dc5af (commit)
via 5bfd002c3f1957746e2b59bc6288d47bfafeab4d (commit)
via 8175b9d46e2d9380194805e69af6bd45c9eeca18 (commit)
via a3f2b42743d8680ad931a51012f84d533181c1dd (commit)
via 3c4eecfb71c3d0c4dac30b9d3ca1d2fe8769ba8c (commit)
via f91750cc1d2c01032b62fc93b28aa8f7b4338bdc (commit)
via 63ed0d1a9c8b6993d7a524d25198f4db43f31741 (commit)
via c50857ab163326297ef468632b078371bd1693a5 (commit)
via 3a5969f1529402891a79ff116c8627be59adf063 (commit)
via 5ea0dc1fecc1706c7f13acdf0729b1f890f919b4 (commit)
via 002594e8f9dfa41f7a7e603d6b81abc351d4c907 (commit)
via 602083057be83e3350c0d981d7facebb82f9c2a0 (commit)
via c8651654464ce2e095a7a95887a49aa64080925d (commit)
via ebec24f9cfbfb5e54a7a0f2c53425d9502fa3de6 (commit)
via 2f13698f3f895e44eca480b47ad248005fa4abfc (commit)
via 746ea848b623eb6405885aa7f94976169d668df1 (commit)
via d2d119b0d96b5cd418545120559430a98832017b (commit)
via 2625b8521cf0494178d78f75d75f2182e73c3163 (commit)
via 90a827841fd6cbec09124acb7266fbd5353e662e (commit)
via bb208e9852f2e1f6549898f860d224356adf0823 (commit)
via 845a48898b361f78cdc533f43b591b9b6243ccf1 (commit)
via 01a20612769d34e581272909d11a243314013e4d (commit)
via 652a8018f0fc91e2badc2ff90ed8afdd10fdbc92 (commit)
via a9433b4b8d034d031471dea906e47aca5f3e945b (commit)
via ec46db8009d0667cdd3566d7a8da3f525aa4e6b5 (commit)
via 3c958ab16fafe553aa21460c123112c3fc4ae1ef (commit)
via 4d35106b44940a75d2b1b3343ca3747d7bbd3537 (commit)
via aab7cafbcb6466b90d484ce14f47178c6de822b2 (commit)
via ebcede353db35f838d95af20a3c033e6dc5e2619 (commit)
via 2eb76ec0477d59edbd0de8f31140aaba3b0dc9a9 (commit)
via d43e8c42d4253b15cf7e4d9fefc1c8bcdd184bcf (commit)
via e1f804a4a71a325688a87329ab9a4298cf8d38d6 (commit)
via 8a2d3c9c6655c05cc153541738a675a5820d033d (commit)
via 975c5c898024d605628575648d19a5e06fc1c332 (commit)
from 634f83acebfdd8d344325d141af8e546d39a5bee (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 04c1f1db7e5c2ff6c13d0ab443b570f7141c5a35
Author: Frédéric Demians <f.demians at tamil.fr>
Date: Fri May 25 08:10:19 2012 +0200
Bug 6267: [SIGNED-OFF]Fix a typo
Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
(cherry picked from commit 8caef646802d390b7c7fe3d6c7b618ef5067127b)
Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com>
commit 92b0f148493f25eccf89e7736e16cb15cf59fd05
Author: Marc Veron <veron at veron.ch>
Date: Sun Jul 29 09:30:54 2012 +0200
Bug 8518 - Self checkout does not display debt amount if syspref AllowFineOverride is set to allow
If the patron has depts that prevent issuing and the system preference 'AllowFineOverride' is set to 'allow', the amount is not displayed in the user message.
Additionally, patch adds currency symbol to amount.
Test plan:
Do self checkout with patron who has debts that are over the limit.
Test with and without preference 'AllowFineOverride' set.
Signed-off-by: Mirko Tietgen <mirko at abunchofthings.net>
Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
(cherry picked from commit 5fdf80afe8626579963626b82e2200497a8e853c)
Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com>
commit 060b78e68f7c36e64dd7cd7f70b134d36b5dc5af
Author: Fridolyn SOMERS <fridolyn.somers at biblibre.com>
Date: Wed Jul 25 14:11:08 2012 +0200
Bug 8503: Software error in edit items with EasyAnalyticalRecords
Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com>
Solves software error when editing items for record with invalid
analytic.
Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
(cherry picked from commit c4d6ad75182694515d611f3f08172ef3d3fcf7aa)
Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com>
commit 5bfd002c3f1957746e2b59bc6288d47bfafeab4d
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date: Thu Jul 26 23:00:18 2012 +1200
Bug 7143: Updating history and about file
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 8175b9d46e2d9380194805e69af6bd45c9eeca18
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Wed Jul 18 15:03:36 2012 +0200
7368 Adjustments for Perl dependencies
HTML::FormatText is used by Template::Plugin::HtmlToText which is called in the template for opac-sendbasket.pl.
This is not a core Perl 5.10 module. I had to install it additionally on a test server. So I am adding it to PerlDependencies.
I just picked an old version 1.23 that I still could find as min_ver.
Changed the version information for Test::Strict too (not required, only for tests).
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
(cherry picked from commit a4ce9af8289fd79e436d4c36e8bce0ee8204ed93)
Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com>
commit a3f2b42743d8680ad931a51012f84d533181c1dd
Author: Savitra sirohi <savitra.sirohi at osslabs.biz>
Date: Sat Nov 5 00:21:03 2011 -0400
Bug 7153 - Show Open Library as Search Target in "More Searches" in OPAC detail page
Update syspref OPACSearchForTitleIn to include Open Library as a target in More Searches in the OPAC detail page
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>
(cherry picked from commit 7de33d3773d9b85739f437d1f822b0775d388c6b)
Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com>
commit 3c4eecfb71c3d0c4dac30b9d3ca1d2fe8769ba8c
Author: Mason James <mtj at kohaaloha.com>
Date: Wed Jul 18 17:24:29 2012 +1200
Bug 8470: remove depreciated H:T:P test
Signed-off-by: Chris Cormack <chrisc at catalyst.net.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 682d6a0a8bdec5db52cd8003e3a745b2a78c873f)
Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com>
commit f91750cc1d2c01032b62fc93b28aa8f7b4338bdc
Author: Magnus Enger <magnus at enger.priv.no>
Date: Mon Jul 23 13:26:19 2012 +0200
Bug 7367 - One "the" too many
On line 123 it says "of the the last". One "the" is probably enough.
Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
(cherry picked from commit ba3ed923064aa0c8cfd513bb0893108daa524775)
Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com>
commit 63ed0d1a9c8b6993d7a524d25198f4db43f31741
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Wed Jul 18 15:58:37 2012 +0200
Bug 8062 Followup for HTML::FormatText
The dependency is not used in opac-sendbasket. But there is a require of HTML::FormatText in the code of Template::Plugin::HTMLToText.
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
(cherry picked from commit 4de7f6b143a25dcfa0084072862a5a8c37e9402c)
Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com>
commit c50857ab163326297ef468632b078371bd1693a5
Author: Dobrica Pavlinusic <dpavlin at rot13.org>
Date: Mon Jul 16 12:43:24 2012 +0200
Bug 8439 - Printing basketgroup does not work on plack
scope $input CGI object with our for plack
Signed-off-by: Mirko Tietgen <5p4m at gmx.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 fdcd1f72dd4785f1a12465d3d3b42b27da89ddf8)
Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com>
commit 3a5969f1529402891a79ff116c8627be59adf063
Author: Fridolyn SOMERS <fridolyn.somers at biblibre.com>
Date: Thu Jul 19 15:29:12 2012 +0200
Bug 8476: Little bug in OPAC XSLT on OPACURLOpenInNewWindow
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
I know where it comes from: vim cut-and-paste...
Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
(cherry picked from commit 8750e787f8b8cc06b3dd9ce6bb2f695add4b715a)
Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com>
commit 5ea0dc1fecc1706c7f13acdf0729b1f890f919b4
Author: Mark Tompsett <mtompset at hotmail.com>
Date: Tue Jul 17 20:53:57 2012 +0800
Bug 8458 - $stemmed_operand in C4::Search _build_stemmed_operand is not initialized. Added =q{} to initialize it to the empty string at declaration time.
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 696789bae552a6cdf2d5a46c92e3ff9a51586c93)
Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com>
commit 002594e8f9dfa41f7a7e603d6b81abc351d4c907
Author: David Cook <dcook at prosentient.com.au>
Date: Thu Jul 12 11:26:56 2012 +1000
Bug 8422 - Fix impossible warning in circulation.pl when OverduesBlockCirc set to Block
Previously, the message Patron has x overdue item(s). Checkout anyway? was shown when syspref OverduesBlockCirc was set to Ask for confirmation or Block.
This patch changes the message for Block to: Checkouts are BLOCKED because patron has overdues.
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 0594a89f0fbd60984f631c65df8de0a0ce9284ee)
Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com>
commit 602083057be83e3350c0d981d7facebb82f9c2a0
Author: Nicole C. Engard <nengard at bywatersolutions.com>
Date: Tue Jul 3 00:53:37 2012 -0400
Bug 8351: Update wording on staged marc
When undoing an import the 'success' message was
poorly worded. This patch fixes that.
Signed-off-by: Mirko Tietgen <5p4m at gmx.de>
works as expected
Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
(cherry picked from commit 1a60179dcb9cee6ccf6a02c907ecf9d9f3b7a308)
Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com>
commit c8651654464ce2e095a7a95887a49aa64080925d
Author: Chris Hall <chrish at catalyst.net.nz>
Date: Tue Jun 12 16:28:56 2012 +1200
bug 8322 removing additional spaces before fullstop on catalogue/detail and opac-detail pages.
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 509c4b01351fea23db68969b1c344c29533d0001)
Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com>
commit ebec24f9cfbfb5e54a7a0f2c53425d9502fa3de6
Author: Owen Leonard <oleonard at myacpl.org>
Date: Mon Jul 9 15:48:23 2012 -0400
Bug 8398 - Missing image file in staff global css
This patch fixes a regression introduced by the fix for
Bug 6855 (bullet point showing in wrong place on error message)
http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=6855
The patch removes the re-introduced reference to a
background image which has since been removed. Testers should
check that this patch does not re-introduce Bug 6855.
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
I checked the styling of the error messages in Chromium and Firefox.
The logs are no longer complaining about the missing image.
Looks good to me.
Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
(cherry picked from commit 6b80d0d681c7f6d9fbb3f0897a59d96de78f4e4f)
Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com>
commit 2f13698f3f895e44eca480b47ad248005fa4abfc
Author: Owen Leonard <oleonard at myacpl.org>
Date: Mon Sep 12 15:50:18 2011 -0400
Fix for Bug 6855 - List bullet showing in wrong place on error message
Added some more specific CSS to help Webkit browsers display
the lists bullets correctly.
Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com>
Rebased 9 June 2012. Signing off as well, since the rebase and test
were trivial.
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
(cherry picked from commit bfcb15eeedf7c709c95af569bedd39a68879b312)
Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com>
commit 746ea848b623eb6405885aa7f94976169d668df1
Author: wajasu <matted-34813 at mypacks.net>
Date: Thu Jul 5 20:02:28 2012 -0500
Bug 8375 - Patch for Common diacritics not shown correctly when exporting batch label to PDF
Signed-off-by: Mason James <mtj at kohaaloha.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 e66b380ead21f5d614f57c1840e8a1633f9aaf39)
Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com>
commit d2d119b0d96b5cd418545120559430a98832017b
Author: Katrin Fischer <Katrin.Fischer.83 at web.de>
Date: Mon Jul 9 22:23:27 2012 +0200
Bug 6394: purchase order has French strings hard coded in
On the purchase order it said 'publié par' - instead of 'published by'.
The layout files for PDF generation in basket groups contain lots of English
strings, this change makes the template more consistent.
Currently the files are not translatable. The only way is to add translated
files to your installation.
To test:
Print a basket group as PDF. Verify string is ok for both possible settings
of system preference OrderPdfFormat:
- pdfformat::layout3pages
- pdfformat::layout2pages
Signed-off-by: Nicole C. Engard <nengard 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 fa238b185614df773d66fb74601b72aa0abaa568)
Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com>
commit 2625b8521cf0494178d78f75d75f2182e73c3163
Author: Dobrica Pavlinusic <dpavlin at rot13.org>
Date: Thu Jul 12 18:01:17 2012 +0200
Bug 8315 - remove use C4::* version
This patch touches a lot of code, but basically it removes version
information from use C4::* in our code.
Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
All script still compiles after the patch (confirmed by pre-applypatch hook)
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com>
commit 90a827841fd6cbec09124acb7266fbd5353e662e
Author: Robin Sheat <robin at catalyst.net.nz>
Date: Mon Jun 11 16:04:06 2012 +0100
Bug 8235 - allow a whitelist of modules that aren't in Debian
This allows modules that aren't in the main debian repos to be handled
by the list-deps script when building a control file.
Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
(cherry picked from commit 5cb0834f4d05361e9d584f340aebf83093aabf19)
Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com>
commit bb208e9852f2e1f6549898f860d224356adf0823
Author: Jared Camins-Esakov <jcamins at cpbibliography.com>
Date: Sun Jul 8 22:06:28 2012 -0400
Bug 8383: Add test to check that Perl scripts compile
This patch adds t/db_dependent/00-strict.pl which tests that all Perl
scripts compile. I chose to use Test::Strict so that in the future we
can also have the test check that "use strict" and "use warnings" are
enabled.
To test:
1. Run t/db_dependent/00-strict.pl.
2. Run around waving your arms in the air that we have a couple of
scripts that don't compile.
3. Actually, that's about it. You could test my patch for bug 8384 next.
Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com>
Moved test to t/db_dependent
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
Conflicts:
C4/Installer/PerlDependencies.pm
(cherry picked from commit 4e2b90506d3b9570987e95918370e07d04df9091)
Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com>
commit 845a48898b361f78cdc533f43b591b9b6243ccf1
Author: Mirko Tietgen <5p4m at gmx.de>
Date: Sun Jul 8 01:10:20 2012 +0200
Bug 7143 – Bug for tracking changes to the about page
This patch updates the German translators. To be applied after attachment 10681.
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 67ead476aa7fb083347e3f4b2798d09850252074)
Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com>
commit 01a20612769d34e581272909d11a243314013e4d
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date: Sat Jul 7 09:35:03 2012 +1200
Bug 7143 : Adding Stacey Walker to the history
Signed-off-by: wajasu <matted-34813 at mypacks.net>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com>
commit 652a8018f0fc91e2badc2ff90ed8afdd10fdbc92
Author: Mark Tompsett <mtompset at hotmail.com>
Date: Wed Jul 4 23:21:31 2012 +0800
Bug 8356 - moveitem.tt and linkitem.tt have cataloging typo Changed urls from cataloging to cataloguing
Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
correct typo
Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
(cherry picked from commit 2c2f919b8a344c674cd318de754aa307bde44023)
Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com>
commit a9433b4b8d034d031471dea906e47aca5f3e945b
Author: Jared Camins-Esakov <jcamins at cpbibliography.com>
Date: Sun Jul 8 22:28:56 2012 -0400
Bug 8384: Some Perl scripts do not compile
Fix syntax errors preventing the scripts misc/translator/text-extract2.pl
and misc/cronjobs/thirdparty/TalkingTech_itiva_inbound.pl from compiling.
Remove misc/migration_tools/build6xx.pl entirely since it refers to
columns that no longer exist in the Koha database, and has seemingly
had broken encoding since Koha switched from CVS to git (or before!).
Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
Conflicts:
misc/cronjobs/thirdparty/TalkingTech_itiva_inbound.pl
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
Rebased as the TalkingTech code doesn't exist in 3.8.x
(cherry picked from commit f6e45171bacaefa6ca83c0796eadf8fab8b67a8b)
Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com>
commit ec46db8009d0667cdd3566d7a8da3f525aa4e6b5
Author: Alex Arnaud <alex.arnaud at biblibre.com>
Date: Sat Jun 9 12:36:55 2012 +0200
Bug 7299 pass itemnumber in ILSDI holditem service
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 bc42bf97cb9ba34a4020b2224fb2028f8139797a)
Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com>
commit 3c958ab16fafe553aa21460c123112c3fc4ae1ef
Author: Marc Veron <veron at veron.ch>
Date: Fri Jun 29 20:21:56 2012 +0200
Bug 8335 - Missing Icon PR.png or typo in MARC21slim2OPACDetail.xsl
Add PR.png (renamed file music.png from http://famfamfam.com/lab/icons/ )
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 29b1860526e40bb51376c996efa429b7c5005f06)
Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com>
commit 4d35106b44940a75d2b1b3343ca3747d7bbd3537
Author: Chris Hall <chrish at catalyst.net.nz>
Date: Fri Jun 22 10:36:45 2012 +1200
Bug 8323 fixing year sorting of a list
Signed-off-by: Marc Veron <veron at veron.ch>
Works as expected.
Caveat: If you edit the list in Opac, change the sort and then klick 'Save',
the List always is displayed in title order. This is du to the fact that
save calls opac-shelves.pl?viewshelf=4 without the sort parameter (defaults
to 'title').
If you go back to lists, choose the list from List name, the param is
correct and the list displays in expected order.
It took quite a time to track that down, I first thought that opac-shelves.pl
was broken.
However, current bug 8323 is not affected, signing off.
Marc
Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
(cherry picked from commit 2b8b926783d4426d4a569fdc717e546d12e88ce5)
Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com>
commit aab7cafbcb6466b90d484ce14f47178c6de822b2
Author: David Cook <dcook at prosentient.com.au>
Date: Fri Jun 29 16:53:14 2012 +1000
Bug 8314 Add MARCISBNs parameter to opac-detail.pl to show multiple isbns in OPAC
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>
Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com>
commit ebcede353db35f838d95af20a3c033e6dc5e2619
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date: Sat Jul 7 11:35:47 2012 +1200
Bug 5327 : Follow up for TTParser test
(cherry picked from commit 0351ea525e36855c896db8a9f4d4f8cc36945896)
Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com>
commit 2eb76ec0477d59edbd0de8f31140aaba3b0dc9a9
Author: Duncan Tyler <duncan at duncan-SoT.wgtn.cat-it.co.nz>
Date: Fri Dec 9 11:29:53 2011 +1300
Bug 5327 : Added coverage to unit test for TTParser
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
Test passes.
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 796127e4b9aed7c1d8cad9c2275e5d3f0bbfa39d)
Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com>
commit d43e8c42d4253b15cf7e4d9fefc1c8bcdd184bcf
Author: Stacey Walker <stacey at catalyst-eu.net>
Date: Mon Jun 11 17:06:00 2012 +0100
bug 5327: added some tests for C4/Items.pm
Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
(cherry picked from commit a44b3652d21895a78fe4e82a41ed2817b4cc6c57)
Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com>
commit e1f804a4a71a325688a87329ab9a4298cf8d38d6
Author: Paul Poulain <paul.poulain at biblibre.com>
Date: Tue Jul 3 18:20:07 2012 +0200
bug 7630 follow-up : welcome #186 Mark Tompsett
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
(cherry picked from commit fc28be8ac385ffefd812e9e2a8945ea6e23e808e)
Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com>
commit 8a2d3c9c6655c05cc153541738a675a5820d033d
Author: Mark Tompsett <mtompset at hotmail.com>
Date: Fri Jun 29 21:54:44 2012 +0800
Bug 7630 - Warning on moremember.pl about param without key Move "$error => 1," to its own conditional $template->param()
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>
Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com>
commit 975c5c898024d605628575648d19a5e06fc1c332
Author: Mark Tompsett <mtompset at hotmail.com>
Date: Sat Jul 21 22:04:23 2012 +0800
Bug 8489: Revise Ubuntu install files
1) Changed ubuntu-pkg-check.sh to use lsb_release to determine version
of ubuntu.{version}.packages file. If a versioned file does not
exist, the user is warned, and ubuntu.packages is used. Told the
user which file is being used. Caught apt-cache policy errors nicely.
NOTE: ubuntu.packages MUST BE A COPY OF THE
LATEST ubuntu.{version}.packages FILE!
2) Moved: ubuntu.packages -> ubuntu.10.04.packages
ubuntu_maverick.packages -> ubuntu.10.10.packages
ubuntu.precise.packages -> ubuntu.12.04 packages
(last file created new, but effectively supersedes bug 8488)
3) Tweaked ubuntu.12.04.packages:
* changed yaz3 references to yaz4
* dropped libmysqlclient16-dev
* changed libmysqlclient16 to libmysqlclient18
4) Copied the ubuntu.12.04.packages file to ubuntu.packages
Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com>
-----------------------------------------------------------------------
Summary of changes:
C4/Creators.pm | 4 +-
C4/Creators/Profile.pm | 2 +-
C4/Creators/Template.pm | 4 +-
C4/ILSDI/Services.pm | 8 +-
C4/Installer.pm | 2 +-
C4/Installer/PerlDependencies.pm | 12 +-
C4/Labels.pm | 10 +-
C4/Patroncards.pm | 12 +-
C4/Patroncards/Patroncard.pm | 6 +-
C4/Search.pm | 2 +-
C4/VirtualShelves/Page.pm | 2 +-
acqui/basketgroup.pl | 2 +-
acqui/pdfformat/layout2pages.pm | 2 +-
acqui/pdfformat/layout3pages.pm | 2 +-
cataloguing/additem.pl | 17 +-
debian/control | 1 +
debian/list-deps | 14 +-
docs/history.txt | 24 ++-
install_misc/ubuntu-pkg-check.sh | 24 ++-
.../{ubuntu.packages => ubuntu.10.04.packages} | 0
...ntu_maverick.packages => ubuntu.10.10.packages} | 0
.../{ubuntu.packages => ubuntu.12.04.packages} | 16 +-
install_misc/ubuntu.packages | 16 +-
installer/data/mysql/sysprefs.sql | 2 +-
.../intranet-tmpl/prog/en/css/staff-global.css | 5 +
koha-tmpl/intranet-tmpl/prog/en/modules/about.tt | 13 +-
.../prog/en/modules/cataloguing/linkitem.tt | 2 +-
.../prog/en/modules/cataloguing/moveitem.tt | 2 +-
.../prog/en/modules/circ/circulation.tt | 2 +-
.../prog/en/modules/tools/manage-marc-import.tt | 2 +-
.../intranet-tmpl/prog/en/xslt/MARC21slimUtils.xsl | 1 -
.../prog/img/famfamfam/PR.png} | Bin 385 -> 385 bytes
.../opac-tmpl/prog/en/modules/opac-topissues.tt | 2 +-
.../opac-tmpl/prog/en/xslt/MARC21slimUtils.xsl | 1 -
.../prog/en/xslt/UNIMARCslim2OPACDetail.xsl | 4 +-
labels/label-create-csv.pl | 4 +-
labels/label-create-pdf.pl | 5 +-
labels/label-create-xml.pl | 4 +-
labels/label-edit-batch.pl | 4 +-
labels/label-edit-layout.pl | 4 +-
labels/label-edit-profile.pl | 4 +-
labels/label-edit-template.pl | 4 +-
labels/label-manage.pl | 4 +-
labels/label-print.pl | 4 +-
members/moremember.pl | 2 +-
misc/cronjobs/check-url.pl | 2 +-
misc/migration_tools/build6xx.pl | 246 --------------------
misc/translator/text-extract2.pl | 8 +-
opac/opac-detail.pl | 3 +-
opac/opac-sendbasket.pl | 1 -
opac/sco/sco-main.pl | 5 +-
patroncards/card-print.pl | 4 +-
patroncards/create-pdf.pl | 4 +-
patroncards/edit-batch.pl | 4 +-
patroncards/edit-layout.pl | 4 +-
patroncards/edit-profile.pl | 4 +-
patroncards/edit-template.pl | 4 +-
patroncards/image-manage.pl | 4 +-
patroncards/manage.pl | 6 +-
patroncards/print.pl | 4 +-
t/Items.t | 14 --
t/db_dependent/00-strict.t | 24 ++
t/db_dependent/Items.t | 54 +++++
tags/review.pl | 2 +-
tools/manage-marc-import.pl | 2 +-
xt/author/test_template.pl | 58 -----
xt/tt_valid.t | 7 +-
67 files changed, 276 insertions(+), 445 deletions(-)
copy install_misc/{ubuntu.packages => ubuntu.10.04.packages} (100%)
rename install_misc/{ubuntu_maverick.packages => ubuntu.10.10.packages} (100%)
copy install_misc/{ubuntu.packages => ubuntu.12.04.packages} (91%)
copy koha-tmpl/{opac-tmpl/prog/famfamfam/silk/music.png => intranet-tmpl/prog/img/famfamfam/PR.png} (100%)
delete mode 100755 misc/migration_tools/build6xx.pl
delete mode 100755 t/Items.t
create mode 100644 t/db_dependent/00-strict.t
create mode 100755 t/db_dependent/Items.t
delete mode 100755 xt/author/test_template.pl
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list