[koha-commits] main Koha release repository branch 3.6.x updated. v3.06.01-136-g3d18ff4
Git repo owner
gitmaster at git.koha-community.org
Wed Dec 14 18:58:09 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 3d18ff446653ea9f18e43c80d8af6b8ef4ec1cf5 (commit)
via 3b2c3edfb1a8d2ebd92ba40631de6958474d852a (commit)
via 792945c9c30eb6aff9cde1cd417071660434c1cb (commit)
via 1737da5bef05b73b5ad666a90bba56991e37d02d (commit)
via e67d2f80d47bde7f112c5df9e55f1e52582eccaf (commit)
via ce6512ada505bb19d7198a886b9df5d1ef0d0a1e (commit)
via 1829f52f2e0c35348df565a61942df161b657a29 (commit)
via cbca6d5fe699748a36f79b315e02a14573265198 (commit)
via 34d8037d134c26c87d2f7ff8783cf711d6aa9afa (commit)
via df5cfbcb376cf605c24c9dd97ddafd27eeaa989d (commit)
via fdc0ad7b929033146bf0231f9b7edcea5a6c85ce (commit)
via 26d5974b49de9a133aeeb832aabaf18e1775b0c4 (commit)
via 27042032c03b3e89803b1551035125cec1492c0d (commit)
via 766ee688f70a00d25e1b26d37f0be5b31b659707 (commit)
via 80ef7efa4a097a03abd925ed34c6a4dddace1069 (commit)
via 665133b10a5ac5ed0865eca2307bb4d2fd05f009 (commit)
via beede5bf609f7fc9a68d3680b56b56ef86dc2207 (commit)
via 432179b5cde2abe78f428e5997dc214311e3b97a (commit)
from 3235e0a127ee15ca494cb841e2029b5251255d02 (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 3d18ff446653ea9f18e43c80d8af6b8ef4ec1cf5
Author: Chris Nighswonger <chris.nighswonger at gmail.com>
Date: Wed Dec 14 12:57:42 2011 -0500
Release Notes for 3.06.02.000 14 Dec 2011 17:57:42 Z
commit 3b2c3edfb1a8d2ebd92ba40631de6958474d852a
Author: Chris Nighswonger <chris.nighswonger at gmail.com>
Date: Wed Dec 14 12:57:13 2011 -0500
Followup on bug 7185 to correct Marcel de Rooy's name
commit 792945c9c30eb6aff9cde1cd417071660434c1cb
Author: Magnus Enger <magnus at enger.priv.no>
Date: Fri Dec 2 16:08:44 2011 +0000
Bug 7309 - Add NORMARCslim2intranetDetail.xsl for detail view in intranet
Adds two files, to enable XSLT for the detail view in the intranet:
koha-tmpl/intranet-tmpl/prog/en/xslt/NORMARCslim2intranetDetail.xsl
koha-tmpl/intranet-tmpl/prog/en/xslt/NORMARCslimUtils.xsl
To test:
- Set sysprefs: marcflavour = NORMARC and XSLTDetailsDisplay = "using XSLT stylesheet"
- Make sure OPACBaseURL is set correctly
- Check that detail display looks ok
- Check that automatic links for author, subjects etc work
- Check that the "Open in new window" link works as expected
- Empty the OPACBaseURL syspref and check that "Open in new window" does not display
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
Great test plan, could reproduce problem and can confirm patch fixes it.
Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
(cherry picked from commit e4c6f1fc20f6d2f658fd5cf56da77708fd9a9c26)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit 1737da5bef05b73b5ad666a90bba56991e37d02d
Author: Sophie Meynieux <sophie.meynieux at biblibre.com>
Date: Fri Dec 2 10:04:25 2011 +0100
Bug 7287 : Fix overdue notification if a branch given as parameter does not have rules
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
(cherry picked from commit a1e3174668181c06baea11161466a1f7bf3a84c4)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit e67d2f80d47bde7f112c5df9e55f1e52582eccaf
Author: Juan Romay Sieira <juan.sieira at xercode.es>
Date: Tue Nov 29 10:17:26 2011 +0100
Bug 7275 - Pagination lost when click in the option "Show more" of facets column
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
(cherry picked from commit 9b9093d2256b18cc0b813894064e527fbc411998)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit ce6512ada505bb19d7198a886b9df5d1ef0d0a1e
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Wed Nov 30 16:42:19 2011 +0100
Bug 7270: Removing double itemtype on shelve contents page when no icon is shown
Just adding a check on imageurl in the template.
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
(cherry picked from commit a8ddf6acaee4ce7661d8fd4e9027fca1e56de1ae)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit 1829f52f2e0c35348df565a61942df161b657a29
Author: Juan Romay Sieira <juan.sieira at xercode.es>
Date: Thu Nov 24 18:01:05 2011 +0100
Bug 7262 - No calendar present in holidays module when there are quotes in title or description
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
Nice patch, making use of the Template::Toolkit filters
Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
(cherry picked from commit a8f3860149cd6b61cc87cb1d4da147359e5b2e43)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit cbca6d5fe699748a36f79b315e02a14573265198
Author: Chris Hall <chrish at catalyst.net.nz>
Date: Tue Dec 6 16:03:59 2011 +1300
bug 7239 fix to avoid error being thrown even though a record is created
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
When creating an item in acquisitions while ordering and not filling out
any fields, there is no longer shown a perl error message.
Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
(cherry picked from commit 48f25fec431322d8ce47d62793985a5b498ab22a)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit 34d8037d134c26c87d2f7ff8783cf711d6aa9afa
Author: Owen Leonard <oleonard at myacpl.org>
Date: Tue Nov 15 11:50:40 2011 -0500
Fix for Bug 7227, "Delete all items" action should redirect to the detail view
Using the delete all items function should now redirect back to the
biblio view specified in the BiblioDefaultView 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 8121f5581ff0f39a31302edace0fc2cf66d65e71)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit df5cfbcb376cf605c24c9dd97ddafd27eeaa989d
Author: Owen Leonard <oleonard at myacpl.org>
Date: Tue Dec 13 14:37:32 2011 -0500
Bug 7135 - in addbiblio, make save button floating to have it on always on screen
Follow-up fix corrects z-index of toolbar so that "More" menu
is not hidden behind it.
Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
(cherry picked from commit edd8e5767d29bbbf28eb88591c00a2e419f4b14f)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit fdc0ad7b929033146bf0231f9b7edcea5a6c85ce
Author: Owen Leonard <oleonard at myacpl.org>
Date: Fri Dec 2 15:14:58 2011 -0500
Bug 7202 - z39.50 search on bib edit not working
The pop-up menu's "Import" link did not correctly pick
up the existing record's biblionumber, if present.
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
To test:
1) Searched for a record in your catalog
2) Edit > Edit record
3) Start Z39.50 search
4) Pick a new record with different title for import
- using the import link at the end of the table line
- using the pop up menu's import link
5) Save and check if a duplicate was created
Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
(cherry picked from commit 7fd5098b98007e3a25e6694a5b31ef0828ce4997)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit 26d5974b49de9a133aeeb832aabaf18e1775b0c4
Author: Robin Sheat <robin at catalyst.net.nz>
Date: Wed Nov 23 18:39:25 2011 +1300
Bug 7197 - add a Spanish readme file to the packages
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
I don't speak spanish, so my signoff is just a technical view of the patch
(cherry picked from commit 373e49576d023c24e1b649f0a5c2a2570f4bb80f)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit 27042032c03b3e89803b1551035125cec1492c0d
Author: Paul Poulain <paul.poulain at biblibre.com>
Date: Wed Dec 14 15:10:28 2011 +0100
Bug 7164 follow-up history.txt and perlcritic compliance
* in history.txt, added a tab for Stephane Delaune, for display consistency
* fixed a small mistake in about.pl that was resulted in a perlcritic failure
(cherry picked from commit 82ed4696321df9b3f4e16b759b1e1a083a5c5e28)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit 766ee688f70a00d25e1b26d37f0be5b31b659707
Author: Paul Poulain <paul.poulain at biblibre.com>
Date: Wed Dec 14 14:49:22 2011 +0100
Bug 7164 minor follow-up
tab for Stephane Delaune, for display consistency
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit 80ef7efa4a097a03abd925ed34c6a4dddace1069
Author: Mason James <mtj at kohaaloha.com>
Date: Sat Nov 5 23:28:48 2011 +1300
Bug 7164 - add Koha history timeline tab to 'About' page
Includes follow up by Chris Cormack fixing formatting in docs/history.txt
[MINOR EDIT] Added html filter to output for validity's sake
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
(cherry picked from commit 6bc414a3d418cd5255a178271207121f3cb9878a)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit 665133b10a5ac5ed0865eca2307bb4d2fd05f009
Author: Ian Walls <ian.walls at bywatersolutions.com>
Date: Fri Nov 4 23:28:31 2011 -0400
Bug 7160: paying fines throws error
The call to ReturnLostItem in C4/Accounts was not properly namespaced to
come from C4::Circulation. That prefix is added to the call.
To test:
Pay a fine, and confirm the error disappears (and the fines is still paid)
Signed-off-by: Brendan <brendan at bywatersolutions.com>
Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
(cherry picked from commit afd2098f3c82812af7ab7366035e18b953662dab)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit beede5bf609f7fc9a68d3680b56b56ef86dc2207
Author: Brendan <info at bywatersolutions.com>
Date: Wed Nov 2 03:04:58 2011 -0700
Bug 7143: Follow up patch for Updating about.tt
I had a typo where I put Ian Walls as Release Manager - I have fixed to QA.
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
I put in another missing space for Colin Campbell.
Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
(cherry picked from commit 04f8dfec9b7de782d206f61650160b2113e12ccd)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit 432179b5cde2abe78f428e5997dc214311e3b97a
Author: Brendan <info at bywatersolutions.com>
Date: Wed Nov 2 02:59:41 2011 -0700
Bug 7143: Updating About.tt for Ian Walls, Chris Nighswonger and Paul Poulain
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
(cherry picked from commit c3494eaaed4cdb45d7b9f80251fa096a57af143b)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
-----------------------------------------------------------------------
Summary of changes:
C4/Accounts.pm | 2 +-
C4/Biblio.pm | 2 +-
about.pl | 41 +++++++++++++
cataloguing/additem.pl | 12 ++++-
debian/docs/LEEME.Debian | 60 ++++++++++++++++++++
debian/koha-common.docs | 1 +
docs/history.txt | 2 +-
.../intranet-tmpl/prog/en/includes/facets.inc | 2 +-
.../prog/en/lib/jquery/plugins/jquery.fixFloat.js | 7 +-
koha-tmpl/intranet-tmpl/prog/en/modules/about.tt | 53 +++++++++++++-----
.../prog/en/modules/catalogue/results.tt | 2 +-
.../prog/en/modules/cataloguing/z3950_search.tt | 2 +-
.../prog/en/modules/tools/holidays.tt | 8 +-
.../prog/en/modules/virtualshelves/shelves.tt | 2 +-
.../prog/en/xslt/NORMARCslim2intranetDetail.xsl} | 48 +++++++++-------
.../prog/en/xslt/NORMARCslimUtils.xsl | 1 -
.../opac-tmpl/prog/en/includes/opac-facets.inc | 2 +-
misc/cronjobs/overdue_notices.pl | 2 +-
misc/release_notes/release_notes_3_6_0.txt | 2 +-
misc/release_notes/release_notes_3_6_1.txt | 2 +-
misc/release_notes/release_notes_3_6_2.txt | 37 ++++++++----
misc/release_notes/release_notes_3_6_x.tmpl | 2 +-
22 files changed, 222 insertions(+), 70 deletions(-)
create mode 100644 debian/docs/LEEME.Debian
create mode 100644 debian/koha-common.docs
copy koha-tmpl/{opac-tmpl/prog/en/xslt/NORMARCslim2OPACDetail.xsl => intranet-tmpl/prog/en/xslt/NORMARCslim2intranetDetail.xsl} (90%)
copy koha-tmpl/{opac-tmpl => intranet-tmpl}/prog/en/xslt/NORMARCslimUtils.xsl (99%)
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list