[koha-commits] main Koha release repository branch 3.4.x updated. v3.04.04-87-gcf3461d
Git repo owner
gitmaster at git.koha-community.org
Tue Sep 13 17:17:42 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 cf3461d8caed3c9dbfd051712cd3552898c3fffa (commit)
via e2a8ad55978e1052e8891f3843da027447043804 (commit)
via d6a6835ec00074fbd98ea7d3b6e14906a037861a (commit)
via 38920a3fe11c91d1111fc1e282567614c0892c43 (commit)
via 4d3bc31ad7414137073ab711fdeb7e40f93ae013 (commit)
via eb0bd32b0120f266fab53d961120b7301689a9fe (commit)
via 22c92b437c2c6f542735cc750544a70c33e51c87 (commit)
via 0aa478deb9a62392f292e060a8785f3a63afe2d6 (commit)
via 9b6c9c49d9443c702565689c0e0a223947a34e8e (commit)
via 753fffb1d8b365470a440f07bba445aa92678425 (commit)
via d9a2faf96922bf389e55ccfbeb88b90f1bdda14b (commit)
via 80890f5a0514d778c9674dcab31602c22596c4fd (commit)
via c2575b3cdb58f1a874faa20fb6d116bc3f418012 (commit)
via 52ad3b1425671b95580f2f804a3b3b977c004425 (commit)
via a35128f88f821c16a2ea704a4407987401c00441 (commit)
via 71bceb8432c4b56d64b30f03127d7fc5e38dd8f1 (commit)
via e5c056dba58188d6687323d190d656f162330615 (commit)
via 641448a5bf7d1cbfa0705c6bdb7f0ca6613dda1a (commit)
via c7483461999a249e67f7cdd518f29830428f87e8 (commit)
from 342d6aaecec84beb0ad1bd0b75714e29490b266d (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 cf3461d8caed3c9dbfd051712cd3552898c3fffa
Author: Robin Sheat <robin at catalyst.net.nz>
Date: Sun Jul 31 14:26:23 2011 +1200
Bug 6651 - fix splitting of names when updating to 3.4
This affects only koha package installations that have multiple
instances running. After this patch, it's worth running the upgrade
again to ensure that everything happened correctly the first time.
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
(cherry picked from commit ae022e9a22a4631216c43399609d8aae62d23fb5)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit e2a8ad55978e1052e8891f3843da027447043804
Author: Katrin Fischer <Katrin.Fischer.83 at web.de>
Date: Thu Aug 25 00:40:56 2011 +0200
Bug 6458: Incorrect translation processing / results
Removed template toolkit directives from within HTML tags.
Advanced Search > Scan Index > Search results
Additional changes:
- removes entry 'Series Title' from the index pull down as it was the same
index as 'Series'
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
(cherry picked from commit 282a2d60b830b22661cc0324a84b7c17b7b905d1)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit d6a6835ec00074fbd98ea7d3b6e14906a037861a
Author: Katrin Fischer <Katrin.Fischer.83 at web.de>
Date: Thu Aug 25 00:09:11 2011 +0200
Bug 6458: Incorrect translation processing / suggestion
Removes template toolkit directives from within HTML tags.
Acquisitions > Suggestions
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
(cherry picked from commit 06d6cb0ce471f312ffb1ddd92f0ce0bc3ab76a24)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit 38920a3fe11c91d1111fc1e282567614c0892c43
Author: Katrin Fischer <Katrin.Fischer.83 at web.de>
Date: Sat Aug 20 19:02:01 2011 +0200
Bug 6458: Incorrect translation processing / sco-main.tt
Patch removes templates directives from HTML tags in sco-main.tt
Problems were related to buttons for renewing items.
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
Before
opac-tmpl/prog/en/modules/sco/sco-main.tt: 135, 222
After, no errors
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
(cherry picked from commit 4530159ce13eb6ff823d6ef49ad847d92556f356)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit 4d3bc31ad7414137073ab711fdeb7e40f93ae013
Author: Katrin Fischer <Katrin.Fischer.83 at web.de>
Date: Wed Aug 24 20:49:23 2011 +0200
Bug 6458: Incorrect translation processing / serials/...
Fixes problems with template toolkit directives within HTML tags
for the serials module.
Serials > add/modify subsciption
serial-issues-full.tt seems to be unused?
I couldn't find the page in the serials module.
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
(cherry picked from commit 8f8fc1088a2c5b43ed03fb06c9c842b7c721a838)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit eb0bd32b0120f266fab53d961120b7301689a9fe
Author: Katrin Fischer <Katrin.Fischer.83 at web.de>
Date: Wed Aug 24 19:43:58 2011 +0200
Bug 6458: Incorrect translation processing - rotating_collections/...
Patch removes templates directives from HTML tags in the
rotating collections module.
The module is currently not interated into Koha's staff interface.
Fixing templats to make Jenkins happy.
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
(cherry picked from commit 22804d6ff6fdc2105644f03d0edca1e4e17d4b72)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit 22c92b437c2c6f542735cc750544a70c33e51c87
Author: Katrin Fischer <Katrin.Fischer.83 at web.de>
Date: Thu Aug 25 12:48:55 2011 -0400
Bug 6458: Incorrect translation processing / opac-detail.tt
Patch removes template directives from within HTML tags from OPAC detail view.
Problems were related to the items tabs for holdings, subscriptions, and serial collection.
Fixed the problem spotted by Frère Sébastien Marie - thx!
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
(cherry picked from commit 6d6c9626274268e82d6fa433894f188b995c913b)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit 0aa478deb9a62392f292e060a8785f3a63afe2d6
Author: Katrin Fischer <Katrin.Fischer.83 at web.de>
Date: Tue Aug 23 00:06:00 2011 +0200
Bug 6458: Incorrect translation processing / cataloguing/...
Patch removes template directives from within HTML tags from
- cataloging > new record
- cataloging
- UNIMARC plugin for 4XX
There is one problem remaining in addbiblio:
<option value="[% frameworkcodeloo.value %]" [% frameworkcodeloo.selected %]>
[% frameworkcodeloo.frameworktext %]
</option>
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
(cherry picked from commit 27c87aea11243e63c2600d71a154d425b3269c13)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit 9b6c9c49d9443c702565689c0e0a223947a34e8e
Author: Katrin Fischer <Katrin.Fischer.83 at web.de>
Date: Mon Aug 22 23:47:02 2011 +0200
Bug 6458: Incorrect translation processing / acqui/...
Patch removes template directives from within HTML tags from
- acquisitions > new vendor / modify vendor / vendor details
- acquisitions > late orders
- acquisitons > vendor x > basket groups
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
(cherry picked from commit d5a9eea5194c97e3874ee830fccf2cdeb1ddf3f8)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit 753fffb1d8b365470a440f07bba445aa92678425
Author: Katrin Fischer <Katrin.Fischer.83 at web.de>
Date: Sat Aug 20 19:38:30 2011 +0200
Bug 6458: Incorrect translation processing - masthead.inc
Patch removes templates directives from HTML tags in masthead.inc
Problem was related to library pull down shown when
OpacAddMastheadLibraryPulldown is activated.
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
Before
opac-tmpl/prog/en/includes/masthead.inc: 83
After no errors
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
(cherry picked from commit 637953df93f7090de846e1f274a1e721687a9277)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit d9a2faf96922bf389e55ccfbeb88b90f1bdda14b
Author: Katrin Fischer <Katrin.Fischer.83 at web.de>
Date: Mon Aug 22 23:25:37 2011 +0200
Bug 6458: Incorrect translation processing / 3x reports/...
Patch removes template directives from within HTML tags from
- Reports > Guided Reports
- Reports > Items with no checkouts
- Reports > Patron statistics
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
(cherry picked from commit fb7b258ec2220fcf6a86d49132b0224175f0a344)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit 80890f5a0514d778c9674dcab31602c22596c4fd
Author: Katrin Fischer <Katrin.Fischer.83 at web.de>
Date: Mon Aug 22 23:16:12 2011 +0200
Bug 6458: Incorrect translation processing / authorities.tt
Patch removes template directives from within HTML tags from
authorities > modify authority.
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
(cherry picked from commit 1866c4939df4298d561bc9f5fe617644a9955371)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit c2575b3cdb58f1a874faa20fb6d116bc3f418012
Author: Katrin Fischer <Katrin.Fischer.83 at web.de>
Date: Mon Aug 22 23:00:18 2011 +0200
Bug 6458: Incorrect translation processing / review.tt
Patch removes template directives from within HTML tags from
Tools > Tags.
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
(cherry picked from commit 1859858af62c6f9923d56b70b29c4c0a3a24f9e4)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit 52ad3b1425671b95580f2f804a3b3b977c004425
Author: Katrin Fischer <Katrin.Fischer.83 at web.de>
Date: Mon Aug 22 22:46:28 2011 +0200
Bug 6458: Incorrect translation processing / overdue.tt
Patch removes template directives from within HTML tags from
circulation > overdues.
Problems were related to patron flags pull down and sort by loop for patron attributes.
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
(cherry picked from commit 18844d6bf1f1c6cf93cbe833067fe747753856b9)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit a35128f88f821c16a2ea704a4407987401c00441
Author: Katrin Fischer <Katrin.Fischer.83 at web.de>
Date: Sun Aug 21 19:58:48 2011 +0200
Bug 6458: Incorrect translation processing - doc-head-close/open.inc
Patch removes templates directives from HTML tags in masthead.inc
Fixes all 3 problems now.
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
(cherry picked from commit 75bfa2a56a857417cf99d605f0f903e14ec0f204)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit 71bceb8432c4b56d64b30f03127d7fc5e38dd8f1
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date: Mon Sep 12 13:57:19 2011 +1200
While testing the commits for 6716 I discovered a couple of missing
drop tables, fixed now
(cherry picked from commit d6417257fde4e22252c78f2def21091016db17f3)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit e5c056dba58188d6687323d190d656f162330615
Author: Magnus Enger <magnus at enger.priv.no>
Date: Thu Jun 30 08:47:35 2011 +0200
Bug 6517 - [REVISED] koha-create wants "use database" in DEFAULTSQL
The revised patch quotes the variable $mysqldb, as suggested by Frère
Sébastien Marie.
This patch makes sure that pointing DEFAULTSQL in /etc/koha/koha-sites.conf
to any (gzip'ed) file produced by mysqldump works, by adding the name of the
database to the end of the call to mysql, when the specified SQL file is
loaded. Files produced with koha-dump-defaults should still work too.
To test:
- Apply the patch
- Create a new package with build-git-snapshot
- Install the package
- Create an SQL file from an existing installation with mysqldump
- gzip the SQL file
- point DEFAULTSQL to the file in /etc/koha/koha-sites.conf
- create a new site with koha-create --create-db
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
(cherry picked from commit b3b6278e206be11ce3b5a8e271f7bccb70539ac5)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit 641448a5bf7d1cbfa0705c6bdb7f0ca6613dda1a
Author: Ian Walls <ian.walls at bywatersolutions.com>
Date: Fri Sep 9 14:37:22 2011 -0400
Bug 6863: Shelf Browser images not showing up
Fixes case for Syndetics (test condition was scoped wrong, leading to "no image available")
as well as Baker and Taylor (bad scope and capitalization on BakerTaylorImageURL).
Signed-off-by: Nicole C. Engard <nengard at bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
(cherry picked from commit b49534ebdc11c36844c87d9588fc4e420509b77e)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit c7483461999a249e67f7cdd518f29830428f87e8
Author: Ian Walls <ian.walls at bywatersolutions.com>
Date: Fri Sep 9 06:34:56 2011 -0400
Bug 6860: SyndeticsClientCode improperly scoped on many OPAC pages
SyndeticsClientCode was locally scoped in nearly all loops, preventing it from working.
This patch fixes not only search results and shelf browsers, but also rarely-used parts of
opac-detail, opac-opensearch, opac-readingrecord, opac-showreviews and opac-user
Signed-off-by: Nicole C. Engard <nengard at bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
(cherry picked from commit 156a849aa3759f377af07d4cdc7a6f58e58c18f4)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
-----------------------------------------------------------------------
Summary of changes:
debian/scripts/koha-create | 2 +-
debian/scripts/koha-upgrade-to-3.4 | 2 +-
installer/data/mysql/kohastructure.sql | 2 +
.../prog/en/modules/acqui/basketgroup.tt | 12 ++++--
.../prog/en/modules/acqui/lateorders.tt | 6 ++-
.../prog/en/modules/acqui/supplier.tt | 10 ++---
.../prog/en/modules/authorities/authorities.tt | 4 +-
.../prog/en/modules/catalogue/results.tt | 34 ++++++++++------
.../prog/en/modules/cataloguing/addbiblio.tt | 2 +
.../prog/en/modules/cataloguing/addbooks.tt | 3 +-
.../cataloguing/value_builder/unimarc_field_4XX.tt | 9 +++-
.../intranet-tmpl/prog/en/modules/circ/overdue.tt | 12 ++++--
.../prog/en/modules/reports/borrowers_stats.tt | 6 ++-
.../prog/en/modules/reports/catalogue_out.tt | 3 +-
.../en/modules/reports/guided_reports_start.tt | 5 ++-
.../en/modules/rotating_collections/addItems.tt | 3 +-
.../rotating_collections/editCollections.tt | 6 ++-
.../prog/en/modules/serials/serial-issues-full.tt | 3 +-
.../prog/en/modules/serials/subscription-add.tt | 3 +-
.../prog/en/modules/suggestion/suggestion.tt | 41 +++++++++++++-------
.../intranet-tmpl/prog/en/modules/tags/review.tt | 18 ++++++---
.../opac-tmpl/prog/en/includes/doc-head-close.inc | 12 ++++--
.../opac-tmpl/prog/en/includes/doc-head-open.inc | 2 +-
koha-tmpl/opac-tmpl/prog/en/includes/masthead.inc | 3 +-
koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tt | 38 ++++++++++--------
.../opac-tmpl/prog/en/modules/opac-opensearch.tt | 4 +-
.../prog/en/modules/opac-readingrecord.tt | 4 +-
.../opac-tmpl/prog/en/modules/opac-results.tt | 4 +-
.../opac-tmpl/prog/en/modules/opac-shelves.tt | 4 +-
.../prog/en/modules/opac-showreviews-rss.tt | 4 +-
.../opac-tmpl/prog/en/modules/opac-showreviews.tt | 4 +-
koha-tmpl/opac-tmpl/prog/en/modules/opac-user.tt | 8 ++--
.../opac-tmpl/prog/en/modules/sco/sco-main.tt | 6 ++-
33 files changed, 173 insertions(+), 106 deletions(-)
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list