[koha-commits] main Koha release repository branch, 3.2.x, updated. v3.02.03-168-ga4d4814
Git repo owner
gitmaster at git.koha-community.org
Tue Apr 5 02:07:19 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 a4d48140b6e10a4a66fcf1630eb2969af95104b1 (commit)
via 6fa25c5bac6e71c3eae6e1a104806ef59494a2e9 (commit)
via 9cdcf01c30fb5490d60e73c4ef343cb71ff7d38f (commit)
via 6c0c0b37cbe4138080207a89a3f66714c2727887 (commit)
via 7c88c7e0f9331a38b0cb173acc783854f2bc4af5 (commit)
via 81fceb0a4aa05c1b8929c7b90d606b0044ea15c8 (commit)
via fcebee99da1a2b09bb04778562bdc395b73b0655 (commit)
via 59cf6186358151965fb3efde6e2baa9b0ff9292b (commit)
via 5cea7643c9e2f8ad578a71d09c0dc88060e91ed2 (commit)
via c1f5171cf7361075c2ea7161fd867e711a5320d5 (commit)
via 77362597e423d9749a1e69ebf18278cbfd34401a (commit)
via 9a3ae7342af425bcaa2c9937afa33e1c1015637a (commit)
from e19534c63801039c3a8fc1e892b72aa05b281ea9 (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 a4d48140b6e10a4a66fcf1630eb2969af95104b1
Author: Paul POULAIN <paul.poulain at biblibre.com>
Date: Sat Mar 26 18:24:19 2011 -0400
Bug 3629 : search limit by group is not OK
MT4491 : limitation by library group
- the group list was not displayed in OPAC (even if everything else was here
- the group limit was not working due to a missing ()
author=jean et group=droit" resulted in:
author=jean and branch=b1 or branch=b2 or branch=b3
that is wrong (executed from left to right)
the fix add () to have :
author=jean and (branch=b1 or branch=b2 or branch=b3)
that is OK
Signed-off-by: Nicole C. Engard <nengard at bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
(cherry picked from commit 091d3100169a12e9498f6d58c8b61ac01a5a5db6)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit 6fa25c5bac6e71c3eae6e1a104806ef59494a2e9
Author: Jared Camins-Esakov <jcamins at bywatersolutions.com>
Date: Mon Mar 28 21:16:02 2011 -0400
Bug 5253: Add options to runreport.pl
This makes sending reports via e-mail with runreport.pl work properly. It also
adds a --format option to allow the user to select between text, html, csv, and
tsv. At the moment text is not implemented, and falls back to tsv, but that is
still more readable than the HTML that used to be produced.
Signed-off-by: Ian Walls <ian.walls at bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
(cherry picked from commit 412966eff0016c69e5763197f1542e88c74580a1)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit 9cdcf01c30fb5490d60e73c4ef343cb71ff7d38f
Author: Owen Leonard <oleonard at myacpl.org>
Date: Sat Mar 26 11:08:43 2011 -0400
Fix for Bug 5833, opacstylesheet not loading on all pages
Signed-off-by: Nicole C. Engard <nengard at bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
(cherry picked from commit b5a050d759b08027b210106e90d5714eb02b9032)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit 6c0c0b37cbe4138080207a89a3f66714c2727887
Author: Magnus Enger <magnus at enger.priv.no>
Date: Mon Mar 28 11:42:57 2011 -0400
Bug 4265: Fix padding of short callnumbers and Bib-1 attribute for sorting
1. The current C4::ClassSortRoutine::Dewey turns "306 Les" into "306_Les" for items.cn_sort and MARC-field 952$6, which results in "306.46 Les" being sorted before "306 Les" in the OPAC. With this patch, "306 Les" is turned into "306_000000000000000_Les".
2. Currently, call_number_asc and call_number_desc are set up to sort by 1=20, but this is mapped to Local-classification in ccl.properties, which is mapped to 952$o in record.abs.
This patch changes these sorts to use 1=8007, which is mapped to cn-sort and 952$6.
Signed-off-by: Jared Camins-Esakov <jcamins at bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
(cherry picked from commit aef8358cf2ce8db9803d94c14f6728cdf9ebd0d4)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit 7c88c7e0f9331a38b0cb173acc783854f2bc4af5
Author: Jared CAMINS-ESAKOV <camins at numismatics.org>
Date: Sat Mar 26 06:04:39 2011 -0400
Bug 4366: Improve COinS support for MARC21
This patch begins the process of improving the COinS support in Koha to take
advantage of all the metadata available in the MARC format. COinS still doesn't
work quite right, but at least it seems to be following the standard now. The
COinS exported by C4::Biblio::GetCOinSBiblio now correctly identifies articles
from journals and books as such.
Signed-off-by: Jared Camins-Esakov <jcamins at bywatersolutions.com>
Signed-off-by: Nicole C. Engard <nengard at bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
(cherry picked from commit 8958f152e7273d3b1fc45a6f7494ab6066aab55e)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit 81fceb0a4aa05c1b8929c7b90d606b0044ea15c8
Author: Jared Camins-Esakov <jcamins at bywatersolutions.com>
Date: Sat Mar 26 05:58:54 2011 -0400
Bug 3326: Staff results still displayed &
In certain circumstances, ampersands would not be displayed properly in the
Staff client search results. This patch fixes that by ensuring that all the
doubled ampersands that Zebra inserts in XML indexing mode are replaced by the
correct single ampersand entity.
Signed-off-by: Nicole C. Engard <nengard at bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
(cherry picked from commit fa7ca5c8b8b5fdf27fae63fd0ada7fe539651bc2)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit fcebee99da1a2b09bb04778562bdc395b73b0655
Author: Jared Camins-Esakov <jcamins at bywatersolutions.com>
Date: Sat Mar 26 11:03:31 2011 -0400
Bug 5817: Follow-up fixing callnum: on staff results
This patch changes the call number links on the staff results page so that
searching will work. The underlying problem described by bug 5274 remains an
issue, but this fixes some of the more problematic symptoms.
Signed-off-by: Jared Camins-Esakov <jcamins at bywatersolutions.com>
Signed-off-by: Nicole C. Engard <nengard at bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
(cherry picked from commit b853b79001ceefc897eac781a6ebf28e7cc29c85)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit 59cf6186358151965fb3efde6e2baa9b0ff9292b
Author: Ian Walls <ian.walls at bywatersolutions.com>
Date: Sun Mar 27 13:05:48 2011 -0400
Bug 3203: ACCTDETAIL notices don't parse branches or borrowers tokens
This patch enables the ACCTDETAIL notices (and any branch-specific derivatives) to use
<<branches.*>> and <<borrowers.*>> tokens
This patch also attempts to send the email from the branch email first, falling back to
KohaAdminEmailAddress if no branch email exists.
To test:
1. Enable AutoEmailOpacUser system preference
2. Add <<branches.*>> tokens to the ACCTDETAIL notice
3. Create a new patron, including:
a. test email address in the field matching your AutoEmailPrimaryAddress syspref value
b. username and password (required to send a notice)
c. any other required fields to save the record
4. Check you inbox. Notice should send instantly (no need to run process_message_queue.pl)
Signed-off-by: Jared Camins-Esakov <jcamins at bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
(cherry picked from commit 1d6f791541686dfa409843f8f5b1624f1be6e8cb)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit 5cea7643c9e2f8ad578a71d09c0dc88060e91ed2
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date: Sun Mar 27 21:13:13 2011 -0400
Bug 5960 : Itemtype icons not showing correctly in staff search results
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
(cherry picked from commit 42f316ae480100572e996a7a4de76b9528db3d23)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit c1f5171cf7361075c2ea7161fd867e711a5320d5
Author: Nicole C. Engard <nengard at bywatersolutions.com>
Date: Thu Mar 24 16:27:03 2011 -0400
Bug 5940: Update Patron Help Files
This patch updates the help files in the patron area of Koha.
Signed-off-by: Nicole C. Engard <nengard at bywatersolutions.com>
Signed-off-by: Ian Walls <ian.walls at bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
(cherry picked from commit b8f3120bf5f5e7f2da73c213ed74bb003cf5da25)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit 77362597e423d9749a1e69ebf18278cbfd34401a
Author: Jared Camins-Esakov <jcamins at bywatersolutions.com>
Date: Sun May 22 17:31:47 2011 -0400
Bug 3098 follow-up: Clean up formatting
This patch cleans up the formatting of the 856 display code in
MARC21slim2OPACDetail.xsl. Tabstops are correct, and the OPACURLOpenInNewWindow
syspref check is moved to control the use of a 'target="_blank"' attribute,
rather than having two blocks of almost-identical code.
Signed-off-by: Nicole C. Engard <nengard at bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
(cherry picked from commit 009036b53722881f607ed01b5701bd300abd6735)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit 9a3ae7342af425bcaa2c9937afa33e1c1015637a
Author: Frédérick Capovilla <frederick.capovilla at sys-tech.net>
Date: Wed Mar 23 15:19:57 2011 +0100
Bug 5883 : Prevent re-encoding the items if they are already in UTF-8 in ModBiblio.
Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
(cherry picked from commit cce98a2914c85ce1e1c5563b64a986c880024079)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
-----------------------------------------------------------------------
Summary of changes:
C4/Auth.pm | 1 +
C4/Biblio.pm | 120 ++++---
C4/ClassSortRoutine/Dewey.pm | 4 +
C4/Letters.pm | 12 +-
C4/Output.pm | 2 +-
C4/Search.pm | 12 +-
catalogue/search.pl | 2 +-
.../prog/en/modules/catalogue/results.tmpl | 8 +-
.../prog/en/modules/help/members/boraccount.tmpl | 51 +--
.../prog/en/modules/help/members/mancredit.tmpl | 16 +-
.../prog/en/modules/help/members/maninvoice.tmpl | 20 +-
.../prog/en/modules/help/members/member-flags.tmpl | 433 ++++++++++++++++----
.../en/modules/help/members/member-password.tmpl | 13 +-
.../prog/en/modules/help/members/member.tmpl | 3 +-
.../prog/en/modules/help/members/memberentry.tmpl | 242 ++++--------
.../prog/en/modules/help/members/members-home.tmpl | 5 +-
.../prog/en/modules/help/members/messaging.tmpl | 16 +-
.../prog/en/modules/help/members/moremember.tmpl | 99 ++++-
.../prog/en/modules/help/members/notices.tmpl | 7 +
.../prog/en/modules/help/members/pay.tmpl | 27 +-
.../prog/en/modules/help/members/readingrec.tmpl | 14 +-
.../opac-tmpl/prog/en/modules/opac-advsearch.tmpl | 10 +-
.../prog/en/xslt/MARC21slim2OPACDetail.xsl | 77 ++---
members/memberentry.pl | 1 +
misc/cronjobs/runreport.pl | 83 +++-
opac/opac-search.pl | 2 +-
26 files changed, 799 insertions(+), 481 deletions(-)
create mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/help/members/notices.tmpl
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list