[koha-commits] main Koha release repository branch 3.6.x updated. v3.06.01-43-g4b4040a
Git repo owner
gitmaster at git.koha-community.org
Tue Dec 6 13:57:49 CET 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.6.x has been updated
via 4b4040ab8518938c555a290ff6cd72e4502119d3 (commit)
via cbcf2cfbd6a7fcbac02e296daf8eec078c42325e (commit)
via a77e3480fc72999881ffad1c9afbb4793098368d (commit)
via 801479f0d761035a7339bb6d49e6783f3e187641 (commit)
via 2249e29e989d3e9329178d619f4afc1ee6c5d487 (commit)
via 6e8ea4df521b5d139fd80da659e3e67c9261fc6f (commit)
via 22ac229bef39736f90daa0a3a181bc5a8ab8da9d (commit)
via f470e266ade7f91042339cfe2fdc62b0297610a6 (commit)
via 352fa2e78cf90694e18146f0ad7a6f394c30dead (commit)
via 410b8b79bffe1c838690b289099ad0cd600e8edb (commit)
via 6da833baf16f940e9780a2a90a523c3f5ee2f41d (commit)
from 5dc48be361fd66db512f8c4caaa022535efa3485 (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 4b4040ab8518938c555a290ff6cd72e4502119d3
Author: Chris Nighswonger <chris.nighswonger at gmail.com>
Date: Tue Dec 6 07:57:05 2011 -0500
Release Notes for 3.06.02.000 06 Dec 2011 12:57:05 Z
commit cbcf2cfbd6a7fcbac02e296daf8eec078c42325e
Author: Srdjan Jankovic <srdjan at catalyst.net.nz>
Date: Fri Dec 2 13:26:50 2011 +1300
bug_5211: LostItem() - added charge_fee param to control fee charging
Pass charge_fee = yes wherever is LostItem() called, which effectively
means tha there's no change.
Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
(cherry picked from commit 1713133fddbd5ee8f722061ef8e1a9b836db1fa0)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit a77e3480fc72999881ffad1c9afbb4793098368d
Author: Martin Renvoize <martin at dev1.vm.bytemark.co.uk>
Date: Fri Oct 28 15:30:39 2011 +0100
Bug7108: Intranet Language Menu Display Patch
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
(cherry picked from commit 5a86cb4ed97e8a4b29feddb1caafb7e111b0c67d)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit 801479f0d761035a7339bb6d49e6783f3e187641
Author: Frédérick Capovilla <frederick.capovilla at libeo.com>
Date: Wed Nov 2 10:56:33 2011 -0400
Fix a problem when translations contain various XSL files
With new 3.6.1 translation files, the lake of 'nbsp' entity definition make
fail t/00-valid-xml.t test.
This patch applies to HEAD and 3.6.x.
How to test:
- checkout 3.6.x branch
- generate French templates:
cd misc/translator
./translate install fr-FR
cd ../..
- run test:
prove -v t/00-valid-xml.t
you get failing error message
- apply this patch
- run test again: it passes
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
http://bugs.koha-community.org/show_bug.cgi?id=7141
(cherry picked from commit 7534c34cdb272987122ef106e9d4523f10ff178e)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit 2249e29e989d3e9329178d619f4afc1ee6c5d487
Author: Ian Walls <ian.walls at bywatersolutions.com>
Date: Sun Dec 4 12:31:22 2011 -0500
Bug 2616: Remove unnecessary 'use HTML::Template' calls
Removes deprecated calls to HTML::Template or HTML::Template::Pro from:
C4/Output.pm
catalogue/export.pl
reports/issues_by_borrower_category.plugin
reports/itemtypes.plugin
Only remaining calls are in misc/cronjobs/rss/rss.pl, misc/cronjobs/smsoverdues.pl,
and t/test_template.pl. These scripts still legitimately depend on H:T:P
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
(cherry picked from commit c70ff88205d9951858c0dc9bb7c581e82dee50e9)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit 6e8ea4df521b5d139fd80da659e3e67c9261fc6f
Author: Henri-Damien LAURENT <henridamien.laurent at biblibre.com>
Date: Thu Mar 3 12:02:38 2011 +0100
Bug 6132: preference were case sensitive.
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
(cherry picked from commit 7655eaedc124d52ca1f4d17855dc3753abf0802c)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit 22ac229bef39736f90daa0a3a181bc5a8ab8da9d
Author: Owen Leonard <oleonard at myacpl.org>
Date: Mon Oct 31 11:01:35 2011 -0400
Fix for Bug 7120 - After deleting order from order receive page redirect fails
The order modification script doesn't retrieve an order's basket
when doing a delete, so the template must explicitly pass
the basket number if we want the redirect to work.
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
(cherry picked from commit dc249205a26426cba0751dcc544996fefa3ede71)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit f470e266ade7f91042339cfe2fdc62b0297610a6
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Sun Dec 4 17:29:05 2011 +0100
Bug 6786: Follow up fixing index names with hyphens
Adds hyphen to regex looking for index names in buildQuery.
Test by searching on Control-number=...
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
(cherry picked from commit 32d8abbb43729aedfe20d30a9acc21d4f7268ec9)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit 352fa2e78cf90694e18146f0ad7a6f394c30dead
Author: Owen Leonard <oleonard at myacpl.org>
Date: Wed Nov 2 10:08:25 2011 -0400
Fix for Bug 7137 - fixed width table where it should be variable
Removing inline style setting the table width.
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
(cherry picked from commit 5a6c8b367544c2608255bdb7add08c3a2eec7ae6)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit 410b8b79bffe1c838690b289099ad0cd600e8edb
Author: Liz Rea <lrea at nekls.org>
Date: Mon Oct 31 16:16:34 2011 -0500
Bug 7122 - Add a div to opac-messaging.tt to facilitate consistent styling across OPAC user pages.
To test:
verify that the div <div class="yui-g" id="usermessaging"> appears and can be styled via opacusercss.
Signed-off-by: Arslan Farooq <arslanone at gmail.com>
Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
(cherry picked from commit e0cba61e316ad13001052421d1f3a5c6844fbe03)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit 6da833baf16f940e9780a2a90a523c3f5ee2f41d
Author: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Date: Thu Oct 27 17:58:28 2011 +0100
Bug 7108 - OPAC Translations Display Patch
If multiple similar languages (i.e: fr-FR, fr-CS or en, en-GB) are installed
and the opaclanguagesdisplay preference is set to allow patrons to choose a
language then at each occurrence of a language with multiple options the
display is the selector splits across multiple lines breaking the display.
http://bugs.koha-community.org/show_bug.cgi?id=7108
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
(cherry picked from commit ccc182f260249e4de485e338abcbe9bc95ca98c8)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
-----------------------------------------------------------------------
Summary of changes:
C4/Circulation.pm | 5 ++-
C4/Context.pm | 2 +-
C4/Output.pm | 1 -
C4/Search.pm | 2 +-
catalogue/export.pl | 1 -
catalogue/updateitem.pl | 2 +-
.../intranet-tmpl/prog/en/css/staff-global.css | 6 ++++-
.../prog/en/includes/intranet-bottom.inc | 2 +
.../intranet-tmpl/prog/en/modules/acqui/parcel.tt | 10 ++++----
.../prog/en/modules/serials/serials-collection.tt | 2 +-
.../intranet-tmpl/prog/en/xslt/MARC21slim2ATOM.xsl | 3 ++
.../intranet-tmpl/prog/en/xslt/MARC21slim2DC.xsl | 1 +
.../intranet-tmpl/prog/en/xslt/MARC21slim2MODS.xsl | 1 +
.../prog/en/xslt/MARC21slim2MODS3-1.xsl | 3 +-
.../prog/en/xslt/MARC21slim2MODS3.xsl | 1 +
.../prog/en/xslt/MARC21slim2MODS32.xsl | 1 +
.../prog/en/xslt/MARC21slim2OAIDC.xsl | 5 +++-
.../prog/en/xslt/MARC21slim2RDFDC.xsl | 3 +-
.../prog/en/xslt/MARC21slim2RDFDC.xsl.1 | 5 +++-
.../intranet-tmpl/prog/en/xslt/MARC21slim2RSS2.xsl | 3 ++
.../prog/en/xslt/MARC21slim2SRWDC.xsl | 5 +++-
.../prog/en/xslt/MARC21slim2intranetDetail.xsl | 3 ++
.../prog/en/xslt/MARC21slim9522852.xsl | 1 +
.../intranet-tmpl/prog/en/xslt/MARC21slimUtils.xsl | 1 +
.../prog/en/xslt/MARC21slimUtils2.xsl | 3 +-
.../prog/en/xslt/NORMARCslim2OAIDC.xsl | 5 +++-
.../intranet-tmpl/prog/en/xslt/UNIMARC_compact.xsl | 4 ++-
.../prog/en/xslt/UNIMARCslim2OAIDC.xsl | 3 ++
koha-tmpl/intranet-tmpl/prog/en/xslt/compact.xsl | 2 +
koha-tmpl/intranet-tmpl/prog/en/xslt/identity.xsl | 1 +
.../prog/en/xslt/oilsMARC21slim2HTML.xsl | 1 +
koha-tmpl/opac-tmpl/prog/en/css/opac.css | 4 +++
.../opac-tmpl/prog/en/includes/opac-bottom.inc | 8 ++++--
.../opac-tmpl/prog/en/modules/opac-messaging.tt | 3 +-
.../prog/en/xslt/MARC21slim2OPACMARCdetail.xsl | 3 +-
.../opac-tmpl/prog/en/xslt/MARC21slimUtils.xsl | 1 +
.../prog/en/xslt/NORMARCslim2OPACDetail.xsl | 3 ++
.../prog/en/xslt/NORMARCslim2OPACResults.xsl | 3 ++
.../opac-tmpl/prog/en/xslt/NORMARCslimUtils.xsl | 1 +
koha-tmpl/opac-tmpl/prog/en/xslt/compact.xsl | 4 ++-
misc/cronjobs/longoverdue.pl | 2 +-
misc/release_notes/release_notes_3_6_2.txt | 21 ++++++++++++++-----
reports/issues_by_borrower_category.plugin | 1 -
reports/itemtypes.plugin | 1 -
tools/batchMod.pl | 2 +-
45 files changed, 107 insertions(+), 38 deletions(-)
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list