From gitmaster at git.koha-community.org Mon Jun 3 16:05:39 2013 From: gitmaster at git.koha-community.org (Git repo owner) Date: Mon, 03 Jun 2013 14:05:39 +0000 Subject: [koha-commits] main Koha release repository branch 3.12.x updated. v3.12.00-16-ged34661 Message-ID: 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.12.x has been updated via ed34661870e50e04acf61c7f687343b9a2a8f1da (commit) via 5cea7144bc50477f8518ae47e78282de287c1a23 (commit) via 84481e79527d8ad1c5a3393b716c17f550736857 (commit) via c8ea6ba025455a26a585733fdb214942a9823a45 (commit) via d22fb794dcc977c096665c4aa44ffc2185af7d46 (commit) from 8e478703296bc128f5974c15e259a0a8167b2d3f (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 ed34661870e50e04acf61c7f687343b9a2a8f1da Author: Colin Campbell Date: Wed May 22 19:32:45 2013 +0100 Bug 10313 Fix link to invoice from orders Need to have invoiceid and pass it to retrieve selected invoicenumber. Wrong data passed causing incorrect records to be displayed Signed-off-by: Julian Maurice Signed-off-by: Jonathan Druart Signed-off-by: Galen Charlton (cherry picked from commit 3f4d31309203b85b5415788967d4c8cf3ce83570) Signed-off-by: Tomas Cohen Arazi There's a small POD error, I'll try to provide a followup for it. commit 5cea7144bc50477f8518ae47e78282de287c1a23 Author: Jonathan Druart Date: Thu May 23 09:33:48 2013 +0200 Bug 10310: Followup Prevent submitting form with enter does not work with IE Check e.target.type instead of using jQuery. Signed-off-by: Marcel de Rooy Signed-off-by: Galen Charlton (cherry picked from commit c4978ef178746df06333c6704ea9e6f888b4b9ff) Signed-off-by: Tomas Cohen Arazi commit 84481e79527d8ad1c5a3393b716c17f550736857 Author: Jonathan Druart Date: Wed May 22 15:49:26 2013 +0200 Bug 10310: Prevent submitting form with enter does not work with IE I am not able to test this patch with IE... I tested it with Chromium and FF and it works great. This patch can be tested on the neworderempty.pl page Signed-off-by: Marcel de Rooy Signed-off-by: Galen Charlton (cherry picked from commit efdf30bc476ab130b0dc4767ba38d68208eb2ca7) Signed-off-by: Tomas Cohen Arazi commit c8ea6ba025455a26a585733fdb214942a9823a45 Author: Jonathan Druart Date: Wed Jan 30 15:19:58 2013 +0100 Bug 9507: prevent submit: refactor some code in a js file This patch refactors some code in a js file. Test plan: On acqui/neworderempty.pl, acqui/orderreceive.pl and serials/serials-edit.tt try to scan a barcode (or press enter) on the form and check that it is not sent. Signed-off-by: Kyle M Hall Signed-off-by: Marcel de Rooy Have to note that the code for IE9 does not work. Before and after this patch. If we refactor code, it would have been nice to resolve this too. But I do not oppose pushing this patch. The test uses 'an ancient Netscape property' window.Event (uppercase!) to make the distinction between browers and event models. Some more documentation here would be welcome too. Signed-off-by: Galen Charlton (cherry picked from commit 9e4c289d3f68aaab5d47172940e30fba0819804e) Signed-off-by: Tomas Cohen Arazi Refactoring, but needed for 10310 inclusion commit d22fb794dcc977c096665c4aa44ffc2185af7d46 Author: Owen Leonard Date: Tue Apr 30 15:33:48 2013 -0400 Bug 10036 - adding header search to additem page The add item screen lacks a header search form. This patch adds the cataloging header search include to additem.tt. To test, apply the patch and add items to or edit items of an existing record. The header search form should appear with options for cataloging search and circulation. Signed-off-by: Kyle M Hall Signed-off-by: Jonathan Druart Signed-off-by: Galen Charlton (cherry picked from commit 646015c6471fa3d248696a55b6f18d268b5a2f60) Signed-off-by: Tomas Cohen Arazi This should have been tagged as a bugfix... ----------------------------------------------------------------------- Summary of changes: C4/Acquisition.pm | 1 + .../intranet-tmpl/prog/en/js/prevent_submit.js | 11 +++++++++++ .../prog/en/modules/acqui/histsearch.tt | 4 ++-- .../prog/en/modules/acqui/neworderempty.tt | 19 +------------------ .../prog/en/modules/acqui/orderreceive.tt | 20 +------------------- .../prog/en/modules/cataloguing/additem.tt | 2 ++ .../prog/en/modules/serials/serials-edit.tt | 19 +------------------ 7 files changed, 19 insertions(+), 57 deletions(-) create mode 100644 koha-tmpl/intranet-tmpl/prog/en/js/prevent_submit.js hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Mon Jun 3 16:31:36 2013 From: gitmaster at git.koha-community.org (Git repo owner) Date: Mon, 03 Jun 2013 14:31:36 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.12.00-beta1-655-g1ef99ac Message-ID: 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, master has been updated via 1ef99ace2043d75889830c4c0af8af3e9e36104e (commit) via 44905ac99cee8ddca6c63752d948a74afae20194 (commit) from fd9d643705b5bb0134ee229a076130a966be23bd (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 1ef99ace2043d75889830c4c0af8af3e9e36104e Author: Marcel de Rooy Date: Mon Jun 3 14:25:43 2013 +0200 Bug 10290: Followup for Virtualshelves.t Put the 10 biblionumbers in a list Add a FIXME for deleting shelves Do temporary repair on duplicate name test (Followup via report 10386) Signed-off-by: Marcel de Rooy Signed-off-by: Galen Charlton commit 44905ac99cee8ddca6c63752d948a74afae20194 Author: Jonathan Druart Date: Mon May 20 16:56:38 2013 +0200 Bug 10290: UT: VirtualShelves.t needs to create its own data Try before the patch: prove t/db_dependent/VirtualShelves.t And after, it should produce: t/db_dependent/VirtualShelves.t .. ok All tests successful. Files=1, Tests=82, 6 wallclock secs ( 0.03 usr 0.00 sys + 0.46 cusr 0.03 csys = 0.52 CPU) Result: PASS Signed-off-by: Chris Cormack Signed-off-by: Marcel de Rooy Signed-off-by: Galen Charlton ----------------------------------------------------------------------- Summary of changes: t/db_dependent/VirtualShelves.t | 67 ++++++++++++++++++++++----------------- 1 files changed, 38 insertions(+), 29 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Mon Jun 3 16:39:11 2013 From: gitmaster at git.koha-community.org (Git repo owner) Date: Mon, 03 Jun 2013 14:39:11 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.12.00-beta1-656-ged8e506 Message-ID: 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, master has been updated via ed8e506953b78de0a09b87011709281054641ab0 (commit) from 1ef99ace2043d75889830c4c0af8af3e9e36104e (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 ed8e506953b78de0a09b87011709281054641ab0 Author: Owen Leonard Date: Mon Mar 11 16:11:26 2013 -0400 Bug 9744 - Add a column Fund name on the home page of acquisitions This patch offers an alternative option to fix Bug 9744. In this version the table of funds swaps positions with the suggestions block so that the table has the whole width of the screen. This eliminates the need to adjust its float property. Other changes: - Simplification of the column and row-hiding JavaScript - The addition of an "Active" column to be shown when all funds are shown (this helps indicate to the user which rows were hidden) - Linking the fund owner to their patron record - Linking the fund id, given the correct permissions, to the view of all funds for that budget (the best alternative to linking to a view of the fund details, which we do not have). - Correcting permission level required to add a budget To test, view the acquisitions home page. The layout should feel comfortable. The table of available funds should show the fund name. The checkbox to show all funds should work correctly. Signed-off-by: caroline very-mathieu Signed-off-by: Chris Cormack ----------------------------------------------------------------------- Summary of changes: acqui/acqui-home.pl | 5 +- .../prog/en/modules/acqui/acqui-home.tt | 154 ++++++++++++-------- 2 files changed, 93 insertions(+), 66 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Mon Jun 3 17:42:21 2013 From: gitmaster at git.koha-community.org (Git repo owner) Date: Mon, 03 Jun 2013 15:42:21 +0000 Subject: [koha-commits] main Koha release repository branch 3.12.x updated. v3.12.00-22-gcfdf475 Message-ID: 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.12.x has been updated via cfdf4759dc0fe857b3dfb2fcab2868e117c5e6ff (commit) via d66e56177ec52d2278007275b261ee5e5b577ad2 (commit) via 09a17abfda2f0f0a01d7b5f807e73dd77bfcb856 (commit) via b459eab4c89cf507ae3108194c2ec159b04672aa (commit) via 95d288da67dfc7c76f17fdd1dbf6feb5dd52678c (commit) via 1c6ab7f78575e7cc4eaee3eca397002ba9e23c8e (commit) from ed34661870e50e04acf61c7f687343b9a2a8f1da (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 cfdf4759dc0fe857b3dfb2fcab2868e117c5e6ff Author: Colin Campbell Date: Fri May 3 15:35:44 2013 +0100 Bug 10184 - Circulation History reverses sort order Issue data is passed to the readingrec template ordered most recent due date first. Datatables unless specified otherwise do a presort on the data they will display the default results in an order the reverse of what was intended. Disabling the presort preserves the initial sort order until the user selects a different sort Signed-off-by: Owen Leonard Signed-off-by: Chris Cormack Signed-off-by: Galen Charlton (cherry picked from commit 3285261d0150113e597d48a5a78aee5fdc1ebd94) Signed-off-by: Tomas Cohen Arazi commit d66e56177ec52d2278007275b261ee5e5b577ad2 Author: Owen Leonard Date: Mon May 13 15:21:46 2013 -0400 Bug 10193 - Copies should be holdings as label for items on MARC view In the OPAC MARC view, the table of holdings is labeled 'copies.' In order to be consistent with the normal view this should be labeled 'holdings.' This patch makes this correction. To test, apply the patch and view the MARC detail page for any record with items. The table of holdings data at the bottom of the page should be labeled 'Holdings.' Signed-off-by: Mirko Tietgen Signed-off-by: Jonathan Druart Signed-off-by: Galen Charlton (cherry picked from commit 492a1a19f99c27ccbb94cab2fa4318379076bc6f) Signed-off-by: Tomas Cohen Arazi commit 09a17abfda2f0f0a01d7b5f807e73dd77bfcb856 Author: Connor Fraser Date: Sat May 25 11:25:18 2013 +1200 Bug 7368: Correct three typos in history.txt Signed-off-by: Chris Cormack Signed-off-by: Marcel de Rooy Signed-off-by: Galen Charlton (cherry picked from commit 342463b5796825e8dd941e575694e8e4be6aa274) Signed-off-by: Tomas Cohen Arazi commit b459eab4c89cf507ae3108194c2ec159b04672aa Author: Katrin Fischer Date: Sun May 19 12:16:16 2013 +0200 Bug 10284: Add missing spaces between label and content in XSLT view (780/785) To test: - Check OPAC and intranet XSLT view for a record that contains 780 and 785 fields. - Verify there is no space between the label and the content of the field. - Apply patch. - Verify the display both in intranet and OPAC is a little nicer now. Signed-off-by: Galen Charlton Signed-off-by: Chris Cormack Signed-off-by: Galen Charlton (cherry picked from commit 4c1c323232cd303c9c1e0f02c83871e1e6fcd62d) Signed-off-by: Tomas Cohen Arazi commit 95d288da67dfc7c76f17fdd1dbf6feb5dd52678c Author: Tomas Cohen Arazi Date: Mon Jun 3 12:11:49 2013 -0300 Bug 10120: DBRev 3.12.00.001 Sponsored-by: Universidad Nacional de C?rdoba Signed-off-by: Tomas Cohen Arazi commit 1c6ab7f78575e7cc4eaee3eca397002ba9e23c8e Author: Chris Cormack Date: Tue Apr 30 08:56:22 2013 +1200 Bug 10120: Adding a syspref to control if overdue charges are updated on return On by default. To Test 1/ Create an overdue item, that should get fines 2/ Return the item 3/ Check the borrowers record to see if the fine has been added/updated Apply patch 1/ Make sure preference is set to do Repeat steps 1-3 above 2/ Switch the preference to don't Repeat stes 1-2 3/ Check the fine hasn't been added/updated Signed-off-by: David Cook Signed-off-by: Katrin Fischer All tests and QA script pass, works as described. I would categorize this a bug fix for libraries that don't want the new changed behaviour that was introduced by recalculating fines on return. Signed-off-by: Galen Charlton (cherry picked from commit fc61bd30186b0305579c5dee0a14f9d2733cd5db) Solved conflicts in: installer/data/mysql/sysprefs.sql installer/data/mysql/updatedatabase.pl and changed DB version number. Signed-off-by: Tomas Cohen Arazi ----------------------------------------------------------------------- Summary of changes: C4/Circulation.pm | 4 +++- docs/history.txt | 6 +++--- installer/data/mysql/sysprefs.sql | 1 + installer/data/mysql/updatedatabase.pl | 13 +++++++++++++ .../en/modules/admin/preferences/circulation.pref | 7 +++++++ .../prog/en/modules/members/readingrec.tt | 1 + .../prog/en/xslt/MARC21slim2intranetDetail.xsl | 3 ++- .../opac-tmpl/prog/en/modules/opac-MARCdetail.tt | 2 +- .../prog/en/xslt/MARC21slim2OPACDetail.xsl | 3 ++- kohaversion.pl | 2 +- 10 files changed, 34 insertions(+), 8 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Tue Jun 4 17:44:06 2013 From: gitmaster at git.koha-community.org (Git repo owner) Date: Tue, 04 Jun 2013 15:44:06 +0000 Subject: [koha-commits] main Koha release repository branch 3.12.x updated. v3.12.00-25-gd68bb6b Message-ID: 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.12.x has been updated via d68bb6b8c03c1d538b29448b5baf0dfb13cca736 (commit) via 85536020599855d6ae89aa1d66e05adc1c705f0e (commit) via cf96dd5f53eea3b585ea8a38b916a30b89c24bea (commit) from cfdf4759dc0fe857b3dfb2fcab2868e117c5e6ff (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 d68bb6b8c03c1d538b29448b5baf0dfb13cca736 Author: Galen Charlton Date: Mon May 20 10:12:44 2013 -0700 bug 10292: improve fallback logic for picking XSLT This patch fixes a bug whereby XSLT files from the prog theme would be used (for English OPACs and staff interfaces) even if the user had created and enabled a custom theme that provided override XSLT files. This patch provides a clearer implementation of the fallback logic and adds test cases. To reproduce the bug: [1] Set OPACXSLTDetailsDisplay to 'default' and English as the OPAC language. [2] Create a new OPAC theme, including copying the XSLT files. [3] Set opactheme to the new theme. [4] Make a change to koha-tmpl/opac-tmpl/NEWTHEME/en/xslt/MARC21slim2OPACDetail.xsl [5] View a bib record in the OPAC. The change made in the previous step is not reflected. To test after applying the patch: [6] Reload the bib record in the OPAC. The change made in step 4 should now be reflected. [7] (To be thorough) Go through the test plan for bug 8947 and verify that there is no regression. Signed-off-by: Galen Charlton Signed-off-by: Mirko Tietgen Signed-off-by: Jonathan Druart Signed-off-by: Galen Charlton (cherry picked from commit b0eeb00d48892c2ea7f42d787dae10364537ed6f) Signed-off-by: Tomas Cohen Arazi commit 85536020599855d6ae89aa1d66e05adc1c705f0e Author: Kyle M Hall Date: Thu May 16 14:02:24 2013 -0400 Bug 10262 - fine calculation at checkin not respecting CircControl The fines.pl script uses the system preference CircControl to decide what branches circ rules to use for fine generation. Recently, code was added to the returns system to recalculate the fine at checkin time ( to support hourly loans ). The problem is that this code does not respect CircControl. Test Plan: 1) Set circ control to "the library you are logged in at" 2) Set different fines rules for two different librarys 3) Check an item out at library A, backdate the due date so it's overdue and will have fines. 4) Check the item in at library B 5) Observe that the fines should be generated based on library A's rules, but the fines will be based on library B's rules instead! 5) Apply the patch 6) Repeat steps 3 and 4. 7) Observe now that the fines should reflect the fines rules for Library A Note: it seems counter-intuitive for the fines system to behave this way based on the preference being set to "the library you are logged in at" but it does make sense. The rules used are from "the library you are logged in at" when the item is first checked out. If the fines system really did use the rules for the library the item was returned to, it would be easy to exploit the library system. Some Koha using systems have branches that charge fines, and others that don't, so a patron could just return any overdue items to a non-charging branch to avoid ever paying fines! Furthermore, it would mean that the fines.pl script would be using one set of rules to charge fines, and the returns system could possibly be using another. Since fines.pl has been around far longer, it makes sense to assume the fines.pl behavior is canonical. Signed-off-by: Mickey Coalwell Signed-off-by: George Williams Signed-off-by: Chris Cormack Signed-off-by: Galen Charlton Merged with reservations; see comment on bug report for details. (cherry picked from commit 040eb4016f4b01d44f87ab6aca515c6917f73479) Signed-off-by: Tomas Cohen Arazi commit cf96dd5f53eea3b585ea8a38b916a30b89c24bea Author: Owen Leonard Date: Mon May 13 15:07:34 2013 -0400 Bug 10218 - In OPAC XSLT search results, add class to 'online access' In some cases in OPAC search results and the detail page there is a class specific to each line of data being output (publisher, date, subjects, etc). In other cases there is no additional class. This patch makes modifications to a few different OPAC files in an attempt to make them consistent with each other. To test, apply the patch and view: - an OPAC detail page with OPACXSLTDetailsDisplay off - the OPAC search results page with OPACXSLTDetailsDisplay off - the OPAC search results page with OPACXSLTDetailsDisplay on Labels should have classes relevant to their data. To test the specific case requested by this bug, view details/results for a record which includes online resources (856u in MARC21). Signed-off-by: Galen Charlton html changes only, passes all tests Signed-off-by: Chris Cormack Signed-off-by: Galen Charlton (cherry picked from commit 45168efeb9a2c6e3268e2f002ca31af8e5e6afc8) Signed-off-by: Tomas Cohen Arazi ----------------------------------------------------------------------- Summary of changes: C4/Circulation.pm | 37 ++++++++++++++------ C4/XSLT.pm | 25 +++++++++++-- koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tt | 36 +++++++++--------- .../opac-tmpl/prog/en/modules/opac-results.tt | 10 +++--- .../prog/en/xslt/MARC21slim2OPACResults.xsl | 18 +++++----- t/XSLT.t | 37 +++++++++++++++++++- 6 files changed, 115 insertions(+), 48 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Tue Jun 4 20:33:24 2013 From: gitmaster at git.koha-community.org (Git repo owner) Date: Tue, 04 Jun 2013 18:33:24 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.12.00-beta1-657-gb74ac4a Message-ID: 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, master has been updated via b74ac4a1cf64678d2a0dab13965576af1e6ed9c8 (commit) from ed8e506953b78de0a09b87011709281054641ab0 (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 b74ac4a1cf64678d2a0dab13965576af1e6ed9c8 Author: Owen Leonard Date: Tue Jun 4 14:36:41 2013 -0400 Bug 10307 - z39.50 server search tab shows z390.50 The label on the global search form for Z39.50 administration reads "Z390.50." This patch corrects the typo. To test, apply the patch and navigate to Administration -> Z39.50 servers. The label on the global search tab should read "Search Z39.50 servers." Signed-off-by: Galen Charlton ----------------------------------------------------------------------- Summary of changes: .../prog/en/includes/z3950-admin-search.inc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Wed Jun 5 16:07:25 2013 From: gitmaster at git.koha-community.org (Git repo owner) Date: Wed, 05 Jun 2013 14:07:25 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.12.00-beta1-658-g336301e Message-ID: 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, master has been updated via 336301e63a919d90d4205f3f537130b7d69b0448 (commit) from b74ac4a1cf64678d2a0dab13965576af1e6ed9c8 (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 336301e63a919d90d4205f3f537130b7d69b0448 Author: Owen Leonard Date: Tue Apr 9 15:11:22 2013 -0400 Bug 10015 - UniqueItemFields could have link to database documentation Other system preferences which require entry of database column names include a link to the scheme for reference. The UniqueItemFields should do the same. This patch rewords the preference description to incorporate a link. To test, open the acquisitions tab in system preferences and confirm that the UniqueItemFields description looks correct and links to the right page in the schema. Signed-off-by: Frederic Durand Signed-off-by: Chris Cormack Signed-off-by: Galen Charlton ----------------------------------------------------------------------- Summary of changes: .../en/modules/admin/preferences/acquisitions.pref | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Wed Jun 5 16:09:26 2013 From: gitmaster at git.koha-community.org (Git repo owner) Date: Wed, 05 Jun 2013 14:09:26 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.12.00-beta1-659-g72157d6 Message-ID: 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, master has been updated via 72157d66886e21354aa754f75530bbec1f11b9e5 (commit) from 336301e63a919d90d4205f3f537130b7d69b0448 (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 72157d66886e21354aa754f75530bbec1f11b9e5 Author: Katrin Fischer Date: Sun Apr 14 17:05:39 2013 +0200 Bug 7892: Open link to imported record in new tab Change links to imported records to open in a new window/tab on the staged records management page. To test: 1) Go to Tools > Staged MARC record management 2) Open an imported batch by clicking on the file name 3) Click on bib# in the record column 4) Verify links open in a new window/tab now Signed-off-by: Nicole C. Engard All tests pass Signed-off-by: Chris Cormack Signed-off-by: Galen Charlton ----------------------------------------------------------------------- Summary of changes: .../prog/en/modules/tools/manage-marc-import.tt | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Wed Jun 5 16:13:44 2013 From: gitmaster at git.koha-community.org (Git repo owner) Date: Wed, 05 Jun 2013 14:13:44 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.12.00-beta1-660-g68b8b9d Message-ID: 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, master has been updated via 68b8b9d7a8e9e52d3ce59b25248df03dd6ec8224 (commit) from 72157d66886e21354aa754f75530bbec1f11b9e5 (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 68b8b9d7a8e9e52d3ce59b25248df03dd6ec8224 Author: Fr?d?rick Capovilla Date: Mon Nov 21 15:33:23 2011 -0500 Bug 8584: cleanup_database.pl : Add a DAYS parameter for email purges. You can now specify a number of days with the --mail parameter. Only mails older than the specified number of days will be deleted. Signed-off-by: Kyle M Hall Signed-off-by: Chris Cormack Signed-off-by: Galen Charlton ----------------------------------------------------------------------- Summary of changes: misc/cronjobs/cleanup_database.pl | 24 +++++++++++++----------- 1 files changed, 13 insertions(+), 11 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Wed Jun 5 16:17:43 2013 From: gitmaster at git.koha-community.org (Git repo owner) Date: Wed, 05 Jun 2013 14:17:43 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.12.00-beta1-661-g787a480 Message-ID: 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, master has been updated via 787a480626be474afa65737ae37a6c07cad0b1c7 (commit) from 68b8b9d7a8e9e52d3ce59b25248df03dd6ec8224 (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 787a480626be474afa65737ae37a6c07cad0b1c7 Author: Katrin Fischer Date: Sun May 19 10:56:01 2013 +0200 Bug 10249: Fix untranslatable strings in OPAC detail page Star ratings feature: - Your CGI session cookie is not current. Please refresh the page and try again. - average rating: - your rating: Browse results feature: - Click to rewind the list to - See biblio - with biblionumber - by (between title and author) - Click to forward the list to - Go to detail To test: - Update the po file using 'perl translate update ' - Translate all new strings, maybe mark them with XX to make it easier to find them - Install the updated translation file using 'perl translate install ' - Test the ratings and browse results features in the OPAC detail page - Verify everything is still working/displaying like it should - Check that you don't find any unstranslated strings/terms Some hints where the changes are: - Change an existing rating - the average and your rating will change - Browse result list and check mouse over tooltips for all links Signed-off-by: Jared Camins-Esakov Strings are now translated, and no emergent JS errors have revealed themselves. Signed-off-by: Chris Cormack Signed-off-by: Galen Charlton ----------------------------------------------------------------------- Summary of changes: koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tt | 22 ++++++++++---------- 1 files changed, 11 insertions(+), 11 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Wed Jun 5 16:23:01 2013 From: gitmaster at git.koha-community.org (Git repo owner) Date: Wed, 05 Jun 2013 14:23:01 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.12.00-beta1-662-g7668e19 Message-ID: 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, master has been updated via 7668e19c9593da570cffb5cd4640fe175d739328 (commit) from 787a480626be474afa65737ae37a6c07cad0b1c7 (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 7668e19c9593da570cffb5cd4640fe175d739328 Author: Colin Campbell Date: Thu May 30 18:23:55 2013 +0100 Bug 766: remove CGI::scrolling_list from request.pl Let the template take care of generating the display. Lets at least part of request.pl be more succinct. To test, place a hold and search for the patron using a partial name. You should get a dropdown select list of patrons and be able to select the patron to hold for from there. The functionality should remain unimpaired after this patch is applied. Signed-off-by: Owen Leonard Signed-off-by: Chris Cormack Signed-off-by: Galen Charlton ----------------------------------------------------------------------- Summary of changes: .../prog/en/modules/reserve/request.tt | 16 +++++-- reserve/request.pl | 46 +++++--------------- 2 files changed, 23 insertions(+), 39 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Wed Jun 5 17:15:50 2013 From: gitmaster at git.koha-community.org (Git repo owner) Date: Wed, 05 Jun 2013 15:15:50 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.12.00-beta1-664-g73535cb Message-ID: 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, master has been updated via 73535cb1120ddb1c1c0fb8f1568cc4da51903a25 (commit) via 0d6bd380ba644ce2cf36a40edbfa5e231e1e19ab (commit) from 7668e19c9593da570cffb5cd4640fe175d739328 (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 73535cb1120ddb1c1c0fb8f1568cc4da51903a25 Author: Galen Charlton Date: Wed Jun 5 08:19:30 2013 -0700 Bug 8600: (followup) remove debug logging statement Signed-off-by: Galen Charlton commit 0d6bd380ba644ce2cf36a40edbfa5e231e1e19ab Author: Fr?d?rick Date: Wed Mar 20 17:23:39 2013 -0400 Bug 8600: can now remove search input fields in OPAC advanced search form If you follow the 'More options' link in the OPAC advanced search form, each search input field after the first now has a '-' button that lets you remove the box. This complements the '+' buttons that already existed that allow the user to add additional input fields. Signed-off-by: Cedric Vita Signed-off-by: Chris Cormack Signed-off-by: Galen Charlton ----------------------------------------------------------------------- Summary of changes: .../opac-tmpl/prog/en/modules/opac-advsearch.tt | 25 ++++++++++++++----- 1 files changed, 18 insertions(+), 7 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Wed Jun 5 17:32:35 2013 From: gitmaster at git.koha-community.org (Git repo owner) Date: Wed, 05 Jun 2013 15:32:35 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.12.00-beta1-665-gbebff40 Message-ID: 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, master has been updated via bebff403f235c0694ce0faf180e30e5e99d00032 (commit) from 73535cb1120ddb1c1c0fb8f1568cc4da51903a25 (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 bebff403f235c0694ce0faf180e30e5e99d00032 Author: Fr?d?rick Date: Wed Mar 20 16:01:42 2013 -0400 Bug 9549: Show local cover images in the OPAC shelf browser Add the ability to view local cover images in the shelf browser. To test: 1. Add a local cover image to a record. Set OPACLocalCoverImages sys pref to "display." 2. Search for the record, go to the Details page, and click on Browse Shelf. 3. Verify that the local cover image appears in the shelf browser. Sponsored-by: CCSR Signed-off-by: Melia Meggs Signed-off-by: Chris Cormack Signed-off-by: Galen Charlton ----------------------------------------------------------------------- Summary of changes: koha-tmpl/opac-tmpl/prog/en/css/opac.css | 4 ++++ koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tt | 6 ++++++ 2 files changed, 10 insertions(+), 0 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Thu Jun 6 02:12:41 2013 From: gitmaster at git.koha-community.org (Git repo owner) Date: Thu, 06 Jun 2013 00:12:41 +0000 Subject: [koha-commits] main Koha release repository branch 3.10.x updated. v3.10.06-7-gfc34035 Message-ID: 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.10.x has been updated via fc34035d5f28c31d887dc3a9b416b0d5d18b4712 (commit) from a19e7f7c0f0f537c600ad219a25f0904e04798ae (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 fc34035d5f28c31d887dc3a9b416b0d5d18b4712 Author: Magnus Enger Date: Sun May 19 18:56:00 2013 +0200 Bug 10288 - Fix a tiny typo on "Pending offline circulation actions" To test: - Apply the patch - Go to /cgi-bin/koha/circ/circulation-home.pl - Verify that is says "There are no pending offline operations." - Sign off Or just have a look at the patch... Signed-off-by: Galen Charlton (cherry picked from commit 3e76b1ac71a9652c06ddac09d81dcef4e5adaddf) Signed-off-by: Tomas Cohen Arazi (cherry picked from commit de32e8d6e849ecfc13d4635c776749f5b5d4ef3e) Signed-off-by: Bernardo Gonzalez Kriegel (cherry picked from commit de32e8d6e849ecfc13d4635c776749f5b5d4ef3e) ----------------------------------------------------------------------- Summary of changes: .../prog/en/modules/offline_circ/list.tt | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Thu Jun 6 02:31:57 2013 From: gitmaster at git.koha-community.org (Git repo owner) Date: Thu, 06 Jun 2013 00:31:57 +0000 Subject: [koha-commits] main Koha release repository branch 3.10.x updated. v3.10.06-8-g3eac45f Message-ID: 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.10.x has been updated via 3eac45f38e8b7761ac3cae69536e618343eaf3d6 (commit) from fc34035d5f28c31d887dc3a9b416b0d5d18b4712 (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 3eac45f38e8b7761ac3cae69536e618343eaf3d6 Author: Robin Sheat Date: Thu May 30 15:32:57 2013 +1200 Bug 10367 - [3.10] update the rules and control file for wheezy This updates the control file to use tinymce rather than tinymce2, as tinymce2 is deprecated and no longer in Debian. Signed-off-by: Bernardo Gonzalez Kriegel This was written and tested by the packages maintainer. ----------------------------------------------------------------------- Summary of changes: debian/control | 6 ++---- debian/control.in | 4 ++-- debian/rules | 2 +- 3 files changed, 5 insertions(+), 7 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Thu Jun 6 02:41:50 2013 From: gitmaster at git.koha-community.org (Git repo owner) Date: Thu, 06 Jun 2013 00:41:50 +0000 Subject: [koha-commits] main Koha release repository branch 3.10.x updated. v3.10.06-9-g363eb07 Message-ID: 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.10.x has been updated via 363eb07090a90a01f75fdcccd7168dc21a2a19c2 (commit) from 3eac45f38e8b7761ac3cae69536e618343eaf3d6 (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 363eb07090a90a01f75fdcccd7168dc21a2a19c2 Author: Owen Leonard Date: Tue Apr 30 15:33:48 2013 -0400 Bug 10036 - adding header search to additem page The add item screen lacks a header search form. This patch adds the cataloging header search include to additem.tt. To test, apply the patch and add items to or edit items of an existing record. The header search form should appear with options for cataloging search and circulation. Signed-off-by: Kyle M Hall Signed-off-by: Jonathan Druart Signed-off-by: Galen Charlton (cherry picked from commit 646015c6471fa3d248696a55b6f18d268b5a2f60) Signed-off-by: Tomas Cohen Arazi This should have been tagged as a bugfix... (cherry picked from commit d22fb794dcc977c096665c4aa44ffc2185af7d46) Signed-off-by: Bernardo Gonzalez Kriegel (cherry picked from commit d22fb794dcc977c096665c4aa44ffc2185af7d46) ----------------------------------------------------------------------- Summary of changes: .../prog/en/modules/cataloguing/additem.tt | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Thu Jun 6 02:57:42 2013 From: gitmaster at git.koha-community.org (Git repo owner) Date: Thu, 06 Jun 2013 00:57:42 +0000 Subject: [koha-commits] main Koha release repository branch 3.10.x updated. v3.10.06-10-g62a88b8 Message-ID: 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.10.x has been updated via 62a88b82c47fd361677a32db669567bca22984ef (commit) from 363eb07090a90a01f75fdcccd7168dc21a2a19c2 (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 62a88b82c47fd361677a32db669567bca22984ef Author: Jonathan Druart Date: Wed Jan 30 15:19:58 2013 +0100 Bug 9507: prevent submit: refactor some code in a js file This patch refactors some code in a js file. Test plan: On acqui/neworderempty.pl, acqui/orderreceive.pl and serials/serials-edit.tt try to scan a barcode (or press enter) on the form and check that it is not sent. Signed-off-by: Kyle M Hall Signed-off-by: Marcel de Rooy Have to note that the code for IE9 does not work. Before and after this patch. If we refactor code, it would have been nice to resolve this too. But I do not oppose pushing this patch. The test uses 'an ancient Netscape property' window.Event (uppercase!) to make the distinction between browers and event models. Some more documentation here would be welcome too. Signed-off-by: Galen Charlton (cherry picked from commit 9e4c289d3f68aaab5d47172940e30fba0819804e) Signed-off-by: Tomas Cohen Arazi Refactoring, but needed for 10310 inclusion (cherry picked from commit c8ea6ba025455a26a585733fdb214942a9823a45) Signed-off-by: Bernardo Gonzalez Kriegel (cherry picked from commit c8ea6ba025455a26a585733fdb214942a9823a45) ----------------------------------------------------------------------- Summary of changes: .../intranet-tmpl/prog/en/js/prevent_submit.js | 18 ++++++++++++++++++ .../prog/en/modules/acqui/neworderempty.tt | 19 +------------------ .../prog/en/modules/acqui/orderreceive.tt | 20 +------------------- .../prog/en/modules/serials/serials-edit.tt | 19 +------------------ 4 files changed, 21 insertions(+), 55 deletions(-) create mode 100644 koha-tmpl/intranet-tmpl/prog/en/js/prevent_submit.js hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Thu Jun 6 03:03:53 2013 From: gitmaster at git.koha-community.org (Git repo owner) Date: Thu, 06 Jun 2013 01:03:53 +0000 Subject: [koha-commits] main Koha release repository branch 3.10.x updated. v3.10.06-11-g9d5316e Message-ID: 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.10.x has been updated via 9d5316e2fb4af51721cf7b11f22759811e344c77 (commit) from 62a88b82c47fd361677a32db669567bca22984ef (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 9d5316e2fb4af51721cf7b11f22759811e344c77 Author: Jonathan Druart Date: Wed May 22 15:49:26 2013 +0200 Bug 10310: Prevent submitting form with enter does not work with IE I am not able to test this patch with IE... I tested it with Chromium and FF and it works great. This patch can be tested on the neworderempty.pl page Signed-off-by: Marcel de Rooy Signed-off-by: Galen Charlton (cherry picked from commit efdf30bc476ab130b0dc4767ba38d68208eb2ca7) Signed-off-by: Tomas Cohen Arazi (cherry picked from commit 84481e79527d8ad1c5a3393b716c17f550736857) Signed-off-by: Bernardo Gonzalez Kriegel (cherry picked from commit 84481e79527d8ad1c5a3393b716c17f550736857) ----------------------------------------------------------------------- Summary of changes: .../intranet-tmpl/prog/en/js/prevent_submit.js | 27 +++++++------------ 1 files changed, 10 insertions(+), 17 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Thu Jun 6 03:07:06 2013 From: gitmaster at git.koha-community.org (Git repo owner) Date: Thu, 06 Jun 2013 01:07:06 +0000 Subject: [koha-commits] main Koha release repository branch 3.10.x updated. v3.10.06-12-g4734914 Message-ID: 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.10.x has been updated via 47349148c798ab17762189ef358adfe8d4bfec56 (commit) from 9d5316e2fb4af51721cf7b11f22759811e344c77 (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 47349148c798ab17762189ef358adfe8d4bfec56 Author: Jonathan Druart Date: Thu May 23 09:33:48 2013 +0200 Bug 10310: Followup Prevent submitting form with enter does not work with IE Check e.target.type instead of using jQuery. Signed-off-by: Marcel de Rooy Signed-off-by: Galen Charlton (cherry picked from commit c4978ef178746df06333c6704ea9e6f888b4b9ff) Signed-off-by: Tomas Cohen Arazi (cherry picked from commit 5cea7144bc50477f8518ae47e78282de287c1a23) Signed-off-by: Bernardo Gonzalez Kriegel (cherry picked from commit 5cea7144bc50477f8518ae47e78282de287c1a23) ----------------------------------------------------------------------- Summary of changes: .../intranet-tmpl/prog/en/js/prevent_submit.js | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Thu Jun 6 03:21:16 2013 From: gitmaster at git.koha-community.org (Git repo owner) Date: Thu, 06 Jun 2013 01:21:16 +0000 Subject: [koha-commits] main Koha release repository branch 3.10.x updated. v3.10.06-13-g0debaa7 Message-ID: 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.10.x has been updated via 0debaa73cdfd3579701a9d3578cc008197ce739f (commit) from 47349148c798ab17762189ef358adfe8d4bfec56 (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 0debaa73cdfd3579701a9d3578cc008197ce739f Author: Colin Campbell Date: Wed May 22 19:32:45 2013 +0100 Bug 10313 Fix link to invoice from orders Need to have invoiceid and pass it to retrieve selected invoicenumber. Wrong data passed causing incorrect records to be displayed Signed-off-by: Julian Maurice Signed-off-by: Jonathan Druart Signed-off-by: Galen Charlton (cherry picked from commit 3f4d31309203b85b5415788967d4c8cf3ce83570) Signed-off-by: Tomas Cohen Arazi There's a small POD error, I'll try to provide a followup for it. (cherry picked from commit ed34661870e50e04acf61c7f687343b9a2a8f1da) Signed-off-by: Bernardo Gonzalez Kriegel (cherry picked from commit ed34661870e50e04acf61c7f687343b9a2a8f1da) ----------------------------------------------------------------------- Summary of changes: C4/Acquisition.pm | 1 + .../prog/en/modules/acqui/histsearch.tt | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Thu Jun 6 11:19:32 2013 From: gitmaster at git.koha-community.org (Git repo owner) Date: Thu, 06 Jun 2013 09:19:32 +0000 Subject: [koha-commits] main Koha release repository branch 3.8.x updated. v3.08.13-4-g6513661 Message-ID: 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.8.x has been updated via 6513661a1d2f8bf3af18377e328333251b76da04 (commit) via 50aa3045babe3742f8c9b56aa6e1d9b6de1eb38e (commit) from 1773a7e86a5f5d864fc583a6788cbab55beafb9f (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 6513661a1d2f8bf3af18377e328333251b76da04 Author: Bernardo Gonzalez Kriegel Date: Tue Mar 26 20:50:05 2013 -0300 Bug 9358 - Followup - Fixed field plugins for MARC21 should be updated for MARC21 update #15 This little patch adds a few values and descriptions to complete value builder for marc21 008. Signed-off-by: Chris Cormack Signed-off-by: Katrin Fischer Follow-up works as described. XML change only. commit 50aa3045babe3742f8c9b56aa6e1d9b6de1eb38e Author: Bernardo Gonzalez Kriegel Date: Mon Jan 7 19:10:56 2013 -0300 Bug 9358 - Fixed field plugins for MARC21 should be updated for MARC21 update #15 This patch, together with 9357, fix plugins for leader, 006, 007 and 008 MARC21 fields Leader18 c and i is fixed on Bug 9357 Added missing/renamed fields on 007 Options 'o' and 'q' already present on 006 and 008, fixing spaces and removing unnecessary descriptions. To test: 1) Catalog/edit a record 2) On 007 value builder, check missing values on 008, BKS, check for example 33- Literary form, i- Letters has a description 3) Apply the patch 4) Clean your browser cache 5) On 007 value builder, new values are present On 008/6 descriptions are absent Signed-off-by: Galen Charlton Signed-off-by: Katrin Fischer Works as described. ----------------------------------------------------------------------- Summary of changes: .../cataloguing/value_builder/marc21_field_006.xml | 198 +++++++------- .../cataloguing/value_builder/marc21_field_007.tt | 301 +++++++++++++++++++- .../cataloguing/value_builder/marc21_field_008.xml | 308 ++++++++++---------- 3 files changed, 553 insertions(+), 254 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Thu Jun 6 11:21:33 2013 From: gitmaster at git.koha-community.org (Git repo owner) Date: Thu, 06 Jun 2013 09:21:33 +0000 Subject: [koha-commits] main Koha release repository branch 3.8.x updated. v3.08.13-6-ga1e9c27 Message-ID: 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.8.x has been updated via a1e9c273537c5c14f60afd4e77bf5cd84d34a88b (commit) via 8449be610e28733a529083e35e9f2980e76ddc5a (commit) from 6513661a1d2f8bf3af18377e328333251b76da04 (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 a1e9c273537c5c14f60afd4e77bf5cd84d34a88b Author: Chris Cormack Date: Sun Apr 8 20:10:19 2012 +1200 Bug 6709 : Patch for testing translating .xml files Signed-off-by: Bernardo Gonzalez Kriegel Signed-off-by: Katrin Fischer Comment on second patch. commit 8449be610e28733a529083e35e9f2980e76ddc5a Author: Bernardo Gonzalez Kriegel Date: Mon Apr 29 13:07:11 2013 -0300 Bug 6709 - marc21_field_006.xml and marc21_field_008.xml can't be translated This patch changes 1) structure and schema for xml files used in MARC21 006 and 008 value builders. 2) JavaScript functions used to show value builders. Xml processing is enabled in previous patch Any translatable string has been moved to an xml element, those strings that no need translation remains as xml attributes. NOTE_1: I do not include as translatable material types codes, because those values are restricted in schema definition. But this restriction can be removed. NOTE_2: Anyone with experience in XML/XSD please check the new schema definition. NOTE_3: Anyone with experience in the former and JavaScript please check xmlControlfield.js To test: 1) Apply the patch 2) Verify that 006 and 008 value builders show and work properly 3) Update translation files for your favorite language, a new set of strings must show up corresponding to names and descriptions on value builders. Note: messed up patches, sending again. Signed-off-by: Katrin Fischer All tests and QA script pass. Did regression tests on the plugins for 006 and 008 and could spot no differences in behavior of the plugins to before. Also tested the translation process and found it working nicely. Thank you for fixing this long standing translation bug! ----------------------------------------------------------------------- Summary of changes: .../intranet-tmpl/prog/en/js/xmlControlfield.js | 23 +- .../cataloguing/value_builder/marc21_field_006.xml | 1562 ++++++------ .../cataloguing/value_builder/marc21_field_008.xml | 2566 ++++++++++---------- .../cataloguing/value_builder/marc21_field_CF.xsd | 26 +- misc/translator/tmpl_process3.pl | 2 +- 5 files changed, 2093 insertions(+), 2086 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Thu Jun 6 11:22:52 2013 From: gitmaster at git.koha-community.org (Git repo owner) Date: Thu, 06 Jun 2013 09:22:52 +0000 Subject: [koha-commits] main Koha release repository branch 3.8.x updated. v3.08.13-7-g3261947 Message-ID: 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.8.x has been updated via 32619477a18cdf38efa66c466d56b4eaeb03558c (commit) from a1e9c273537c5c14f60afd4e77bf5cd84d34a88b (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 32619477a18cdf38efa66c466d56b4eaeb03558c Author: Bernardo Gonzalez Kriegel Date: Thu May 2 22:18:27 2013 -0300 Bug 10178 - Typos in plugins for 006 and 008 in MARC21 Well, not only typos. There is also a NEW update for 006/8 Music on April 2013. And 3 missing values in 006. Revised descriptions and labels, source LOC page. Strings spell checked. To test: 1) Apply the patch 2) Test that MARC21 006 and 008 value builders works properly. Small string changes. Signed-off-by: Nicole C. Engard All tests pass Signed-off-by: Katrin Fischer XML changes only, passes all tests. Contains string changes, so should go into 3.14. ----------------------------------------------------------------------- Summary of changes: .../cataloguing/value_builder/marc21_field_006.xml | 99 ++++++----- .../cataloguing/value_builder/marc21_field_008.xml | 189 ++++++++++---------- 2 files changed, 146 insertions(+), 142 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Thu Jun 6 11:31:22 2013 From: gitmaster at git.koha-community.org (Git repo owner) Date: Thu, 06 Jun 2013 09:31:22 +0000 Subject: [koha-commits] main Koha release repository branch 3.8.x updated. v3.08.13-9-gfc63c89 Message-ID: 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.8.x has been updated via fc63c89322e0a13be692ba8061136b24335f91c9 (commit) via 1612e7d5e7d762dac057ea3b05257ba05952e27b (commit) from 32619477a18cdf38efa66c466d56b4eaeb03558c (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 fc63c89322e0a13be692ba8061136b24335f91c9 Author: Magnus Enger Date: Sun May 19 18:56:00 2013 +0200 Bug 10288 - Fix a tiny typo on "Pending offline circulation actions" To test: - Apply the patch - Go to /cgi-bin/koha/circ/circulation-home.pl - Verify that is says "There are no pending offline operations." - Sign off Or just have a look at the patch... Signed-off-by: Galen Charlton (cherry picked from commit 3e76b1ac71a9652c06ddac09d81dcef4e5adaddf) Signed-off-by: Tomas Cohen Arazi (cherry picked from commit de32e8d6e849ecfc13d4635c776749f5b5d4ef3e) Signed-off-by: Bernardo Gonzalez Kriegel (cherry picked from commit de32e8d6e849ecfc13d4635c776749f5b5d4ef3e) commit 1612e7d5e7d762dac057ea3b05257ba05952e27b Author: Owen Leonard Date: Thu May 16 09:20:01 2013 -0400 Bug 10083 [3.10.x] In Transit string doesn't get translated in the staff interface For some reason this text inside a isn't getting picked up by the translator unless it's inside a . This patch adds the span and tidies up the text. To test, apply the patch and "translate update" a translation. Searching the po file for "In transit from" should return a result from detail.pl. Signed-off-by: Gaetan Boisson Signed-off-by: Jonathan Druart Signed-off-by: Bernardo Gonzalez Kriegel ----------------------------------------------------------------------- Summary of changes: .../prog/en/modules/catalogue/detail.tt | 4 +--- .../prog/en/modules/offline_circ/list.tt | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Thu Jun 6 11:37:06 2013 From: gitmaster at git.koha-community.org (Git repo owner) Date: Thu, 06 Jun 2013 09:37:06 +0000 Subject: [koha-commits] main Koha release repository branch 3.8.x updated. v3.08.13-10-g5a14657 Message-ID: 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.8.x has been updated via 5a146577813f8f7d8598f762bf880a54a6568c81 (commit) from fc63c89322e0a13be692ba8061136b24335f91c9 (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 5a146577813f8f7d8598f762bf880a54a6568c81 Author: Owen Leonard Date: Tue Apr 30 15:33:48 2013 -0400 Bug 10036 - adding header search to additem page The add item screen lacks a header search form. This patch adds the cataloging header search include to additem.tt. To test, apply the patch and add items to or edit items of an existing record. The header search form should appear with options for cataloging search and circulation. Signed-off-by: Kyle M Hall Signed-off-by: Jonathan Druart Signed-off-by: Galen Charlton (cherry picked from commit 646015c6471fa3d248696a55b6f18d268b5a2f60) Signed-off-by: Tomas Cohen Arazi This should have been tagged as a bugfix... (cherry picked from commit d22fb794dcc977c096665c4aa44ffc2185af7d46) Signed-off-by: Bernardo Gonzalez Kriegel (cherry picked from commit d22fb794dcc977c096665c4aa44ffc2185af7d46) ----------------------------------------------------------------------- Summary of changes: .../prog/en/modules/cataloguing/additem.tt | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Thu Jun 6 14:58:19 2013 From: gitmaster at git.koha-community.org (Git repo owner) Date: Thu, 06 Jun 2013 12:58:19 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.12.00-beta1-666-g7b667ab Message-ID: 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, master has been updated via 7b667ab134cdec5d90e71f52c6cdd3ee78559f6a (commit) from bebff403f235c0694ce0faf180e30e5e99d00032 (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 7b667ab134cdec5d90e71f52c6cdd3ee78559f6a Author: Fridolyn SOMERS Date: Thu Jun 6 11:44:38 2013 +0200 Bug 10413 - Odd space character breaks translation This patch simply removes an odd space character that breaks translation by adding a second msgid="" in PO files. VI shows it as . Signed-off-by: Bernardo Gonzalez Kriegel Small patch, removes invisible char. No errors. Signed-off-by: Jonathan Druart Signed-off-by: Galen Charlton ----------------------------------------------------------------------- Summary of changes: .../prog/en/modules/help/members/moremember.tt | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Jun 7 17:15:19 2013 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 07 Jun 2013 15:15:19 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.12.00-beta1-667-g7fa326a Message-ID: 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, master has been updated via 7fa326af89dd3e6d5bddbc1e826d63818371699f (commit) from 7b667ab134cdec5d90e71f52c6cdd3ee78559f6a (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 7fa326af89dd3e6d5bddbc1e826d63818371699f Author: Owen Leonard Date: Wed Jun 5 08:49:50 2013 -0400 Bug 10414 - "Course Reserves" should be "Course reserves" in global "More" menu The global "More" menu lists "Course Reserves," which is incorrectly capitalized. This patch changes it to "Course reserves." To test, apply the patch and view any page in the staff client. When you click the "More" menu item the link should read "Course reserves." Signed-off-by: Kyle M Hall Signed-off-by: Jonathan Druart Signed-off-by: Galen Charlton ----------------------------------------------------------------------- Summary of changes: .../intranet-tmpl/prog/en/includes/header.inc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Jun 7 17:20:55 2013 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 07 Jun 2013 15:20:55 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.12.00-beta1-668-g20180b4 Message-ID: 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, master has been updated via 20180b4c392219f41d86becbbda1133ac9c2c075 (commit) from 7fa326af89dd3e6d5bddbc1e826d63818371699f (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 20180b4c392219f41d86becbbda1133ac9c2c075 Author: Owen Leonard Date: Wed Jun 5 10:48:36 2013 -0400 Bug 10420 - Standardize spelling of "authorized" This patch corrects instances of the non-[American]-standard spelling "authorised" when used in text. The following instances are corrected: - In Administration -> Funds, the error message displayed if you do not have permission to edit a fund. - In Administration -> Authorized values, the instructions linked to the "Libraries limitation" field. - In Administration -> MARC bibliographic framework test, instructions related to linking to authorized values. - In the course reserves add form, error messages referring to missing authorized values. - In guided reports, error messages shown when an authorized value chosen as a report parameter doesn't exit. Signed-off-by: Kyle M Hall Signed-off-by: Jonathan Druart Signed-off-by: Galen Charlton ----------------------------------------------------------------------- Summary of changes: .../prog/en/modules/admin/aqbudgets.tt | 2 +- .../prog/en/modules/admin/authorised_values.tt | 2 +- .../prog/en/modules/admin/checkmarc.tt | 6 +++--- .../prog/en/modules/admin/patron-attr-types.tt | 2 +- .../prog/en/modules/course_reserves/course.tt | 4 ++-- .../en/modules/reports/guided_reports_start.tt | 4 ++-- 6 files changed, 10 insertions(+), 10 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Jun 7 17:34:08 2013 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 07 Jun 2013 15:34:08 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.12.00-beta1-669-g5cf5da1 Message-ID: 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, master has been updated via 5cf5da12ef8667513d2f6fb494c6997cbe82899b (commit) from 20180b4c392219f41d86becbbda1133ac9c2c075 (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 5cf5da12ef8667513d2f6fb494c6997cbe82899b Author: Jesse Weaver Date: Mon Jun 3 13:22:57 2013 -0600 Bug 9300 - filtering Export (MARC) data by accession date does not work Small typo in query construction, fixed. To test: 1) Try filtering a MARC export using "Start date" 2) Notice the lack of filtering 3) Apply patch 4) Try export again, records are filtered by dateaccessioned Signed-off-by: Cedric Vita Signed-off-by: Jonathan Druart Signed-off-by: Galen Charlton ----------------------------------------------------------------------- Summary of changes: tools/export.pl | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Jun 7 17:37:48 2013 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 07 Jun 2013 15:37:48 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.12.00-beta1-670-g545ed7a Message-ID: 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, master has been updated via 545ed7a0b6f7cffc7a5cc904963b7bdcf75038fc (commit) from 5cf5da12ef8667513d2f6fb494c6997cbe82899b (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 545ed7a0b6f7cffc7a5cc904963b7bdcf75038fc Author: Owen Leonard Date: Fri May 31 09:54:34 2013 -0400 Bug 10354 - Don't show optgroup Libraries when no search groups are defined In the OPAC, if there are no search groups defined, there's no reason to embed library choices inside an . should only be used to differentiate the list of individual libraries from search groups. This patch removes the when no search groups are enabled. To test, apply the patch and: - Enable OpacAddMastheadLibraryPulldown. - Create a library search group in Administration -> Libraries and Groups and enable it by checking the "show in search pulldown" box. - View the library pulldown in the OPAC search bar. Libraries and groups should be separated into s. - Disable your library search group and refresh the OPAC page. The pulldown of libraries should now display libraries with no . Signed-off-by: Srdjan Signed-off-by: Jonathan Druart Signed-off-by: Galen Charlton ----------------------------------------------------------------------- Summary of changes: koha-tmpl/opac-tmpl/prog/en/includes/masthead.inc | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Jun 7 17:43:28 2013 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 07 Jun 2013 15:43:28 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.12.00-beta1-671-g225a700 Message-ID: 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, master has been updated via 225a7007052e9027f6fa1c141c6a3494224c1af8 (commit) from 545ed7a0b6f7cffc7a5cc904963b7bdcf75038fc (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 225a7007052e9027f6fa1c141c6a3494224c1af8 Author: Owen Leonard Date: Mon May 13 14:26:17 2013 -0400 Bug 10221 - hold expiration doesn't show on patron's list of holds When viewing the list of a patron's holds on the circulation page or the patron detail page the table of holds doesn't display the holds expiration date, if present. This patch adds display of the hold expiration date. To test, place a hold for a patron and set an expiration date for it. View the patron's existing holds on both circulation.pl and moremember.pl. The expiration date you chose should appear in the table of information about existing holds. Signed-off-by: Nicole C. Engard works great Signed-off-by: Jonathan Druart Signed-off-by: Galen Charlton ----------------------------------------------------------------------- Summary of changes: circ/circulation.pl | 1 + .../prog/en/modules/circ/circulation.tt | 2 ++ .../prog/en/modules/members/moremember.tt | 6 ++++-- members/moremember.pl | 1 + 4 files changed, 8 insertions(+), 2 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Jun 7 17:50:13 2013 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 07 Jun 2013 15:50:13 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.12.00-beta1-673-g1cf55d9 Message-ID: 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, master has been updated via 1cf55d9381418aeeb0895f6d99add957acc7bcfd (commit) via f6f7a3435c2da10fe294896db46f553bfb625c2f (commit) from 225a7007052e9027f6fa1c141c6a3494224c1af8 (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 1cf55d9381418aeeb0895f6d99add957acc7bcfd Author: Galen Charlton Date: Fri Jun 7 08:56:48 2013 -0700 Bug 10368: (followup) tweak label Not everything is a book. Signed-off-by: Galen Charlton commit f6f7a3435c2da10fe294896db46f553bfb625c2f Author: Amit Gupta Date: Wed May 29 13:23:33 2013 +0530 Bug 10368 - Added price to overdue report Signed-off-by: Srdjan Signed-off-by: Kyle M Hall Signed-off-by: Galen Charlton ----------------------------------------------------------------------- Summary of changes: .../intranet-tmpl/prog/en/modules/circ/overdue.tt | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Jun 7 17:54:05 2013 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 07 Jun 2013 15:54:05 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.12.00-beta1-674-gd502926 Message-ID: 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, master has been updated via d5029260a01ee6c47ec74deece7020665100387d (commit) from 1cf55d9381418aeeb0895f6d99add957acc7bcfd (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 d5029260a01ee6c47ec74deece7020665100387d Author: Amit Gupta Date: Thu Jun 6 11:51:35 2013 +0530 Bug 10370: Add item barcode to circulation print summary page Signed-off-by: Srdjan Signed-off-by: Jonathan Druart Signed-off-by: Galen Charlton ----------------------------------------------------------------------- Summary of changes: .../prog/en/modules/members/moremember-print.tt | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Jun 7 18:06:47 2013 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 07 Jun 2013 16:06:47 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.12.00-beta1-675-g32fa69e Message-ID: 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, master has been updated via 32fa69ee3641fabaff03994c2abddaefc38b9579 (commit) from d5029260a01ee6c47ec74deece7020665100387d (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 32fa69ee3641fabaff03994c2abddaefc38b9579 Author: Owen Leonard Date: Tue Jun 4 15:35:42 2013 -0400 Bug 2774 - Path to theme is hard-coded in many places This patch corrects serveral more places in the templates where the path to the prog theme is hard-coded. To test, apply the patch and view the following cases: - When a database update is triggered the login page loads login.css. This path should be correct. (Reference to wizard.css is removed as per Bug 10422). - The course reserves home page should load datatables-related assets correctly. - Help pages for the Quick spine label creator and the staff client home page should show the correct paths where they reference the Koha file system. - The web installer pages should correctly load the Koha logo. - The label creator "manage" pages (layouts, templates, etc.) should correctly load datatables-related assets. Signed-off-by: Liz Rea Checked all 5 - look good. Signed-off-by: Jonathan Druart Signed-off-by: Galen Charlton ----------------------------------------------------------------------- Summary of changes: .../prog/en/includes/installer-doc-head-close.inc | 5 +---- .../en/modules/course_reserves/course-reserves.tt | 15 +++++++-------- .../prog/en/modules/help/labels/spinelabel-home.tt | 2 +- .../intranet-tmpl/prog/en/modules/help/mainpage.tt | 2 +- .../prog/en/modules/installer/step1.tt | 2 +- .../prog/en/modules/installer/step2.tt | 2 +- .../prog/en/modules/installer/step3.tt | 2 +- .../prog/en/modules/labels/label-manage.tt | 6 +++--- .../en/modules/reports/guided_reports_start.tt | 4 ++-- 9 files changed, 18 insertions(+), 22 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Jun 7 18:48:21 2013 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 07 Jun 2013 16:48:21 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.12.00-beta1-677-gaacb81f Message-ID: 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, master has been updated via aacb81f0abd36a2ce3800f5bff15ef2652e418a9 (commit) via 388a4bd47cbd4f031b5f48674572725da0d4403a (commit) from 32fa69ee3641fabaff03994c2abddaefc38b9579 (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 aacb81f0abd36a2ce3800f5bff15ef2652e418a9 Author: Marcel de Rooy Date: Fri May 24 10:31:54 2013 +0200 Bug 10321: QA Followup on report 9722 As Jonathan suggested, use jQuery toggle function. Signed-off-by: Srdjan Signed-off-by: Jonathan Druart Signed-off-by: Galen Charlton commit 388a4bd47cbd4f031b5f48674572725da0d4403a Author: Marcel de Rooy Date: Mon Mar 18 11:20:42 2013 +0100 Bug 10321: Followup for hold notes Based on work for report 9722. This patch resolves a small display problem with the number of columns of the table on opac-reserve. Signed-off-by: Srdjan Signed-off-by: Jonathan Druart Signed-off-by: Galen Charlton ----------------------------------------------------------------------- Summary of changes: .../opac-tmpl/prog/en/modules/opac-reserve.tt | 7 +------ opac/opac-reserve.pl | 3 ++- 2 files changed, 3 insertions(+), 7 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Jun 7 18:58:48 2013 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 07 Jun 2013 16:58:48 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.12.00-beta1-680-ga588325 Message-ID: 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, master has been updated via a588325ed67a551bb28fd2dd63b717c056360808 (commit) via 168cd232f869755f89bc7590c9d962e2cdc9db1d (commit) via 77c646a5db9995cfc9c9d3633103e8bededd9781 (commit) from aacb81f0abd36a2ce3800f5bff15ef2652e418a9 (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 a588325ed67a551bb28fd2dd63b717c056360808 Author: Galen Charlton Date: Fri Jun 7 10:06:36 2013 -0700 Bug 10343: DBRev 3.13.00.007 Signed-off-by: Galen Charlton commit 168cd232f869755f89bc7590c9d962e2cdc9db1d Author: Marcel de Rooy Date: Wed May 29 16:20:46 2013 +0200 Bug 10343: dbrev for rename OpacShowHoldNotes to OpacHoldNotes Renames the pref for install and upgrade. Test plan: See the other patch. Signed-off-by: Kyle M Hall Signed-off-by: Jonathan Druart Signed-off-by: Galen Charlton commit 77c646a5db9995cfc9c9d3633103e8bededd9781 Author: Marcel de Rooy Date: Wed May 29 16:19:27 2013 +0200 Bug 10343: Rename OpacShowHoldNotes to OpacHoldNotes As QA followup on report 9722. Built on top of another followup report 10321. Test plan: Run the db revision included in the other patch. Enable OpacHoldNotes. Check that you can add a hold note on opac-reserve. Do you see it on opac-user and in staff on catalog detail of that biblio? Do a grep on ShowHoldNotes on the Koha code: grep -i ignores case. You should find three occurrences only in updatedatabase.pl (the old dbrev and this dbrev renaming them). These are fine. Signed-off-by: Kyle M Hall Signed-off-by: Jonathan Druart Signed-off-by: Galen Charlton ----------------------------------------------------------------------- Summary of changes: installer/data/mysql/sysprefs.sql | 2 +- installer/data/mysql/updatedatabase.pl | 7 +++++++ .../prog/en/modules/admin/preferences/opac.pref | 2 +- .../opac-tmpl/prog/en/modules/opac-reserve.tt | 6 +++--- koha-tmpl/opac-tmpl/prog/en/modules/opac-user.tt | 4 ++-- kohaversion.pl | 2 +- opac/opac-reserve.pl | 4 ++-- opac/opac-user.pl | 2 +- 8 files changed, 18 insertions(+), 11 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Sun Jun 9 02:54:05 2013 From: gitmaster at git.koha-community.org (Git repo owner) Date: Sun, 09 Jun 2013 00:54:05 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.12.00-beta1-681-gd2ee2b5 Message-ID: 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, master has been updated via d2ee2b5cf34aa73bba23d2d54c32588f8acaa4e5 (commit) from a588325ed67a551bb28fd2dd63b717c056360808 (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 d2ee2b5cf34aa73bba23d2d54c32588f8acaa4e5 Author: Jonathan Druart Date: Tue May 21 14:54:36 2013 +0200 Bug 10296: UT: t/data/db_schemas not needed Signed-off-by: Galen Charlton These were added with the intention of writing some schema verification test cases, but if that idea gets picked up again in the future, fresher copies of kohastructure.sql can be obtained from Git. Signed-off-by: Chris Cormack Signed-off-by: Galen Charlton ----------------------------------------------------------------------- Summary of changes: t/data/db_schemas/koha.mysql-2.2.9 | 1357 ------------- .../db_schemas/kohastructure.sql-3.00.00-alpha-044 | 1895 ------------------ .../db_schemas/kohastructure.sql-3.00.00-beta-067 | 2029 -------------------- 3 files changed, 0 insertions(+), 5281 deletions(-) delete mode 100644 t/data/db_schemas/koha.mysql-2.2.9 delete mode 100644 t/data/db_schemas/kohastructure.sql-3.00.00-alpha-044 delete mode 100644 t/data/db_schemas/kohastructure.sql-3.00.00-beta-067 hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Sun Jun 9 03:04:39 2013 From: gitmaster at git.koha-community.org (Git repo owner) Date: Sun, 09 Jun 2013 01:04:39 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.12.00-beta1-682-g96363fa Message-ID: 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, master has been updated via 96363fa1c3db4398890ece41e7cc19003c0c5133 (commit) from d2ee2b5cf34aa73bba23d2d54c32588f8acaa4e5 (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 96363fa1c3db4398890ece41e7cc19003c0c5133 Author: Nicole C. Engard Date: Sun May 19 13:56:50 2013 -0400 Bug 10250: Fix typos in guided reports help file This is a string patch that fixes typos in the guided reports help file. To test: * Go to the guided reports page * Click help * Confirm text is right Signed-off-by: Jared Camins-Esakov Signed-off-by: Chris Cormack Signed-off-by: Galen Charlton ----------------------------------------------------------------------- Summary of changes: .../prog/en/modules/help/reports/guided_reports.tt | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Mon Jun 10 16:47:30 2013 From: gitmaster at git.koha-community.org (Git repo owner) Date: Mon, 10 Jun 2013 14:47:30 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.12.00-beta1-683-ge0dc603 Message-ID: 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, master has been updated via e0dc603d8ff3a7fcaade0cf29aa9be11066b06f3 (commit) from 96363fa1c3db4398890ece41e7cc19003c0c5133 (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 e0dc603d8ff3a7fcaade0cf29aa9be11066b06f3 Author: Owen Leonard Date: Tue Apr 9 13:46:14 2013 -0400 Bug 10406 - Remove obsolete CSS related to YUI autocomplete staff-global.css contains CSS which related to the old YUI autocomplete widget. Since this has been replaced with jQueryUI the CSS is now unused and can be removed. Signed-off-by: Srdjan Passed-QA-by: Marcel de Rooy ----------------------------------------------------------------------- Summary of changes: .../intranet-tmpl/prog/en/css/staff-global.css | 16 ---------------- 1 files changed, 0 insertions(+), 16 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Mon Jun 10 16:52:40 2013 From: gitmaster at git.koha-community.org (Git repo owner) Date: Mon, 10 Jun 2013 14:52:40 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.12.00-beta1-686-gf1c4578 Message-ID: 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, master has been updated via f1c45784dc5dfa431ef68e5d38a14b6fb93c904d (commit) via bc87274c66a50712dccb15656001d97f2a36fba5 (commit) via 87ab820a20e1ef935d4d29c6fed313e9723fcb64 (commit) from e0dc603d8ff3a7fcaade0cf29aa9be11066b06f3 (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 f1c45784dc5dfa431ef68e5d38a14b6fb93c904d Author: Galen Charlton Date: Fri Aug 17 11:49:45 2012 -0400 bug 6281: add Library::CallNumber::LC as a required Perl dependency This module is currently packaged by Debian for Wheezy and by Ubuntu for Precise and Quantal. Signed-off-by: Galen Charlton Signed-off-by: Kyle M Hall Signed-off-by: Chris Cormack Signed-off-by: Galen Charlton commit bc87274c66a50712dccb15656001d97f2a36fba5 Author: Galen Charlton Date: Fri Aug 17 11:23:47 2012 -0400 bug 6281: introduce LC::CallNumber::LC for sorting LC call numbers This replaces the previous hand-coded normalizer. Because LC::CallNumber::LC appears to reject strings that aren't valid LC call numbers, significant changes to the test cases were made as well -- however, the one that really counts is the last one which verifies the sorting. To recalculate the call number sort key for each item, it is necessary to run misc/maintenance/touch_all_items.pl To test, create item records with the following call numbers, setting the classification sort to 'lcc': QC100 .U57 NO. 555 1986 QC145 .A57 V.12 1980 QC145.45 .H4 D65 1998 QC995 .E29 1997 Next, make a report of them in the inventory tool. The items should be sorted in the above order. Signed-off-by: Galen Charlton Signed-off-by: Kyle M Hall Signed-off-by: Chris Cormack Signed-off-by: Galen Charlton commit 87ab820a20e1ef935d4d29c6fed313e9723fcb64 Author: Galen Charlton Date: Fri Aug 17 11:17:03 2012 -0400 bug 6281: add test case for sorting LC call numbers correctly My thanks to Michael Flanagan of UCAR for providing some of these examples. Signed-off-by: Galen Charlton Signed-off-by: Kyle M Hall Signed-off-by: Chris Cormack Signed-off-by: Galen Charlton ----------------------------------------------------------------------- Summary of changes: C4/ClassSortRoutine/LCC.pm | 19 ++++++------------- C4/Installer/PerlDependencies.pm | 5 +++++ t/ClassSortRoutine_LCC.t | 32 +++++++++++++++++++++++++------- 3 files changed, 36 insertions(+), 20 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Mon Jun 10 17:59:27 2013 From: gitmaster at git.koha-community.org (Git repo owner) Date: Mon, 10 Jun 2013 15:59:27 +0000 Subject: [koha-commits] main Koha release repository branch 3.12.x updated. v3.12.00-36-ga6cf34d Message-ID: 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.12.x has been updated via a6cf34d164c045bbd5e7ea250eae9fb666ccbb13 (commit) via 240f535e807715e8bb33ff7565065285018ea720 (commit) via 910bfa1d1f3823d418d4024be082bd5a1da43a65 (commit) via 299182c7f222460db5fd5f4df15873110300257c (commit) via e26655fe03c2f5181d6a820f40e38a7cebb46e05 (commit) via e918450e6ad6e661474479f8890f6b141fe4e15a (commit) via 450d4070b9d7103e30547eb5bce88d4cd5a97621 (commit) via 658071008320fdaad425e49e79bd240dc817d7e5 (commit) via 8fc93e7abced06ae5adce80e123e061aea46950a (commit) via 1530cee8a50006bbaa013676917086175401968c (commit) via 8d27bd783ebb353aea3d1a428b42b0b012b9d5a0 (commit) from d68bb6b8c03c1d538b29448b5baf0dfb13cca736 (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 a6cf34d164c045bbd5e7ea250eae9fb666ccbb13 Author: Katrin Fischer Date: Sun May 19 10:56:01 2013 +0200 Bug 10249: Fix untranslatable strings in OPAC detail page Star ratings feature: - Your CGI session cookie is not current. Please refresh the page and try again. - average rating: - your rating: Browse results feature: - Click to rewind the list to - See biblio - with biblionumber - by (between title and author) - Click to forward the list to - Go to detail To test: - Update the po file using 'perl translate update ' - Translate all new strings, maybe mark them with XX to make it easier to find them - Install the updated translation file using 'perl translate install ' - Test the ratings and browse results features in the OPAC detail page - Verify everything is still working/displaying like it should - Check that you don't find any unstranslated strings/terms Some hints where the changes are: - Change an existing rating - the average and your rating will change - Browse result list and check mouse over tooltips for all links Signed-off-by: Jared Camins-Esakov Strings are now translated, and no emergent JS errors have revealed themselves. Signed-off-by: Chris Cormack Signed-off-by: Galen Charlton (cherry picked from commit 787a480626be474afa65737ae37a6c07cad0b1c7) Signed-off-by: Tomas Cohen Arazi commit 240f535e807715e8bb33ff7565065285018ea720 Author: Katrin Fischer Date: Sun Apr 14 17:05:39 2013 +0200 Bug 7892: Open link to imported record in new tab Change links to imported records to open in a new window/tab on the staged records management page. To test: 1) Go to Tools > Staged MARC record management 2) Open an imported batch by clicking on the file name 3) Click on bib# in the record column 4) Verify links open in a new window/tab now Signed-off-by: Nicole C. Engard All tests pass Signed-off-by: Chris Cormack Signed-off-by: Galen Charlton (cherry picked from commit 72157d66886e21354aa754f75530bbec1f11b9e5) Signed-off-by: Tomas Cohen Arazi commit 910bfa1d1f3823d418d4024be082bd5a1da43a65 Author: Owen Leonard Date: Tue Apr 9 15:11:22 2013 -0400 Bug 10015 - UniqueItemFields could have link to database documentation Other system preferences which require entry of database column names include a link to the scheme for reference. The UniqueItemFields should do the same. This patch rewords the preference description to incorporate a link. To test, open the acquisitions tab in system preferences and confirm that the UniqueItemFields description looks correct and links to the right page in the schema. Signed-off-by: Frederic Durand Signed-off-by: Chris Cormack Signed-off-by: Galen Charlton (cherry picked from commit 336301e63a919d90d4205f3f537130b7d69b0448) Signed-off-by: Tomas Cohen Arazi Usefull and trivial string patch. commit 299182c7f222460db5fd5f4df15873110300257c Author: Owen Leonard Date: Tue Jun 4 14:36:41 2013 -0400 Bug 10307 - z39.50 server search tab shows z390.50 The label on the global search form for Z39.50 administration reads "Z390.50." This patch corrects the typo. To test, apply the patch and navigate to Administration -> Z39.50 servers. The label on the global search tab should read "Search Z39.50 servers." Signed-off-by: Galen Charlton (cherry picked from commit b74ac4a1cf64678d2a0dab13965576af1e6ed9c8) Signed-off-by: Tomas Cohen Arazi commit e26655fe03c2f5181d6a820f40e38a7cebb46e05 Author: Marcel de Rooy Date: Mon Jun 3 14:25:43 2013 +0200 Bug 10290: Followup for Virtualshelves.t Put the 10 biblionumbers in a list Add a FIXME for deleting shelves Do temporary repair on duplicate name test (Followup via report 10386) Signed-off-by: Marcel de Rooy Signed-off-by: Galen Charlton (cherry picked from commit 1ef99ace2043d75889830c4c0af8af3e9e36104e) Signed-off-by: Tomas Cohen Arazi commit e918450e6ad6e661474479f8890f6b141fe4e15a Author: Jonathan Druart Date: Mon May 20 16:56:38 2013 +0200 Bug 10290: UT: VirtualShelves.t needs to create its own data Try before the patch: prove t/db_dependent/VirtualShelves.t And after, it should produce: t/db_dependent/VirtualShelves.t .. ok All tests successful. Files=1, Tests=82, 6 wallclock secs ( 0.03 usr 0.00 sys + 0.46 cusr 0.03 csys = 0.52 CPU) Result: PASS Signed-off-by: Chris Cormack Signed-off-by: Marcel de Rooy Signed-off-by: Galen Charlton (cherry picked from commit 44905ac99cee8ddca6c63752d948a74afae20194) Signed-off-by: Tomas Cohen Arazi Tests are good :-D. They look fine and work as expected. commit 450d4070b9d7103e30547eb5bce88d4cd5a97621 Author: Owen Leonard Date: Fri May 31 11:36:02 2013 -0400 Bug 10350 - Capitalization: Home Library column in staff detail items table "Home library" is incorrectly capitalized on the catalog detail page. This patch corrects it. To test, view the normal view of record in the staff client catalog. The "Home library" table header in the holdings table should be correctly capitalized. Signed-off-by: Galen Charlton (cherry picked from commit fd9d643705b5bb0134ee229a076130a966be23bd) Signed-off-by: Tomas Cohen Arazi Trivial string patch commit 658071008320fdaad425e49e79bd240dc817d7e5 Author: Janusz Kaczmarek Date: Fri May 24 14:21:36 2013 +0300 Bug 10326: bulkmarcimport.pl doesn't restore value of CataloguingLog syspref To test: 0) Don't apply the patch yet. 1) Have the CataloguingLog system preference set to 'Log'. 2) Import a file of bibliographic records with bulkmarcimport.pl. 3) Check the state of CataloguingLog system preference -- it will be set to 'Don't log'. 4) Apply the patch. 5) Repeat steps 1-3. The CataloguingLog system preference will be 'Log'. Signed-off-by: Galen Charlton Signed-off-by: Jonathan Druart Signed-off-by: Galen Charlton (cherry picked from commit 9d0284096708a65954c7e35a093cfdb727a6bb84) Signed-off-by: Tomas Cohen Arazi commit 8fc93e7abced06ae5adce80e123e061aea46950a Author: Marcel de Rooy Date: Wed May 22 15:01:07 2013 +0200 Bug 10381: Followup adding some text around Apply/cancel filter. The texts Apply/cancel filter did not need translation and were used to get this change into 3.12. For 3.12.X or 3.14 we can add some words to clarify its meaning. With thanks to Owen for some rewording. Signed-off-by: Marcel de Rooy Signed-off-by: Pierre Angot Signed-off-by: Jonathan Druart Signed-off-by: Galen Charlton (cherry picked from commit 600eff7827be1c396e7ea13cd7c7159003d6c794) Signed-off-by: Tomas Cohen Arazi commit 1530cee8a50006bbaa013676917086175401968c Author: Marcel de Rooy Date: Wed May 22 14:51:00 2013 +0200 Bug 10381: POD lines of GetBasketsInfosByBookseller Signed-off-by: Marcel de Rooy Signed-off-by: Cedric Vita Signed-off-by: Jonathan Druart Signed-off-by: Galen Charlton (cherry picked from commit 5bf996f68d2279ae9582b338b3d094ad20f7596c) Signed-off-by: Tomas Cohen Arazi commit 8d27bd783ebb353aea3d1a428b42b0b012b9d5a0 Author: Jared Camins-Esakov Date: Tue May 28 07:44:35 2013 -0400 Bug 10359: transform masthead dropdown after user JS for CCSR Since libraries may want to customize the options in the masthead search dropdown, which is done via dropdown, it would be better if the select box were transformed *after* user javascript was run. To test: 1) Switch to the CCSR OPAC theme. 2) Add some Javascript to your OpacUserJS that will modify the masthead search dropdown, such as: $("select[name='idx']").append(""); 3) Note that when you view the OPAC, the results in the dropdown are unchanged. 4) Apply patch. 5) Note that your new option now shows up. 6) Sign off. Signed-off-by: Mirko Tietgen Signed-off-by: Jonathan Druart Signed-off-by: Galen Charlton (cherry picked from commit ff2b4d1ff5992989478f83517d95f957c4af50d4) Signed-off-by: Tomas Cohen Arazi ----------------------------------------------------------------------- Summary of changes: C4/Acquisition.pm | 6 ++- .../prog/en/includes/z3950-admin-search.inc | 2 +- .../prog/en/modules/acqui/booksellers.tt | 6 +- .../en/modules/admin/preferences/acquisitions.pref | 3 +- .../prog/en/modules/catalogue/detail.tt | 2 +- .../prog/en/modules/tools/manage-marc-import.tt | 2 +- .../opac-tmpl/ccsr/en/includes/opac-bottom.inc | 4 +- koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tt | 22 +++--- misc/migration_tools/bulkmarcimport.pl | 2 +- t/db_dependent/VirtualShelves.t | 67 +++++++++++--------- 10 files changed, 63 insertions(+), 53 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Mon Jun 10 18:13:47 2013 From: gitmaster at git.koha-community.org (Git repo owner) Date: Mon, 10 Jun 2013 16:13:47 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.12.00-beta1-687-gacd4b21 Message-ID: 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, master has been updated via acd4b21c91f4b06a6e19cafb4b9a6dd2817ad8e9 (commit) from f1c45784dc5dfa431ef68e5d38a14b6fb93c904d (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 acd4b21c91f4b06a6e19cafb4b9a6dd2817ad8e9 Author: Kyle M Hall Date: Wed May 22 09:52:40 2013 -0400 Bug 10311 - Holds queue ignores item-level holds where only one items exists If a record has only one item, and that item has one item-level hold on it, that hold will not show in the holds queue. Test Plan: 1) Create 1 record with 1 item at BranchA 2) Create an item-level hold for that item, for pickup at BranchA by a patron of BranchA 3) Run build_holds_queue.pl 4) View the holds queue for BranchA 5) Note the hold is not in there 6) Apply this patch 7) Re-run build_holds_queue.pl 8) View the holds queue again 9) Not that the hold is now there Signed-off-by: George Williams Signed-off-by: Chris Cormack Signed-off-by: Galen Charlton ----------------------------------------------------------------------- Summary of changes: C4/HoldsQueue.pm | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Mon Jun 10 19:53:19 2013 From: gitmaster at git.koha-community.org (Git repo owner) Date: Mon, 10 Jun 2013 17:53:19 +0000 Subject: [koha-commits] main Koha release repository branch 3.12.x updated. v3.12.00-42-gfd7b1a9 Message-ID: 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.12.x has been updated via fd7b1a95120313316d987d353e7787bb4371bed8 (commit) via 68a893fe11cc6fa8e8a2a372180a3fd2ad722d18 (commit) via 24798ff35e8d9c7f6e77445597fa5632dda3fc83 (commit) via e9f1137391bedd8214c8dca4e407331c381201a2 (commit) via e3fe4cb3c1b41cba659139467c2caf7a7496e8b8 (commit) via 14593a799760d105ed824586bcfade85d2b2a508 (commit) from a6cf34d164c045bbd5e7ea250eae9fb666ccbb13 (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 fd7b1a95120313316d987d353e7787bb4371bed8 Author: Owen Leonard Date: Fri May 31 09:54:34 2013 -0400 Bug 10354 - Don't show optgroup Libraries when no search groups are defined In the OPAC, if there are no search groups defined, there's no reason to embed library choices inside an . should only be used to differentiate the list of individual libraries from search groups. This patch removes the when no search groups are enabled. To test, apply the patch and: - Enable OpacAddMastheadLibraryPulldown. - Create a library search group in Administration -> Libraries and Groups and enable it by checking the "show in search pulldown" box. - View the library pulldown in the OPAC search bar. Libraries and groups should be separated into s. - Disable your library search group and refresh the OPAC page. The pulldown of libraries should now display libraries with no . Signed-off-by: Srdjan Signed-off-by: Jonathan Druart Signed-off-by: Galen Charlton (cherry picked from commit 545ed7a0b6f7cffc7a5cc904963b7bdcf75038fc) Signed-off-by: Tomas Cohen Arazi commit 68a893fe11cc6fa8e8a2a372180a3fd2ad722d18 Author: Jesse Weaver Date: Mon Jun 3 13:22:57 2013 -0600 Bug 9300 - filtering Export (MARC) data by accession date does not work Small typo in query construction, fixed. To test: 1) Try filtering a MARC export using "Start date" 2) Notice the lack of filtering 3) Apply patch 4) Try export again, records are filtered by dateaccessioned Signed-off-by: Cedric Vita Signed-off-by: Jonathan Druart Signed-off-by: Galen Charlton (cherry picked from commit 5cf5da12ef8667513d2f6fb494c6997cbe82899b) Signed-off-by: Tomas Cohen Arazi commit 24798ff35e8d9c7f6e77445597fa5632dda3fc83 Author: Owen Leonard Date: Wed Jun 5 10:48:36 2013 -0400 Bug 10420 - Standardize spelling of "authorized" This patch corrects instances of the non-[American]-standard spelling "authorised" when used in text. The following instances are corrected: - In Administration -> Funds, the error message displayed if you do not have permission to edit a fund. - In Administration -> Authorized values, the instructions linked to the "Libraries limitation" field. - In Administration -> MARC bibliographic framework test, instructions related to linking to authorized values. - In the course reserves add form, error messages referring to missing authorized values. - In guided reports, error messages shown when an authorized value chosen as a report parameter doesn't exit. Signed-off-by: Kyle M Hall Signed-off-by: Jonathan Druart Signed-off-by: Galen Charlton (cherry picked from commit 20180b4c392219f41d86becbbda1133ac9c2c075) Conflicts: koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course.tt Signed-off-by: Tomas Cohen Arazi Trivial string changes. There was a conflict with course reserves stuff, that is absent from 3.12. commit e9f1137391bedd8214c8dca4e407331c381201a2 Author: Fridolyn SOMERS Date: Thu Jun 6 11:44:38 2013 +0200 Bug 10413 - Odd space character breaks translation This patch simply removes an odd space character that breaks translation by adding a second msgid="" in PO files. VI shows it as . Signed-off-by: Bernardo Gonzalez Kriegel Small patch, removes invisible char. No errors. Signed-off-by: Jonathan Druart Signed-off-by: Galen Charlton (cherry picked from commit 7b667ab134cdec5d90e71f52c6cdd3ee78559f6a) Signed-off-by: Tomas Cohen Arazi commit e3fe4cb3c1b41cba659139467c2caf7a7496e8b8 Author: Galen Charlton Date: Wed Jun 5 08:19:30 2013 -0700 Bug 8600: (followup) remove debug logging statement Signed-off-by: Galen Charlton (cherry picked from commit 73535cb1120ddb1c1c0fb8f1568cc4da51903a25) Signed-off-by: Tomas Cohen Arazi commit 14593a799760d105ed824586bcfade85d2b2a508 Author: Fr?d?rick Date: Wed Mar 20 17:23:39 2013 -0400 Bug 8600: can now remove search input fields in OPAC advanced search form If you follow the 'More options' link in the OPAC advanced search form, each search input field after the first now has a '-' button that lets you remove the box. This complements the '+' buttons that already existed that allow the user to add additional input fields. Signed-off-by: Cedric Vita Signed-off-by: Chris Cormack Signed-off-by: Galen Charlton (cherry picked from commit 0d6bd380ba644ce2cf36a40edbfa5e231e1e19ab) Signed-off-by: Tomas Cohen Arazi ----------------------------------------------------------------------- Summary of changes: .../prog/en/modules/admin/aqbudgets.tt | 2 +- .../prog/en/modules/admin/authorised_values.tt | 2 +- .../prog/en/modules/admin/checkmarc.tt | 6 ++-- .../prog/en/modules/admin/patron-attr-types.tt | 2 +- .../prog/en/modules/help/members/moremember.tt | 2 +- .../en/modules/reports/guided_reports_start.tt | 4 +- koha-tmpl/opac-tmpl/prog/en/includes/masthead.inc | 4 +- .../opac-tmpl/prog/en/modules/opac-advsearch.tt | 25 ++++++++++++++----- tools/export.pl | 2 +- 9 files changed, 30 insertions(+), 19 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Mon Jun 10 21:48:42 2013 From: gitmaster at git.koha-community.org (Git repo owner) Date: Mon, 10 Jun 2013 19:48:42 +0000 Subject: [koha-commits] main Koha release repository branch 3.10.x updated. v3.10.06-14-gc8a3e85 Message-ID: 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.10.x has been updated via c8a3e85d3c7a9516336cf920075f8b9a943c35d2 (commit) from 0debaa73cdfd3579701a9d3578cc008197ce739f (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 c8a3e85d3c7a9516336cf920075f8b9a943c35d2 Author: Chris Cormack Date: Tue Apr 30 08:56:22 2013 +1200 Bug 10120: Adding a syspref to control if overdue charges are updated on return On by default. To Test 1/ Create an overdue item, that should get fines 2/ Return the item 3/ Check the borrowers record to see if the fine has been added/updated Apply patch 1/ Make sure preference is set to do Repeat steps 1-3 above 2/ Switch the preference to don't Repeat stes 1-2 3/ Check the fine hasn't been added/updated Signed-off-by: David Cook Signed-off-by: Katrin Fischer All tests and QA script pass, works as described. I would categorize this a bug fix for libraries that don't want the new changed behaviour that was introduced by recalculating fines on return. Signed-off-by: Galen Charlton (cherry picked from commit fc61bd30186b0305579c5dee0a14f9d2733cd5db) Solved conflicts in: installer/data/mysql/sysprefs.sql installer/data/mysql/updatedatabase.pl and changed DB version number. Signed-off-by: Tomas Cohen Arazi (cherry picked from commit 1c6ab7f78575e7cc4eaee3eca397002ba9e23c8e) Solved conflicts in: installer/data/mysql/sysprefs.sql installer/data/mysql/updatedatabase.pl and changed DB version number. Signed-off-by: Bernardo Gonzalez Kriegel (cherry picked from commit 1c6ab7f78575e7cc4eaee3eca397002ba9e23c8e) ----------------------------------------------------------------------- Summary of changes: C4/Circulation.pm | 4 +++- installer/data/mysql/sysprefs.sql | 7 +++++++ installer/data/mysql/updatedatabase.pl | 12 ++++++++++++ .../en/modules/admin/preferences/circulation.pref | 7 +++++++ 4 files changed, 29 insertions(+), 1 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Mon Jun 10 21:52:49 2013 From: gitmaster at git.koha-community.org (Git repo owner) Date: Mon, 10 Jun 2013 19:52:49 +0000 Subject: [koha-commits] main Koha release repository branch 3.10.x updated. v3.10.06-15-g1bd9491 Message-ID: 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.10.x has been updated via 1bd9491b607cbbf8bd9e2373a931cb3a54c71385 (commit) from c8a3e85d3c7a9516336cf920075f8b9a943c35d2 (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 1bd9491b607cbbf8bd9e2373a931cb3a54c71385 Author: Bernardo Gonzalez Kriegel Date: Mon Jun 10 16:58:06 2013 -0300 Bug 10120: DBRev 3.10.6.001 ----------------------------------------------------------------------- Summary of changes: kohaversion.pl | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Mon Jun 10 22:02:18 2013 From: gitmaster at git.koha-community.org (Git repo owner) Date: Mon, 10 Jun 2013 20:02:18 +0000 Subject: [koha-commits] main Koha release repository branch 3.10.x updated. v3.10.06-16-gd972e91 Message-ID: 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.10.x has been updated via d972e9161432f5879a7f5d8c7e0b22708c783a1d (commit) from 1bd9491b607cbbf8bd9e2373a931cb3a54c71385 (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 d972e9161432f5879a7f5d8c7e0b22708c783a1d Author: Katrin Fischer Date: Sun May 19 12:16:16 2013 +0200 Bug 10284: Add missing spaces between label and content in XSLT view (780/785) To test: - Check OPAC and intranet XSLT view for a record that contains 780 and 785 fields. - Verify there is no space between the label and the content of the field. - Apply patch. - Verify the display both in intranet and OPAC is a little nicer now. Signed-off-by: Galen Charlton Signed-off-by: Chris Cormack Signed-off-by: Galen Charlton (cherry picked from commit 4c1c323232cd303c9c1e0f02c83871e1e6fcd62d) Signed-off-by: Tomas Cohen Arazi (cherry picked from commit b459eab4c89cf507ae3108194c2ec159b04672aa) Signed-off-by: Bernardo Gonzalez Kriegel (cherry picked from commit b459eab4c89cf507ae3108194c2ec159b04672aa) ----------------------------------------------------------------------- Summary of changes: .../prog/en/xslt/MARC21slim2intranetDetail.xsl | 3 ++- .../prog/en/xslt/MARC21slim2OPACDetail.xsl | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Mon Jun 10 22:06:53 2013 From: gitmaster at git.koha-community.org (Git repo owner) Date: Mon, 10 Jun 2013 20:06:53 +0000 Subject: [koha-commits] main Koha release repository branch 3.10.x updated. v3.10.06-17-g268cbf0 Message-ID: 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.10.x has been updated via 268cbf08d142c7a27a752b15bf3fc376767c2799 (commit) from d972e9161432f5879a7f5d8c7e0b22708c783a1d (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 268cbf08d142c7a27a752b15bf3fc376767c2799 Author: Connor Fraser Date: Sat May 25 11:25:18 2013 +1200 Bug 7368: Correct three typos in history.txt Signed-off-by: Chris Cormack Signed-off-by: Marcel de Rooy Signed-off-by: Galen Charlton (cherry picked from commit 342463b5796825e8dd941e575694e8e4be6aa274) Signed-off-by: Tomas Cohen Arazi (cherry picked from commit 09a17abfda2f0f0a01d7b5f807e73dd77bfcb856) Signed-off-by: Bernardo Gonzalez Kriegel (cherry picked from commit 09a17abfda2f0f0a01d7b5f807e73dd77bfcb856) ----------------------------------------------------------------------- Summary of changes: docs/history.txt | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Mon Jun 10 22:12:07 2013 From: gitmaster at git.koha-community.org (Git repo owner) Date: Mon, 10 Jun 2013 20:12:07 +0000 Subject: [koha-commits] main Koha release repository branch 3.10.x updated. v3.10.06-18-g7b4cb94 Message-ID: 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.10.x has been updated via 7b4cb9406e67c787444681af269ca77ee6c45e14 (commit) from 268cbf08d142c7a27a752b15bf3fc376767c2799 (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 7b4cb9406e67c787444681af269ca77ee6c45e14 Author: Owen Leonard Date: Mon May 13 15:21:46 2013 -0400 Bug 10193 - Copies should be holdings as label for items on MARC view In the OPAC MARC view, the table of holdings is labeled 'copies.' In order to be consistent with the normal view this should be labeled 'holdings.' This patch makes this correction. To test, apply the patch and view the MARC detail page for any record with items. The table of holdings data at the bottom of the page should be labeled 'Holdings.' Signed-off-by: Mirko Tietgen Signed-off-by: Jonathan Druart Signed-off-by: Galen Charlton (cherry picked from commit 492a1a19f99c27ccbb94cab2fa4318379076bc6f) Signed-off-by: Tomas Cohen Arazi (cherry picked from commit d66e56177ec52d2278007275b261ee5e5b577ad2) Signed-off-by: Bernardo Gonzalez Kriegel (cherry picked from commit d66e56177ec52d2278007275b261ee5e5b577ad2) ----------------------------------------------------------------------- Summary of changes: .../opac-tmpl/prog/en/modules/opac-MARCdetail.tt | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Mon Jun 10 22:17:43 2013 From: gitmaster at git.koha-community.org (Git repo owner) Date: Mon, 10 Jun 2013 20:17:43 +0000 Subject: [koha-commits] main Koha release repository branch 3.10.x updated. v3.10.06-19-g4ffd79b Message-ID: 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.10.x has been updated via 4ffd79b2f3c6471c730497b892235661e6391e64 (commit) from 7b4cb9406e67c787444681af269ca77ee6c45e14 (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 4ffd79b2f3c6471c730497b892235661e6391e64 Author: Colin Campbell Date: Fri May 3 15:35:44 2013 +0100 Bug 10184 - Circulation History reverses sort order Issue data is passed to the readingrec template ordered most recent due date first. Datatables unless specified otherwise do a presort on the data they will display the default results in an order the reverse of what was intended. Disabling the presort preserves the initial sort order until the user selects a different sort Signed-off-by: Owen Leonard Signed-off-by: Chris Cormack Signed-off-by: Galen Charlton (cherry picked from commit 3285261d0150113e597d48a5a78aee5fdc1ebd94) Signed-off-by: Tomas Cohen Arazi (cherry picked from commit cfdf4759dc0fe857b3dfb2fcab2868e117c5e6ff) Signed-off-by: Bernardo Gonzalez Kriegel (cherry picked from commit cfdf4759dc0fe857b3dfb2fcab2868e117c5e6ff) ----------------------------------------------------------------------- Summary of changes: .../prog/en/modules/members/readingrec.tt | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Tue Jun 11 00:24:52 2013 From: gitmaster at git.koha-community.org (Git repo owner) Date: Mon, 10 Jun 2013 22:24:52 +0000 Subject: [koha-commits] main Koha release repository branch 3.10.x updated. v3.10.06-20-g0657257 Message-ID: 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.10.x has been updated via 0657257f828615893173f0dd131e1bd87b5eee18 (commit) from 4ffd79b2f3c6471c730497b892235661e6391e64 (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 0657257f828615893173f0dd131e1bd87b5eee18 Author: Owen Leonard Date: Mon May 13 15:07:34 2013 -0400 Bug 10218 - In OPAC XSLT search results, add class to 'online access' In some cases in OPAC search results and the detail page there is a class specific to each line of data being output (publisher, date, subjects, etc). In other cases there is no additional class. This patch makes modifications to a few different OPAC files in an attempt to make them consistent with each other. To test, apply the patch and view: - an OPAC detail page with OPACXSLTDetailsDisplay off - the OPAC search results page with OPACXSLTDetailsDisplay off - the OPAC search results page with OPACXSLTDetailsDisplay on Labels should have classes relevant to their data. To test the specific case requested by this bug, view details/results for a record which includes online resources (856u in MARC21). Signed-off-by: Galen Charlton html changes only, passes all tests Signed-off-by: Chris Cormack Signed-off-by: Galen Charlton (cherry picked from commit 45168efeb9a2c6e3268e2f002ca31af8e5e6afc8) Signed-off-by: Tomas Cohen Arazi (cherry picked from commit cf96dd5f53eea3b585ea8a38b916a30b89c24bea) Solved conflicts in: koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tt Signed-off-by: Bernardo Gonzalez Kriegel (cherry picked from commit cf96dd5f53eea3b585ea8a38b916a30b89c24bea) ----------------------------------------------------------------------- Summary of changes: koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tt | 32 ++++++++++---------- .../opac-tmpl/prog/en/modules/opac-results.tt | 10 +++--- .../prog/en/xslt/MARC21slim2OPACResults.xsl | 18 +++++----- 3 files changed, 30 insertions(+), 30 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Tue Jun 11 00:40:41 2013 From: gitmaster at git.koha-community.org (Git repo owner) Date: Mon, 10 Jun 2013 22:40:41 +0000 Subject: [koha-commits] main Koha release repository branch 3.10.x updated. v3.10.06-21-g8fc0b34 Message-ID: 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.10.x has been updated via 8fc0b34e88c0fe030283f2913658105bca0d2b30 (commit) from 0657257f828615893173f0dd131e1bd87b5eee18 (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 8fc0b34e88c0fe030283f2913658105bca0d2b30 Author: Kyle M Hall Date: Thu May 16 14:02:24 2013 -0400 Bug 10262 - fine calculation at checkin not respecting CircControl The fines.pl script uses the system preference CircControl to decide what branches circ rules to use for fine generation. Recently, code was added to the returns system to recalculate the fine at checkin time ( to support hourly loans ). The problem is that this code does not respect CircControl. Test Plan: 1) Set circ control to "the library you are logged in at" 2) Set different fines rules for two different librarys 3) Check an item out at library A, backdate the due date so it's overdue and will have fines. 4) Check the item in at library B 5) Observe that the fines should be generated based on library A's rules, but the fines will be based on library B's rules instead! 5) Apply the patch 6) Repeat steps 3 and 4. 7) Observe now that the fines should reflect the fines rules for Library A Note: it seems counter-intuitive for the fines system to behave this way based on the preference being set to "the library you are logged in at" but it does make sense. The rules used are from "the library you are logged in at" when the item is first checked out. If the fines system really did use the rules for the library the item was returned to, it would be easy to exploit the library system. Some Koha using systems have branches that charge fines, and others that don't, so a patron could just return any overdue items to a non-charging branch to avoid ever paying fines! Furthermore, it would mean that the fines.pl script would be using one set of rules to charge fines, and the returns system could possibly be using another. Since fines.pl has been around far longer, it makes sense to assume the fines.pl behavior is canonical. Signed-off-by: Mickey Coalwell Signed-off-by: George Williams Signed-off-by: Chris Cormack Signed-off-by: Galen Charlton Merged with reservations; see comment on bug report for details. (cherry picked from commit 040eb4016f4b01d44f87ab6aca515c6917f73479) Signed-off-by: Tomas Cohen Arazi (cherry picked from commit 85536020599855d6ae89aa1d66e05adc1c705f0e) Signed-off-by: Bernardo Gonzalez Kriegel (cherry picked from commit 85536020599855d6ae89aa1d66e05adc1c705f0e) ----------------------------------------------------------------------- Summary of changes: C4/Circulation.pm | 37 ++++++++++++++++++++++++++----------- 1 files changed, 26 insertions(+), 11 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Tue Jun 11 00:59:22 2013 From: gitmaster at git.koha-community.org (Git repo owner) Date: Mon, 10 Jun 2013 22:59:22 +0000 Subject: [koha-commits] main Koha release repository branch 3.10.x updated. v3.10.06-22-g0c222ea Message-ID: 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.10.x has been updated via 0c222eaa9c7e86f400e827b7c008a73815fb177d (commit) from 8fc0b34e88c0fe030283f2913658105bca0d2b30 (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 0c222eaa9c7e86f400e827b7c008a73815fb177d Author: Galen Charlton Date: Mon May 20 10:12:44 2013 -0700 bug 10292: improve fallback logic for picking XSLT This patch fixes a bug whereby XSLT files from the prog theme would be used (for English OPACs and staff interfaces) even if the user had created and enabled a custom theme that provided override XSLT files. This patch provides a clearer implementation of the fallback logic and adds test cases. To reproduce the bug: [1] Set OPACXSLTDetailsDisplay to 'default' and English as the OPAC language. [2] Create a new OPAC theme, including copying the XSLT files. [3] Set opactheme to the new theme. [4] Make a change to koha-tmpl/opac-tmpl/NEWTHEME/en/xslt/MARC21slim2OPACDetail.xsl [5] View a bib record in the OPAC. The change made in the previous step is not reflected. To test after applying the patch: [6] Reload the bib record in the OPAC. The change made in step 4 should now be reflected. [7] (To be thorough) Go through the test plan for bug 8947 and verify that there is no regression. Signed-off-by: Galen Charlton Signed-off-by: Mirko Tietgen Signed-off-by: Jonathan Druart Signed-off-by: Galen Charlton (cherry picked from commit b0eeb00d48892c2ea7f42d787dae10364537ed6f) Signed-off-by: Tomas Cohen Arazi (cherry picked from commit d68bb6b8c03c1d538b29448b5baf0dfb13cca736) Signed-off-by: Bernardo Gonzalez Kriegel (cherry picked from commit d68bb6b8c03c1d538b29448b5baf0dfb13cca736) ----------------------------------------------------------------------- Summary of changes: C4/XSLT.pm | 25 +++++++++++++++++++++---- t/XSLT.t | 37 ++++++++++++++++++++++++++++++++++++- 2 files changed, 57 insertions(+), 5 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Tue Jun 11 01:07:04 2013 From: gitmaster at git.koha-community.org (Git repo owner) Date: Mon, 10 Jun 2013 23:07:04 +0000 Subject: [koha-commits] main Koha release repository branch 3.10.x updated. v3.10.06-23-g50d90e2 Message-ID: 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.10.x has been updated via 50d90e28024a41bda6f7789eb2d6d577b844e982 (commit) from 0c222eaa9c7e86f400e827b7c008a73815fb177d (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 50d90e28024a41bda6f7789eb2d6d577b844e982 Author: Jared Camins-Esakov Date: Tue May 28 07:44:35 2013 -0400 Bug 10359: transform masthead dropdown after user JS for CCSR Since libraries may want to customize the options in the masthead search dropdown, which is done via dropdown, it would be better if the select box were transformed *after* user javascript was run. To test: 1) Switch to the CCSR OPAC theme. 2) Add some Javascript to your OpacUserJS that will modify the masthead search dropdown, such as: $("select[name='idx']").append(""); 3) Note that when you view the OPAC, the results in the dropdown are unchanged. 4) Apply patch. 5) Note that your new option now shows up. 6) Sign off. Signed-off-by: Mirko Tietgen Signed-off-by: Jonathan Druart Signed-off-by: Galen Charlton (cherry picked from commit ff2b4d1ff5992989478f83517d95f957c4af50d4) Signed-off-by: Tomas Cohen Arazi (cherry picked from commit 8d27bd783ebb353aea3d1a428b42b0b012b9d5a0) Signed-off-by: Bernardo Gonzalez Kriegel (cherry picked from commit 8d27bd783ebb353aea3d1a428b42b0b012b9d5a0) ----------------------------------------------------------------------- Summary of changes: .../opac-tmpl/ccsr/en/includes/opac-bottom.inc | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Tue Jun 11 01:20:42 2013 From: gitmaster at git.koha-community.org (Git repo owner) Date: Mon, 10 Jun 2013 23:20:42 +0000 Subject: [koha-commits] main Koha release repository branch 3.10.x updated. v3.10.06-24-g6db304f Message-ID: 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.10.x has been updated via 6db304f2db231c2fe491d7da273f0ca75daee8d1 (commit) from 50d90e28024a41bda6f7789eb2d6d577b844e982 (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 6db304f2db231c2fe491d7da273f0ca75daee8d1 Author: Marcel de Rooy Date: Wed May 22 14:51:00 2013 +0200 Bug 10381: POD lines of GetBasketsInfosByBookseller Signed-off-by: Marcel de Rooy Signed-off-by: Cedric Vita Signed-off-by: Jonathan Druart Signed-off-by: Galen Charlton (cherry picked from commit 5bf996f68d2279ae9582b338b3d094ad20f7596c) Signed-off-by: Tomas Cohen Arazi (cherry picked from commit 1530cee8a50006bbaa013676917086175401968c) Signed-off-by: Bernardo Gonzalez Kriegel (cherry picked from commit 1530cee8a50006bbaa013676917086175401968c) ----------------------------------------------------------------------- Summary of changes: C4/Acquisition.pm | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Tue Jun 11 02:40:55 2013 From: gitmaster at git.koha-community.org (Git repo owner) Date: Tue, 11 Jun 2013 00:40:55 +0000 Subject: [koha-commits] main Koha release repository branch 3.10.x updated. v3.10.06-25-g02fd269 Message-ID: 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.10.x has been updated via 02fd26956b16720c135cc19362ca6aa2251f3d09 (commit) from 6db304f2db231c2fe491d7da273f0ca75daee8d1 (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 02fd26956b16720c135cc19362ca6aa2251f3d09 Author: Bernardo Gonzalez Kriegel Date: Mon Jun 10 21:40:33 2013 -0300 Revert "Bug 10381: POD lines of GetBasketsInfosByBookseller" This reverts commit 6db304f2db231c2fe491d7da273f0ca75daee8d1. My mistake, I first need Bug 9824. ----------------------------------------------------------------------- Summary of changes: C4/Acquisition.pm | 6 +----- 1 files changed, 1 insertions(+), 5 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Tue Jun 11 19:41:10 2013 From: gitmaster at git.koha-community.org (Git repo owner) Date: Tue, 11 Jun 2013 17:41:10 +0000 Subject: [koha-commits] main Koha release repository branch 3.12.x updated. v3.12.00-46-g46296f1 Message-ID: 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.12.x has been updated via 46296f1e3e92435ea1190615042aee09a7743114 (commit) via 47c4564f0564e88f6e0b845dbdf8f07b4fe5f796 (commit) via 20bd5b63c4a098fd0d7e98343894d6b2c0b6914d (commit) via 8357d686ca80dcf98c4fb1e40290e53a2e6203dd (commit) from fd7b1a95120313316d987d353e7787bb4371bed8 (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 46296f1e3e92435ea1190615042aee09a7743114 Author: Owen Leonard Date: Tue Apr 9 13:46:14 2013 -0400 Bug 10406 - Remove obsolete CSS related to YUI autocomplete staff-global.css contains CSS which related to the old YUI autocomplete widget. Since this has been replaced with jQueryUI the CSS is now unused and can be removed. Signed-off-by: Srdjan Passed-QA-by: Marcel de Rooy (cherry picked from commit e0dc603d8ff3a7fcaade0cf29aa9be11066b06f3) Signed-off-by: Tomas Cohen Arazi commit 47c4564f0564e88f6e0b845dbdf8f07b4fe5f796 Author: Nicole C. Engard Date: Sun May 19 13:56:50 2013 -0400 Bug 10250: Fix typos in guided reports help file This is a string patch that fixes typos in the guided reports help file. To test: * Go to the guided reports page * Click help * Confirm text is right Signed-off-by: Jared Camins-Esakov Signed-off-by: Chris Cormack Signed-off-by: Galen Charlton (cherry picked from commit 96363fa1c3db4398890ece41e7cc19003c0c5133) Signed-off-by: Tomas Cohen Arazi Trivial string patch. commit 20bd5b63c4a098fd0d7e98343894d6b2c0b6914d Author: Jonathan Druart Date: Tue May 21 14:54:36 2013 +0200 Bug 10296: UT: t/data/db_schemas not needed Signed-off-by: Galen Charlton These were added with the intention of writing some schema verification test cases, but if that idea gets picked up again in the future, fresher copies of kohastructure.sql can be obtained from Git. Signed-off-by: Chris Cormack Signed-off-by: Galen Charlton (cherry picked from commit d2ee2b5cf34aa73bba23d2d54c32588f8acaa4e5) Signed-off-by: Tomas Cohen Arazi commit 8357d686ca80dcf98c4fb1e40290e53a2e6203dd Author: Owen Leonard Date: Mon May 13 14:26:17 2013 -0400 Bug 10221 - hold expiration doesn't show on patron's list of holds When viewing the list of a patron's holds on the circulation page or the patron detail page the table of holds doesn't display the holds expiration date, if present. This patch adds display of the hold expiration date. To test, place a hold for a patron and set an expiration date for it. View the patron's existing holds on both circulation.pl and moremember.pl. The expiration date you chose should appear in the table of information about existing holds. Signed-off-by: Nicole C. Engard works great Signed-off-by: Jonathan Druart Signed-off-by: Galen Charlton (cherry picked from commit 225a7007052e9027f6fa1c141c6a3494224c1af8) Signed-off-by: Tomas Cohen Arazi Works as expected, I consider this an usability bugfix. ----------------------------------------------------------------------- Summary of changes: circ/circulation.pl | 1 + .../intranet-tmpl/prog/en/css/staff-global.css | 16 - .../prog/en/modules/circ/circulation.tt | 2 + .../prog/en/modules/help/reports/guided_reports.tt | 8 +- .../prog/en/modules/members/moremember.tt | 6 +- members/moremember.pl | 1 + t/data/db_schemas/koha.mysql-2.2.9 | 1357 ------------- .../db_schemas/kohastructure.sql-3.00.00-alpha-044 | 1895 ------------------ .../db_schemas/kohastructure.sql-3.00.00-beta-067 | 2029 -------------------- 9 files changed, 13 insertions(+), 5302 deletions(-) delete mode 100644 t/data/db_schemas/koha.mysql-2.2.9 delete mode 100644 t/data/db_schemas/kohastructure.sql-3.00.00-alpha-044 delete mode 100644 t/data/db_schemas/kohastructure.sql-3.00.00-beta-067 hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Wed Jun 12 10:01:50 2013 From: gitmaster at git.koha-community.org (Git repo owner) Date: Wed, 12 Jun 2013 08:01:50 +0000 Subject: [koha-commits] main Koha release repository branch 3.8.x updated. v3.08.13-13-gbe77fa0 Message-ID: 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.8.x has been updated via be77fa00350d9ea471c2adb7ef8b3dc9586696da (commit) via 68bad5874ae7ea8110851368bb6d9848e679d1a7 (commit) via 7bac076cdc94051700ece215baec31a60fddc799 (commit) from 5a146577813f8f7d8598f762bf880a54a6568c81 (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 be77fa00350d9ea471c2adb7ef8b3dc9586696da Author: Jonathan Druart Date: Thu May 23 09:33:48 2013 +0200 Bug 10310: Followup Prevent submitting form with enter does not work with IE Check e.target.type instead of using jQuery. Signed-off-by: Marcel de Rooy Signed-off-by: Galen Charlton (cherry picked from commit c4978ef178746df06333c6704ea9e6f888b4b9ff) Signed-off-by: Tomas Cohen Arazi (cherry picked from commit 5cea7144bc50477f8518ae47e78282de287c1a23) Signed-off-by: Bernardo Gonzalez Kriegel (cherry picked from commit 5cea7144bc50477f8518ae47e78282de287c1a23) Signed-off-by: Chris Hall (cherry picked from commit 47349148c798ab17762189ef358adfe8d4bfec56) commit 68bad5874ae7ea8110851368bb6d9848e679d1a7 Author: Jonathan Druart Date: Wed May 22 15:49:26 2013 +0200 Bug 10310: Prevent submitting form with enter does not work with IE I am not able to test this patch with IE... I tested it with Chromium and FF and it works great. This patch can be tested on the neworderempty.pl page Signed-off-by: Marcel de Rooy Signed-off-by: Galen Charlton (cherry picked from commit efdf30bc476ab130b0dc4767ba38d68208eb2ca7) Signed-off-by: Tomas Cohen Arazi (cherry picked from commit 84481e79527d8ad1c5a3393b716c17f550736857) Signed-off-by: Bernardo Gonzalez Kriegel (cherry picked from commit 84481e79527d8ad1c5a3393b716c17f550736857) Signed-off-by: Chris Hall (cherry picked from commit 9d5316e2fb4af51721cf7b11f22759811e344c77) commit 7bac076cdc94051700ece215baec31a60fddc799 Author: Jonathan Druart Date: Wed Jan 30 15:19:58 2013 +0100 Bug 9507: prevent submit: refactor some code in a js file This patch refactors some code in a js file. Test plan: On acqui/neworderempty.pl, acqui/orderreceive.pl and serials/serials-edit.tt try to scan a barcode (or press enter) on the form and check that it is not sent. Signed-off-by: Kyle M Hall Signed-off-by: Marcel de Rooy Have to note that the code for IE9 does not work. Before and after this patch. If we refactor code, it would have been nice to resolve this too. But I do not oppose pushing this patch. The test uses 'an ancient Netscape property' window.Event (uppercase!) to make the distinction between browers and event models. Some more documentation here would be welcome too. ----------------------------------------------------------------------- Summary of changes: .../intranet-tmpl/prog/en/js/prevent_submit.js | 11 +++++++++++ .../prog/en/modules/acqui/neworderempty.tt | 19 +------------------ .../prog/en/modules/acqui/orderreceive.tt | 1 + .../prog/en/modules/serials/serials-edit.tt | 1 + 4 files changed, 14 insertions(+), 18 deletions(-) create mode 100644 koha-tmpl/intranet-tmpl/prog/en/js/prevent_submit.js hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Wed Jun 12 10:11:22 2013 From: gitmaster at git.koha-community.org (Git repo owner) Date: Wed, 12 Jun 2013 08:11:22 +0000 Subject: [koha-commits] main Koha release repository branch 3.8.x updated. v3.08.13-14-g9ddd9e0 Message-ID: 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.8.x has been updated via 9ddd9e013b8b3973c2986da5fd22a654a7d5d502 (commit) from be77fa00350d9ea471c2adb7ef8b3dc9586696da (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 9ddd9e013b8b3973c2986da5fd22a654a7d5d502 Author: Katrin Fischer Date: Sun May 19 12:16:16 2013 +0200 Bug 10284: Add missing spaces between label and content in XSLT view (780/785) To test: - Check OPAC and intranet XSLT view for a record that contains 780 and 785 fields. - Verify there is no space between the label and the content of the field. - Apply patch. - Verify the display both in intranet and OPAC is a little nicer now. Signed-off-by: Galen Charlton Signed-off-by: Chris Cormack Signed-off-by: Galen Charlton (cherry picked from commit 4c1c323232cd303c9c1e0f02c83871e1e6fcd62d) Signed-off-by: Tomas Cohen Arazi (cherry picked from commit b459eab4c89cf507ae3108194c2ec159b04672aa) Signed-off-by: Bernardo Gonzalez Kriegel (cherry picked from commit b459eab4c89cf507ae3108194c2ec159b04672aa) ----------------------------------------------------------------------- Summary of changes: .../prog/en/xslt/MARC21slim2intranetDetail.xsl | 3 ++- .../prog/en/xslt/MARC21slim2OPACDetail.xsl | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Wed Jun 12 10:12:53 2013 From: gitmaster at git.koha-community.org (Git repo owner) Date: Wed, 12 Jun 2013 08:12:53 +0000 Subject: [koha-commits] main Koha release repository branch 3.8.x updated. v3.08.13-15-g2648b9d Message-ID: 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.8.x has been updated via 2648b9db33fd02f116aac202fe3f7a3c5fb6f1f7 (commit) from 9ddd9e013b8b3973c2986da5fd22a654a7d5d502 (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 2648b9db33fd02f116aac202fe3f7a3c5fb6f1f7 Author: Connor Fraser Date: Sat May 25 11:25:18 2013 +1200 Bug 7368: Correct three typos in history.txt Signed-off-by: Chris Cormack Signed-off-by: Marcel de Rooy Signed-off-by: Galen Charlton (cherry picked from commit 342463b5796825e8dd941e575694e8e4be6aa274) Signed-off-by: Tomas Cohen Arazi (cherry picked from commit 09a17abfda2f0f0a01d7b5f807e73dd77bfcb856) Signed-off-by: Bernardo Gonzalez Kriegel (cherry picked from commit 09a17abfda2f0f0a01d7b5f807e73dd77bfcb856) ----------------------------------------------------------------------- Summary of changes: docs/history.txt | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Wed Jun 12 16:17:38 2013 From: gitmaster at git.koha-community.org (Git repo owner) Date: Wed, 12 Jun 2013 14:17:38 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.12.00-beta1-688-g6d9d558 Message-ID: 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, master has been updated via 6d9d5581ab7bb458dcca3dcb19c7f5929fa7ea50 (commit) from acd4b21c91f4b06a6e19cafb4b9a6dd2817ad8e9 (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 6d9d5581ab7bb458dcca3dcb19c7f5929fa7ea50 Author: Tomas Cohen Arazi Date: Tue Jun 11 15:25:38 2013 -0300 Bug 10406: memove div and more obsolete CSS related to YUI autocomplete To test: - Apply, then test the patron search form Sponsored-by: Universidad Nacional de C?rdoba Signed-off-by: Owen Leonard Signed-off-by: Jonathan Druart Signed-off-by: Galen Charlton ----------------------------------------------------------------------- Summary of changes: .../intranet-tmpl/prog/en/css/right-to-left.css | 5 ----- .../prog/en/includes/patron-search-box.inc | 2 -- 2 files changed, 0 insertions(+), 7 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Wed Jun 12 16:36:14 2013 From: gitmaster at git.koha-community.org (Git repo owner) Date: Wed, 12 Jun 2013 14:36:14 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.12.00-beta1-691-gedb8bdd Message-ID: 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, master has been updated via edb8bddff074769a95744b6a7fa59eff61e0cfc1 (commit) via a5e9e15663289489e0baafff73d7bed20434b8ec (commit) via ecf6721060607b621c58f234ab5a5f43e30b1d98 (commit) from 6d9d5581ab7bb458dcca3dcb19c7f5929fa7ea50 (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 edb8bddff074769a95744b6a7fa59eff61e0cfc1 Author: Galen Charlton Date: Tue Jan 8 17:32:47 2013 -0800 bug 9370: improve splitting of LC call numbers for labels Use the Perl module Library::CallNumber::LC to parse and split LC call numbers when generating spine labels. For example, QH541.15.C6 C25 2012 should be split as follows: QH 541.15 .C6 C25 2012 To test, create an item with call number QH541.15.C6 C25 2012 and classification source LC, then create a spine label for that item using a layout of type 'biblio' that has the split call numbers option enabled. The call number should be split as indicated above. Signed-off-by: Galen Charlton Signed-off-by: Kyle M Hall Signed-off-by: Chris Cormack Signed-off-by: Galen Charlton commit a5e9e15663289489e0baafff73d7bed20434b8ec Author: Galen Charlton Date: Tue Jan 8 17:28:40 2013 -0800 bug 9370: add invalid call number to LC splitting test cases '123 ABC FOO BAR' is intentionally *not* a valid LC call number, but in order to preserve legacy behavior, it should be split on whitespace. Signed-off-by: Galen Charlton Signed-off-by: Kyle M Hall Signed-off-by: Chris Cormack Signed-off-by: Galen Charlton commit ecf6721060607b621c58f234ab5a5f43e30b1d98 Author: Galen Charlton Date: Tue Jan 8 17:18:30 2013 -0800 bug 9370: test case for splitting LC call number QH541.15.C6 C25 2012 should be split as follows: QH 541.15 .C6 C25 2012 Signed-off-by: Galen Charlton Signed-off-by: Kyle M Hall Signed-off-by: Chris Cormack Signed-off-by: Galen Charlton ----------------------------------------------------------------------- Summary of changes: C4/Labels/Label.pm | 15 ++++----------- t/Labels_split_lccn.t | 2 ++ 2 files changed, 6 insertions(+), 11 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Wed Jun 12 20:00:14 2013 From: gitmaster at git.koha-community.org (Git repo owner) Date: Wed, 12 Jun 2013 18:00:14 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.12.00-beta1-692-g39de7a8 Message-ID: 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, master has been updated via 39de7a8de855c61a50191c9b3fca5b6480e10f92 (commit) from edb8bddff074769a95744b6a7fa59eff61e0cfc1 (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 39de7a8de855c61a50191c9b3fca5b6480e10f92 Author: Owen Leonard Date: Mon Jun 10 14:21:11 2013 -0400 Bug 10432 - Display of enabled status on course list is not accessible The list of courses in Course Reserves uses an image with no alt attribute to display the enabled/disabled status of each course. This is not accessible or valid HTML. This patch removes the image altogether in favor of a simple "Yes" or "No." To test, view the list of existing course reserves. Enabled and disabled courses should show "yes" or "no" in the "Enabled" column. Signed-off-by: Galen Charlton Signed-off-by: Kyle M Hall Signed-off-by: Galen Charlton ----------------------------------------------------------------------- Summary of changes: .../en/modules/course_reserves/course-reserves.tt | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Wed Jun 12 20:39:55 2013 From: gitmaster at git.koha-community.org (Git repo owner) Date: Wed, 12 Jun 2013 18:39:55 +0000 Subject: [koha-commits] main Koha release repository branch 3.12.x updated. v3.12.00-48-ge126310 Message-ID: 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.12.x has been updated via e126310bf41cc484dd2a5c8c1b29f4b48e157895 (commit) via c500fbb9e2fe292adbd4c33f8a6071bd7aa5b0fd (commit) from 46296f1e3e92435ea1190615042aee09a7743114 (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 e126310bf41cc484dd2a5c8c1b29f4b48e157895 Author: Tomas Cohen Arazi Date: Tue Jun 11 15:25:38 2013 -0300 Bug 10406: Remove div and more obsolete CSS related to YUI autocomplete To test: - Apply, then test the patron search form Sponsored-by: Universidad Nacional de C?rdoba Signed-off-by: Owen Leonard Signed-off-by: Jonathan Druart Signed-off-by: Galen Charlton (cherry picked from commit 6d9d5581ab7bb458dcca3dcb19c7f5929fa7ea50) Signed-off-by: Tomas Cohen Arazi commit c500fbb9e2fe292adbd4c33f8a6071bd7aa5b0fd Author: Kyle M Hall Date: Wed May 22 09:52:40 2013 -0400 Bug 10311 - Holds queue ignores item-level holds where only one items exists If a record has only one item, and that item has one item-level hold on it, that hold will not show in the holds queue. Test Plan: 1) Create 1 record with 1 item at BranchA 2) Create an item-level hold for that item, for pickup at BranchA by a patron of BranchA 3) Run build_holds_queue.pl 4) View the holds queue for BranchA 5) Note the hold is not in there 6) Apply this patch 7) Re-run build_holds_queue.pl 8) View the holds queue again 9) Not that the hold is now there Signed-off-by: George Williams Signed-off-by: Chris Cormack Signed-off-by: Galen Charlton (cherry picked from commit acd4b21c91f4b06a6e19cafb4b9a6dd2817ad8e9) Signed-off-by: Tomas Cohen Arazi ----------------------------------------------------------------------- Summary of changes: C4/HoldsQueue.pm | 2 +- .../intranet-tmpl/prog/en/css/right-to-left.css | 5 ----- .../prog/en/includes/patron-search-box.inc | 2 -- 3 files changed, 1 insertions(+), 8 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Wed Jun 12 20:45:36 2013 From: gitmaster at git.koha-community.org (Git repo owner) Date: Wed, 12 Jun 2013 18:45:36 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.12.00-beta1-693-g81bfae9 Message-ID: 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, master has been updated via 81bfae93649a2f1a93f4722d052fc529c6495d71 (commit) from 39de7a8de855c61a50191c9b3fca5b6480e10f92 (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 81bfae93649a2f1a93f4722d052fc529c6495d71 Author: Owen Leonard Date: Mon Jun 10 11:14:41 2013 -0400 Bug 10297 - categorycode and branchcode should be required when adding patrons categorycode and branchcode should show as required under all circumstances, not just when they are included in the BorrowerMandatoryField system preference. This patch adds the correct classes and hints to those fields. To test, view the patron entry form for a new or existing patron. Category and Library should show that they are required. Signed-off-by: David Cook Signed-off-by: Galen Charlton ----------------------------------------------------------------------- Summary of changes: .../prog/en/modules/members/memberentrygen.tt | 14 ++++---------- 1 files changed, 4 insertions(+), 10 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Jun 14 03:15:08 2013 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 14 Jun 2013 01:15:08 +0000 Subject: [koha-commits] main Koha release repository branch 3.10.x updated. v3.10.06-26-gc80b91c Message-ID: 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.10.x has been updated via c80b91c3e0114dae1d09a158baa4cc8c81ac62ee (commit) from 02fd26956b16720c135cc19362ca6aa2251f3d09 (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 c80b91c3e0114dae1d09a158baa4cc8c81ac62ee Author: Lyon3 Team Date: Thu Mar 21 14:47:43 2013 +0100 Bug 9824 - Hide basket with no expected items in basqket list by bookseller Before patch you will see in acqui/booksellers.pl all the baskets ever created. After the patch you will see in acqui/booksellers.pl only the basket with expected items. Test plan : * Create a basket with some orders lines You should see this basket in acqui/booksellers.pl * receive or cancel all the line in this basket This basket shouldn't appear any more in acqui/booksellers.pl Signed-off-by: Owen Leonard Signed-off-by: Marcel de Rooy Signed-off-by: Jared Camins-Esakov (cherry picked from commit a0a6d6e64bca28b4d9bc668f614ed286b07327f9) Signed-off-by: Jared Camins-Esakov (cherry picked from commit e1dbabdb7a3bc0ec92d629b862a077f1b6594fbb) Signed-off-by: Bernardo Gonzalez Kriegel (cherry picked from commit e1dbabdb7a3bc0ec92d629b862a077f1b6594fbb) As this is requested, and applies well in 3.10.x, I push it with it's followups. ----------------------------------------------------------------------- Summary of changes: C4/Acquisition.pm | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Jun 14 03:17:39 2013 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 14 Jun 2013 01:17:39 +0000 Subject: [koha-commits] main Koha release repository branch 3.10.x updated. v3.10.06-27-gbf47671 Message-ID: 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.10.x has been updated via bf47671bace7ff55af53694cd8165f0acf0a5966 (commit) from c80b91c3e0114dae1d09a158baa4cc8c81ac62ee (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 bf47671bace7ff55af53694cd8165f0acf0a5966 Author: Marcel de Rooy Date: Fri May 17 19:01:06 2013 +0200 Bug 9824: Followup for removing filter Adds allbaskets parameter to GetBasketsInfosByBookseller. (Only used in booksellers.pl now) Normally, all 'active' baskets are shown. With allbaskets=1 all baskets :) In the template I had to rename a loop var supplier to supplier1 to resolve name conflict between template vars. In the template I added the string: Cancel filter. Note that this string is already translated: msgid "Cancel filter" msgstr "" Hope this helps. Signed-off-by: Katrin Fischer Undoing the filter works and I checked that the string gets translated with the po files in current master. So this is almost perfect, only we can't apply the filters again and the link remains 'cancel' when we already did. Sending a follow-up trying to fix this. Signed-off-by: Jared Camins-Esakov (cherry picked from commit 529434cab891a8b76b3792e12e359f8c8b171519) Signed-off-by: Jared Camins-Esakov (cherry picked from commit a114dc76149c9c27d5b3e0596302d41a9870fc8b) Signed-off-by: Bernardo Gonzalez Kriegel (cherry picked from commit a114dc76149c9c27d5b3e0596302d41a9870fc8b) ----------------------------------------------------------------------- Summary of changes: C4/Acquisition.pm | 12 +++++++----- acqui/booksellers.pl | 3 ++- .../prog/en/modules/acqui/booksellers.tt | 5 +++-- 3 files changed, 12 insertions(+), 8 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Jun 14 03:21:03 2013 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 14 Jun 2013 01:21:03 +0000 Subject: [koha-commits] main Koha release repository branch 3.10.x updated. v3.10.06-28-gb3fe1c1 Message-ID: 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.10.x has been updated via b3fe1c1b93bd8f825dfe59659fd83bfb23f904cf (commit) from bf47671bace7ff55af53694cd8165f0acf0a5966 (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 b3fe1c1b93bd8f825dfe59659fd83bfb23f904cf Author: Katrin Fischer Date: Fri May 17 21:12:05 2013 +0200 Bug 9824: Make it possible to apply/cancel switch Using another existing string 'Apply filter' we are now able to cancel the filter... and apply it... and cancel it again... and so on. Signed-off-by: Owen Leonard Signed-off-by: Jared Camins-Esakov (cherry picked from commit 7acdcb7e2aedf2ff202c009ce053de6dff54e840) Signed-off-by: Jared Camins-Esakov (cherry picked from commit 6bfb91f9df69c887643d0f1ae925595c365da10e) Signed-off-by: Bernardo Gonzalez Kriegel (cherry picked from commit 6bfb91f9df69c887643d0f1ae925595c365da10e) ----------------------------------------------------------------------- Summary of changes: acqui/booksellers.pl | 1 + .../prog/en/modules/acqui/booksellers.tt | 8 +++++++- 2 files changed, 8 insertions(+), 1 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Jun 14 03:27:39 2013 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 14 Jun 2013 01:27:39 +0000 Subject: [koha-commits] main Koha release repository branch 3.10.x updated. v3.10.06-29-gf57dab4 Message-ID: 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.10.x has been updated via f57dab4b0d385cb9e6a21f1248661fc655dd4cee (commit) from b3fe1c1b93bd8f825dfe59659fd83bfb23f904cf (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 f57dab4b0d385cb9e6a21f1248661fc655dd4cee Author: Marcel de Rooy Date: Wed May 22 14:51:00 2013 +0200 Bug 10381: POD lines of GetBasketsInfosByBookseller Signed-off-by: Marcel de Rooy Signed-off-by: Cedric Vita Signed-off-by: Jonathan Druart Signed-off-by: Galen Charlton (cherry picked from commit 5bf996f68d2279ae9582b338b3d094ad20f7596c) Signed-off-by: Tomas Cohen Arazi (cherry picked from commit 1530cee8a50006bbaa013676917086175401968c) Signed-off-by: Bernardo Gonzalez Kriegel (cherry picked from commit 1530cee8a50006bbaa013676917086175401968c) ----------------------------------------------------------------------- Summary of changes: C4/Acquisition.pm | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Jun 14 03:29:54 2013 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 14 Jun 2013 01:29:54 +0000 Subject: [koha-commits] main Koha release repository branch 3.10.x updated. v3.10.06-30-gc1e883b Message-ID: 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.10.x has been updated via c1e883b298a24af0276ec5d2ac75b9c87d8ffde7 (commit) from f57dab4b0d385cb9e6a21f1248661fc655dd4cee (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 c1e883b298a24af0276ec5d2ac75b9c87d8ffde7 Author: Marcel de Rooy Date: Wed May 22 15:01:07 2013 +0200 Bug 10381: Followup adding some text around Apply/cancel filter. The texts Apply/cancel filter did not need translation and were used to get this change into 3.12. For 3.12.X or 3.14 we can add some words to clarify its meaning. With thanks to Owen for some rewording. Signed-off-by: Marcel de Rooy Signed-off-by: Pierre Angot Signed-off-by: Jonathan Druart Signed-off-by: Galen Charlton (cherry picked from commit 600eff7827be1c396e7ea13cd7c7159003d6c794) Signed-off-by: Tomas Cohen Arazi (cherry picked from commit 8fc93e7abced06ae5adce80e123e061aea46950a) Signed-off-by: Bernardo Gonzalez Kriegel (cherry picked from commit 8fc93e7abced06ae5adce80e123e061aea46950a) ----------------------------------------------------------------------- Summary of changes: .../prog/en/modules/acqui/booksellers.tt | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Jun 14 03:34:24 2013 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 14 Jun 2013 01:34:24 +0000 Subject: [koha-commits] main Koha release repository branch 3.10.x updated. v3.10.06-31-gca17520 Message-ID: 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.10.x has been updated via ca175204715cef46d77df7785baac46930fc7269 (commit) from c1e883b298a24af0276ec5d2ac75b9c87d8ffde7 (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 ca175204715cef46d77df7785baac46930fc7269 Author: Janusz Kaczmarek Date: Fri May 24 14:21:36 2013 +0300 Bug 10326: bulkmarcimport.pl doesn't restore value of CataloguingLog syspref To test: 0) Don't apply the patch yet. 1) Have the CataloguingLog system preference set to 'Log'. 2) Import a file of bibliographic records with bulkmarcimport.pl. 3) Check the state of CataloguingLog system preference -- it will be set to 'Don't log'. 4) Apply the patch. 5) Repeat steps 1-3. The CataloguingLog system preference will be 'Log'. Signed-off-by: Galen Charlton Signed-off-by: Jonathan Druart Signed-off-by: Galen Charlton (cherry picked from commit 9d0284096708a65954c7e35a093cfdb727a6bb84) Signed-off-by: Tomas Cohen Arazi (cherry picked from commit 658071008320fdaad425e49e79bd240dc817d7e5) Signed-off-by: Bernardo Gonzalez Kriegel (cherry picked from commit 658071008320fdaad425e49e79bd240dc817d7e5) ----------------------------------------------------------------------- Summary of changes: misc/migration_tools/bulkmarcimport.pl | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Jun 14 03:39:16 2013 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 14 Jun 2013 01:39:16 +0000 Subject: [koha-commits] main Koha release repository branch 3.10.x updated. v3.10.06-32-g8c1589e Message-ID: 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.10.x has been updated via 8c1589e2541920d65f858eaa59c114a18837e8f3 (commit) from ca175204715cef46d77df7785baac46930fc7269 (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 8c1589e2541920d65f858eaa59c114a18837e8f3 Author: Owen Leonard Date: Fri May 31 11:36:02 2013 -0400 Bug 10350 - Capitalization: Home Library column in staff detail items table "Home library" is incorrectly capitalized on the catalog detail page. This patch corrects it. To test, view the normal view of record in the staff client catalog. The "Home library" table header in the holdings table should be correctly capitalized. Signed-off-by: Galen Charlton (cherry picked from commit fd9d643705b5bb0134ee229a076130a966be23bd) Signed-off-by: Tomas Cohen Arazi Trivial string patch (cherry picked from commit 450d4070b9d7103e30547eb5bce88d4cd5a97621) Signed-off-by: Bernardo Gonzalez Kriegel (cherry picked from commit 450d4070b9d7103e30547eb5bce88d4cd5a97621) ----------------------------------------------------------------------- Summary of changes: .../prog/en/modules/catalogue/detail.tt | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Jun 14 04:06:53 2013 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 14 Jun 2013 02:06:53 +0000 Subject: [koha-commits] main Koha release repository branch 3.10.x updated. v3.10.06-33-g00aa61d Message-ID: 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.10.x has been updated via 00aa61dec0c7e9d6c77158d33c69d0108135211b (commit) from 8c1589e2541920d65f858eaa59c114a18837e8f3 (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 00aa61dec0c7e9d6c77158d33c69d0108135211b Author: Fr?d?ric Demians Date: Tue May 14 13:01:56 2013 +0200 Bug 10214 Add header to syspref po files With this patch, header is created when creating a new syspref .po file for a new language (translate create), and is added if it doesn't already exist when updating an existing language (translate update). To test: (1) Create a new language syspref file: ./translate create -p xx-XX Check that there is an header (2) Update an existing syspref file without header: ./translate update fr-FR Check that fr-FR-pref.po has a header (3) Update an existing syspref file with header: Modify fr-FR-pref.po. Add an email, or whatever. ./translate update fr-FR Check that fr-FR-pref.po has a header with the manual modification Signed-off-by: Bernardo Gonzalez Kriegel Comment: Work as described. No errors. Signed-off-by: Katrin Fischer All tests and QA script pass. Also tested that updated pref files can still be installed correctly. Signed-off-by: Jared Camins-Esakov (cherry picked from commit 9ce862e451f56fdca7d368fd1a39e64e40fc678f) Signed-off-by: Jared Camins-Esakov (cherry picked from commit 06d576f4d7698152db8f2b1c89b92dc6892c5dfd) Signed-off-by: Bernardo Gonzalez Kriegel (cherry picked from commit 06d576f4d7698152db8f2b1c89b92dc6892c5dfd) ----------------------------------------------------------------------- Summary of changes: misc/translator/LangInstaller.pm | 22 ++++++++++++++++++++-- 1 files changed, 20 insertions(+), 2 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Jun 14 04:12:51 2013 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 14 Jun 2013 02:12:51 +0000 Subject: [koha-commits] main Koha release repository branch 3.10.x updated. v3.10.06-34-ga675bc2 Message-ID: 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.10.x has been updated via a675bc263c6a6d0322483a0b54c06f009e83eae9 (commit) from 00aa61dec0c7e9d6c77158d33c69d0108135211b (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 a675bc263c6a6d0322483a0b54c06f009e83eae9 Author: Tomas Cohen Arazi Date: Tue Apr 30 11:58:25 2013 -0300 Bug 10159 - koha-rebuild-zebra error handling This patch makes koha-rebuild-zebra: - Check for the existence of the instance - Handle arbitrary amount of instance parameters - Capture -a and -b (which made the script rebuild twice the chosen DB). It adds the extended version (--authorities and --biblios respectively) of the option switch. This makes the -a and -b switches work as "only do authorities" (or viceversa). They can be used concurrently, which is the default behaviour when no switch is provided. - Handle -v (and --verbose) as koha-rebuild-zebra options, to ease the use for non-techie users. - The rebuild_zebra.pl is wrapped inside an IF to return error values if we ever make rebuild_zebra.pl return error codes (this is pointed in the code). - Added -h/--help switches and an 'usage' output :-D Please provide patches for any wording issues, or contact me to fix it. To test: - Apply the patch and create your packages (or just use the script from your branch) - Run it in this scenarios / options - -h/--help to see the available option switches - Mix them with one or more instances, of which some could be fake - try -a/--authorities and -b/--biblios in all possible combinations - try -v/--verbose works Regards To+ Sponsored-by: Universidad Nacional de C?rdoba Signed-off-by: Robin Sheat Signed-off-by: Jared Camins-Esakov (cherry picked from commit 39d3b9088a34b464708e40d1fd20a954d4a6e702) Signed-off-by: Jared Camins-Esakov (cherry picked from commit a3422a47027188b7b76f137fd92effe328ca30c3) Signed-off-by: Bernardo Gonzalez Kriegel (cherry picked from commit a3422a47027188b7b76f137fd92effe328ca30c3) ----------------------------------------------------------------------- Summary of changes: debian/docs/koha-rebuild-zebra.xml | 26 ++++++- debian/scripts/koha-rebuild-zebra | 143 +++++++++++++++++++++++++++++++----- 2 files changed, 147 insertions(+), 22 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Jun 14 04:16:08 2013 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 14 Jun 2013 02:16:08 +0000 Subject: [koha-commits] main Koha release repository branch 3.10.x updated. v3.10.06-35-gaec01a3 Message-ID: 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.10.x has been updated via aec01a39e08eee1f46bed5f08dc7e50979b9b4ba (commit) from a675bc263c6a6d0322483a0b54c06f009e83eae9 (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 aec01a39e08eee1f46bed5f08dc7e50979b9b4ba Author: Tomas Cohen Arazi Date: Tue Apr 30 10:05:44 2013 -0300 Bug 10157 - koha-email-enable error handling koha-email-enable now - Checks the instance exists. - Checks if email is already enabled. Regards To+ Sponsored-by: Universidad Nacional de C?rdoba Signed-off-by: Robin Sheat Signed-off-by: Jared Camins-Esakov (cherry picked from commit 1126dd8bf3e3f386acfc007bc6e3310cc5320100) Signed-off-by: Jared Camins-Esakov (cherry picked from commit 0526bc3fa72ed6f5e7c13d581a051bd6894374f2) Signed-off-by: Bernardo Gonzalez Kriegel (cherry picked from commit 0526bc3fa72ed6f5e7c13d581a051bd6894374f2) ----------------------------------------------------------------------- Summary of changes: debian/docs/koha-email-enable.xml | 4 +- debian/scripts/koha-email-enable | 81 +++++++++++++++++++++++++++++++----- 2 files changed, 71 insertions(+), 14 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Jun 14 04:27:04 2013 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 14 Jun 2013 02:27:04 +0000 Subject: [koha-commits] main Koha release repository branch 3.10.x updated. v3.10.06-36-gbd80daa Message-ID: 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.10.x has been updated via bd80daad3e65433204fd169be47f123900556805 (commit) from aec01a39e08eee1f46bed5f08dc7e50979b9b4ba (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 bd80daad3e65433204fd169be47f123900556805 Author: Tomas Cohen Arazi Date: Mon Apr 29 11:08:35 2013 -0300 Bug 10146 - koha-stop-zebra error handling koha-stop-zebra now - Checks the instance exists. - Checks the instance is enabled. - Checks if the zebra daemon is already running. Regards To+ Edit: Corrected the die message Sponsored-by: Universidad Nacional de C?rdoba Signed-off-by: Robin Sheat Signed-off-by: Jared Camins-Esakov (cherry picked from commit 898e178c6ff3a79bf991defb60aec8ff58f107c6) Signed-off-by: Jared Camins-Esakov (cherry picked from commit 2e550307bedc8f198667f9c6a95b72fd33073a3e) Signed-off-by: Bernardo Gonzalez Kriegel (cherry picked from commit 2e550307bedc8f198667f9c6a95b72fd33073a3e) ----------------------------------------------------------------------- Summary of changes: debian/scripts/koha-stop-zebra | 127 +++++++++++++++++++++++++++++++++++----- 1 files changed, 112 insertions(+), 15 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Jun 14 04:35:57 2013 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 14 Jun 2013 02:35:57 +0000 Subject: [koha-commits] main Koha release repository branch 3.10.x updated. v3.10.06-37-gef33224 Message-ID: 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.10.x has been updated via ef3322404bf3403a7f5508797cf7051bfb9b88d2 (commit) from bd80daad3e65433204fd169be47f123900556805 (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 ef3322404bf3403a7f5508797cf7051bfb9b88d2 Author: Tomas Cohen Arazi Date: Tue Apr 23 10:14:37 2013 -0300 Bug 10094 - koha-list should have a --disabled option switch This patch adds that (--disabled) option switch, Also revisits some of the code and docs. To test: - Apply the patch and create new packages (you might just drop the koha-list command somewhere) - Create several instances (koha-create) - Randomly set some as disabled, others enabled and enable email on some. - Test all possible option switches combinations Expected results: - koha-list should abort with a proper message if mutually exclusive options selected (--email vs. --noemail, --enabled vs. --disabled) - koha-list should show the exact instances you asked for Regards To+ P.S.: I wanted to add the --disabled option switch for the tab-completion work I'm doing, but as of bug 4876 I thought it would be ok to revisit the script to make it robust and clear. Sponsored-by: Universidad Nacional de C?rdoba Signed-off-by: Robin Sheat Does what it says, and cleans up the script at the same time. Signed-off-by: Jared Camins-Esakov (cherry picked from commit de275ec128d3b26e953c35778e6a37e5b85273f5) Signed-off-by: Jared Camins-Esakov (cherry picked from commit 3772f30a0c50db7b993ce68b10b27aeeb09f1f4b) Signed-off-by: Bernardo Gonzalez Kriegel (cherry picked from commit 3772f30a0c50db7b993ce68b10b27aeeb09f1f4b) ----------------------------------------------------------------------- Summary of changes: debian/docs/koha-list.xml | 10 +++- debian/scripts/koha-list | 134 +++++++++++++++++++++++++++++++++++++-------- 2 files changed, 119 insertions(+), 25 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Jun 14 04:44:23 2013 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 14 Jun 2013 02:44:23 +0000 Subject: [koha-commits] main Koha release repository branch 3.10.x updated. v3.10.06-38-gd4d3cb9 Message-ID: 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.10.x has been updated via d4d3cb901951b50808c564d5f124be98c66bf47b (commit) from ef3322404bf3403a7f5508797cf7051bfb9b88d2 (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 d4d3cb901951b50808c564d5f124be98c66bf47b Author: Tomas Cohen Arazi Date: Thu May 16 11:11:52 2013 -0300 Bug 10259 - koha-*-zebra scripts are expected to run without warnings if no instance name passed Commented out the code that checks for intance name parameters on the zebra service handling scripts. It restores the original behaviour, while leaving error checking code. Regards To+ Sponsored-by: Universidad Nacional de C?rdoba Signed-off-by: Robin Sheat Signed-off-by: Jared Camins-Esakov (cherry picked from commit f937d41dbfb5440a0451fbc9cf648339f1566bd3) Signed-off-by: Jared Camins-Esakov (cherry picked from commit 9903fc6fa08c11b3d48fad9c72cce8c60b01bc3d) Signed-off-by: Bernardo Gonzalez Kriegel (cherry picked from commit 9903fc6fa08c11b3d48fad9c72cce8c60b01bc3d) ----------------------------------------------------------------------- Summary of changes: debian/scripts/koha-restart-zebra | 2 +- debian/scripts/koha-start-zebra | 2 +- debian/scripts/koha-stop-zebra | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Jun 14 04:52:55 2013 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 14 Jun 2013 02:52:55 +0000 Subject: [koha-commits] main Koha release repository branch 3.10.x updated. v3.10.06-39-g27408b4 Message-ID: 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.10.x has been updated via 27408b436a53e3bc72b57b2dd5dd5ab20c9f7541 (commit) from d4d3cb901951b50808c564d5f124be98c66bf47b (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 27408b436a53e3bc72b57b2dd5dd5ab20c9f7541 Author: Owen Leonard Date: Tue Jun 4 14:36:41 2013 -0400 Bug 10307 - z39.50 server search tab shows z390.50 The label on the global search form for Z39.50 administration reads "Z390.50." This patch corrects the typo. To test, apply the patch and navigate to Administration -> Z39.50 servers. The label on the global search tab should read "Search Z39.50 servers." Signed-off-by: Galen Charlton (cherry picked from commit b74ac4a1cf64678d2a0dab13965576af1e6ed9c8) Signed-off-by: Tomas Cohen Arazi (cherry picked from commit 299182c7f222460db5fd5f4df15873110300257c) Signed-off-by: Bernardo Gonzalez Kriegel (cherry picked from commit 299182c7f222460db5fd5f4df15873110300257c) ----------------------------------------------------------------------- Summary of changes: .../prog/en/includes/z3950-admin-search.inc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Jun 14 16:45:45 2013 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 14 Jun 2013 14:45:45 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.12.00-beta1-697-g7b21025 Message-ID: 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, master has been updated via 7b21025e6bc092420756a141a728942e31083ad4 (commit) via 43b17feed6ce64bdff6b31918e40170f6681e397 (commit) via 2e86612a15c228357223beaf996f4b3350334b2e (commit) from 32960372225163b76fd214813b9a4e10f39b162f (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 7b21025e6bc092420756a141a728942e31083ad4 Author: Galen Charlton Date: Fri Jun 14 07:50:02 2013 -0700 Bug 10443: DBRev 3.13.00.008 - make sure borrower_files exists This schema update ensures that the borrower_files table will exist for libraries who first installed Koha at 3.10.x. Signed-off-by: Galen Charlton commit 43b17feed6ce64bdff6b31918e40170f6681e397 Author: Galen Charlton Date: Fri Jun 14 07:48:24 2013 -0700 Bug 10443: (follow-up) make sure borrower_files has FK constraint This follows the example of the DBrev that introduced this table. Signed-off-by: Galen Charlton commit 2e86612a15c228357223beaf996f4b3350334b2e Author: Juan Romay Sieira Date: Tue Jun 11 11:36:48 2013 +0200 Bug 10443 - Table borrower_files does not exists in kohastructure.sql file As a consequence, the borrower_files table would not exist in Koha databases that were installed starting at 3.10.0 or later. Signed-off-by: Kyle M Hall Signed-off-by: Jonathan Druart Signed-off-by: Galen Charlton ----------------------------------------------------------------------- Summary of changes: installer/data/mysql/kohastructure.sql | 18 ++++++++++++++++++ installer/data/mysql/updatedatabase.pl | 19 +++++++++++++++++++ kohaversion.pl | 2 +- 3 files changed, 38 insertions(+), 1 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Jun 14 16:54:34 2013 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 14 Jun 2013 14:54:34 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.12.00-beta1-699-gcab5069 Message-ID: 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, master has been updated via cab50698f57c88670241d88028afebd3eb5b5dd8 (commit) via 63ba05183e627bbe7278b9064d22e93d39b65461 (commit) from 7b21025e6bc092420756a141a728942e31083ad4 (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 cab50698f57c88670241d88028afebd3eb5b5dd8 Author: Jonathan Druart Date: Fri Jun 14 14:48:46 2013 +0200 Bug 10458: t/Z3950.t should be removed too Signed-off-by: Jonathan Druart Signed-off-by: Galen Charlton commit 63ba05183e627bbe7278b9064d22e93d39b65461 Author: Marcel de Rooy Date: Thu Jun 13 10:20:27 2013 +0200 Bug 10458: Remove obsolete Z3950 module and test Are not used. Contain several FIXMEs. Removing them makes life easier. Test plan: Actually, you cannot test this. But for confidence: do a Z3950 search in cataloguing and acquisition. Signed-off-by: Kyle M Hall Signed-off-by: Jonathan Druart Signed-off-by: Galen Charlton ----------------------------------------------------------------------- Summary of changes: C4/Z3950.pm | 301 ---------------------------------- t/Z3950.t | 14 -- t/db_dependent/lib/KohaTest/Z3950.pm | 25 --- 3 files changed, 0 insertions(+), 340 deletions(-) delete mode 100644 C4/Z3950.pm delete mode 100644 t/Z3950.t delete mode 100644 t/db_dependent/lib/KohaTest/Z3950.pm hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Jun 14 17:03:15 2013 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 14 Jun 2013 15:03:15 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.12.00-beta1-702-g6e6ed43 Message-ID: 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, master has been updated via 6e6ed4306521f4e8966c4b40f23ce2d539476d1a (commit) via 0fc32a427427dbb27c5c33728b62d5135dc209df (commit) via 5b53b59fe47e01d3427fda89d444246a7968688e (commit) from cab50698f57c88670241d88028afebd3eb5b5dd8 (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 6e6ed4306521f4e8966c4b40f23ce2d539476d1a Author: Jonathan Druart Date: Thu Jun 13 11:11:07 2013 +0200 Bug 10444: Fix prevent the default action on click In particular, clicking the [+] and [-] links on the OPAC advanced search page will no longer scroll the page back to the top. Signed-off-by: Kyle M Hall Signed-off-by: Jonathan Druart Signed-off-by: Galen Charlton commit 0fc32a427427dbb27c5c33728b62d5135dc209df Author: Tomas Cohen Arazi Date: Tue Jun 11 11:49:06 2013 -0300 Bug 10444 - (CCSR followup) In advanced search(more), [+] and [-] should behave like links on hover Same fix for CCSR. Regards To+ Sponsored-by: Universidad Nacional de C?rdoba Signed-off-by: Owen Leonard Signed-off-by: Kyle M Hall Signed-off-by: Jonathan Druart Signed-off-by: Galen Charlton commit 5b53b59fe47e01d3427fda89d444246a7968688e Author: Tomas Cohen Arazi Date: Tue Jun 11 09:54:13 2013 -0300 Bug 10444 - In advanced search(more), [+] and [-] should behave like links on hover This patch add href="#" to the [+] and [-] links for adding and removing search terms. It also defines its style so it doesn't show underlined. To test: - Browse your OPAC to "Advanced Search" and then "More options". - The [+] and [-] don't change the cursor on hover - Apply the patch, reload and see the cursor changes - Functionality should remain unchanged Regards To+ Sponsored-by: Universidad Nacional de C?rdoba Signed-off-by: Owen Leonard Signed-off-by: Kyle M Hall Signed-off-by: Jonathan Druart Signed-off-by: Galen Charlton ----------------------------------------------------------------------- Summary of changes: koha-tmpl/opac-tmpl/ccsr/en/css/opac.css | 4 ++++ koha-tmpl/opac-tmpl/prog/en/css/opac.css | 4 ++++ .../opac-tmpl/prog/en/modules/opac-advsearch.tt | 10 ++++++---- 3 files changed, 14 insertions(+), 4 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Jun 14 17:09:06 2013 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 14 Jun 2013 15:09:06 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.12.00-beta1-703-g1a15b26 Message-ID: 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, master has been updated via 1a15b26e65fb57c622ed11cb0c7459516e6e023c (commit) from 6e6ed4306521f4e8966c4b40f23ce2d539476d1a (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 1a15b26e65fb57c622ed11cb0c7459516e6e023c Author: Owen Leonard Date: Thu May 23 12:44:58 2013 -0400 Bug 10315 - Use easier readable font for generated passwords The text inputs on the change password form are not very big, and the default sans-serif font isn't always good for showing unambiguous characters. This patch sets a larger, monospace font for those fields. To test, apply the patch, clear your browser cache, and open the patron change password form (members/member-password.pl). The inputs should be more readable, especially the password fields when you click to fill with a randomly generated password. Signed-off-by: Mirko Tietgen Signed-off-by: Jonathan Druart Signed-off-by: Galen Charlton ----------------------------------------------------------------------- Summary of changes: .../intranet-tmpl/prog/en/css/staff-global.css | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Jun 14 17:25:12 2013 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 14 Jun 2013 15:25:12 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.12.00-beta1-705-gc02b57b Message-ID: 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, master has been updated via c02b57bd5cacc3fbe981f5d8331c7cfe8aa178a7 (commit) via 0e0a1a61a62473de7ae92bde9d0f3617c34ba325 (commit) from 1a15b26e65fb57c622ed11cb0c7459516e6e023c (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 c02b57bd5cacc3fbe981f5d8331c7cfe8aa178a7 Author: Galen Charlton Date: Fri Jun 14 08:30:35 2013 -0700 Bug 10425: tweaks to text of help for local use system preference Signed-off-by: Galen Charlton commit 0e0a1a61a62473de7ae92bde9d0f3617c34ba325 Author: Fridolyn SOMERS Date: Thu Jun 6 10:57:29 2013 +0200 Bug 10425 - Help page missing for Local Use preferences When viewing Local Use system preferences tab, the help button will lead to an error page. This is because Local Use tab uses not the same script has other tabs : systempreferences.pl. This patch adds help/systemprefences.tt Test plan : - Go to Local Use preferences : /cgi-bin/koha/admin/systempreferences.pl - Click on Help link (at right top) - See you get the same page as other preferences tab help Signed-off-by: Marcel de Rooy Signed-off-by: Galen Charlton ----------------------------------------------------------------------- Summary of changes: .../en/modules/help/admin/systempreferences.tt | 13 +++++++++++++ 1 files changed, 13 insertions(+), 0 deletions(-) create mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/systempreferences.tt hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Jun 14 20:11:23 2013 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 14 Jun 2013 18:11:23 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.12.00-beta1-706-g02d4719 Message-ID: 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, master has been updated via 02d4719437a84ca99d6265ad5bc27a6a8c3d88ad (commit) from c02b57bd5cacc3fbe981f5d8331c7cfe8aa178a7 (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 02d4719437a84ca99d6265ad5bc27a6a8c3d88ad Author: Owen Leonard Date: Wed Jun 5 09:19:26 2013 -0400 Bug 10416 - Correct template markup problems on course detail page This patch corrects several problems with the course reserves course detail page: - Unescaped ampersands - Extra - Incorrect text in title tag - Use of a table to display information which is more consistently displayed as a list. - More accurate alert message, "Are you sure you want to remove this item from the course?" rather than "Are you sure you want to delete this item?" - Missing icons from toolbar buttons To test, apply the patch and view the details of an existing course (Course reserves -> [Course name]). Confirm that these changes are present and look like an improvement. Signed-off-by: Jared Camins-Esakov The course details screen looks much more consistent with other parts of Koha now. Signed-off-by: Kyle M Hall Passes koha-qa.pl, template only changes. Everything checks out and works as advertised. Signed-off-by: Galen Charlton ----------------------------------------------------------------------- Summary of changes: .../en/modules/course_reserves/course-details.tt | 47 ++++++++++---------- 1 files changed, 23 insertions(+), 24 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Jun 14 20:16:11 2013 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 14 Jun 2013 18:16:11 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.12.00-beta1-707-g5fbf07d Message-ID: 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, master has been updated via 5fbf07df7ccd404570281256ce8f9afb5a09834c (commit) from 02d4719437a84ca99d6265ad5bc27a6a8c3d88ad (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 5fbf07df7ccd404570281256ce8f9afb5a09834c Author: Owen Leonard Date: Wed Jun 5 09:56:23 2013 -0400 Bug 10418 - Correct template markup problems on course reserves add item page This patch corrects several problems with the course reserves add item pages: - Non-standard grid markup. - Extra . - Incorrect styling of errors and messages. - Redundant JS for adding focus to a field (use "focus" class). - Invalid use of