[koha-commits] main Koha release repository branch, 3.2.x, updated. v3.02.01-87-g92070b3
Git repo owner
gitmaster at git.koha-community.org
Wed Dec 15 03:51:47 CET 2010
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 92070b30398e8700a2db6db8b44c9a8f740311b7 (commit)
via d19300432fe0f7a940e7b685a343b7e505bbd0d4 (commit)
via 106725c45d7d3838b01e37b9d86f86dd84bfbde0 (commit)
via a9b88549db1974a9ed4b9901b25c9650e28737a2 (commit)
via 93800bf6fd0f78f1bf4be74e110ec11df363f2f5 (commit)
via 335fbe5da7300aefc89b3bec77229cb0f62fae39 (commit)
via 0e088620640f8b20a1b88ce6adb3e7c7888bab3e (commit)
via 54fb32b52139067155873d2d4c5daa0a42609599 (commit)
via a39f706f096a6ed034af0d7e80e1a7adf4ed2670 (commit)
via fb468b5629b5b84d8745c7a94d86d1093be0348a (commit)
via 253ddbc50aa3c8935976483b50f71704fc520d14 (commit)
via d39aef7de1a48a3095f7f1ac20b177b9eb12c531 (commit)
via 0b32d910d777949cf34e66f8c85cca8d3529c7b7 (commit)
via 3c5b2bef897dfa2b9db09782dedde29a21fd5338 (commit)
via 08c2668ee218e162af099de7dffa724624e04ac5 (commit)
via 59814b0cecebb868dbacaf9a9ef6548f27ba0949 (commit)
via 8dab9b47710ddd0705691949bfea2c847185a856 (commit)
via a7ed9401724f8bd0141bd73f27986543f1ef258c (commit)
via 4da3829b0d4bf2eaeccc297ba921b84b2ae951de (commit)
via 2e9910ce678b25626570f4bbd3bba29f40f7006f (commit)
via 86c0f0ee8ca584c4f2f42c44ad094851a74a011e (commit)
via 937752bcf7f2cae5709d995bbc6290d538b8b948 (commit)
via f5f7455c0271123eb364e230bb47a9a297109af3 (commit)
via 825aba2cdba3ec6ff0a734e471f3ac389afc6639 (commit)
via 15f32df3f8b6858f02f8a4def1014f5a674dbb5a (commit)
via 3970e42a725d0bf93ab4f45d51023f1374360126 (commit)
via acdd08a538ec09f97d86e01cc7a799845ba45949 (commit)
from 1ff0bd7a491ccbaf5f136019e0de07bfe3e3230b (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 92070b30398e8700a2db6db8b44c9a8f740311b7
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date: Tue Dec 14 14:20:42 2010 -0500
Fix for 5143, now with IE debug removed
Need to set up keyword to marc mappings for subtitle, parts, numbers for this to work
adds:
- the subtitles into the title link (originally Chris Cormack)
- barcodes for every listed hold
- denoted which items were only item and which could be filled by any item on that bib.
- added id's to every column for ease of jquery suppression of data (example: publication data or patron column could be suppressed)
[EDIT]: Added missing template variable
[EDIT]: Converted table cell IDs to classes. Having multiple identical IDs is invalid.
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
(cherry picked from commit be8f1f33430f35257c0ed5e93fc52ddfc65b7d84)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit d19300432fe0f7a940e7b685a343b7e505bbd0d4
Author: Jane Wagner <jwagner at ptfs.com>
Date: Tue Dec 14 11:39:12 2010 -0500
Bug 3789 Set off shelving location in staff and OPAC title display
Koha puts the shelving location immediately after the library name in the
"Location" column of the title display. If the library name and/or shelving
location is wordy, the two can run together and a user can overlook the
shelving location. I've added a new span class to the staff and OPAC .css
files and applied it to shelving location in both templates. This puts the
shelving location on a separate line and in italics, to make it stand out from
the library name.
[Edit] Re-implemented some changes which wouldn't merge after so long
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
(cherry picked from commit f05bd5984c94fbbf1603317fd9fdd8909959dbb5)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit 106725c45d7d3838b01e37b9d86f86dd84bfbde0
Author: Garry Collum <gcollum at gmail.com>
Date: Tue Dec 14 09:38:19 2010 -0500
Bug 4937: Fixes XHTML in the pagination links of a saved report.
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
(cherry picked from commit 0fc7e5bfdc30ba03ff342f35b27c61f0bd3938d8)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit a9b88549db1974a9ed4b9901b25c9650e28737a2
Author: Nicole Engard <nengard at bywatersolutions.com>
Date: Tue Dec 14 08:57:46 2010 -0500
bug 4977 add missing order links to 'no results found' page
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
(cherry picked from commit 5c8ca5129cef8b8d1042e9b774114463bb4e75bb)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit 93800bf6fd0f78f1bf4be74e110ec11df363f2f5
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date: Wed Dec 15 09:03:11 2010 +1300
Revert "Ergonomy improvement in smart rule management"
This reverts commit fefd158f424939fc473f54a2ffe4ee0e39ffba08.
This was causing quite major errors, read the details at bug 5496
(cherry picked from commit 3705965cd71bc30ed4ba325cde115764fa1afe44)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit 335fbe5da7300aefc89b3bec77229cb0f62fae39
Author: Owen Leonard <oleonard at myacpl.org>
Date: Mon Dec 13 14:26:35 2010 -0500
Alternate fix for Bug 2981, removing onclick redirect
Signed-off-by: Nicole Engard <nengard at bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
(cherry picked from commit c4ea43f3dbe1f8d36086944d95c67a20c9caa894)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit 0e088620640f8b20a1b88ce6adb3e7c7888bab3e
Author: Robin Sheat <robin at catalyst.net.nz>
Date: Mon Jul 19 14:06:32 2010 +1200
bug 5033: Add a reference to xml_sax to the Makefile.PL
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
(cherry picked from commit 9c8f934a2c2c3808a2a5502c839b9cb087231ec5)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit 54fb32b52139067155873d2d4c5daa0a42609599
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date: Tue Dec 14 20:10:59 2010 +1300
Fix for intranet-tmpl had one /TMPL_IF to many
(cherry picked from commit e83beb048201fdc3be9286006173973eb73d6ce0)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit a39f706f096a6ed034af0d7e80e1a7adf4ed2670
Author: Ian Walls <ian.walls at bywatersolutions.com>
Date: Fri Sep 10 12:43:18 2010 -0400
Fixes bug 5125: Default focus on circulation-home page
Fix created by Owen Leonard, related over IRC chat (rather than a patch file).
Signed-off-by: Ian Walls <ian.walls at bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
(cherry picked from commit 34155975fc805059635f520c6cedfe927b9fd7fa)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit fb468b5629b5b84d8745c7a94d86d1093be0348a
Author: Owen Leonard <oleonard at myacpl.org>
Date: Tue Dec 14 07:24:16 2010 +0100
Possible fix for Bug 2307, Calendar widget cannot be translated
This patch copies the calendar's language strings from a stand-
alone javascript file into calendar.inc where they can be
translated along with other strings.
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 21c516601cf1bba2ae22a3448898a2efed159b8a)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit 253ddbc50aa3c8935976483b50f71704fc520d14
Author: Katrin Fischer <Katrin.Fischer.83 at web.de>
Date: Tue Dec 14 06:33:27 2010 +0100
Bug 2965: Allow due date in the past - small template fix
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
(cherry picked from commit 872529cb118874e5604dc8faa23ecbffb2439456)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit d39aef7de1a48a3095f7f1ac20b177b9eb12c531
Author: Robin Sheat <robin at catalyst.net.nz>
Date: Wed Aug 4 15:48:10 2010 +1200
Bug 5084 - hide funds that are part of an inactive budget
Prevents inactive funds from showing in the aquisitions module, they
still show in the administration.
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
(cherry picked from commit 00dd0ae6276e9ea9d744d42b3871a4d35a70a1d7)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit 0b32d910d777949cf34e66f8c85cca8d3529c7b7
Author: Srdjan Jankovic <srdjan at catalyst.net.nz>
Date: Mon Dec 13 22:34:07 2010 +0100
Bug 2965: Allow due date in the past
Raise warning rather than disallowing
Remove due date js validation when checking out
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
Fixed small error in circulation.tmpl
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
(cherry picked from commit 4d1762f5ec451729d74e3fa6282e1726a0a74969)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit 3c5b2bef897dfa2b9db09782dedde29a21fd5338
Author: Owen Leonard <oleonard at myacpl.org>
Date: Mon Dec 13 22:14:11 2010 +0100
Fix for Bug 5000, Uncertain prices misses option to choose display language
- Adding missing footer include for language chooser
- Correcting markup and structure errors
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 21cdd2feb45406728faa395cd457670c4aef2bb3)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit 08c2668ee218e162af099de7dffa724624e04ac5
Author: Colin Campbell <colin.campbell at ptfs-europe.com>
Date: Mon Dec 13 17:05:06 2010 +0000
Variable redeclared in same scope
lexical variable declared twice causing run time warnings
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
(cherry picked from commit 51dc5b060beb4243b364da9b3df81c9454107175)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit 59814b0cecebb868dbacaf9a9ef6548f27ba0949
Author: Nicole Engard <nengard at bywatersolutions.com>
Date: Mon Dec 13 11:13:58 2010 -0500
bug 5255 change 'document type' to 'item type'
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
(cherry picked from commit 40e2b5421a478ec2e9251798b34858eefa2ef114)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit 8dab9b47710ddd0705691949bfea2c847185a856
Author: Nicole Engard <nengard at bywatersolutions.com>
Date: Mon Dec 13 10:27:47 2010 -0500
bug 4252 add authorites permission to menus
Added to more menu and to the main intranet page
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
(cherry picked from commit a6799f95fb0315aa413c56f7d75817bb9d1a481e)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit a7ed9401724f8bd0141bd73f27986543f1ef258c
Author: Colin Campbell <colin.campbell at ptfs-europe.com>
Date: Mon Dec 13 15:31:47 2010 +0000
Bug 2170 Supplementary Fix Wrap link in permissions check
Found an edit item link not subject to edit_items permission check
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
(cherry picked from commit c53c96fa5738ab76285ceaab64952d3b29adf0d1)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit 4da3829b0d4bf2eaeccc297ba921b84b2ae951de
Author: Owen Leonard <oleonard at myacpl.org>
Date: Mon Dec 13 15:30:07 2010 +0000
Updated fix for Bug 2170, Adding 'edititems' user-permission
This patch follows up on the addition of the 'edititems'
permission by adding a check of the new permission to places
in the interface which link to the edit item screen.
The catalogue toolbar had to be extensively re-worked in
order to ensure that the "New" and "Edit" menus would appear
(or not) whether or not edit_catalogue, edit_items, or
create_subscription permissions are on.
Revised for current HEAD
Signed-off-by: Colin Campbell <colin.campbell at ptfs-europe.com>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
(cherry picked from commit bd7cca935b9c77ad0514038cfee6c84d02bd8e7d)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit 2e9910ce678b25626570f4bbd3bba29f40f7006f
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date: Mon Dec 13 11:44:35 2010 +0000
Bug 5484 - Handling bad borrower categories in serial routing lists more gracefully
Signed-off-by: Colin Campbell <colin.campbell at ptfs-europe.com>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
(cherry picked from commit 96330a7b07dc78e627d44c5347fd07e42415ca36)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit 86c0f0ee8ca584c4f2f42c44ad094851a74a011e
Author: Nicole Engard <nengard at bywatersolutions.com>
Date: Tue Aug 17 21:22:56 2010 -0400
bug 5150 change issuing to circ & fine rules
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
(cherry picked from commit 1b36fafe8c21e55367d139ca1823d5e51b3280ba)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit 937752bcf7f2cae5709d995bbc6290d538b8b948
Author: Owen Leonard <oleonard at myacpl.org>
Date: Fri Sep 10 14:37:55 2010 +0200
Fix for Bug 5208, Language chooser missing on Batch item deletion/modification
Signed-off-by: Katrin Fischer <katrin.fischer at bsz-bw.de>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
(cherry picked from commit 2b53b14bacfdd276c3188de2f76ed03201a0cab0)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit f5f7455c0271123eb364e230bb47a9a297109af3
Author: Robin Sheat <robin at catalyst.net.nz>
Date: Thu Sep 16 19:08:57 2010 +1200
Bug 5228 - make rebuild_zebra handle fixing the zebra dirs
If the zebra server directories don't exist, zebra will spit the dummy.
This makes rebuild_zebra.pl smart enough to create them if they're not
there. If that fails, it'll scream loudly so you know zebra isn't
reindexing.
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
(cherry picked from commit 8de1ef7e94b37f343b5a1896b1ab06950ee83530)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit 825aba2cdba3ec6ff0a734e471f3ac389afc6639
Author: Robin Sheat <robin at catalyst.net.nz>
Date: Wed Oct 20 14:28:29 2010 +1300
Bug 5313 - allow creation of libraries with hyphens
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
(cherry picked from commit 4f4c4eceb3e4d6b01a87c4c5dbb65df24fcc0638)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit 15f32df3f8b6858f02f8a4def1014f5a674dbb5a
Author: Owen Leonard <oleonard at myacpl.org>
Date: Wed Nov 24 09:48:24 2010 -0500
Fix for Bug 5416, Template syntax error in moredetails.tmpl
Credit for finding this bug and patching it goes to Fridolyn Somers,
but the patch in Bugzilla didn't apply for me so I duplicated the
changes and reformatted.
--
Owen
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
(cherry picked from commit 554b6ad34056cd3ab166b244c200720c17f2d891)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit 3970e42a725d0bf93ab4f45d51023f1374360126
Author: Frédéric Demians <f.demians at tamil.fr>
Date: Tue Jul 20 14:03:35 2010 +0200
Bug 5041 Allow to delete non-repeatable field
Minus links wasn't displayed as it should in order to allow cataloger to
delete (empty all subfields) a non repeatable subfield.
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
(cherry picked from commit 565b780becd291d29d768e4851d3935b3cb19751)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit acdd08a538ec09f97d86e01cc7a799845ba45949
Author: Katrin Fischer <katrin.fischer at bsz-bw.de>
Date: Tue Dec 7 04:47:35 2010 +0100
Bug 4218: Fixes display problem introduced by last patch
Adds back missing <!-- /TMPL_IF -->.
Without navigation tabs and holdigns are not displayed in staff detail.
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
(cherry picked from commit bd26d056283e5a98bfcf655c5f956faedfb258e4)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
-----------------------------------------------------------------------
Summary of changes:
C4/Budgets.pm | 8 +-
C4/Circulation.pm | 9 +-
C4/Items.pm | 2 +-
Makefile.PL | 1 +
circ/circulation.pl | 13 +-
circ/view_holdsqueue.pl | 8 +-
debian/scripts/koha-create | 8 +-
debian/scripts/koha-remove | 4 +-
.../intranet-tmpl/prog/en/css/staff-global.css | 12 ++-
.../intranet-tmpl/prog/en/includes/calendar.inc | 62 +++++++-
.../intranet-tmpl/prog/en/includes/cat-toolbar.inc | 173 +++++++++++---------
.../intranet-tmpl/prog/en/includes/header.inc | 2 +
koha-tmpl/intranet-tmpl/prog/en/js/staff-global.js | 2 +-
.../en/lib/jquery/plugins/jquery.uitablefilter.js | 90 ----------
.../prog/en/modules/acqui/neworderbiblio.tmpl | 2 +
.../prog/en/modules/acqui/uncertainprice.tmpl | 23 +--
.../prog/en/modules/admin/smart-rules.tmpl | 149 +++++------------
.../prog/en/modules/catalogue/detail.tmpl | 3 +-
.../prog/en/modules/catalogue/moredetail.tmpl | 6 +-
.../prog/en/modules/cataloguing/addbiblio.tmpl | 2 +-
.../prog/en/modules/cataloguing/addbooks.tmpl | 16 +--
.../prog/en/modules/circ/circulation.tmpl | 13 +-
.../prog/en/modules/circ/view_holdsqueue.tmpl | 54 +++---
.../prog/en/modules/intranet-main.tmpl | 32 +++-
.../prog/en/modules/reports/catalogue_out.tmpl | 4 +-
.../prog/en/modules/tools/batchMod-del.tmpl | 11 +-
.../prog/en/modules/tools/batchMod-edit.tmpl | 6 +-
.../prog/en/modules/tools/batchMod.tmpl | 4 +-
koha-tmpl/opac-tmpl/prog/en/css/opac.css | 6 +
.../opac-tmpl/prog/en/modules/opac-detail.tmpl | 2 +-
misc/migration_tools/rebuild_zebra.pl | 30 +++-
reports/guided_reports.pl | 2 +-
serials/member-search.pl | 26 ++--
33 files changed, 397 insertions(+), 388 deletions(-)
delete mode 100644 koha-tmpl/intranet-tmpl/prog/en/lib/jquery/plugins/jquery.uitablefilter.js
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list