[koha-commits] main Koha release repository branch, 3.4.x, updated. v3.04.01-33-g7641f9f
Git repo owner
gitmaster at git.koha-community.org
Mon May 30 05:28:28 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.4.x has been updated
via 7641f9f3fbe17dd160bcb63e517ad9b4bf74aecd (commit)
via 49f8c29c7c74a71ebcc678b9c24565f8af7a9376 (commit)
via 66a3e96608aa3d8838e5b937413c6d17f798f95d (commit)
via 4b6283b38ecbc3a7f38e5f5bd0f2ce3183754457 (commit)
via f0d97c1e44f7d197f9eb7d3e955ccce37457c812 (commit)
via b9338020d1a86216f789716bda35936370c6e87a (commit)
via 5da7fb70210922b7e20284954974b311fd1f104a (commit)
via 4d5460ec854fe46530deddb6ca2cc8cb72e9b14f (commit)
via f219d17d59a93d3dc605f1d5f5e002868c0f023a (commit)
via 84470b4a027f67d11d9f2d2ab1a38c21a8a1b2cc (commit)
via a3288f06d7fea1ace36ba180bd248cb6d31a465f (commit)
via 047b817897dd2a216b79c62d72af5e0a254ca98e (commit)
via 5a81cbdcb38657f2ac2d68fea6ce82579b365543 (commit)
via e0fa183cf386fd1f230779d87b3a834373428eca (commit)
via b718496ab0f4d432c9b0c2d4b7079cbb07e32e52 (commit)
via d90e1b0a38144c1b7a31e9d8939e96d0146f0aac (commit)
via 0d6196fb96b5d4db29c3194221a3bd31f1a03a2c (commit)
via 5b3ed73573fc3a0c36c2ca9cb54071893c0218da (commit)
via 58a61bb11d8dcb7e5215b1d7607d715b3129d707 (commit)
via 532fb07cf757d37a2e040929d9300b65e880a1d1 (commit)
via c7191ea62a8e4dc4d715bea4e2b629f3397d65bc (commit)
via 7f87543b414c322dc0918901c4fa7e9a17d8b14a (commit)
via ae8a469999596a816f3de59c3328343fc247c1c7 (commit)
via 3aa7904582b23a90531773166f831ed58286a376 (commit)
via 5875c919c4bd7b37972db1623fb0ba81589d54a3 (commit)
via 89fcf44257619283a25a56da7f788c45f2ac2bea (commit)
via c28ef702db025b70657c83d8db8aff4016a4febb (commit)
via 3836d118034de560c526ea0931e677991d3dfa44 (commit)
via c3c1a04dc8d2e7976a6c91b9a4d7bf662a06dd8d (commit)
via 3acb23f9c00ad9bf25eea1fb0e6491bd74ab4102 (commit)
via 15d9caf0e2bb0fda3ef8e4b5387cb596f5d98d49 (commit)
via 4ccf43c7d6d5fe54d083b9efe0f8de49f996730d (commit)
via 2d7fae94cab8f45df4740a81eb808407700e7bd9 (commit)
from 03e6e5cb033edceaffef0dd693300df8fa9fb0f6 (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 7641f9f3fbe17dd160bcb63e517ad9b4bf74aecd
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date: Sun May 29 22:52:59 2011 +1200
Updating about page
(cherry picked from commit 44b52a4c870684bcbf58bf0b87302c6b5227cfbd)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit 49f8c29c7c74a71ebcc678b9c24565f8af7a9376
Author: Owen Leonard <oleonard at myacpl.org>
Date: Wed May 11 10:51:01 2011 -0400
Fix for Bug 6338 - Datepickers on OPAC hold form does not work
Signed-off-by: Nicole C. Engard <nengard at bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
(cherry picked from commit 98ff8672e8b10a8835fe6ec37c4a161902a52ffb)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit 66a3e96608aa3d8838e5b937413c6d17f798f95d
Author: Owen Leonard <oleonard at myacpl.org>
Date: Fri May 20 15:38:51 2011 -0400
Fix for Bug 6306 - It is not possible edit news
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 71d9dfda3c75a53485abbb1eec95e4e9720a1f53)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit 4b6283b38ecbc3a7f38e5f5bd0f2ce3183754457
Author: Katrin Fischer <Katrin.Fischer.83 at web.de>
Date: Fri May 27 07:46:06 2011 +0200
Bug 6415: Can't make patron card batch
TT corrections from bug 6343 for label creator were also needed for patron card creator.
- Manage Batch and New Batch were missing the branch info
- Add link on patron search was missing batch id parameter
To test:
- Check branch is correctly shown on pages 'Manage Batch' and 'New Batch'
- Check you can create a new batch and add names to it by using the 'Add'
right to the patron's name
Signed-off-by: Magnus Enger <magnus at enger.priv.no>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
(cherry picked from commit 8a3160c870d17c4a4efa7d91afa018afc5b4f442)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit f0d97c1e44f7d197f9eb7d3e955ccce37457c812
Author: Owen Leonard <oleonard at myacpl.org>
Date: Wed May 25 12:55:22 2011 -0400
Fix for Bug 6408 - column alignment off on the patron categories admin
Signed-off-by: Nicole C. Engard <nengard at bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
(cherry picked from commit f7d0939942268e736f5d7939417ba3d6532f2f79)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit b9338020d1a86216f789716bda35936370c6e87a
Author: Janusz Kaczmarek <januszop at gmail.com>
Date: Wed May 18 18:19:28 2011 +0200
Bug 6365: Missing information about tab number when mandatory fields unfilled
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 52ebf8f3f0dde98386cf5a12917c19e6d236a465)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit 5da7fb70210922b7e20284954974b311fd1f104a
Author: Owen Leonard <oleonard at myacpl.org>
Date: Wed May 18 11:01:20 2011 -0400
Fix for Bug 6364 - Display of item availability broken on OPAC detail screen
Owen:
The markup for showing item availability has been moved to an include
file. The include lacked the scope declaration for the item results
loop. Adding the scope declaration to the include file means it can't
be used by other template unless within the same scope, but I'm not
aware of a better way to do it given the number of variables in use.
Frédéric:
I confirm the bug.
I propose a alternative solution which solve the bug and keep its
versability-reusability to the include file. With this solution, when including
item-status.inc, the foreach loop variable name, which can change from template
to template, is renamed by using a local variable definition: ie a variable
name specified after file name in the INCLUDE directive, this variable
temporalily masking any existing variable.
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
(cherry picked from commit 559091c5589887adc774e2f217c64de390270d4e)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit 4d5460ec854fe46530deddb6ca2cc8cb72e9b14f
Author: Chris Cormack <chris at bigballofwax.co.nz>
Date: Tue May 17 09:23:52 2011 +1200
Bug 6347 - Fix for itemlevel holds in OPAC
Edits by Owen:
- More variable scope corrections
- Minor markup and style tweak
- Table column span correction
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
- Item level holds can be placed and hold saved
- Table and layout are ok now
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
(cherry picked from commit 481ffe7474fa9d0a972dd4be70ac2cad62e315a6)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit f219d17d59a93d3dc605f1d5f5e002868c0f023a
Author: Owen Leonard <oleonard at myacpl.org>
Date: Wed May 11 10:56:39 2011 -0400
Fix for Bug 6300 - can't get to other pages of marc import
T:T variable scope error.
Signed-off-by: Nicole C. Engard <nengard at bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
(cherry picked from commit 31fbe0d70dff7ed4e04a4b84462c6c833090ead2)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit 84470b4a027f67d11d9f2d2ab1a38c21a8a1b2cc
Author: Owen Leonard <oleonard at myacpl.org>
Date: Mon May 16 15:42:12 2011 -0400
Follow-up fix for Bug 6170 'More options' in advanced search broken
Simplifying markup in the staff client advanced search:
- Moving IDs to fieldsets and removing redundant divs
- Removing unused section
- Adding missing IDs and fieldsets
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 c97868ef6338d2dd41f9d75618c9d4ff9a0db8cd)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit a3288f06d7fea1ace36ba180bd248cb6d31a465f
Author: Owen Leonard <oleonard at myacpl.org>
Date: Wed May 25 12:52:23 2011 -0400
Fix for Bug 6417 - Template variable errors in Guided Reports
Looks like the T:T conversion script missed these instances
of TMPL markup because they had line breaks:
<!-- TMPL_VAR
NAME="name" -->
Signed-off-by: Nicole C. Engard <nengard at bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
(cherry picked from commit d19998413a7a67798626400466e8adaee167a579)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit 047b817897dd2a216b79c62d72af5e0a254ca98e
Author: Owen Leonard <oleonard at myacpl.org>
Date: Fri May 13 11:11:46 2011 -0400
Fix for Bug 6332, Hold forms missing 'clear date' link
Signed-off-by: Ian Walls <ian.walls at bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
(cherry picked from commit 3e69eb7cddeeb31c4c72cc4a0e994e17c691fc0b)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit 5a81cbdcb38657f2ac2d68fea6ce82579b365543
Author: Owen Leonard <oleonard at myacpl.org>
Date: Tue May 24 13:00:29 2011 -0400
Fix for Bug 5020 - on patron record sex should be gender
Signed-off-by: Ian Walls <ian.walls at bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
(cherry picked from commit f1ecfc7669f085c7577100db2902ac0de34b827e)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit e0fa183cf386fd1f230779d87b3a834373428eca
Author: Owen Leonard <oleonard at myacpl.org>
Date: Fri May 20 10:48:13 2011 -0400
Fix for Bug 6378 - Misaligned columns on tags approval page
T:T variable scope correction.
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 fa7d6a0435f5ef2e6b8f50a61b95d4bfc22c8bef)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit b718496ab0f4d432c9b0c2d4b7079cbb07e32e52
Author: Fridolyn SOMERS <fridolyn.somers at progilone.fr>
Date: Wed Apr 6 16:04:55 2011 +0200
BUG6091 Remove undeclared syspref OPACAdvSearchInputCount
Signed-off-by: Ian Walls <ian.walls at bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
(cherry picked from commit a8f5bf93f962ae21c2bddf32832a511d9e778e12)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit d90e1b0a38144c1b7a31e9d8939e96d0146f0aac
Author: Tomas Cohen Arazi <tomascohen at gmail.com>
Date: Wed Mar 30 11:38:42 2011 -0300
Add entries so Z39.50 public server works
I added a comment on the file so the user uncomments the appropriate koha-conf.xml sections.
To+
Signed-off-by: Magnus Enger <magnus at enger.priv.no>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
(cherry picked from commit b4b445818f46e59cf62f968f219963c132832c2b)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit 0d6196fb96b5d4db29c3194221a3bd31f1a03a2c
Author: Frédéric Demians <f.demians at tamil.fr>
Date: Sun May 15 07:23:03 2011 +0200
Bug 6342 Help link doesn't popup anymore contextual help page
Fix help.pl script to deal with Template Toolkit.
Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
Signed-off-by: Ian Walls <ian.walls at bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
(cherry picked from commit becc07cb7b944f66d7f7df92dfc69317e8127d1e)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit 5b3ed73573fc3a0c36c2ca9cb54071893c0218da
Author: Owen Leonard <oleonard at myacpl.org>
Date: Fri May 20 15:22:11 2011 -0400
Fix for Bug 6370 - news showing that it's for the opac when it's for the librarian interface
T:T variable scope error.
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
Signed-off-by: Ian Walls <ian.walls at bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
(cherry picked from commit 28eca1ec926e2971cf20d1ce18dafe6896fb7db8)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit 58a61bb11d8dcb7e5215b1d7607d715b3129d707
Author: D Ruth Bavousett <ruth at bywatersolutions.com>
Date: Tue May 17 11:45:48 2011 -0400
Bug 6351: Unable to delete branch-specific circulation rule
The URL on the page did not have a branchcode, so the delete failed silently, and
returned the user to the "All" rules page. Turns out, the array for the rules was
not being populated with the branchcode!
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
Signed-off-by: Ian Walls <ian.walls at bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
(cherry picked from commit eba64bf25d8da0f091ce0b5d8329385638fb1fe1)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit 532fb07cf757d37a2e040929d9300b65e880a1d1
Author: Katrin Fischer <Katrin.Fischer.83 at web.de>
Date: Sat May 14 12:36:25 2011 +0200
Bug 6340: Pagination bar on guided reports result page broken
The pagination on the guided reports page was not showing up.
TT problem.
To test:
Add a sql report with more than 20 results.
Example: select * from borrowers
Without the patch, only the first 20 results will show and no pagination bar.
Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
Signed-off-by: Ian Walls <ian.walls at bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
(cherry picked from commit ad6ec128e7cb012bd0e4afa8ac168b0c6b08d5db)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit c7191ea62a8e4dc4d715bea4e2b629f3397d65bc
Author: Liz Rea <lrea at nekls.org>
Date: Fri May 20 14:41:20 2011 -0500
Bug 6258 - Guided reports wizard 'Build new' brings up empty page
Patch fixes a TT error that caused Build New to be empty.
To test:
Click More -> Reports, you should see the welcome page and be able to step through creating the report.
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
(cherry picked from commit 14364d9866dd65abb737a59e49f297328edde83d)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit 7f87543b414c322dc0918901c4fa7e9a17d8b14a
Author: Owen Leonard <oleonard at myacpl.org>
Date: Tue May 17 11:07:03 2011 -0400
Fix for Bug 3140 - It is possible to email someone else's private list
Adding check for ShelfPossibleAction("view") to make sure the logged
in user has permission to view the selected list when downloading
or emailing a list.
Signed-off-by: Paul Poulain <paul.poulain at biblibre.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 b65f6d0a99dc13e73aed5058a44a72895c829b32)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit ae8a469999596a816f3de59c3328343fc247c1c7
Author: Owen Leonard <oleonard at myacpl.org>
Date: Tue May 24 15:15:18 2011 -0400
Fix for Bug 6395, Cannot create routing list
Some old TMPL tags got left behind.
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 5984520211337750fbae0fe5a5fcba7cb85bf212)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit 3aa7904582b23a90531773166f831ed58286a376
Author: Katrin Fischer <Katrin.Fischer.83 at web.de>
Date: Fri May 20 21:14:56 2011 +0200
Bug 6343: TT issues in label creator
- Manage Batch had no branch set
- New Batch had no branch set
- Add link on item result list was broken, missing the batchid
To test:
Create a new batch and add items one by one. Look at 'Manage batches'.
Check that the branch in the top right corner is always correctly shown and set.
Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
Signed-off-by: Ian Walls <ian.walls at bywatersolutions.com>
(cherry picked from commit f515052d6e2a41f0a84b2999204691a84ebe78e1)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit 5875c919c4bd7b37972db1623fb0ba81589d54a3
Author: Fridolyn SOMERS <fridolyn.somers at progilone.fr>
Date: Mon May 23 09:07:28 2011 -0400
Bug 5658 can't delete subfields in frameworks
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
Signed-off-by: Ian Walls <ian.walls at bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
(cherry picked from commit fafbff9018ecc4030983ca14c4743813e2e95f2b)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit 89fcf44257619283a25a56da7f788c45f2ac2bea
Author: ruth at bywatersolutions.com <ruth at bywatersolutions.com>
Date: Tue May 24 15:57:08 2011 -0400
Bug 6401 fix to the history file
This patch adds Ian Walls' name to the history file, so he can be found.
Signed-off-by: Liz Rea <lrea at nekls.org>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
(cherry picked from commit 59e9137d8339de68f2cc4c7dcc60f4e2d7fbea43)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit c28ef702db025b70657c83d8db8aff4016a4febb
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date: Tue May 17 15:36:01 2011 +1200
Bug 6350 : Updating history docs
http://bugs.koha-community.org/show_bug.cgi?id=6350
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
(cherry picked from commit 37cf503fdf1006e0c0c935e795dfc8cb4af80c9a)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit 3836d118034de560c526ea0931e677991d3dfa44
Author: Owen Leonard <oleonard at myacpl.org>
Date: Wed May 18 14:05:47 2011 -0400
Fix for bug 6367 - 'Preview MARC' hover button does not show correct MARC record
Misplaced line of JavaScript meant that the menu always grabbed
the ID of the last item in the search results.
Signed-off-by: Ian Walls <ian.walls at bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
(cherry picked from commit 3b8c61d5dcd985ea4e2bd80f9f0628f4cb4dd7c0)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit c3c1a04dc8d2e7976a6c91b9a4d7bf662a06dd8d
Author: Frédéric Demians <f.demians at tamil.fr>
Date: Wed May 18 07:23:21 2011 +0200
Improve error message when translation installation fails
For Translator Manager (myself...). A translation installation may fail because
translator hasn't enter properly string parameters (%s). With this patch, the
message ID is displayed not only the parameter.
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
(cherry picked from commit e6b591d95fd40eb68bfa71761010bf85e3116c5b)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit 3acb23f9c00ad9bf25eea1fb0e6491bd74ab4102
Author: Alex Arnaud <alex.arnaud at biblibre.com>
Date: Fri May 13 16:19:09 2011 +0200
Bug #6131 - change index "Author-name-personal" for "Personal-name"
Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
Signed-off-by: Ian Walls <ian.walls at bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
(cherry picked from commit 7006eebd6eb234901e2397f289444b7024d0e16b)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit 15d9caf0e2bb0fda3ef8e4b5387cb596f5d98d49
Author: Ian Walls <ian.walls at bywatersolutions.com>
Date: Tue May 3 11:37:46 2011 -0400
Bug 6294: {BIBLIONUMBER} parsing for SearchForTitleIn
Adds support for parsing of the biblionumber into the SearchForTitleIn system preference, allowing
external sites with APIs (like Facebook or Twitter) to do link-backs to the details page for the
title.
Sample code for implementing Facebook "like" links and Twitter "tweet this" are included on the bug 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 e064aba47e2047df9feeac985573784f6eff5912)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit 4ccf43c7d6d5fe54d083b9efe0f8de49f996730d
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date: Mon May 2 12:39:35 2011 +1200
Bug 6031 : Fix for syntax (bashism crept into a pure sh script)
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
(cherry picked from commit ae70c2f79007e224510d13eb52e6a392c60e25a6)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit 2d7fae94cab8f45df4740a81eb808407700e7bd9
Author: Robin Sheat <robin at catalyst.net.nz>
Date: Thu Dec 16 18:05:43 2010 +1300
Bug 5509 - use an XML parser to get values from config
Using sed and regex was causing issues when LDAP connection details were
added.
See
http://stackoverflow.com/questions/1732348/regex-match-open-tags-except-xhtml-self-contained-tags/1732454#1732454
for more information.
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
(cherry picked from commit dfc1038931618a820942f8cb9456be72648ce0f4)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
-----------------------------------------------------------------------
Summary of changes:
admin/smart-rules.pl | 1 +
catalogue/search.pl | 2 +-
debian/control | 2 +-
debian/control.in | 1 +
debian/scripts/koha-dump | 8 +-
debian/scripts/koha-dump-defaults | 10 +-
debian/scripts/koha-rebuild-zebra | 3 +-
debian/scripts/koha-restore | 2 +-
docs/history.txt | 5 +-
etc/koha-conf.xml | 83 ++++++++++++-
etc/zebradb/marc_defs/unimarc/biblios/record.abs | 8 +-
help.pl | 55 ++-------
.../intranet-tmpl/prog/en/css/staff-global.css | 33 +++++-
koha-tmpl/intranet-tmpl/prog/en/modules/about.tt | 8 +-
.../prog/en/modules/admin/categorie.tt | 2 +-
.../en/modules/admin/marc_subfields_structure.tt | 6 +-
.../prog/en/modules/admin/preferences/opac.pref | 2 +-
.../prog/en/modules/catalogue/advsearch.tt | 132 ++++++--------------
.../prog/en/modules/cataloguing/addbiblio.tt | 2 +-
.../prog/en/modules/cataloguing/z3950_search.tt | 2 +-
.../intranet-tmpl/prog/en/modules/labels/result.tt | 2 +-
.../prog/en/modules/members/moremember-brief.tt | 2 +-
.../prog/en/modules/members/moremember.tt | 4 +-
.../prog/en/modules/patroncards/members-search.tt | 2 +-
.../prog/en/modules/reports/borrowers_stats.tt | 2 +-
.../en/modules/reports/guided_reports_start.tt | 15 +--
.../prog/en/modules/reserve/request.tt | 1 +
.../prog/en/modules/serials/member-search.tt | 3 +-
.../prog/en/modules/serials/routing.tt | 11 +-
.../intranet-tmpl/prog/en/modules/tags/review.tt | 2 +-
.../prog/en/modules/tools/koha-news.tt | 16 ++--
.../prog/en/modules/tools/manage-marc-import.tt | 4 +-
.../opac-tmpl/prog/en/includes/item-status.inc | 36 +++---
koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tt | 2 +-
.../prog/en/modules/opac-downloadshelf.tt | 51 +++++---
.../opac-tmpl/prog/en/modules/opac-reserve.tt | 35 +++---
.../prog/en/modules/opac-sendshelfform.tt | 41 ++++---
.../opac-tmpl/prog/en/modules/opac-userdetails.tt | 2 +-
.../opac-tmpl/prog/en/modules/opac-userupdate.tt | 4 +-
labels/label-edit-batch.pl | 2 +-
labels/label-manage.pl | 2 +-
misc/translator/TmplTokenizer.pm | 2 +-
opac/opac-detail.pl | 1 +
opac/opac-downloadshelf.pl | 85 +++++++------
opac/opac-reserve.pl | 6 +-
opac/opac-search.pl | 2 +-
opac/opac-sendshelf.pl | 9 ++
patroncards/edit-batch.pl | 2 +-
patroncards/manage.pl | 2 +-
reports/guided_reports.pl | 2 +-
tools/koha-news.pl | 2 +-
51 files changed, 385 insertions(+), 334 deletions(-)
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list