[koha-commits] main Koha release repository branch 3.6.x updated. v3.06.01-118-g3235e0a
Git repo owner
gitmaster at git.koha-community.org
Tue Dec 13 21:09:02 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 3235e0a127ee15ca494cb841e2029b5251255d02 (commit)
via e6e7757f98cc6d81d711b786be80d9be630ebd7b (commit)
via f66250b7eefde80dd850f4426ded49aba1ab6c51 (commit)
via dc50e463b7583d19180b37605aced56d57dcaf86 (commit)
via 4de9ab33eb41267e8fcbcc97ba55df8b8095f139 (commit)
via c49e42103cab56ae8e9d2c27ad7798aa18dd1785 (commit)
via 41c5937615af5efcd0f49428570c482d51209eb4 (commit)
via f901dc3a45c68bc7b4a106b7ac925d8d1e964a86 (commit)
via 21c34e5712daa65e21d7c4cff2510f3538811bba (commit)
via 6d241c8732534a2821f313a55e1f23dba9fb0366 (commit)
via 189ccf555dfeae9f6ec278455fbc57a194cc757c (commit)
via b87c3d08eb531eec8b4b87b09775c1a6ca45fbf6 (commit)
via 9a1344c1354f911e305a395c7653844eaf2a8a68 (commit)
via ebb653b27f64bd019ec975fcf36fea3aef29d34a (commit)
via 4afb0d058be157ec9b25e3727edb67e2f57f6b74 (commit)
via 354c953ab5f73de1bb9f67b12ef58e723bdef95e (commit)
via c70c748d0356cdf864a7a86fb140f8dcee19d6e7 (commit)
via 1b88fabf01c3e73e22586f591d16b84a7d42374b (commit)
via 3a3bf0c0202e104d440783d761e0f60dbc4e1c90 (commit)
via 5e57830a18aaa9849d0430698567a4dded7c1ebd (commit)
via eb4d2a19d1617e3365282ef4f7de9c5f4bc6d973 (commit)
from 8a6fdae8657dffe78e7841f20b0ae00e7ac1a7b3 (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 3235e0a127ee15ca494cb841e2029b5251255d02
Author: Chris Nighswonger <chris.nighswonger at gmail.com>
Date: Tue Dec 13 15:00:36 2011 -0500
Release Notes for 3.06.02.000 13 Dec 2011 20:00:36 Z
commit e6e7757f98cc6d81d711b786be80d9be630ebd7b
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date: Wed Nov 2 14:43:45 2011 +1300
Bug 7139 : Log addition and deletion of circulation messages
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Changed the two action names into caps no-spaces.
Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
(cherry picked from commit 288c1a768db4f578900de904ce39bc9a2f64378f)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit f66250b7eefde80dd850f4426ded49aba1ab6c51
Author: Owen Leonard <oleonard at myacpl.org>
Date: Thu Nov 3 14:54:39 2011 -0400
Fix for Bug 7135: Save button options
This patch adds a jQuery plugin which will cause
an element to remain "fixed" at the top of the
screen if it would otherwise scroll up out of
view.
The license of this plugin is "This plugin is as free as fresh
air. Feel free to use it anywhere.".
Signed-off-by: Liz Rea <wizzyrea at gmail.com>
I tested this on Chrome OSX
saving works
changing framework works
scrolling works, obviously.
tabbing through the records works
z39 button works as expected
Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
updated patch comment about licensing of the plugin
(cherry picked from commit da916a368c98e7f2599cf3a52126d53ee0ecfcd1)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit dc50e463b7583d19180b37605aced56d57dcaf86
Author: Owen Leonard <oleonard at myacpl.org>
Date: Tue Nov 1 09:21:51 2011 -0400
Fix for Bug 7123 - barcode should be one word
Other fixes thrown in for good measure:
- Adding data to the results table to match output of returns
- Better checking of error codes in the script to control
output of error messages (don't show error box when there
are no errors).
- Move some errors/messages from the right column onto the
top of the page to match Koha's established pattern.
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
(cherry picked from commit fff32393cf19fb5ef0a22979bb84a47fa27cc949)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit 4de9ab33eb41267e8fcbcc97ba55df8b8095f139
Author: Owen Leonard <oleonard at myacpl.org>
Date: Fri Nov 11 11:43:27 2011 -0500
Fix for Bug 7121 - remove comma on items info
Because I can't just take out one comma, I reworked
the way moredetail.pl fetches and outputs biblio
data based on the way it does in detail.pl. This
allows for simpler output in the template. In the
process I've added subtitle information to the
template.
Revision adds line break for readability
Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
(cherry picked from commit e65dc43af76b6e27481af8691c3ff4032245e4d2)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit c49e42103cab56ae8e9d2c27ad7798aa18dd1785
Author: Ian Walls <ian.walls at bywatersolutions.com>
Date: Wed Dec 7 11:43:20 2011 -0500
Bug 7093: placeholds for suggestion table not working in notices
In parseletter_sth, the suggestions table was defined twice. The first time (which
is the only definition to get called, as it matches first then exists), defined the
primary search keys as borrowernumber and biblionumber. This is incorrect; the only
usage of the suggestions table tokens is with suggestionid as the key. This is defined
further down the if/then chain.
This patch removes the erroneous sth query definition.
To test:
1. Place a suggestion with a patron account with a configured email you can access
2. Approve or reject it
3. Verify the message you receive contains suggestion tokens (like title, author and reason)
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
Suggestion mails for accepted, rejected and ordered look good now.
I couldn't test the suggestion mail AVAILABLE (bug 7096), but
assuming this would work too.
Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
(cherry picked from commit 6e497471e3341788401f86a06347045aed018a2c)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit 41c5937615af5efcd0f49428570c482d51209eb4
Author: Katrin Fischer <Katrin.Fischer.83 at web.de>
Date: Wed Nov 30 08:04:27 2011 +0100
Bug 6935: Correct XISBNDailyLimit for new installations
This corrects the value of XISBNDailyLimit in the system preferences
installation file to 999 instead of 499.
The file was missed in an earlier update, so new installations
have different values than older installations that were updated.
Another patch with a database update is needed. Sending this patch first,
until it's clear how database updates will work for 3.8.
To test:
1) Recreate your database from scratch
2) Check your system preference XISBNDailyLimit shows 999 instead of 499,
matching the description of the system preference.
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
(cherry picked from commit 61102d16d13a704f27a776350aa6d5582344b7e3)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit f901dc3a45c68bc7b4a106b7ac925d8d1e964a86
Author: Alex Arnaud <alex.arnaud at biblibre.com>
Date: Mon Sep 26 12:21:58 2011 +0200
bug 6917 Dates filters doesn't work when they are not selected on row or column
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
(cherry picked from commit 9855b834b66bf4b3dc1edb36e1347997d5aded86)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit 21c34e5712daa65e21d7c4cff2510f3538811bba
Author: Owen Leonard <oleonard at myacpl.org>
Date: Tue Sep 13 08:16:13 2011 -0400
Bug 6865 - Replace image-based gradient backgrounds with CSS3 gradients
Replaces image-based gradients in:
OPAC search bar
OPAC submit buttons
OPAC lists menu background
OPAC alert and message boxes
OPAC user menu tabs
Staff client alert and message boxes
Staff client side menu tabs
Removes obsoleted background image files.
Cross-browser background-gradients created using:
http://www.colorzilla.com/gradient-editor/
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
(cherry picked from commit da6c532074adb20158658fab9515bc4af60e8a48)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit 6d241c8732534a2821f313a55e1f23dba9fb0366
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Wed Oct 12 14:00:54 2011 +0200
Bug 6803: Replacing remote XSL include
Replacing remote include by local one.
This resolves possible connectivity issues (see Bugzilla comments).
Should theoretically be safer and faster too.
December 7, 2011: Rebased and included nbsp entity definition (bug 7141).
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
(cherry picked from commit 5db33970410d5fb43bb1934513ec7d2741b18b3d)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit 189ccf555dfeae9f6ec278455fbc57a194cc757c
Author: Nicole C. Engard <nengard at bywatersolutions.com>
Date: Thu Oct 20 06:47:54 2011 -0400
Bug 6716 Update biblio & deletedbiblio tables
The comments on the biblio and deletedbiblio table
didn't mention the MARC21 subfields. This patch adds
that documentation in.
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
(cherry picked from commit c30f0e8e89a1299d3390a633c5a9baea8054592e)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit b87c3d08eb531eec8b4b87b09775c1a6ca45fbf6
Author: Nicole C. Engard <nengard at bywatersolutions.com>
Date: Mon Oct 10 06:50:23 2011 -0400
Bug 6716 : Categories table
This patch documents the patron categories table in Koha.
There are a couple fields marked unused and a couple that aren't
documented because I wasn't sure:
* dateofbirthrequired
* bulk
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
(cherry picked from commit 3aa00f63131fdccba4bb57870bc86c93329d5050)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit 9a1344c1354f911e305a395c7653844eaf2a8a68
Author: Nicole C. Engard <nengard at bywatersolutions.com>
Date: Sun Oct 2 10:04:37 2011 -0400
Bug 6716: Document biblioitems and deletedbiblioitems
This patch documents the biblioitems and the deletedbiblioitems
tables. There are many fields left undocumented because I didn't see
information in them, but this is enough of a start to be helpful to
those writing reports.
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
(cherry picked from commit 66b5175aa5b38fd793db64f725fa927bc113e8c4)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit ebb653b27f64bd019ec975fcf36fea3aef29d34a
Author: Nicole C. Engard <nengard at bywatersolutions.com>
Date: Sun Oct 2 02:16:44 2011 -0400
Bug 6716 Document deleteditems table
This patch documents the deleted items table. Some fields were left
undocumented because I was unsure of what data was stored there:
stack - might be linked to shelving number, but need confirmation
paidfor - pretty sure this is unused, but don't want to document it that way
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
(cherry picked from commit c9441f48955360829ef7f8e97a54afa7aa31fc5b)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit 4afb0d058be157ec9b25e3727edb67e2f57f6b74
Author: Nicole C. Engard <nengard at bywatersolutions.com>
Date: Sun Oct 2 02:11:06 2011 -0400
Bug 6716 - Document Items Table
This patch documents the items table. Some fields were left
undocumented because I was unsure of what data was stored there:
stack - might be linked to shelving number, but need confirmation
paidfor - pretty sure this is unused, but don't want to document it that way
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
(cherry picked from commit 12031f5b8cfc9e294f121135a7eb83449f1c2b63)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit 354c953ab5f73de1bb9f67b12ef58e723bdef95e
Author: Nicole C. Engard <nengard at bywatersolutions.com>
Date: Wed Sep 28 06:19:33 2011 -0400
bug6716: documenting reserves and old_reserves tables
This patch documents the reserves and the old_reserves table.
Note that a few fields are marked unused: notificationdate and
reminderdate. Also two fields are left undocumented: lowestPriority
which never seems to be anything other than 0 and constrainttype which
is either 'a' or 0, but there doesn't appear to be any explanation
as to what each stands for.
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
(cherry picked from commit 156f45fe2158ebfb8eeced2614a212f7bcb6aa7b)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit c70c748d0356cdf864a7a86fb140f8dcee19d6e7
Author: Christophe Croullebois <christophe.croullebois at biblibre.com>
Date: Fri Dec 2 16:03:19 2011 +0100
Bug 6663: Features for holidays.pl with datepicker
Allow to select a range between 2 dates and in one "submit" creates holidays only on these days.
I have added also Holidays repeated yearly on a range.
On suggestions I have added a datepicker for "To Date".
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
(cherry picked from commit 806fac60f466b79d9c60023df4425b134040bfdc)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit 1b88fabf01c3e73e22586f591d16b84a7d42374b
Author: Paul Poulain <paul.poulain at biblibre.com>
Date: Tue Dec 13 14:43:41 2011 +0100
welcome Fabio, you're 165th !
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit 3a3bf0c0202e104d440783d761e0f60dbc4e1c90
Author: Frédéric Demians <f.demians at tamil.fr>
Date: Sun Nov 20 13:13:28 2011 +0100
Bug 7245 Tables population with mandatory data for italian installation
Formatted patch from Fabio Tiana <fabio.tian at gmail.com>
While installing italian and UNIMARC version of Koha via web installer, two
errors occur: ERROR 1136 (21S01) and ERROR 1064 (42000). Some tables can't be
populated with mandatory data.
Errors are related to files sample_itemtypes.sql and unimarc_framework.sql
(/usr/share/koha/intranet/cgi-bin/installer/data/mysql/it-IT/ and
subdirectories).
Signed-off-by: koha <koha at kohabase.l.i>
Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
(cherry picked from commit a5241093b3cfd564f69b26a76b52ef04eaa5719e)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit 5e57830a18aaa9849d0430698567a4dded7c1ebd
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date: Tue Dec 13 21:18:37 2011 +1300
Bug 7215 : The Module changed, but the tests weren't updated to reflect that
Updating the test
Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
(cherry picked from commit 9c66c427642b9b8add00c389e0c33ddc3ecac622)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit eb4d2a19d1617e3365282ef4f7de9c5f4bc6d973
Author: Brendan <info at bywatersolutions.com>
Date: Fri Nov 11 09:25:15 2011 -0800
Bug 7215 - changed callnumber PRESET field to itemcallnumber
Fixes problem with creating new labels - before it populated with callnumber and not itemcallnumber
Signed-off-by: Nicole C. Engard <nengard at bywatersolutions.com>
Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
(cherry picked from commit b255d091fdbfecf1dd82475052ad966546a76e7f)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
-----------------------------------------------------------------------
Summary of changes:
C4/Creators/Layout.pm | 2 +-
C4/Letters.pm | 1 -
C4/Members.pm | 10 +-
catalogue/moredetail.pl | 30 +-
circ/branchtransfers.pl | 92 +++---
docs/history.txt | 3 +-
.../unimarc/necessari/unimarc_framework.sql | 24 +-
.../mysql/it-IT/necessari/sample_itemtypes.sql | 18 +-
installer/data/mysql/kohastructure.sql | 326 ++++++++++----------
installer/data/mysql/sysprefs.sql | 2 +-
koha-tmpl/intranet-tmpl/prog/en/css/addbiblio.css | 5 +
.../intranet-tmpl/prog/en/css/staff-global.css | 70 ++++-
.../prog/en/lib/jquery/plugins/jquery.fixFloat.js | 67 ++++
.../prog/en/modules/catalogue/moredetail.tt | 33 +-
.../prog/en/modules/cataloguing/addbiblio.tt | 2 +
.../prog/en/modules/circ/branchtransfers.tt | 97 ++++---
.../prog/en/modules/tools/holidays.tt | 27 ++-
.../prog/en/xslt/MARC21slim2MODS3-1.xsl | 2 +-
.../prog/en/xslt/MARC21slimUtils-MODS31.xsl | 190 ++++++++++++
koha-tmpl/intranet-tmpl/prog/img/alert-bg.gif | Bin 2255 -> 0 bytes
koha-tmpl/intranet-tmpl/prog/img/bg-tab.png | Bin 115 -> 0 bytes
koha-tmpl/intranet-tmpl/prog/img/button-bg.gif | Bin 582 -> 0 bytes
koha-tmpl/intranet-tmpl/prog/img/dialog-bg.gif | Bin 1922 -> 0 bytes
koha-tmpl/intranet-tmpl/prog/img/fade-butt.png | Bin 785 -> 0 bytes
koha-tmpl/intranet-tmpl/prog/img/message-bg.gif | Bin 966 -> 0 bytes
.../prog/img/side-tab-gradient-hover.gif | Bin 92 -> 0 bytes
.../intranet-tmpl/prog/img/side-tab-gradient.gif | Bin 92 -> 0 bytes
koha-tmpl/opac-tmpl/prog/en/css/opac.css | 105 +++++--
koha-tmpl/opac-tmpl/prog/images/alert-bg.gif | Bin 2255 -> 0 bytes
.../prog/images/listmenu-container-bg.gif | Bin 347 -> 0 bytes
.../opac-tmpl/prog/images/menu-background.gif | Bin 3048 -> 0 bytes
koha-tmpl/opac-tmpl/prog/images/message-bg.gif | Bin 966 -> 0 bytes
.../prog/images/side-tab-gradient-hover.gif | Bin 92 -> 0 bytes
.../opac-tmpl/prog/images/side-tab-gradient.gif | Bin 92 -> 0 bytes
koha-tmpl/opac-tmpl/prog/images/submit-bg.gif | Bin 2899 -> 0 bytes
misc/release_notes/release_notes_3_6_2.txt | 48 ++-
reports/acquisitions_stats.pl | 8 +-
t/db_dependent/Labels/t_Layout.t | 2 +-
tools/holidays.pl | 1 +
tools/newHolidays.pl | 98 +++++-
40 files changed, 881 insertions(+), 382 deletions(-)
create mode 100644 koha-tmpl/intranet-tmpl/prog/en/lib/jquery/plugins/jquery.fixFloat.js
create mode 100644 koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slimUtils-MODS31.xsl
delete mode 100644 koha-tmpl/intranet-tmpl/prog/img/alert-bg.gif
delete mode 100644 koha-tmpl/intranet-tmpl/prog/img/bg-tab.png
delete mode 100644 koha-tmpl/intranet-tmpl/prog/img/button-bg.gif
delete mode 100644 koha-tmpl/intranet-tmpl/prog/img/dialog-bg.gif
delete mode 100644 koha-tmpl/intranet-tmpl/prog/img/fade-butt.png
delete mode 100644 koha-tmpl/intranet-tmpl/prog/img/message-bg.gif
delete mode 100644 koha-tmpl/intranet-tmpl/prog/img/side-tab-gradient-hover.gif
delete mode 100644 koha-tmpl/intranet-tmpl/prog/img/side-tab-gradient.gif
delete mode 100644 koha-tmpl/opac-tmpl/prog/images/alert-bg.gif
delete mode 100644 koha-tmpl/opac-tmpl/prog/images/listmenu-container-bg.gif
delete mode 100644 koha-tmpl/opac-tmpl/prog/images/menu-background.gif
delete mode 100644 koha-tmpl/opac-tmpl/prog/images/message-bg.gif
delete mode 100644 koha-tmpl/opac-tmpl/prog/images/side-tab-gradient-hover.gif
delete mode 100644 koha-tmpl/opac-tmpl/prog/images/side-tab-gradient.gif
delete mode 100644 koha-tmpl/opac-tmpl/prog/images/submit-bg.gif
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list