[koha-commits] main Koha release repository branch 3.4.x updated. v3.04.04-39-g5cc224c
Git repo owner
gitmaster at git.koha-community.org
Fri Sep 2 21:24:02 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 5cc224c2b9c2e4e56743f47f01e7203129d98674 (commit)
via f8b236cf41bb94e23092ecd7719104655f327e8a (commit)
via ea13523f39b64876aeecc55bf5b272aac20be9d8 (commit)
via d40172304337df6ac767603f12ba8c9aac088652 (commit)
via 26c8351e0824aae59b33a1f175a5f5b5658c2d61 (commit)
via b2b850e196494446c7a576e3c7616b38b8114754 (commit)
via 23a289c8fc338e60c31e1c9ace5cd2578190453a (commit)
via 3e24de6743b8a679120d8a6f3e6d9a4b75b2ffb5 (commit)
via ad588f2d30ef706aceb6a5cb86733da8089ca52c (commit)
via 95e47cd9490f3471cc5f90039fa90910684107ef (commit)
via c03df35867e6df5d2ce45d6423434c6fceddd079 (commit)
via 85f5f84f0161e2ee57e8302215580a3e747b0ddc (commit)
via e934c2fb99d482456ae9cb6421046037f345cefe (commit)
via 2346f0e97a4ff5d8062e1c6f09f94512dee84847 (commit)
via 86b844adf21e49fa8779211b149de0390cf4d072 (commit)
via f7622034a9ec700de0f2da0a7524df7583693853 (commit)
via 4849fa64f5278b305f5334e600ff05448e2f2e09 (commit)
via de601feb6ba95de66bff008e6e00d24b367f23d6 (commit)
via 3bfed2b838893dbca336a042405a77eb93b21100 (commit)
via d879db93bd81a9f0a54fdf1d56a76f451a22795e (commit)
via d4ade6fcb20b07c0da38b9d4067ba9ed6b0cfea8 (commit)
via 80ffc7e53cc7262a1b0502f689af0fe43d3123ba (commit)
via b4ad543173782db98443b03e3ed099859c99e02a (commit)
via 21c4438cceeb490a1bd46ddf11ed9df3fe330fd8 (commit)
via 5f5a782666dd2005e8cb7ee679eda281e807df18 (commit)
via 0dfdb05c8892f070da27a94f15fad47d24c26e2a (commit)
via 1cc389269cf536c9ca580199c1dc1f878b4af555 (commit)
via 503bed73705c124c76b66de0539bb1608b94bb48 (commit)
via 09010c20383fc1f592d0376559765024b302ebac (commit)
via f1e7a9f019cb82c555711129b63b06282f0b397d (commit)
via d729e75b0d1c21178fe988cc1b66b567ff45dd1b (commit)
via 862df3d8461a7a6455b606a7ee595334a93c59cf (commit)
via 85f4ca591ee6cd1d672e251dc416bc86a3e92142 (commit)
via 31b326c7507a1b0a6d475d3576ccc88af4c89efd (commit)
via c587b2e8548578365c244ec699e4fe471a42ce4d (commit)
via 807b5ef4c78179498096c2494797f0a57363a6a9 (commit)
via bfed019c2006d8268a99c8bdfa9f3b5b288d7b00 (commit)
via 624d79e99f9a29494a5c664343d1151f4c7cb81e (commit)
via 2912b144cd6703286e4c6d60d25b9d1606fc2b45 (commit)
from de9926a99c8cbd940abd20279f8af0413fa79593 (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 5cc224c2b9c2e4e56743f47f01e7203129d98674
Author: Steven Callender <stevecallender at esilibrary.com>
Date: Tue Aug 30 15:19:23 2011 -0400
Bug 6822: fix RIS export from OPAC
Prior to this patch, RIS export was producing
effectively empty output.
Signed-off-by: Steven Callender <stevecallender at esilibrary.com>
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
(cherry picked from commit a2a9bc522035c17a24aa48badc5184b015197826)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit f8b236cf41bb94e23092ecd7719104655f327e8a
Author: Ian Walls <ian.walls at bywatersolutions.com>
Date: Tue Aug 30 13:49:51 2011 -0400
Bug 6351: Cannot delete library-specific holds polices and checkout limits
Template::Toolkit scope error on delete links on Checkout Limit by Patron Category
and Holds Policy by Item Type areas.
Testing Results:
Tested adding and removing Checkout Limits by Patron Category - both work
Tested adding and removing Holds Policies by ItemTypes - both work
Signed-off-by: Liz Rea <lrea at nekls.org>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
(cherry picked from commit cb6c40faf78fa25b752c3c51abc98435e9afe4cb)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit ea13523f39b64876aeecc55bf5b272aac20be9d8
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date: Mon Aug 29 16:46:11 2011 +1200
Bug 6704 : Escaping html in the merging records, so " don't break the merge
Signed-off-by: Nicole C. Engard <nengard at bywatersolutions.com>
Signed-off-by: Liz Rea <lrea at nekls.org>
Signed-off-by: Ian Walls <ian.walls at bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
(cherry picked from commit 720e3012a87ca437c17e864f159138304ed0c006)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit d40172304337df6ac767603f12ba8c9aac088652
Author: Maxime Pelletier <maxime.pelletier at libeo.com>
Date: Sat Aug 27 09:09:46 2011 +1200
Bug 6794 : Fixing a bug with member flags in IE
Rebased for template toolkit
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
(cherry picked from commit 6756581cf88bcbe40203722bb29aef6abe9283f6)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit 26c8351e0824aae59b33a1f175a5f5b5658c2d61
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date: Fri Aug 26 13:42:44 2011 +1200
Bug 5524 : Cant delete list from the second page of lists
Includes follow up fixing deleting lists in OPAC
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
Signed-off-by: Ian Walls <ian.walls at bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
(cherry picked from commit e39de040206eae26e22d6375479b548017cb7217)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit b2b850e196494446c7a576e3c7616b38b8114754
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date: Mon Aug 29 14:14:58 2011 +1200
Bug 6528 : Cataloguing search not showing location for available items
Cataloging search now shows holdings information.
Signed-off-by: Liz Rea <lrea at nekls.org>
Signed-off-by: Ian Walls <ian.walls at bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
(cherry picked from commit ff4b179e14ab15bf5d20852a37e2b0a2dca45800)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit 23a289c8fc338e60c31e1c9ace5cd2578190453a
Author: preprod34 <preprod34 at koha.ccsr.qc.ca>
Date: Fri Aug 12 11:44:33 2011 -0400
Bug 6715 - Fix xmlControlfield.js so the xml files are fetched in the correct language directory.
xmlControlfield.js was always fetching the "en" xml file, preventing the translations
from working.
http://bugs.koha-community.org/show_bug.cgi?id=6715
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
- Apply patch
- Install language files, example: perl translate install de-DE
- Edit .xml files for value builders 006 and 008
- Test by creating a new record and using value builders
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
(cherry picked from commit 390d1d5be6e59990bee85ed6e44f117a8cd19c54)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit 3e24de6743b8a679120d8a6f3e6d9a4b75b2ffb5
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date: Sun Aug 28 19:47:22 2011 +1200
Updating about page and history
(cherry picked from commit 61758c8bcbd6d8c2a03e39ca196e944470520c97)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit ad588f2d30ef706aceb6a5cb86733da8089ca52c
Author: Owen Leonard <oleonard at myacpl.org>
Date: Thu Aug 11 15:21:35 2011 -0400
Fix for Bug 6712 - Remove memberofinstitution markup from templates until it can be completed
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
To test:
1) Make sure syspref memberofinstitution is turned on
2) Add a new patron of organisation category (example: library)
3) Check that there is no field set 'organisation' showing up
4) Checkout books to any borrower
5) Renew books until no longer possible
6) Scan barcode from renewed book to force renewal
6) Check that the 'no more renewals' message has no empty pull below text message
Signed-off-by: Ian Walls <ian.walls at bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
(cherry picked from commit bd744e6f2af85110cefa8d9e613393a0a517185b)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit 95e47cd9490f3471cc5f90039fa90910684107ef
Author: Owen Leonard <oleonard at myacpl.org>
Date: Wed Aug 10 11:44:37 2011 -0400
Fix for Bug 6696, New category button broken when no categories defined
The javascript tablesorter will trigger an error if we try
to apply it to a table with no <tbody>. That error prevented
the YUI button script to complete properly, hence the broken
button.
This patch hides the table in cases where there are no
categories and displays an error message instead.
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
- Deleted all patron categories and checked button was broken
- Applied patch and checked again - button shows up
- Nice: There is a note now that you have to create categories
Signed-off-by: Ian Walls <ian.walls at bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
(cherry picked from commit a94a9f745556d42e5018695dbaa70a72129cc993)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit c03df35867e6df5d2ce45d6423434c6fceddd079
Author: Owen Leonard <oleonard at myacpl.org>
Date: Mon Aug 1 07:51:18 2011 -0400
Fix for Bug 6652, Zip showing in funny place on libraries admin
This fixes display of Zip code relative to the city and state if
you're in the USA and you like to do it this way. At the very
least this matches how we display addresses elsewhere in Koha.
It should be noted that this makes it incorrect for anyone who
wants to see addresses like this:
[name]
[street address]
[postal code + city]
...or any other variation of course.
While I'm in there, also making branch URLs and emails clickable.
Signed-off-by: Nicole Engard <nengard at gmail.com>
Signed-off-by: Ian Walls <ian.walls at bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
(cherry picked from commit 3731ec80fc407ba4668450b48c9c81b8c0a98460)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit 85f5f84f0161e2ee57e8302215580a3e747b0ddc
Author: Owen Leonard <oleonard at myacpl.org>
Date: Fri Aug 26 15:14:48 2011 -0400
Fix for Bug 6791 - editing list with apostrophe loses text
Markup used single quotes around value attribute. Since single
quotes aren't escaped by the template's HTML filter these
quotes conflicted with the one in the text.
Signed-off-by: Nicole C. Engard <nengard at bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
(cherry picked from commit e73965c62f3895d5bdf5ad0a52c89e54e248f8f1)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit e934c2fb99d482456ae9cb6421046037f345cefe
Author: Colin Campbell <colin.campbell at ptfs-europe.com>
Date: Fri Aug 26 17:14:25 2011 +0100
Bug 6733 - Change return page after printing routing slip
Previously printing a routing slip returned the user to
the top level in serials this change maintains the context
in the current subscription
Signed-off-by: Nicole C. Engard <nengard at bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
(cherry picked from commit 99b51e03183ec79f6ce46834207511702c2599d6)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit 2346f0e97a4ff5d8062e1c6f09f94512dee84847
Author: Ulrich Kleiber <ulrich.kleiber at bsz-bw.de>
Date: Fri Jul 29 16:35:40 2011 +0200
Bug 6765: sip2 unicode checksum
Changes checksum calculation method, as per Dan Scott's fix in openncip.
see http://sourceforge.net/tracker/?func=detail&aid=2925760&group_id=161781&atid=821216
http://bugs.koha-community.org/show_bug.cgi?id=6765
Signed-off-by: Ian Walls <ian.walls at bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
(cherry picked from commit 8a7c9167660493bc1a01a93dddba37a1a3683bc0)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit 86b844adf21e49fa8779211b149de0390cf4d072
Author: Owen Leonard <oleonard at myacpl.org>
Date: Mon Aug 22 11:08:59 2011 -0400
Fix for Bug 4419 - cannot change module for notice templates
Adding a hidden form field to contain the original module
so that it can be used in the check for an existing entry.
Signed-off-by: Nicole C. Engard <nengard at bywatersolutions.com>
Signed-off-by: Ian Walls <ian.walls at bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
(cherry picked from commit eb7456c685db962f0c1c3d1d88421711a7ec4a7d)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit f7622034a9ec700de0f2da0a7524df7583693853
Author: Nicole C. Engard <nengard at bywatersolutions.com>
Date: Sat Aug 20 19:33:18 2011 -0400
Bug 6662: Remove Dewey Specific References in Sort
The sort option used to include tooltips for call number
that were Dewey specific. This patch removes references
to Fiction and Nonfiction so that it can apply to any
classification.
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
Signed-off-by: Ian Walls <ian.walls at bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
(cherry picked from commit 57a0fcb475ff7e353329ba9a7e5963a22351b4c9)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit 4849fa64f5278b305f5334e600ff05448e2f2e09
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Mon Aug 22 14:02:03 2011 +0200
6747 Checks in opac-export
Added check on returned marc. If record does not exist, generate 404. (Prevents 500 errors by Googlebot on deleted records.)
Fixed typo, whitespace. Removed if on op=export. Added check on format.
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
Signed-off-by: Ian Walls <ian.walls at bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
(cherry picked from commit 223156ea74233122c35d16100724eddbcd69d66a)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit de601feb6ba95de66bff008e6e00d24b367f23d6
Author: Chris Nighswonger <chris.nighswonger at gmail.com>
Date: Fri Sep 2 15:07:38 2011 -0400
Updating Version Number to 3.04.04.001
commit 3bfed2b838893dbca336a042405a77eb93b21100
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date: Thu Aug 25 15:21:01 2011 +1200
Bug 5866 : Updated patch to speed up holds awaiting pickup
This reduced execution time on the report from timeout (1400 holds waiting + 200 holds over) to 6 or so seconds, with 1566 holds over (test data, no holds waiting).
Signed-off-by: Liz Rea <lrea at nekls.org>
Signed-off-by: Ian Walls <ian.walls at bywatersolutions.com>
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit d879db93bd81a9f0a54fdf1d56a76f451a22795e
Author: Owen Leonard <oleonard at myacpl.org>
Date: Fri Aug 19 10:23:58 2011 -0400
Follow-up fix for Bug 6753, Markup corrections and improvements for label export window
Making the same changes to the patron card export window.
Now that all references are removed, the old icons and CSS
have been removed as well.
Signed-off-by: Nicole C. Engard <nengard at bywatersolutions.com>
(cherry picked from commit 63d300191efb3207b7ebb95b98db0d86ca371f16)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit d4ade6fcb20b07c0da38b9d4067ba9ed6b0cfea8
Author: Owen Leonard <oleonard at myacpl.org>
Date: Wed Aug 24 09:50:19 2011 -0400
Follow-up fix for Bug 6726 - When SMS is enabled the messaging table is misaligned
Corresponding fix for the OPAC
Signed-off-by: Nicole C. Engard <nengard at bywatersolutions.com>
Signed-off-by: Ian Walls <ian.walls at bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
(cherry picked from commit 666a2316d8adbd8fadba263c42dba71fe992532c)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit 80ffc7e53cc7262a1b0502f689af0fe43d3123ba
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date: Fri Aug 26 13:00:54 2011 +1200
Fixing typo in history doc
(cherry picked from commit 9c346e25269ada0b3fa5f5a6934986970c6b9a9f)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit b4ad543173782db98443b03e3ed099859c99e02a
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date: Fri Aug 26 12:49:50 2011 +1200
150th developer!!!
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit 21c4438cceeb490a1bd46ddf11ed9df3fe330fd8
Author: Ward van Wanrooij <wvanwanrooij at nextfactory.nl>
Date: Mon Aug 15 14:38:40 2011 +0200
Bug 6723 : import-framework-crlf
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
Signed-off-by: Ian Walls <ian.walls at bywatersolutions.com>
(cherry picked from commit 07838bfcb16bf329bbc4953dff5b624005a8a734)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit 5f5a782666dd2005e8cb7ee679eda281e807df18
Author: Colin Campbell <colin.campbell at ptfs-europe.com>
Date: Mon Jul 4 16:20:59 2011 +0100
Bug 6562: Silence runtime error in reserve/request.pl
Not defining action just causes logging of noisy
runtime warnings.
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
(cherry picked from commit bb251a484fb9acbce9b162213278d7f5a49fa269)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit 0dfdb05c8892f070da27a94f15fad47d24c26e2a
Author: Nicole C. Engard <nengard at bywatersolutions.com>
Date: Tue Jun 28 15:24:45 2011 -0400
bug 6538 update letter.pl help file
Signed-off-by: Nicole C. Engard <nengard at bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
(cherry picked from commit 13fd914b086d32c69c190a6fa0279fc2b2054780)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit 1cc389269cf536c9ca580199c1dc1f878b4af555
Author: Owen Leonard <oleonard at myacpl.org>
Date: Wed Aug 10 11:16:42 2011 -0400
Fix for Bug 6695 - Layout of patron category add/edit form slightly broken
The markup for the fields for enrollment period "in months" and "until date"
was non-standard I think because the two fields are supposed to be visually
and functionally linked (having the same purpose and being mutually
exclusive).
This patch changes the markup so that the two fields share a fieldset
having "choose one" as the legend. The "hint" is now hidden unless
it is triggered by the javascript validation on submit.
I wanted to trigger the validation of the two fields onblur instead
of just onsubmit, but found that the datepicker widget doesn't
consistently trigger a change or a blur event on that field.
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
- Layout problems are fixed
- Layout is more clear about choosing either 'In months' or 'Until date'
- Clear error message shows when you enter values in both fields
Signed-off-by: Ian Walls <ian.walls at bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
(cherry picked from commit 54e0667b23466043de2ddd73b0b0e37f9632ea06)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit 503bed73705c124c76b66de0539bb1608b94bb48
Author: Owen Leonard <oleonard at myacpl.org>
Date: Mon Aug 15 15:22:21 2011 -0400
Follow-up to Bug 4868, Improve controls for cloning and deleting subfields
- Adding similar icons for cloning and deleting tags
- Adding icon for the "Tag editor" links ("...")
Signed-off-by: Nicole C. Engard <nengard at bywatersolutions.com>
(cherry picked from commit 7b2cd8e636a5b2eda0c405c2198eb09c2c35e22c)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit 09010c20383fc1f592d0376559765024b302ebac
Author: Salvador Zaragoza Rubio <salvazm at masmedios.com>
Date: Fri Aug 19 12:33:05 2011 +0200
Bug 6727 - Change on exporting and importing csv to deal with spurious CR/LF
Function _export_table_csv modified to remove CR/LF in the data
from the database to built a correct csv file.
Function _import_table_csv modified to deal with CR/LF in the data
field. When a line is found with an unproper end (a data field has not
end quote), it's concatenated to a temporary buffer until the next
line ends ok and then it's proccessed.
Signed-off-by: Nicole C. Engard <nengard at bywatersolutions.com>
Signed-off-by: Ian Walls <ian.walls at bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
(cherry picked from commit 6b69260fbd75f80b1831341b9bb5b18b54fef56b)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit f1e7a9f019cb82c555711129b63b06282f0b397d
Author: Owen Leonard <oleonard at myacpl.org>
Date: Fri Aug 19 14:40:48 2011 -0400
Follow-up fix for Bug 5498, Standardize markup and style of pagination menus
Missed a couple of instances of the pagination menu on the
lists page. Previously the pagination links on the page
listing lists (/cgi-bin/koha/virtualshelves/shelves.pl) was
unstyled. After this patch the links should be styled.
Signed-off-by: Nicole C. Engard <nengard at bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
(cherry picked from commit 7f884128f67125c542daae77b32108e6cf14a5a5)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit d729e75b0d1c21178fe988cc1b66b567ff45dd1b
Author: Owen Leonard <oleonard at myacpl.org>
Date: Mon Jul 18 15:38:13 2011 -0400
Fix for Bug 6602 - Reports dictionary doesn't properly recognize text columns
Reports dictionary won't let you set a comparison for MEDIUMTEXT columns. To
test, choose a MEDIUMTEXT column like borrowers.surname in Step 3 of adding
a new dictionary definition. Before the patch, in Step 4 you would not see
any kind of form field for entering a comparison. After patching Step 4 will
offer you a field labeled "Search string matches."
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
Fixes described problem with mediumtext columns.
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
(cherry picked from commit df2a3a9a3cf138bc11e2a39b4aad591d17359830)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit 862df3d8461a7a6455b606a7ee595334a93c59cf
Author: Magnus Enger <magnus at enger.priv.no>
Date: Mon Aug 15 09:00:07 2011 +0200
Bug 6540 - Followup - koha-create would die without --configfile
koha-create would fail to check that --configfile was set on the
commandline, before either including it if it existed or dying if
it did not. This patch should make sure the existence of a
configfile is only tested if --config is set.
Signed-off-by: Robin Sheat <robin at catalyst.net.nz>
This should apply against 3.4 and master.
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
(cherry picked from commit 31bb901e2b31748dd86e7da45672c42a5359c5a4)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit 85f4ca591ee6cd1d672e251dc416bc86a3e92142
Author: Owen Leonard <oleonard at myacpl.org>
Date: Tue Aug 16 08:38:21 2011 -0400
Fix for Bug 6726 - When SMS is enabled the messaging table is misaligned
The SMS section of the template was commented out in the patch
pushed for Bug 5889, 'Allow message names to be translatable'
with the comment 'fixing columns overflow.' That seems to have been
a cosmetic fix for what I can only imagine was a different bug?
Also fixing a T:T variable scope error.
After applying this patch the "SMS" column in the Patron messaging
preferences should appear when the SMSSendDriver preference is not empty.
Signed-off-by: Nicole C. Engard <nengard at bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
(cherry picked from commit 3270d384c53c04eee44fa54ed065eebb0741df22)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit 31b326c7507a1b0a6d475d3576ccc88af4c89efd
Author: Owen Leonard <oleonard at myacpl.org>
Date: Wed Aug 17 16:04:55 2011 -0400
Fix for Bug 6728, Table sorter for receiving acquisitions
Signed-off-by: Nicole C. Engard <nengard at bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
(cherry picked from commit cbdb5a823aa6387e77adb63e3ff389103ce8f603)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit c587b2e8548578365c244ec699e4fe471a42ce4d
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date: Mon Aug 22 14:05:05 2011 +1200
Bug 6703 : Link to invoice broken
(cherry picked from commit b78004c8e1e4c01ec44feede84bca58a9921664c)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit 807b5ef4c78179498096c2494797f0a57363a6a9
Author: Owen Leonard <oleonard at myacpl.org>
Date: Thu Aug 18 16:25:32 2011 -0400
Fix for Bug 6753, Markup corrections and improvements for label export window
The most visible change in this patch is the conversion of image-only
links to text links combined with icons. Other changes include
markup corrections and standardization and language corrections.
To test, go to Labels > Manage Batches. Select a batch and click
'Export' to see the revised interface.
Signed-off-by: Nicole C. 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 77e1a62efa6814b1beaefd5f8dd99b31643182bc)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit bfed019c2006d8268a99c8bdfa9f3b5b288d7b00
Author: Owen Leonard <oleonard at myacpl.org>
Date: Fri Aug 19 14:38:37 2011 -0400
Fix for Bug 6754, Improve breadcrumbs on lists pages
Breadcrumb navigation on the lists pages should give the user links back to the
category of list they're viewing, public or private.
Patch changes this:
Lists -> Contents of (Your list)
To this:
Lists -> Your lists -> Contents of (Your list)
Signed-off-by: Nicole C. Engard <nengard at bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
(cherry picked from commit 02f1058a80c4bd4f28331ce389c71a32b3fe1294)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit 624d79e99f9a29494a5c664343d1151f4c7cb81e
Author: Owen Leonard <oleonard at myacpl.org>
Date: Tue Aug 2 15:23:00 2011 -0400
Fix for Bug 6640, Locations not showing in circ reports
An invalid template syntax for defining a variable's default
value is found in the circ report template and several
others:
[% DEFAULT LibraryNameTitle="Koha Online" %]
Based on the T:T docs this appears to be the correct way of defining
a default value:
[% LibraryNameTitle or "Koha Online" %]
Reference:
http://template-toolkit.org/docs/manual/Syntax.html#section_Implicit_Directives_GET_and_SET
Signed-off-by: Nicole Engard <nengard at gmail.com>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
(cherry picked from commit 714c8b924ede922971086597e382364bf4d79312)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
commit 2912b144cd6703286e4c6d60d25b9d1606fc2b45
Author: Tomas Cohen Arazi <tomascohen at gmail.com>
Date: Wed Aug 17 13:45:34 2011 -0300
Bug 6744 - Acknowledge the actual es-ES translators
es-ES translator credits are way outdated as of http://translate.koha-community.org/es/34
Regards
To+
Signed-off-by: Federico Rinaudo <frinaudo at infocpt.com.ar>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
(cherry picked from commit bc5aa5281d4bc29c8398d3411db4b03e1601ad4f)
Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>
-----------------------------------------------------------------------
Summary of changes:
C4/ImportExportFramework.pm | 17 ++-
C4/SIP/Sip/Checksum.pm | 4 +-
C4/VirtualShelves/Page.pm | 18 ++-
cataloguing/addbiblio.pl | 10 +-
circ/waitingreserves.pl | 3 +-
debian/scripts/koha-create | 11 +-
docs/history.txt | 7 +-
installer/data/mysql/kohastructure.sql | 1 +
installer/data/mysql/updatedatabase.pl | 6 +
.../intranet-tmpl/prog/en/css/staff-global.css | 75 +++-------
.../prog/en/includes/messaging-preference-form.inc | 6 +-
.../intranet-tmpl/prog/en/includes/resort_form.inc | 8 +-
.../intranet-tmpl/prog/en/js/xmlControlfield.js | 6 +-
koha-tmpl/intranet-tmpl/prog/en/modules/about.tt | 8 +-
.../intranet-tmpl/prog/en/modules/acqui/parcel.tt | 13 ++-
.../intranet-tmpl/prog/en/modules/acqui/parcels.tt | 2 +-
.../prog/en/modules/admin/branches.tt | 10 +-
.../prog/en/modules/admin/categorie.tt | 34 +++--
.../prog/en/modules/admin/preferences.tt | 6 +-
.../prog/en/modules/admin/smart-rules.tt | 4 +-
.../prog/en/modules/cataloguing/addbiblio.tt | 5 +-
.../prog/en/modules/cataloguing/addbooks.tt | 4 +-
.../prog/en/modules/cataloguing/merge.tt | 10 +-
.../cataloguing/value_builder/marc21_field_006.tt | 2 +-
.../cataloguing/value_builder/marc21_field_008.tt | 2 +-
.../prog/en/modules/circ/circulation.tt | 4 -
.../intranet-tmpl/prog/en/modules/circ/overdue.tt | 4 +-
.../prog/en/modules/circ/reserveratios.tt | 4 +-
.../intranet-tmpl/prog/en/modules/circ/returns.tt | 2 +-
.../prog/en/modules/circ/selectbranchprinter.tt | 8 +-
.../prog/en/modules/help/tools/letter.tt | 131 ++++++++++++----
.../prog/en/modules/labels/label-print.tt | 162 ++++++-------------
.../prog/en/modules/members/member-flags.tt | 10 +-
.../prog/en/modules/members/memberentrygen.tt | 20 ---
.../prog/en/modules/patroncards/members-search.tt | 2 +-
.../prog/en/modules/patroncards/print.tt | 144 +++++++-----------
.../en/modules/reports/guided_reports_start.tt | 4 +-
.../prog/en/modules/reports/issues_stats.tt | 10 +-
.../prog/en/modules/reports/reserves_stats.tt | 10 +-
.../prog/en/modules/serials/routing-preview.tt | 4 +-
.../intranet-tmpl/prog/en/modules/tools/letter.tt | 1 +
.../prog/en/modules/virtualshelves/shelves.tt | 15 +-
koha-tmpl/intranet-tmpl/prog/img/csv_icon.gif | Bin 1315 -> 0 bytes
koha-tmpl/intranet-tmpl/prog/img/delete-tag.png | Bin 0 -> 244 bytes
koha-tmpl/intranet-tmpl/prog/img/edit-tag.png | Bin 0 -> 264 bytes
.../img}/famfamfam/silk/page_white_acrobat.png | Bin 591 -> 591 bytes
.../prog/img}/famfamfam/silk/page_white_code.png | Bin 603 -> 603 bytes
.../prog/img}/famfamfam/silk/page_white_excel.png | Bin 663 -> 663 bytes
koha-tmpl/intranet-tmpl/prog/img/icon_xml.gif | Bin 1239 -> 0 bytes
koha-tmpl/intranet-tmpl/prog/img/pdficon_large.gif | Bin 434 -> 0 bytes
koha-tmpl/intranet-tmpl/prog/img/repeat-tag.png | Bin 0 -> 244 bytes
.../opac-tmpl/prog/en/includes/resort_form.inc | 8 +-
koha-tmpl/opac-tmpl/prog/en/modules/ilsdi.tt | 2 +-
.../opac-tmpl/prog/en/modules/opac-messaging.tt | 6 +-
.../prog/en/modules/opac-readingrecord.tt | 2 +-
.../opac-tmpl/prog/en/modules/opac-reserve.tt | 2 +-
koha-tmpl/opac-tmpl/prog/en/modules/opac-review.tt | 2 +-
.../opac-tmpl/prog/en/modules/opac-shelves.tt | 2 +
koha-tmpl/opac-tmpl/prog/en/modules/opac-tags.tt | 2 +-
.../opac-tmpl/prog/en/modules/opac-tags_subject.tt | 2 +-
.../opac-tmpl/prog/en/modules/sco/sco-main.tt | 2 +-
kohaversion.pl | 2 +-
opac/opac-export.pl | 105 ++++++-------
reports/dictionary.pl | 2 +-
reserve/request.pl | 1 +
tools/letter.pl | 18 ++-
66 files changed, 472 insertions(+), 493 deletions(-)
delete mode 100644 koha-tmpl/intranet-tmpl/prog/img/csv_icon.gif
create mode 100644 koha-tmpl/intranet-tmpl/prog/img/delete-tag.png
create mode 100644 koha-tmpl/intranet-tmpl/prog/img/edit-tag.png
copy koha-tmpl/{opac-tmpl/prog => intranet-tmpl/prog/img}/famfamfam/silk/page_white_acrobat.png (100%)
copy koha-tmpl/{opac-tmpl/prog => intranet-tmpl/prog/img}/famfamfam/silk/page_white_code.png (100%)
copy koha-tmpl/{opac-tmpl/prog => intranet-tmpl/prog/img}/famfamfam/silk/page_white_excel.png (100%)
delete mode 100644 koha-tmpl/intranet-tmpl/prog/img/icon_xml.gif
delete mode 100644 koha-tmpl/intranet-tmpl/prog/img/pdficon_large.gif
create mode 100644 koha-tmpl/intranet-tmpl/prog/img/repeat-tag.png
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list