[koha-commits] main Koha release repository branch, 3.2.x, updated. v3.02.01-10-gdd79498
Git repo owner
gitmaster at git.koha-community.org
Mon Nov 29 21:14:08 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 dd7949876854c1485f480e93181e9f989d3bb2ce (commit)
via ebb6e40ccdaebf0066db726be0d97045f37bcc2b (commit)
via 92b4ccdbaf45d9c37fd5c5ee007d9b572a3c12a0 (commit)
via 3e0ffc7d19a2843b48f168608db1ddb052c4c807 (commit)
via a65d4188b216a762af97b04c56f33701b0b24742 (commit)
via 9273f354a9ce6d490b9ad95251706ebec69adc53 (commit)
via 19e494bcd52bee7abf43a2f4ea5b9c197680d7b3 (commit)
via 38927a44063f9c36ab34a771e40e26d3ff361888 (commit)
via 5bb5216f82ef896aeb5e74a65532f059f27c22aa (commit)
via 1880cc14e834f8c40c206f1500968b3f5b001501 (commit)
from 253e30a541809be66f882a1e613dca7528494b57 (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 dd7949876854c1485f480e93181e9f989d3bb2ce
Author: Owen Leonard <oleonard at myacpl.org>
Date: Sat Nov 13 12:55:02 2010 -0500
Fix for Bug 4981, Tweak style of item listing on MARC display
Signed-off-by: Galen Charlton <gmcharlt at gmail.com>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
(cherry picked from commit 781b4e5fae89021c69c5de5e621faebb6457dd31)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit ebb6e40ccdaebf0066db726be0d97045f37bcc2b
Author: Owen Leonard <oleonard at myacpl.org>
Date: Fri Nov 12 22:00:26 2010 -0500
Fix for Bug 5051, Renewal due date doesn't always show on patron Checkout tab
Display of the renewal date footer in the template was conditional upon
the existence of checkouts from today.
In order to fix this bug it was necessary to repeat the markup for the
table footer twice in the template, so I created an include file for it.
The same include file can now be used in moremember.tmpl.
Signed-off-by: Galen Charlton <gmcharlt at gmail.com>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
(cherry picked from commit 083d3b1a929707a84fe4c97d4c815198bef9e1dc)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit 92b4ccdbaf45d9c37fd5c5ee007d9b572a3c12a0
Author: Owen Leonard <oleonard at myacpl.org>
Date: Fri Nov 12 16:12:11 2010 -0500
Fix for Bug 5269 - link to patron edit form when editing turned off
Signed-off-by: Nicole Engard <nengard at bywatersolutions.com>
Signed-off-by: Chris Nighswonger <cnighswonger at foundations.edu>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
(cherry picked from commit 16c891092fec9b413fb5cb86cc4a0f8f7c43888f)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit 3e0ffc7d19a2843b48f168608db1ddb052c4c807
Author: Owen Leonard <oleonard at myacpl.org>
Date: Fri Nov 12 15:59:47 2010 -0500
Fix for Bug 5281, "Check in" then "Renew" checkboxes checked in the same time
This fix corrects the behavior of the checkboxes whether the user clicks the
checkbox itself or the <td> around it. Tested on a PC in Firefox 3.6, Chrome,
Safari 5, and IE 8.
Signed-off-by: Chris Nighswonger <cnighswonger at foundations.edu>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
(cherry picked from commit cc57c2688d73046ee4930869d2d7fabdc8dd37ca)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit a65d4188b216a762af97b04c56f33701b0b24742
Author: Galen Charlton <gmcharlt at gmail.com>
Date: Sat Nov 13 16:50:30 2010 -0500
Updating Version Number to 3.02.01.001
bug 5127: database update to add the suggestion notification templates
Being especially careful to not scribble over any ones
that the library might have already defined.
Signed-off-by: Galen Charlton <gmcharlt at gmail.com>
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit 9273f354a9ce6d490b9ad95251706ebec69adc53
Author: Galen Charlton <gmcharlt at gmail.com>
Date: Sat Nov 13 16:35:43 2010 -0500
bug 5127: sample notice templates for suggestions
* supply default suggestion status change email
templates.
* remove the deprecated mail_suggestion_*.tmpl files
There are a couple suggestion statuses referred to
in the code and suggestion management page that currently
do not have notice templates defined: ASK and CHECKED. These
seem to be internal, so perhaps default message templates
are not needed for these.
Signed-off-by: Galen Charlton <gmcharlt at gmail.com>
(cherry picked from commit 7fd45b986197721f1486bea61a20a717d4217c4a)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit 19e494bcd52bee7abf43a2f4ea5b9c197680d7b3
Author: Galen Charlton <gmcharlt at gmail.com>
Date: Sat Nov 13 16:27:47 2010 -0500
bug 4211: ensure that suggestion emails have full details
Because of how the ModFoo routines work, if you are only
changing selected columns but are also using the change
as a trigger to place a message in the queue, you need
to fetch the full row before generating the message.
Signed-off-by: Galen Charlton <gmcharlt at gmail.com>
(cherry picked from commit d3df54d05245b3fa11f052b4c09104bdd2531e31)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit 38927a44063f9c36ab34a771e40e26d3ff361888
Author: Galen Charlton <gmcharlt at gmail.com>
Date: Sat Nov 13 15:43:27 2010 -0500
bug 4211: more fixes to suggestion letter template handling
* Now displays the correct list of fields to choose
for suggestion letters.
* Clean up mixture of old and new column selection code
introduced in commit 88bb1b63, thereby restoring
the intent of the patch for bug 3522.
* Enable suggestion library to be used in suggestion
letter templates
Signed-off-by: Galen Charlton <gmcharlt at gmail.com>
(cherry picked from commit 994d6e2aac6092b7c852546eeca2253f59270e53)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit 5bb5216f82ef896aeb5e74a65532f059f27c22aa
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date: Fri Aug 13 09:44:46 2010 +1200
Bug 4211: This patch should provide a working way to send out mail from suggestions
Your suggestion notices template needs to contain things like
<<suggestions.title>>
<<suggestions.author>>
etc
Squashed commit of the following:
commit 3f4278bbe8d4c68be9f72d50e1eef6a411dc873d
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date: Fri Aug 13 09:41:34 2010 +1200
bug 4211 parsing the letter before we enqueue it
commit ecdc0ff34c1aa9b96b68d541423ca693e2d63e67
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date: Fri Aug 13 09:32:09 2010 +1200
Changing the query to fetch suggestions data, this is needed for suggestion mail to be sent
commit ece11d015b945ce119cf7cbc5e2563f4bc8aecf9
Author: Owen Leonard <oleonard at myacpl.org>
Date: Thu Aug 12 12:36:26 2010 -0400
Fix for Bug 4211, Acquisitions actions on suggestions don't generate email
Assuming 1) The patch for Bug 5126 is approved and 2) Suggestions
notices are added by hand (or from default sql--see Bug 5127) this
correction should get suggestions notices properly enqueued.
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
commit 5c3bbe7d557b1994be72518746217fc6fc4e5b83
Author: Owen Leonard <oleonard at myacpl.org>
Date: Thu Aug 12 12:27:33 2010 -0400
Fix for Bug 5126 - Suggestions module missing from "add notice" form
- Adding "suggestions" entry
- Re-ordering options in alphabetical order
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
Signed-off-by: Galen Charlton <gmcharlt at gmail.com>
(cherry picked from commit b1c2d560b66272ec34c1bbd380db24452be9bc3f)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit 1880cc14e834f8c40c206f1500968b3f5b001501
Author: Chris Nighswonger <chris.nighswonger at gmail.com>
Date: Mon Nov 29 14:43:24 2010 -0500
Updating Version Number to 3.02.01.000
Updating version number for 3.2.1 release.
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
-----------------------------------------------------------------------
Summary of changes:
C4/Letters.pm | 3 +-
C4/Suggestions.pm | 28 +++--
.../data/mysql/de-DE/mandatory/sample_notices.sql | 6 +-
.../data/mysql/en/mandatory/sample_notices.sql | 6 +-
.../mysql/fr-FR/1-Obligatoire/sample_notices.sql | 6 +-
installer/data/mysql/it-IT/necessari/notices.sql | 6 +-
.../data/mysql/pl-PL/mandatory/sample_notices.sql | 6 +-
.../data/mysql/ru-RU/mandatory/sample_notices.sql | 6 +-
.../data/mysql/uk-UA/mandatory/sample_notices.sql | 6 +-
installer/data/mysql/updatedatabase.pl | 40 +++++++
.../prog/en/includes/checkouts-table-footer.inc | 25 +++++
.../prog/en/modules/circ/circulation.tmpl | 110 +++++++-------------
.../prog/en/modules/members/moremember.tmpl | 36 ++-----
.../suggestion/mail_suggestion_ACCEPTED.tmpl | 11 --
.../suggestion/mail_suggestion_AVAILABLE.tmpl | 11 --
.../suggestion/mail_suggestion_ORDERED.tmpl | 13 ---
.../suggestion/mail_suggestion_REJECTED.tmpl | 13 ---
.../prog/en/modules/tools/letter.tmpl | 23 +++--
koha-tmpl/opac-tmpl/prog/en/css/opac.css | 63 +++++++-----
koha-tmpl/opac-tmpl/prog/en/modules/opac-user.tmpl | 6 +-
kohaversion.pl | 2 +-
tools/letter.pl | 59 +----------
22 files changed, 224 insertions(+), 261 deletions(-)
create mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/checkouts-table-footer.inc
delete mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/mail_suggestion_ACCEPTED.tmpl
delete mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/mail_suggestion_AVAILABLE.tmpl
delete mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/mail_suggestion_ORDERED.tmpl
delete mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/mail_suggestion_REJECTED.tmpl
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list