From gitmaster at git.koha-community.org Wed Feb 1 17:02:04 2012 From: gitmaster at git.koha-community.org (Git repo owner) Date: Wed, 01 Feb 2012 16:02:04 +0000 Subject: [koha-commits] main Koha release repository branch new/bug_6488 created. v3.06.00-456-g706712d 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, new/bug_6488 has been created at 706712dd1edebb6eed8b632ca8db4dcd9df39b56 (commit) - Log ----------------------------------------------------------------- commit 706712dd1edebb6eed8b632ca8db4dcd9df39b56 Author: Srdjan Jankovic Date: Mon Jan 23 17:04:02 2012 +1300 bug_6488: Take in account opachiddenitems when searching in opac Changed searchResults() interface Added trailing \n when parsing OpacHiddenItems to make YAML happy XSLTParse4Display() and buildKohaItemsNamespace() take hidden items as input param Removed numbering from the search results, looks wrong with hidden items Signed-off-by: Nicole C. Engard Signed-off-by: Paul Poulain ----------------------------------------------------------------------- hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Wed Feb 1 17:44:29 2012 From: gitmaster at git.koha-community.org (Git repo owner) Date: Wed, 01 Feb 2012 16:44:29 +0000 Subject: [koha-commits] main Koha release repository branch new/bug_6210 created. v3.06.00-458-g049ac6e 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, new/bug_6210 has been created at 049ac6e2a7182a65cc83cea352ab377c3bec6924 (commit) - Log ----------------------------------------------------------------- commit 049ac6e2a7182a65cc83cea352ab377c3bec6924 Author: Owen Leonard Date: Tue Jan 24 10:44:11 2012 -0500 Bug 6210 - Follow up, Choose framework on merge - Adding subtitle to the display of titles to be merged - Adding a link to preview the MARC record of titles to be merged - Fixing up markup of form to improve appearance - Correcting breadcrumbs Signed-off-by: Nicole C. Engard Signed-off-by: Paul Poulain commit 91d870f67aa4b6a4784794e77304fcf759675184 Author: Srdjan Jankovic Date: Mon Dec 19 19:22:49 2011 +1300 bug_6210: Select framework if merging two records with different frameworks ModBiblio() - set framework to "" if "Default" Signed-off-by: Nicole C. Engard All 4 tests passed: Test 1: Merge two records with the same framework Desired result: shouldn't get any prompting to pick a framework, and the same framework should be used Test 2: 2 records, different frameworks, into the kept record's framework Desired result: merge with kept records framework used Test 3: 2 records, different frameworks, into the discarded record's framework Desired result: merge with used records framework used Test 4: 2 records, different frameworks, into a third framework Desired result: merge with third framework used ----------------------------------------------------------------------- hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Wed Feb 1 17:51:14 2012 From: gitmaster at git.koha-community.org (Git repo owner) Date: Wed, 01 Feb 2012 16:51:14 +0000 Subject: [koha-commits] main Koha release repository branch new/bug_6539 created. v3.06.00-460-g64da5af 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, new/bug_6539 has been created at 64da5af31d76471b9552df0366d71db742fdb84c (commit) - Log ----------------------------------------------------------------- commit 64da5af31d76471b9552df0366d71db742fdb84c Author: Paul Poulain Date: Wed Feb 1 17:51:05 2012 +0100 Bug 6539 follow-up, fixing wrong indentation commit 22aed769a69fd3b6d1864889d9f63406d92052f9 Author: Peter Lorimer Date: Thu Jun 30 09:47:55 2011 +0100 Bug 6539 - When searching the catalogue, if I get no results then hit the Z39.50 search the title field in the pop up window is populated with what I searched for. If I search for a valid ISBN number and hit the Z39.50 search, the title field is populated with the ISBN number I searched for. This number should populate the ISBN field and not the title field. http://bugs.koha-community.org/show_bug.cgi?id=6539 Signed-off-by: Katrin Fischer To test: - Search new ISBN using ISBN search from advanced search page - 0 results - click on Z39.50 search - Z30.50 form will have your ISBN in ISBN search option I am signing off on this, because it's an improvement over the current behaviour. I see some problems though that should perhaps be addressed in a separate bug or as a follow-up: If you use th catalog search field and search for an ISBN or a keyword the right fields of the Z39.50 search form will be populated, but the search index will be put in front: ISBN: kw,wrdl: 9783492251495 or Title: kw,wrdl: koha testing If you search for ISBN as keyword on the advanced search page, it will still populate the Title search. Signed-off-by: Liz Rea Signed-off-by: Paul Poulain ----------------------------------------------------------------------- hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Wed Feb 1 17:56:51 2012 From: gitmaster at git.koha-community.org (Git repo owner) Date: Wed, 01 Feb 2012 16:56:51 +0000 Subject: [koha-commits] main Koha release repository branch new/bug_6631 created. v3.06.00-462-g4cb60db 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, new/bug_6631 has been created at 4cb60dbbe21a58d62c66908a600fce5d306601fd (commit) - Log ----------------------------------------------------------------- commit 4cb60dbbe21a58d62c66908a600fce5d306601fd Author: Paul Poulain Date: Wed Feb 1 17:56:42 2012 +0100 bug 6631 follow-up adding author in contributors list commit 8eb727d671f8a264afb3e978a9046c151ed072a9 Author: Aleksa Vujicic Date: Tue Jan 24 14:09:34 2012 +1300 Bug 6631: Anonymous users can create lists in OPAC Made opac-addbybiblionumber.pl page require authentication. Signed-off-by: Jared Camins-Esakov Signed-off-by: Paul Poulain ----------------------------------------------------------------------- hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Wed Feb 1 18:15:41 2012 From: gitmaster at git.koha-community.org (Git repo owner) Date: Wed, 01 Feb 2012 17:15:41 +0000 Subject: [koha-commits] main Koha release repository branch new/bug_5327 updated. v3.06.00-251-g8aacb28 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, new/bug_5327 has been updated via 8aacb28fc02323367f33f96ca83730342fda97ea (commit) via 227cafe8c2d7fd321c77a807d1196f43d5ba450a (commit) from a0c1414f6d7e431dd0c6bc55f0dd11b55951df81 (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 8aacb28fc02323367f33f96ca83730342fda97ea Author: Robin Sheat Date: Wed Feb 1 13:52:53 2012 +1300 Bug 5327 - move another test around commit 227cafe8c2d7fd321c77a807d1196f43d5ba450a Author: Chris Cormack Date: Tue Jan 31 12:48:13 2012 +1300 Bug 5327: Shifting a db dependent test to the right place Signed-off-by: Robin Sheat ----------------------------------------------------------------------- Summary of changes: t/{ => db_dependent}/Csv.t | 0 t/{ => db_dependent}/Reports.t | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename t/{ => db_dependent}/Csv.t (100%) rename t/{ => db_dependent}/Reports.t (100%) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Wed Feb 1 18:29:44 2012 From: gitmaster at git.koha-community.org (Git repo owner) Date: Wed, 01 Feb 2012 17:29:44 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.06.00-466-g563fcd1 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 563fcd1fd11402d4644b20eef4dbe970ff92f544 (commit) via 5900dfff9a455bbb60b33919faa9299843c42fd3 (commit) via 8aacb28fc02323367f33f96ca83730342fda97ea (commit) via 227cafe8c2d7fd321c77a807d1196f43d5ba450a (commit) via 4cb60dbbe21a58d62c66908a600fce5d306601fd (commit) via 8eb727d671f8a264afb3e978a9046c151ed072a9 (commit) via 64da5af31d76471b9552df0366d71db742fdb84c (commit) via 22aed769a69fd3b6d1864889d9f63406d92052f9 (commit) via 049ac6e2a7182a65cc83cea352ab377c3bec6924 (commit) via 91d870f67aa4b6a4784794e77304fcf759675184 (commit) via 706712dd1edebb6eed8b632ca8db4dcd9df39b56 (commit) from d508f0244bd288066d62dcaa40244702b2581514 (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 563fcd1fd11402d4644b20eef4dbe970ff92f544 Author: Paul Poulain Date: Wed Feb 1 18:23:16 2012 +0100 adding 3 contributors from catalyst OpenSource academy they contributed tests commit 5900dfff9a455bbb60b33919faa9299843c42fd3 Merge: 4cb60db 8aacb28 Author: Paul Poulain Date: Wed Feb 1 18:15:45 2012 +0100 Merge remote-tracking branch 'origin/new/bug_5327' ----------------------------------------------------------------------- Summary of changes: C4/Biblio.pm | 41 +++--- C4/Items.pm | 52 ++++---- C4/Search.pm | 96 ++++++++------ C4/XSLT.pm | 11 +- catalogue/search.pl | 2 +- cataloguing/addbooks.pl | 2 +- cataloguing/merge.pl | 145 ++++++++++++-------- docs/history.txt | 5 + koha-tmpl/intranet-tmpl/prog/en/modules/about.tt | 1 + .../prog/en/modules/cataloguing/merge.tt | 35 ++++- .../opac-tmpl/prog/en/modules/opac-results.tt | 1 - opac/opac-addbybiblionumber.pl | 2 +- opac/opac-search.pl | 4 +- t/{ => db_dependent}/Csv.t | 0 t/{ => db_dependent}/Reports.t | 0 15 files changed, 244 insertions(+), 153 deletions(-) rename t/{ => db_dependent}/Csv.t (100%) rename t/{ => db_dependent}/Reports.t (100%) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Thu Feb 2 08:56:25 2012 From: gitmaster at git.koha-community.org (Git repo owner) Date: Thu, 02 Feb 2012 07:56:25 +0000 Subject: [koha-commits] main Koha release repository branch new/bug_6843 created. v3.06.00-468-gc579226 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, new/bug_6843 has been created at c579226ac8e521f8a23af2de890fb21c38bb06a7 (commit) - Log ----------------------------------------------------------------- commit c579226ac8e521f8a23af2de890fb21c38bb06a7 Author: Paul Poulain Date: Wed Feb 1 23:09:30 2012 +0100 Bug 6843 follow-up DBrev commit bafc25c9d27ffd90d9bf0c55917ee2fe8c28e8c3 Author: Koustubha Kale Date: Wed Dec 14 15:48:16 2011 +0530 Renew membership from expiry date or from current date based on a syspref This patch adds a system preference under Patron -> BorrowerRenewalPeriodBase Using this preference the patch allows renewal of Patron account either from todays date or from existing expiry date in the patrons account. To test : Apply patch; Set System Preference BorrowerRenewalPeriodBase ( under Patron ) to "current membership expiry date"; Renew a patron; You will observe that patrons account expiry date has been calculated from previuos expiry date instead of today's date ( as is the default in Koha prior to this patch ). ----------------------------------------------------------------------- hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Thu Feb 2 09:17:00 2012 From: gitmaster at git.koha-community.org (Git repo owner) Date: Thu, 02 Feb 2012 08:17:00 +0000 Subject: [koha-commits] main Koha release repository branch new/bug_6913 created. v3.06.00-471-g297d224 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, new/bug_6913 has been created at 297d22459f670212624d22a0e48447799004935b (commit) - Log ----------------------------------------------------------------- commit 297d22459f670212624d22a0e48447799004935b Author: Jared Camins-Esakov Date: Sat Oct 8 15:34:24 2011 -0400 Bug 6913: More options for koha-create and koha-remove This commit makes koha-create more flexible by adding a number of command-line and configuration options. The biggest change is to add support for pre-determined MySQL credentials using a file in /etc/koha/passwd (for security reasons, if you use this feature, make sure the file is not world-readable). The configuration file has the following format: instance:user:password:database The database is optional, but the other two are both required if you want to specify MySQL credentials. If no credentials are specified for a given instance, the standard koha_instance username and an auto-generated password are used. The following additional command line options are now available: * --use-db - use a pre-existing database, see also --database * --database - specify the name of the mysql database (still defaults to koha_instance) * --passwdfile - specify a custom (Koha) passwd file for MySQL credentials The following additional variables are now available (for use in koha-sites.conf or a custom config file): * OPACPORT (previously added but not documented) - port on which the OPAC should be served * OPACPREFIX - prefix for the OPAC's virtual host * OPACSUFFIX - suffix for the OPAC's virtual host This commit also adds the --keep-mysql option to koha-remove, which, if specified, will prevent koha-remove from deleting the database or MySQL user when removing an instance. Signed-off-by: Chris Cormack commit 44377378582a1cbe9b38858f81d33dd1480a195d Author: Robin Sheat Date: Mon Sep 26 12:04:13 2011 +1300 Bug 6913 - change how ports are handled by koha-create This does two things: * Allows OPACPORT to be specified to change the default OPAC port, * removes the port number from the ServerName directive, as it's already handled by the VirtualHost declaration. Signed-off-by: Jared Camins-Esakov Signed-off-by: Chris Cormack commit f68d56bbab77d6330d8f657a3a3de508e0b1224d Author: Paul Poulain Date: Thu Feb 2 09:06:51 2012 +0100 Adding Jorgia Kelsey and Peter Lorimer as contributors ----------------------------------------------------------------------- hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Thu Feb 2 10:19:25 2012 From: gitmaster at git.koha-community.org (Git repo owner) Date: Thu, 02 Feb 2012 09:19:25 +0000 Subject: [koha-commits] main Koha release repository branch new/bug_6933 created. v3.06.00-473-ga153335 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, new/bug_6933 has been created at a1533359f843893b5604f21f2cecf6facddf6cfb (commit) - Log ----------------------------------------------------------------- commit a1533359f843893b5604f21f2cecf6facddf6cfb Author: Paul Poulain Date: Thu Feb 2 10:17:43 2012 +0100 Bug 6933 follow-up, perltyding new script list.pl commit a526f2936e0f412b570e7a06f0134fafa8641432 Author: Owen Leonard Date: Wed Sep 28 12:44:26 2011 -0400 Bug 6933 [REVISED] Add a view of titles with a particular tag to the staff client - Adds a new page to the tags moderation section for viewing all the titles tagged with a particular term. - Adds display of approved tags to the catalog detail page matching the opac view. Adding tags from the detail view not implemented. Follow-up adds tags display to XSLT detail view Areas for improvement: - I think it would be better to show "Also tagged with:" and exclude the current tag from the list of titles tagged with a particular tag. - It would be nice to be able to show unapproved tags (and some idication of their status) along with approved tags on the detail page if the user had TagsModeration permission. Signed-off-by: Nicole C. Engard Signed-off-by: Paul Poulain ----------------------------------------------------------------------- hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Thu Feb 2 11:43:52 2012 From: gitmaster at git.koha-community.org (Git repo owner) Date: Thu, 02 Feb 2012 10:43:52 +0000 Subject: [koha-commits] main Koha release repository branch new/bug_6964 created. v3.06.00-474-g3982d97 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, new/bug_6964 has been created at 3982d97af3599aab990d407f9a5f973ae3922149 (commit) - Log ----------------------------------------------------------------- commit 3982d97af3599aab990d407f9a5f973ae3922149 Author: Aleksa Vujicic Date: Fri Jan 20 16:00:19 2012 +1300 Bug 6964 - 'Add child' function should be dependant on system preference 'borrowerRelationship' The 'Add Child' button is not shown if 'borrowerRelationship' is empty. System preference description changed. Signed-off-by: Owen Leonard Signed-off-by: Paul Poulain ----------------------------------------------------------------------- hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Thu Feb 2 12:05:04 2012 From: gitmaster at git.koha-community.org (Git repo owner) Date: Thu, 02 Feb 2012 11:05:04 +0000 Subject: [koha-commits] main Koha release repository branch new/bug_7005 created. v3.06.00-476-gabdef00 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, new/bug_7005 has been created at abdef00248903539ea9836bb43b7edcf28fabd02 (commit) - Log ----------------------------------------------------------------- commit abdef00248903539ea9836bb43b7edcf28fabd02 Author: Paul Poulain Date: Thu Feb 2 12:04:55 2012 +0100 Bug 7005 follow-up fix coding guidelines broken commit fbfdfa2cc74ecec0255288977aea3ad66100d786 Author: Aleksa Vujicic Date: Thu Jan 19 15:01:19 2012 +1300 Bug 7005: Writeoff all now has a confirmation dialog. Signed-off-by: Nicole C. Engard Signed-off-by: Paul Poulain ----------------------------------------------------------------------- hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Thu Feb 2 12:21:53 2012 From: gitmaster at git.koha-community.org (Git repo owner) Date: Thu, 02 Feb 2012 11:21:53 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.06.00-476-gabdef00 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 abdef00248903539ea9836bb43b7edcf28fabd02 (commit) via fbfdfa2cc74ecec0255288977aea3ad66100d786 (commit) via 3982d97af3599aab990d407f9a5f973ae3922149 (commit) via a1533359f843893b5604f21f2cecf6facddf6cfb (commit) via a526f2936e0f412b570e7a06f0134fafa8641432 (commit) via 297d22459f670212624d22a0e48447799004935b (commit) via 44377378582a1cbe9b38858f81d33dd1480a195d (commit) via f68d56bbab77d6330d8f657a3a3de508e0b1224d (commit) via c579226ac8e521f8a23af2de890fb21c38bb06a7 (commit) via bafc25c9d27ffd90d9bf0c55917ee2fe8c28e8c3 (commit) from 563fcd1fd11402d4644b20eef4dbe970ff92f544 (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 ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: C4/Members.pm | 4 +- catalogue/detail.pl | 13 +++ circ/circulation.pl | 1 + debian/docs/koha-create.xml | 57 ++++++++++- debian/docs/koha-remove.xml | 19 +++- debian/scripts/koha-create | 76 +++++++++++--- debian/scripts/koha-remove | 16 +++- docs/history.txt | 4 +- ...Renew_membership_from_expiry_or_current_date.pl | 9 ++ installer/data/mysql/sysprefs.sql | 1 + installer/data/mysql/updatedatabase.pl | 11 ++- .../prog/en/includes/circ-toolbar.inc | 2 +- .../prog/en/includes/members-toolbar.inc | 2 +- .../prog/en/modules/admin/preferences/patrons.pref | 8 ++- .../prog/en/modules/catalogue/detail.tt | 27 +++++ .../intranet-tmpl/prog/en/modules/members/pay.tt | 12 ++- .../intranet-tmpl/prog/en/modules/tags/list.tt | 103 ++++++++++++++++++++ .../intranet-tmpl/prog/en/modules/tags/review.tt | 2 +- kohaversion.pl | 2 +- members/boraccount.pl | 1 + members/deletemem.pl | 1 + members/mancredit.pl | 1 + members/maninvoice.pl | 1 + members/member-flags.pl | 1 + members/member-password.pl | 1 + members/moremember.pl | 1 + members/notices.pl | 1 + members/pay.pl | 2 + members/paycollect.pl | 1 + members/readingrec.pl | 1 + tags/list.pl | 93 ++++++++++++++++++ 31 files changed, 440 insertions(+), 34 deletions(-) create mode 100755 installer/data/mysql/atomicupdate/bug_6843_Renew_membership_from_expiry_or_current_date.pl create mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/tags/list.tt create mode 100755 tags/list.pl hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Thu Feb 2 14:14:23 2012 From: gitmaster at git.koha-community.org (Git repo owner) Date: Thu, 02 Feb 2012 13:14:23 +0000 Subject: [koha-commits] main Koha release repository branch new/bug_7148 created. v3.06.00-477-g952bfc6 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, new/bug_7148 has been created at 952bfc6f0790e60425767272de578170cee63e4c (commit) - Log ----------------------------------------------------------------- commit 952bfc6f0790e60425767272de578170cee63e4c Author: Owen Leonard Date: Thu Nov 3 10:22:11 2011 -0400 Fix for Bug 7148 - Add some error handling to Acquisitions' Z39.50 search to match Cataloging's - Copying over error handling for timeout(10007) and refused(10000) - Copying over error handling for submission with no targets chosen - Correcting "cancel" link in the template which was not modified when it was copied from cataloging's popup window template. Signed-off-by: Chris Cormack Signed-off-by: Paul Poulain ----------------------------------------------------------------------- hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Thu Feb 2 15:21:41 2012 From: gitmaster at git.koha-community.org (Git repo owner) Date: Thu, 02 Feb 2012 14:21:41 +0000 Subject: [koha-commits] main Koha release repository branch new/bug_6488 updated. v3.06.00-457-g1f66e9f 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, new/bug_6488 has been updated via 1f66e9fa691f9cfd705375450a21c623e0155f52 (commit) from 706712dd1edebb6eed8b632ca8db4dcd9df39b56 (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 1f66e9fa691f9cfd705375450a21c623e0155f52 Author: Paul Poulain Date: Thu Feb 2 15:21:25 2012 +0100 Bug 6488 adding a 2nd \n to silence logs YAML don't like when you try to open a YAML file with just a \n. This patch add a 2nd \n to silence logs. ----------------------------------------------------------------------- Summary of changes: C4/Items.pm | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Thu Feb 2 15:22:09 2012 From: gitmaster at git.koha-community.org (Git repo owner) Date: Thu, 02 Feb 2012 14:22:09 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.06.00-479-g522a7a3 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 522a7a3255c38047e6c68269c695e6e03f8baa12 (commit) via 1f66e9fa691f9cfd705375450a21c623e0155f52 (commit) via 952bfc6f0790e60425767272de578170cee63e4c (commit) from abdef00248903539ea9836bb43b7edcf28fabd02 (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 522a7a3255c38047e6c68269c695e6e03f8baa12 Merge: 952bfc6 1f66e9f Author: Paul Poulain Date: Thu Feb 2 15:21:45 2012 +0100 Merge remote-tracking branch 'origin/new/bug_6488' ----------------------------------------------------------------------- Summary of changes: C4/Items.pm | 2 +- acqui/z3950_search.pl | 33 +++++++++++--------- .../prog/en/modules/acqui/z3950_search.tt | 9 +++++- 3 files changed, 27 insertions(+), 17 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Thu Feb 2 15:35:34 2012 From: gitmaster at git.koha-community.org (Git repo owner) Date: Thu, 02 Feb 2012 14:35:34 +0000 Subject: [koha-commits] main Koha release repository branch new/bug_6210 updated. v3.06.00-459-g1637af3 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, new/bug_6210 has been updated via 1637af349e4976c146d1ae5e1fb5b49aaaef288d (commit) from 049ac6e2a7182a65cc83cea352ab377c3bec6924 (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 1637af349e4976c146d1ae5e1fb5b49aaaef288d Author: Paul Poulain Date: Thu Feb 2 15:35:26 2012 +0100 Bug 6210 follow-up, removing warn See http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=6210#c27 and http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=6210#c28 ----------------------------------------------------------------------- Summary of changes: C4/Biblio.pm | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Thu Feb 2 15:35:44 2012 From: gitmaster at git.koha-community.org (Git repo owner) Date: Thu, 02 Feb 2012 14:35:44 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.06.00-481-gf799c32 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 f799c32307be124f461e2e02e4a2668fcc13cade (commit) via 1637af349e4976c146d1ae5e1fb5b49aaaef288d (commit) from 522a7a3255c38047e6c68269c695e6e03f8baa12 (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 f799c32307be124f461e2e02e4a2668fcc13cade Merge: 522a7a3 1637af3 Author: Paul Poulain Date: Thu Feb 2 15:35:38 2012 +0100 Merge remote-tracking branch 'origin/new/bug_6210' ----------------------------------------------------------------------- Summary of changes: C4/Biblio.pm | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Thu Feb 2 16:22:33 2012 From: gitmaster at git.koha-community.org (Git repo owner) Date: Thu, 02 Feb 2012 15:22:33 +0000 Subject: [koha-commits] main Koha release repository branch new/bug_6964 updated. v3.06.00-475-g2e4cd0a 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, new/bug_6964 has been updated via 2e4cd0ada310532d3a9365429433711a7b3abd10 (commit) from 3982d97af3599aab990d407f9a5f973ae3922149 (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 2e4cd0ada310532d3a9365429433711a7b3abd10 Author: Paul Poulain Date: Thu Feb 2 16:22:24 2012 +0100 Bug 6964 follow-up Seems everybody forgot to test paycollect, as there was a syntax error ! ----------------------------------------------------------------------- Summary of changes: members/paycollect.pl | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Thu Feb 2 16:22:43 2012 From: gitmaster at git.koha-community.org (Git repo owner) Date: Thu, 02 Feb 2012 15:22:43 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.06.00-483-gc24b765 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 c24b7653ba6d54ba54b592f70f9b79f633aef3af (commit) via 2e4cd0ada310532d3a9365429433711a7b3abd10 (commit) from f799c32307be124f461e2e02e4a2668fcc13cade (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 c24b7653ba6d54ba54b592f70f9b79f633aef3af Merge: f799c32 2e4cd0a Author: Paul Poulain Date: Thu Feb 2 16:22:36 2012 +0100 Merge remote-tracking branch 'origin/new/bug_6964' ----------------------------------------------------------------------- Summary of changes: members/paycollect.pl | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Thu Feb 2 18:17:38 2012 From: gitmaster at git.koha-community.org (Git repo owner) Date: Thu, 02 Feb 2012 17:17:38 +0000 Subject: [koha-commits] main Koha release repository branch new/bug_7190 created. v3.06.00-478-g6b092f0 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, new/bug_7190 has been created at 6b092f0e2784c3ea82f48fe8a6660d54a3fe6119 (commit) - Log ----------------------------------------------------------------- commit 6b092f0e2784c3ea82f48fe8a6660d54a3fe6119 Author: Srdjan Jankovic Date: Tue Jan 31 15:36:44 2012 +1300 bug_7190: Do not reverse writeoffs when item is returned Signed-off-by: Nicole C. Engard Signed-off-by: Paul Poulain ----------------------------------------------------------------------- hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Thu Feb 2 18:29:32 2012 From: gitmaster at git.koha-community.org (Git repo owner) Date: Thu, 02 Feb 2012 17:29:32 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.06.00-485-g8dc8521 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 8dc85214be45b760e62b95169f67068f213e2d68 (commit) via 6b092f0e2784c3ea82f48fe8a6660d54a3fe6119 (commit) from c24b7653ba6d54ba54b592f70f9b79f633aef3af (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 8dc85214be45b760e62b95169f67068f213e2d68 Merge: c24b765 6b092f0 Author: Paul Poulain Date: Thu Feb 2 18:17:42 2012 +0100 Merge remote-tracking branch 'origin/new/bug_7190' ----------------------------------------------------------------------- Summary of changes: C4/Circulation.pm | 3 ++- .../prog/en/modules/members/paycollect.tt | 2 ++ members/paycollect.pl | 2 ++ 3 files changed, 6 insertions(+), 1 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Feb 3 09:18:58 2012 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 03 Feb 2012 08:18:58 +0000 Subject: [koha-commits] main Koha release repository branch new/bug_6964 updated. v3.06.00-476-g20e8aab 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, new/bug_6964 has been updated via 20e8aab5b9c14e8b0da74711c3c9fc690b0c4a1e (commit) from 2e4cd0ada310532d3a9365429433711a7b3abd10 (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 20e8aab5b9c14e8b0da74711c3c9fc690b0c4a1e Author: Marcel de Rooy Date: Fri Feb 3 08:46:39 2012 +0100 6964 Follow-up typo borrowenumber ----------------------------------------------------------------------- Summary of changes: members/paycollect.pl | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Feb 3 11:36:11 2012 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 03 Feb 2012 10:36:11 +0000 Subject: [koha-commits] main Koha release repository branch new/bug_7355 created. v3.06.00-488-g86406bc 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, new/bug_7355 has been created at 86406bcf910d28691655d4a9a1490d34e669a6ee (commit) - Log ----------------------------------------------------------------- commit 86406bcf910d28691655d4a9a1490d34e669a6ee Author: Fr?d?ric Demians Date: Wed Dec 14 08:52:32 2011 +0100 Bug 7355 Note subfields are not displayed in TEXTAREA if hidden In the data entry form, there is a (hidden) functionality for note subfields. MARC21 500-599 and UNIMARC 300-399 subfields are displayed in TEXTAREA rather than INPUT tags. This is good since usually notes can be pretty long. But if one of those fields is marked in the framework as 'hidden', then it isn't displayed at first when you create a record and when you expand the field by clicking on its label the field is displayed in a one-line INPUT tag. To reproduce this bug: - Modify your framework: MARC21: 500$a, hidden=1 UNIMARC: 300$a, hidden=1 - Create a new biblio record with this framework - Open the tab containing 500 or 300 field - 500 or 300 tab is collapsed - Click on 500 or 300 label to expand the field - 500$a or 300$a is displayed in a one-line INPUT tag, not in a TEXTAREA as it should Signed-off-by: Katrin Fischer Test plan works. Also checked cloning and deleting subfields still works. Signed-off-by: Marcel de Rooy Works as advertised. Simplifies code too. Well documented test plan. Signed-off-by: Paul Poulain commit de7867eeadb94c2920d33c51e472d0200bcb43b5 Merge: 8dc8521 20e8aab Author: Paul Poulain Date: Fri Feb 3 09:19:04 2012 +0100 Merge remote-tracking branch 'origin/new/bug_6964' ----------------------------------------------------------------------- hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Feb 3 11:58:47 2012 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 03 Feb 2012 10:58:47 +0000 Subject: [koha-commits] main Koha release repository branch new/bug_7431 created. v3.06.00-489-gcf15a0e 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, new/bug_7431 has been created at cf15a0e427d8b8166d1dde8dae6ad6bf1a6f7de9 (commit) - Log ----------------------------------------------------------------- commit cf15a0e427d8b8166d1dde8dae6ad6bf1a6f7de9 Author: Garry Collum Date: Sat Jan 28 14:36:18 2012 -0500 Bug 7431: Fixes the display of the due date in opac item specific holds. Fixes the reference to the due date in opac-reserve from date_due to dateDue as defined int opac-reserve.pl. Signed-off-by: Owen Leonard Signed-off-by: Paul Poulain ----------------------------------------------------------------------- hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Feb 3 12:17:04 2012 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 03 Feb 2012 11:17:04 +0000 Subject: [koha-commits] main Koha release repository branch new/bug_7450 created. v3.06.00-491-g1034b21 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, new/bug_7450 has been created at 1034b21dea0460b58ef63550cf920b17d5e2662e (commit) - Log ----------------------------------------------------------------- commit 1034b21dea0460b58ef63550cf920b17d5e2662e Author: Paul Poulain Date: Fri Feb 3 12:09:24 2012 +0100 bug 7450 small follow-up, removing warn removing an unconditional warn. It was already here before the patch, but my pre-applypatch script complained, so I fix as a follow-up commit f0a660093442941ee11c0c2fe11402eebfa45a01 Author: Adrien Saurat Date: Tue Jan 17 12:00:32 2012 +0100 Bug 7450: missing placeholders in authorised_values.pl Signed-off-by: Katrin Fischer Successfully added, edited and deleted authorised values. No problems found. ----------------------------------------------------------------------- hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Feb 3 12:17:57 2012 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 03 Feb 2012 11:17:57 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.06.00-491-g1034b21 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 1034b21dea0460b58ef63550cf920b17d5e2662e (commit) via f0a660093442941ee11c0c2fe11402eebfa45a01 (commit) via cf15a0e427d8b8166d1dde8dae6ad6bf1a6f7de9 (commit) via 86406bcf910d28691655d4a9a1490d34e669a6ee (commit) via de7867eeadb94c2920d33c51e472d0200bcb43b5 (commit) via 20e8aab5b9c14e8b0da74711c3c9fc690b0c4a1e (commit) from 8dc85214be45b760e62b95169f67068f213e2d68 (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 ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: admin/authorised_values.pl | 13 ++++++------- cataloguing/addbiblio.pl | 15 +-------------- .../opac-tmpl/prog/en/modules/opac-reserve.tt | 4 ++-- members/paycollect.pl | 4 +--- 4 files changed, 10 insertions(+), 26 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Feb 3 14:17:16 2012 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 03 Feb 2012 13:17:16 +0000 Subject: [koha-commits] main Koha release repository branch new/bug_6984 created. v3.06.00-492-g6782563 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, new/bug_6984 has been created at 67825637beb8ce3fabb7f34548f6962dec2993e5 (commit) - Log ----------------------------------------------------------------- commit 67825637beb8ce3fabb7f34548f6962dec2993e5 Author: Garry Collum Date: Wed Feb 1 10:15:46 2012 -0500 Bug 6984 - Holds statistics doesn't work. This patch fixes several errors in reserves_stats.pl and reserves_stats.tt. Testing - To test this patch, data must be in either the reserves table or old_reserves or both. The following SQL will give you the raw data that is used by the report. SELECT priority, found, reservedate, notificationdate, reminderdate, waitingdate, cancellationdate, borrowers.categorycode, items.itype, reserves.branchcode, holdingbranch, items.homebranch, items.ccode, items.location, items.itemcallnumber, borrowers.sort1, borrowers.sort2 FROM reserves LEFT JOIN borrowers on (borrowers.borrowernumber = reserves.borrowernumber) LEFT JOIN items on (items.itemnumber = reserves.itemnumber) UNION SELECT priority, found, reservedate, notificationdate, reminderdate, waitingdate, cancellationdate, borrowers.categorycode, items.itype, old_reserves.branchcode, holdingbranch, items.homebranch, items.ccode, items.location, items.itemcallnumber, borrowers.sort1, borrowers.sort2 FROM old_reserves LEFT JOIN borrowers on (borrowers.borrowernumber = old_reserves.borrowernumber) LEFT JOIN items on (items.itemnumber = old_reserves.itemnumber) To test the notificationdate and reminderdate, I added data to the old_reserves table, since I have never run notices on my test machine. Ex: UPDATE old_reserves SET notificationdate = "2012-01-29", reminderdate = "2012-01-29" WHERE timestamp = "2012-01-29 20:09:34"; Signed-off-by: Liz Rea Confirm original bug -- Reports work as expected now! prove t xt t/db_dependent no different from master. ----------------------------------------------------------------------- hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Feb 3 14:18:59 2012 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 03 Feb 2012 13:18:59 +0000 Subject: [koha-commits] main Koha release repository branch new/bug_7459 created. v3.06.00-493-g724e0d5 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, new/bug_7459 has been created at 724e0d520df63bfbe5dfdf4d8ea0aedd7889f9d1 (commit) - Log ----------------------------------------------------------------- commit 724e0d520df63bfbe5dfdf4d8ea0aedd7889f9d1 Author: Marcel de Rooy Date: Mon Jan 9 13:10:51 2012 +0100 Bug 7459 - Can only add to one public list in OPAC search results This makes the second and higher public list appear again in the AddTo combo of the search results screen. Signed-off-by: Owen Leonard Signed-off-by: Paul Poulain ----------------------------------------------------------------------- hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Feb 3 14:27:11 2012 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 03 Feb 2012 13:27:11 +0000 Subject: [koha-commits] main Koha release repository branch new/bug_7476 created. v3.06.00-494-gd4b1321 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, new/bug_7476 has been created at d4b132136cef6204dd074205aef94b6b0efc6930 (commit) - Log ----------------------------------------------------------------- commit d4b132136cef6204dd074205aef94b6b0efc6930 Author: MJ Ray Date: Mon Jan 30 21:06:57 2012 +0000 Bug 7476 Remove executable bit from files that probably should not be executed Signed-off-by: Aleksa Vujicic Signed-off-by: Marcel de Rooy Amended to replace some copy-and-paste comments only with consent of MJR. Signed-off-by: Paul Poulain ----------------------------------------------------------------------- hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Feb 3 14:31:08 2012 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 03 Feb 2012 13:31:08 +0000 Subject: [koha-commits] main Koha release repository branch new/bug_7472 created. v3.06.00-495-g9d80ca2 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, new/bug_7472 has been created at 9d80ca27750c60471ef0902c6f7bda345341dd7c (commit) - Log ----------------------------------------------------------------- commit 9d80ca27750c60471ef0902c6f7bda345341dd7c Author: Fr?d?ric Demians Date: Thu Jan 26 10:39:52 2012 +0100 Bug 7472 Edit button ineffective when paying borrower fee On payment page, the Edit button doesn't load anymore the current borrower edit page. To reproduce the bug: - Define a borrower category 'foo' with Enrollment fee - Create a new 'foo' borrower - Click on Check out tab - A message is displayed: Fees & Charges: Patron has Outstanding fees & charges of xx.00. Checkouts are BLOCKED because fine balance is OVER THE LIMIT. Make Payment - Click on Payment link - Click on Edit button - You reach a page for creating a new borrower => you should reach the current borrower edition page - Same issue on paycollect.tt template Signed-off-by: Owen Leonard Signed-off-by: Paul Poulain ----------------------------------------------------------------------- hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Feb 3 15:13:23 2012 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 03 Feb 2012 14:13:23 +0000 Subject: [koha-commits] main Koha release repository branch new/bug_7461 created. v3.06.00-496-g5528b06 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, new/bug_7461 has been created at 5528b06fda325396484a3841d08687c697bc8ca6 (commit) - Log ----------------------------------------------------------------- commit 5528b06fda325396484a3841d08687c697bc8ca6 Author: Owen Leonard Date: Tue Jan 24 09:10:46 2012 -0500 Bug 7461 - Cart offering to remove items when closing The "hide window" button in the cart called a quit() function which deletes any checked items. My understanding of the "hide window" button is that it should *only* hide the window, not perform any other operations. I'm removing the calls to the quit() function in both the OPAC and staff client and adding a CSS class, "close," which is already tied via jQuery to the window.close() function. To test in both OPAC and staff client: Add items to the cart. Try clicking the "hide window" button with items selected and without. In both cases the window should close without affecting the contents of the cart. Signed-off-by: Nicole C. Engard Signed-off-by: Paul Poulain ----------------------------------------------------------------------- hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Feb 3 15:15:32 2012 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 03 Feb 2012 14:15:32 +0000 Subject: [koha-commits] main Koha release repository branch new/bug_7238 created. v3.06.00-498-g43b3fb9 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, new/bug_7238 has been created at 43b3fb97015c16d159f67b758ff01483890b42d1 (commit) - Log ----------------------------------------------------------------- commit 43b3fb97015c16d159f67b758ff01483890b42d1 Author: Chris Cormack Date: Thu Nov 17 13:17:01 2011 +1300 Bug 7238 : Shifting SIPconfig.xml to the etc dir and the scripts to misc/bin Signed-off-by: Liz Rea The scripts run with the caveat that you must specify the path to SIPconfig.xml. The followup previously attached should take care of that issue. Signed-off-by: Paul Poulain commit 866bb561dc4dc92b587be177a7c8261b58439a3d Author: Liz Rea Date: Sat Dec 31 21:41:03 2011 -0600 Bug 7238 Followup - fix sip_run to require path to SIPconfig.xml This requires Chris C's patch to move the scripts to the new location outside of C4. To test: run sip_run.sh with no arguments - it should fail with a message to add the path and try again. Run sip_run.sh with a path to a valid SIPconfig.xml - it should start and run. ----------------------------------------------------------------------- hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Feb 3 15:21:46 2012 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 03 Feb 2012 14:21:46 +0000 Subject: [koha-commits] main Koha release repository branch new/bug_6323 created. v3.06.00-499-g5bba135 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, new/bug_6323 has been created at 5bba1353d0a910ee3337e99c0d67cc619608fcb6 (commit) - Log ----------------------------------------------------------------- commit 5bba1353d0a910ee3337e99c0d67cc619608fcb6 Author: Liz Rea Date: Wed Sep 28 09:04:14 2011 -0500 Bug 6323 -- Error handling cleanup for moveitem.tt Added button to retry attaching item, added default bib view handling, cosmetic changes to the error display (buttons now in error div). Incorporates changes that should satisfy QA. To test: Find a bib with multiple items and grab one of the barcodes. Go to a second bib and click Edit -> Attach item Paste your barcode in there and click "Submit" Click the "Try again with a different barcode" button. It should take you back to the barcode entry screen. Also try with a non-existent barcode and verify that the button appears and works as intended. Signed-off-by: Chris Cormack Signed-off-by: Paul Poulain ----------------------------------------------------------------------- hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Feb 3 15:49:20 2012 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 03 Feb 2012 14:49:20 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.06.00-499-g5bba135 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 5bba1353d0a910ee3337e99c0d67cc619608fcb6 (commit) via 43b3fb97015c16d159f67b758ff01483890b42d1 (commit) via 866bb561dc4dc92b587be177a7c8261b58439a3d (commit) via 5528b06fda325396484a3841d08687c697bc8ca6 (commit) via 9d80ca27750c60471ef0902c6f7bda345341dd7c (commit) via d4b132136cef6204dd074205aef94b6b0efc6930 (commit) via 724e0d520df63bfbe5dfdf4d8ea0aedd7889f9d1 (commit) via 67825637beb8ce3fabb7f34548f6962dec2993e5 (commit) from 1034b21dea0460b58ef63550cf920b17d5e2662e (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 ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: {C4/SIP => etc}/SIPconfig.xml | 0 .../intranet-tmpl/prog/en/modules/basket/basket.tt | 2 +- .../prog/en/modules/cataloguing/moveitem.tt | 82 ++++++++++++------ .../intranet-tmpl/prog/en/modules/members/pay.tt | 2 +- .../prog/en/modules/members/paycollect.tt | 2 +- .../prog/en/modules/reports/reserves_stats.tt | 28 +++--- koha-tmpl/opac-tmpl/prog/en/modules/opac-basket.tt | 2 +- .../opac-tmpl/prog/en/modules/opac-results.tt | 2 +- {C4/SIP => misc/bin}/sip_run.sh | 15 ++- {C4/SIP => misc/bin}/sip_shutdown.sh | 0 reports/reserves_stats.pl | 89 ++++++++++++-------- xt/{find-nonutf8 => find-misplaced-executables} | 32 ++++---- 12 files changed, 155 insertions(+), 101 deletions(-) mode change 100755 => 100644 C4/Auth.pm mode change 100755 => 100644 C4/ImportExportFramework.pm mode change 100755 => 100644 C4/TTParser.pm mode change 100755 => 100644 C4/XSLT.pm mode change 100755 => 100644 acqui/pdfformat/layout2pages.pm mode change 100755 => 100644 acqui/pdfformat/layout3pages.pm rename {C4/SIP => etc}/SIPconfig.xml (100%) mode change 100755 => 100644 etc/zebradb/marc_defs/marc21/biblios/record.abs mode change 100755 => 100644 installer/data/mysql/ru-RU/mandatory/system_preferences_full_optimal_for_install_only.sql mode change 100755 => 100644 installer/data/mysql/sysprefs.sql mode change 100755 => 100644 installer/data/mysql/uk-UA/mandatory/system_preferences_full_optimal_for_install_only.sql mode change 100755 => 100644 koha-tmpl/opac-tmpl/prog/en/css/opac.css mode change 100755 => 100644 koha-tmpl/opac-tmpl/prog/en/includes/opac-facets.inc mode change 100755 => 100644 koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tt mode change 100755 => 100644 koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tt mode change 100755 => 100644 koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACDetail.xsl rename {C4/SIP => misc/bin}/sip_run.sh (69%) rename {C4/SIP => misc/bin}/sip_shutdown.sh (100%) copy xt/{find-nonutf8 => find-misplaced-executables} (63%) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Feb 3 16:40:36 2012 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 03 Feb 2012 15:40:36 +0000 Subject: [koha-commits] main Koha release repository branch new/bug_5674 created. v3.06.00-500-ge1d948e 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, new/bug_5674 has been created at e1d948ecd69b802917272b2bc73e11fabc2a0e88 (commit) - Log ----------------------------------------------------------------- commit e1d948ecd69b802917272b2bc73e11fabc2a0e88 Author: Garry Collum Date: Wed Feb 1 12:35:27 2012 -0500 Bug 5674: patron name sort ignoring case when placing holds. Fixes the patron name sorting when placing holds. Testing - See Bug 5674. Create two patrons. One named SMITH, THOMAS and the other Smith, John. Search for an item to place on request. Do a patron search for Smith. Signed-off-by: Liz Rea Confirm both the original bug and the fix, sorting is correct now. Patch does not change status of tests - prove t t/db_dependent xt no different from master. Signed-off-by: Paul Poulain ----------------------------------------------------------------------- hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Feb 3 16:44:20 2012 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 03 Feb 2012 15:44:20 +0000 Subject: [koha-commits] main Koha release repository branch new/bug_6314 created. v3.06.00-501-gfd84f8c 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, new/bug_6314 has been created at fd84f8c2bcdc01fc753c6b281f13e387586199cc (commit) - Log ----------------------------------------------------------------- commit fd84f8c2bcdc01fc753c6b281f13e387586199cc Author: Fr?d?ric Demians Date: Fri May 6 08:43:34 2011 +0200 Bug 6314 XSL UNIMARC Improvments - Exclude 'marc' & 'item' prefix from UNIMARC util XSL to slim down result - Add missing NSB/NSE characters striping - 200 fields on result/detail page: show all subfields in order, link to detail page only on $a - 4xx display, more fields and more subfields, respects subfields order which matter - Improve RAMEAU authorities linkings to subdivisions (pure XSLT) - Add missing fields: 205, 500 - Add missing MARC21 syspref: - DisplayOPACiconsXSLT, not implemtable in UNIMARC - OPACURLOpenInNewWindow - URLLinkText - ShowISBD Sidenote: this should have been done by people having introduced those syspref into MARC21 XSL. Suite http://bugs.koha-community.org/show_bug.cgi?id=6314 Signed-off-by: Alex Arnaud Signed-off-by: Paul Poulain ----------------------------------------------------------------------- hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Feb 3 16:44:29 2012 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 03 Feb 2012 15:44:29 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.06.00-501-gfd84f8c 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 fd84f8c2bcdc01fc753c6b281f13e387586199cc (commit) via e1d948ecd69b802917272b2bc73e11fabc2a0e88 (commit) from 5bba1353d0a910ee3337e99c0d67cc619608fcb6 (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 ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: .../prog/en/xslt/UNIMARCslim2OPACDetail.xsl | 133 ++++-- .../prog/en/xslt/UNIMARCslim2OPACResults.xsl | 90 +++-- .../opac-tmpl/prog/en/xslt/UNIMARCslimUtils.xsl | 475 +++++++++++--------- reserve/request.pl | 6 +- 4 files changed, 418 insertions(+), 286 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Feb 3 17:18:06 2012 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 03 Feb 2012 16:18:06 +0000 Subject: [koha-commits] main Koha release repository branch new/bug_7453 created. v3.06.00-502-ga406a5c 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, new/bug_7453 has been created at a406a5cbb08c351992280cfd77d98afe7543f329 (commit) - Log ----------------------------------------------------------------- commit a406a5cbb08c351992280cfd77d98afe7543f329 Author: Katrin Fischer Date: Fri Jan 20 08:08:24 2012 +0100 Bug 7453: All patrons should have an expiry date Fixes sample data. All patrons should always have an expiry date. To test: Load sample patron data and check that all patrons have an expiry date. Signed-off-by: Jared Camins-Esakov Signed-off-by: Paul Poulain ----------------------------------------------------------------------- hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Feb 3 17:36:39 2012 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 03 Feb 2012 16:36:39 +0000 Subject: [koha-commits] main Koha release repository branch new/bug_7466 created. v3.06.00-503-g1eb0cbc 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, new/bug_7466 has been created at 1eb0cbc5bf728f6cdb64b5cf102f227df1efb617 (commit) - Log ----------------------------------------------------------------- commit 1eb0cbc5bf728f6cdb64b5cf102f227df1efb617 Author: Owen Leonard Date: Tue Jan 24 15:46:20 2012 -0500 Bug 7466 - Cart notification popup should appear onscreen even when button isn't This patch compares the scroll position of the window with the page position of the cart button and displays the cart notification popup at the top of the visible page if the cart button has moved offscreen. Includes fix for OPAC and staff client. Signed-off-by: Aleksa Vujicic Signed-off-by: Paul Poulain ----------------------------------------------------------------------- hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Feb 3 17:51:27 2012 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 03 Feb 2012 16:51:27 +0000 Subject: [koha-commits] main Koha release repository branch new/bug_6490 created. v3.06.00-504-g58c62f6 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, new/bug_6490 has been created at 58c62f69c1cabf31840006531338f9362f0a1e0e (commit) - Log ----------------------------------------------------------------- commit 58c62f69c1cabf31840006531338f9362f0a1e0e Author: Kyle M Hall Date: Thu Feb 2 10:15:43 2012 -0500 Bug 6490 - Lost and paid not updated when book is checked out. Signed-off-by: Liz Rea Tested: item checked out and marked lost - item is removed from borrower's checkouts and charged to patron Checking out the item (without checking it in first) removed the fines and issued the item normally. Passed prove t xt t/db_dependent (results congruent with current master failures) Signed-off-by: Paul Poulain ----------------------------------------------------------------------- hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Feb 3 17:55:54 2012 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 03 Feb 2012 16:55:54 +0000 Subject: [koha-commits] main Koha release repository branch new/bug_6943 created. v3.06.00-505-gdeeefde 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, new/bug_6943 has been created at deeefdeaec59ae2f041f78de221e950aa6c0cbdc (commit) - Log ----------------------------------------------------------------- commit deeefdeaec59ae2f041f78de221e950aa6c0cbdc Author: Chris Hall Date: Fri Nov 25 10:44:45 2011 +1300 Bug 6943: Added ability to duplicate a budget tree (from the edit sub menu) http://bugs.koha-community.org/show_bug.cgi?id=6943 Signed-off-by: Katrin Fischer - all new javascript alerts have translations markers _() - hierarchies and permissions were copied correctly Possible enhancements: - make it possible to move orders from old to new funds - make it possible to change description while copying, saving 1 additional step Signed-off-by: Paul Poulain ----------------------------------------------------------------------- hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Mon Feb 6 21:25:24 2012 From: gitmaster at git.koha-community.org (Git repo owner) Date: Mon, 06 Feb 2012 20:25:24 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.06.00-505-gdeeefde 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 deeefdeaec59ae2f041f78de221e950aa6c0cbdc (commit) via 58c62f69c1cabf31840006531338f9362f0a1e0e (commit) via 1eb0cbc5bf728f6cdb64b5cf102f227df1efb617 (commit) via a406a5cbb08c351992280cfd77d98afe7543f329 (commit) from fd84f8c2bcdc01fc753c6b281f13e387586199cc (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 ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: C4/Circulation.pm | 6 ++ admin/aqbudgetperiods.pl | 73 +++++++++++++++++++ .../data/mysql/de-DE/optional/sample_patrons.sql | 2 +- .../data/mysql/en/optional/sample_patrons.sql | 2 +- .../data/mysql/es-ES/optional/sample_patrons.sql | 2 +- .../mysql/nb-NO/2-Valgfritt/sample_patrons.sql | 2 +- .../data/mysql/pl-PL/optional/sample_patrons.sql | 2 +- .../prog/en/includes/budgets-admin-toolbar.inc | 2 +- koha-tmpl/intranet-tmpl/prog/en/js/basket.js | 4 + .../prog/en/modules/admin/aqbudgetperiods.tt | 75 ++++++++++++++++++++ koha-tmpl/opac-tmpl/prog/en/js/basket.js | 4 + 11 files changed, 168 insertions(+), 6 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Mon Feb 6 21:50:39 2012 From: gitmaster at git.koha-community.org (Git repo owner) Date: Mon, 06 Feb 2012 20:50:39 +0000 Subject: [koha-commits] main Koha release repository branch new/bug_7127 created. v3.06.00-507-ge1ebabf 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, new/bug_7127 has been created at e1ebabf3ec488bc742b6926a64b758f7f6912989 (commit) - Log ----------------------------------------------------------------- commit e1ebabf3ec488bc742b6926a64b758f7f6912989 Author: Owen Leonard Date: Thu Jan 26 15:00:36 2012 -0500 Bug 7127 - Follow-up - Templates must be valid XHTML Corrections to OPAC search results and lists pages for validity errors: duplicate ids, invalidly placed elements, unescaped ampersands. The change to localcovers.js adds a check for in addition to
so that the results template can use a The
tag has been removed from the inline tag entry markup in order to correct a display error in Internet Explorer 8. Removing it doesn't affect functionality or validity. To test: Validate the HTML of the OPAC results page and an OPAC list contents page (/cgi-bin/koha/opac-shelves.pl?viewshelf=XX). Verify the functinality of adding tags on both pages with the TagsInputOnList system preference enabled. Verify that local cover images are display on search results and detail pages. Includes fixes for errors spotted by QA Revisions Signed-off-by: Ian Walls Signed-off-by: Paul Poulain commit 311dbc8bc1d5c89eff73d4e33c598c9435025ce6 Author: Owen Leonard Date: Tue Nov 1 14:14:51 2011 -0400 Bug 7127 - Templates must be valid XHTML Replaces & with & on several template pages Signed-off-by: Ian Walls ----------------------------------------------------------------------- hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Mon Feb 6 21:52:01 2012 From: gitmaster at git.koha-community.org (Git repo owner) Date: Mon, 06 Feb 2012 20:52:01 +0000 Subject: [koha-commits] main Koha release repository branch new/bug_7502 created. v3.06.00-508-gc1e47b9 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, new/bug_7502 has been created at c1e47b9359a77b6812173b7b23934bbc154a88e4 (commit) - Log ----------------------------------------------------------------- commit c1e47b9359a77b6812173b7b23934bbc154a88e4 Author: Janusz Kaczmarek Date: Mon Feb 6 15:44:36 2012 +0100 Error in records.abs for marc21/biblios http://bugs.koha-community.org/show_bug.cgi?id=7502 Signed-off-by: Paul Poulain ----------------------------------------------------------------------- hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Mon Feb 6 22:24:11 2012 From: gitmaster at git.koha-community.org (Git repo owner) Date: Mon, 06 Feb 2012 21:24:11 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.06.00-508-gc1e47b9 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 c1e47b9359a77b6812173b7b23934bbc154a88e4 (commit) via e1ebabf3ec488bc742b6926a64b758f7f6912989 (commit) via 311dbc8bc1d5c89eff73d4e33c598c9435025ce6 (commit) from deeefdeaec59ae2f041f78de221e950aa6c0cbdc (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 ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: etc/zebradb/marc_defs/marc21/biblios/record.abs | 2 +- .../prog/en/modules/admin/systempreferences.tt | 2 +- .../modules/authorities/searchresultlist-auth.tt | 2 +- .../prog/en/modules/catalogue/detail.tt | 6 +- .../prog/en/modules/cataloguing/additem.tt | 4 +- .../prog/en/modules/help/acqui/lateorders.tt | 2 +- .../prog/en/modules/help/acqui/supplier.tt | 2 +- .../prog/en/modules/help/admin/branches.tt | 4 +- .../prog/en/modules/help/members/boraccount.tt | 4 +- .../rotating_collections/editCollections.tt | 4 +- .../opac-tmpl/prog/en/includes/page-numbers.inc | 6 +- koha-tmpl/opac-tmpl/prog/en/js/localcovers.js | 2 +- koha-tmpl/opac-tmpl/prog/en/modules/ilsdi.tt | 72 ++++++++++---------- .../opac-tmpl/prog/en/modules/opac-results.tt | 13 ++-- .../opac-tmpl/prog/en/modules/opac-shelves.tt | 18 ++--- 15 files changed, 67 insertions(+), 76 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Tue Feb 7 16:43:23 2012 From: gitmaster at git.koha-community.org (Git repo owner) Date: Tue, 07 Feb 2012 15:43:23 +0000 Subject: [koha-commits] main Koha release repository branch new/bug_929 updated. v3.06.00-300-g6a06860 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, new/bug_929 has been updated via 6a06860f0c48101414015b44d6b44873631554cc (commit) from 2cfb891c83f4e6eab8518c4944c70d751b966cfb (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 6a06860f0c48101414015b44d6b44873631554cc Author: Chris Cormack Date: Tue Jan 31 12:37:43 2012 +1300 Bug 929 : Follow up, shifting test ----------------------------------------------------------------------- Summary of changes: .../Koha_template_plugin_KohaDates.t | 0 1 files changed, 0 insertions(+), 0 deletions(-) rename t/{ => db_dependent}/Koha_template_plugin_KohaDates.t (100%) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Feb 10 15:11:22 2012 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 10 Feb 2012 14:11:22 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.06.00-510-g28646dd 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 28646dd55007003300b8c76262c25ab96e04871e (commit) via 6a06860f0c48101414015b44d6b44873631554cc (commit) from c1e47b9359a77b6812173b7b23934bbc154a88e4 (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 28646dd55007003300b8c76262c25ab96e04871e Merge: c1e47b9 6a06860 Author: Paul Poulain Date: Tue Feb 7 16:43:29 2012 +0100 Merge remote-tracking branch 'origin/new/bug_929' ----------------------------------------------------------------------- Summary of changes: .../Koha_template_plugin_KohaDates.t | 0 1 files changed, 0 insertions(+), 0 deletions(-) rename t/{ => db_dependent}/Koha_template_plugin_KohaDates.t (100%) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Feb 10 15:13:16 2012 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 10 Feb 2012 14:13:16 +0000 Subject: [koha-commits] main Koha release repository branch new/bug_7339 created. v3.06.00-511-g3317d16 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, new/bug_7339 has been created at 3317d16029fc230ed51d987bc412b9d89463596f (commit) - Log ----------------------------------------------------------------- commit 3317d16029fc230ed51d987bc412b9d89463596f Author: Duncan Tyler Date: Tue Dec 20 13:37:18 2011 +1300 Small fix to allow help popup in IE9, not 7 or 8 - bug 7339 Signed-off-by: Owen Leonard Signed-off-by: Paul Poulain ----------------------------------------------------------------------- hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Feb 10 15:35:44 2012 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 10 Feb 2012 14:35:44 +0000 Subject: [koha-commits] main Koha release repository branch new/bug_7457 created. v3.06.00-515-g19d6339 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, new/bug_7457 has been created at 19d6339c26e5a9160592c7f861493c03da21b1f8 (commit) - Log ----------------------------------------------------------------- commit 19d6339c26e5a9160592c7f861493c03da21b1f8 Author: Adrien Saurat Date: Tue Jan 31 15:17:07 2012 +0100 Bug 7457: log cleaning on basket.pl Signed-off-by: Owen Leonard Signed-off-by: Paul Poulain commit 098ac933153193868775fbd1e6516c01d31c7081 Merge: 3317d16 54e6b44 Author: Paul Poulain Date: Fri Feb 10 15:19:20 2012 +0100 Merge remote-tracking branch 'origin/new/bug_6842' ----------------------------------------------------------------------- hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Feb 10 15:40:02 2012 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 10 Feb 2012 14:40:02 +0000 Subject: [koha-commits] main Koha release repository branch new/bug_7129 created. v3.06.00-515-g19d6339 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, new/bug_7129 has been created at 19d6339c26e5a9160592c7f861493c03da21b1f8 (commit) - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Feb 10 15:56:24 2012 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 10 Feb 2012 14:56:24 +0000 Subject: [koha-commits] main Koha release repository branch new/bug_7505 created. v3.06.00-516-g78f2ac2 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, new/bug_7505 has been created at 78f2ac28626196950891dc562714f8d463f5f9bd (commit) - Log ----------------------------------------------------------------- commit 78f2ac28626196950891dc562714f8d463f5f9bd Author: Fr?d?ric Demians Date: Mon Feb 6 20:00:24 2012 +0100 Bug 7505 Superlibrarian can't export all biblios when IndependantBranches is enabled When a Koha user has superlibrarian permissions, and if IndependantBranches is enabled, in Tools > Export bibliographic and holdings, this user can't export all biblio records. He will just export the biblio from the branch he belongs to. This patch fix that. To test: - Do a ALL records export as superlibrian on a multi-branches Koha instance - Examine the resulting MARC file with the tool of your choice (MArcEdit, yaz-marcdump, etc.) - You will see that 952/995 contains exlusively items from your branch (as Koha user) Signed-off-by: Jared Camins-Esakov Signed-off-by: Paul Poulain ----------------------------------------------------------------------- hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Feb 10 16:06:29 2012 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 10 Feb 2012 15:06:29 +0000 Subject: [koha-commits] main Koha release repository branch new/bug_7147 created. v3.06.00-517-g8ec2e22 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, new/bug_7147 has been created at 8ec2e22a7ade4b303bef27241b544d9bdc701f43 (commit) - Log ----------------------------------------------------------------- commit 8ec2e22a7ade4b303bef27241b544d9bdc701f43 Author: Owen Leonard Date: Thu Feb 2 12:59:22 2012 -0500 Bug 7147 - Style Z39.50 search errors according to style patterns Styles Z39.50 errors and messages in the standard style. Signed-off-by: Jared Camins-Esakov Signed-off-by: Paul Poulain ----------------------------------------------------------------------- hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Feb 10 16:09:14 2012 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 10 Feb 2012 15:09:14 +0000 Subject: [koha-commits] main Koha release repository branch new/bug_6865 updated. v3.06.00-196-gac3b406 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, new/bug_6865 has been updated via ac3b4061b7bb63b42cfbf8945789289215e90ee4 (commit) from da6c532074adb20158658fab9515bc4af60e8a48 (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 ac3b4061b7bb63b42cfbf8945789289215e90ee4 Author: Owen Leonard Date: Tue Jan 24 08:34:55 2012 -0500 Bug 6865 - Follow-up, Replace image-based gradient backgrounds with CSS3 gradients Staff client login screen has a separate CSS file which wasn't included in the original changes for Bug 6865. This caused a 404 error (missing background image). Signed-off-by: Jared Camins-Esakov Tested in Chrome, FF, Safari, and IE8. Signed-off-by: Paul Poulain ----------------------------------------------------------------------- Summary of changes: koha-tmpl/intranet-tmpl/prog/en/css/login.css | 19 ++++++++++++++----- 1 files changed, 14 insertions(+), 5 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Feb 10 16:26:27 2012 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 10 Feb 2012 15:26:27 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.06.00-519-gbd28b8d 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 bd28b8d6c3ab15ae278d7d9eddc73e3af786e87f (commit) via ac3b4061b7bb63b42cfbf8945789289215e90ee4 (commit) via 8ec2e22a7ade4b303bef27241b544d9bdc701f43 (commit) via 78f2ac28626196950891dc562714f8d463f5f9bd (commit) via 19d6339c26e5a9160592c7f861493c03da21b1f8 (commit) via 098ac933153193868775fbd1e6516c01d31c7081 (commit) via 3317d16029fc230ed51d987bc412b9d89463596f (commit) via 54e6b44da956190bb555045e522e6ed6ce49229e (commit) via 74f7638f99c4c193f8972caab3be2ad397d04de0 (commit) from 28646dd55007003300b8c76262c25ab96e04871e (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 bd28b8d6c3ab15ae278d7d9eddc73e3af786e87f Merge: 8ec2e22 ac3b406 Author: Paul Poulain Date: Fri Feb 10 16:09:19 2012 +0100 Merge remote-tracking branch 'origin/new/bug_6865' ----------------------------------------------------------------------- Summary of changes: C4/Circulation.pm | 11 +++++++---- acqui/basket.pl | 14 +++++++------- admin/branch_transfer_limits.pl | 3 ++- koha-tmpl/intranet-tmpl/prog/en/css/login.css | 19 ++++++++++++++----- .../intranet-tmpl/prog/en/css/staff-global.css | 6 ++++-- .../intranet-tmpl/prog/en/includes/header.inc | 2 +- .../intranet-tmpl/prog/en/includes/table-pager.inc | 4 ++-- .../prog/en/modules/acqui/z3950_search.tt | 14 ++++++++++---- .../en/modules/admin/branch_transfer_limits.tt | 2 +- .../prog/en/modules/cataloguing/z3950_search.tt | 18 ++++++++++-------- tools/export.pl | 5 +++-- 11 files changed, 61 insertions(+), 37 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Feb 10 19:44:36 2012 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 10 Feb 2012 18:44:36 +0000 Subject: [koha-commits] main Koha release repository branch new/bug_7090 created. v3.06.00-521-gbca1de8 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, new/bug_7090 has been created at bca1de8c9aa0f2a8cf05a483a5b416503c5f362e (commit) - Log ----------------------------------------------------------------- commit bca1de8c9aa0f2a8cf05a483a5b416503c5f362e Author: Paul Poulain Date: Fri Feb 10 19:43:54 2012 +0100 Bug 7090 follow-up, setting DBrev number when pushing commit 2041f2c973ad7782b6ebbc0fe215c7b3036c166d Author: Srdjan Jankovic Date: Wed Dec 21 21:26:30 2011 +1300 bug_7090: AllowItemsOnHandCheckout syspref Observe AllowItemsOnHandCheckout syspref when using SIP self checkout Signed-off-by: Liz Rea To test: * place an item on hold for patron A * attempt to circulate that item to patron B (via SIP/selfcheck) syspref off: item should not circulate to patron B Syspref On: item should circulate to patron B Both conditions passed in our testing. Also verified that normal staff client behavior regarding this situation was preserved. It was. ----------------------------------------------------------------------- hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Feb 10 20:10:09 2012 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 10 Feb 2012 19:10:09 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.06.00-521-gbca1de8 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 bca1de8c9aa0f2a8cf05a483a5b416503c5f362e (commit) via 2041f2c973ad7782b6ebbc0fe215c7b3036c166d (commit) from bd28b8d6c3ab15ae278d7d9eddc73e3af786e87f (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 ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: C4/Circulation.pm | 68 ++++++++++--------- C4/SIP/ILS/Transaction/Checkout.pm | 8 ++- installer/data/mysql/sysprefs.sql | 1 + installer/data/mysql/updatedatabase.pl | 8 ++ .../en/modules/admin/preferences/circulation.pref | 6 ++ kohaversion.pl | 2 +- opac/sco/sco-main.pl | 16 ++++- 7 files changed, 73 insertions(+), 36 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Mon Feb 13 10:19:12 2012 From: gitmaster at git.koha-community.org (Git repo owner) Date: Mon, 13 Feb 2012 09:19:12 +0000 Subject: [koha-commits] main Koha release repository branch new/bug_7501 created. v3.06.00-522-g44fd379 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, new/bug_7501 has been created at 44fd379dc23fb4423619ab07e5f4a4906c097a6c (commit) - Log ----------------------------------------------------------------- commit 44fd379dc23fb4423619ab07e5f4a4906c097a6c Author: Jared Camins-Esakov Date: Sat Feb 4 12:39:12 2012 -0500 Bug 7501: OPAC auth browser should have alternating colors Test plan: 1. Access authority browser in OPAC. Note that all rows have the same background color. 2. Apply patch, notice that colors now alternate. Signed-off-by: Owen Leonard Signed-off-by: Paul Poulain ----------------------------------------------------------------------- hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Mon Feb 13 11:01:23 2012 From: gitmaster at git.koha-community.org (Git repo owner) Date: Mon, 13 Feb 2012 10:01:23 +0000 Subject: [koha-commits] main Koha release repository branch new/bug_7519 created. v3.06.00-523-g858efb4 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, new/bug_7519 has been created at 858efb488643979eeddcf99f532e1bfaa45287d5 (commit) - Log ----------------------------------------------------------------- commit 858efb488643979eeddcf99f532e1bfaa45287d5 Author: Robin Sheat Date: Fri Feb 10 14:33:29 2012 +1300 Bug 7519 - show patron's street number in search results When searching for a patron in the staff client, their address is shown. However, the street number component isn't included. This includes it. Signed-off-by: Fr?d?ric Demians It works as announced. I confirm that street number isn't displayed on patron search result table without this patch, and is displayed with this patch. Signed-off-by: Paul Poulain ----------------------------------------------------------------------- hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Mon Feb 13 11:04:31 2012 From: gitmaster at git.koha-community.org (Git repo owner) Date: Mon, 13 Feb 2012 10:04:31 +0000 Subject: [koha-commits] main Koha release repository branch new/bug_7511 created. v3.06.00-524-g1161079 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, new/bug_7511 has been created at 1161079e1f14c681e82e139e72291af35d6f9b98 (commit) - Log ----------------------------------------------------------------- commit 1161079e1f14c681e82e139e72291af35d6f9b98 Author: Paul Poulain Date: Fri Feb 10 09:45:34 2012 +0100 Bug 7511 [ENH] Template caching (T::T feature) Just add to your Koha configuration file /path/writable/by/apache/user in the block, and Koha will use template caching, for about 10% CPU time saving. on linux servers, /tmp is usually OK (also fixes an indenting with a TAB) Signed-off-by: Jared Camins-Esakov The results of using this are very striking. Based on an insufficient sample size, it would seem that the time spent in T::T is reduced by a factor of at least 5. Signed-off-by: Paul Poulain ----------------------------------------------------------------------- hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Mon Feb 13 12:22:15 2012 From: gitmaster at git.koha-community.org (Git repo owner) Date: Mon, 13 Feb 2012 11:22:15 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.06.00-524-g1161079 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 1161079e1f14c681e82e139e72291af35d6f9b98 (commit) via 858efb488643979eeddcf99f532e1bfaa45287d5 (commit) via 44fd379dc23fb4423619ab07e5f4a4906c097a6c (commit) from bca1de8c9aa0f2a8cf05a483a5b416503c5f362e (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 ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: C4/Templates.pm | 5 +++-- .../prog/en/modules/members/member.tt | 2 +- .../en/modules/opac-authoritiessearchresultlist.tt | 6 +++++- 3 files changed, 9 insertions(+), 4 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Mon Feb 13 13:35:07 2012 From: gitmaster at git.koha-community.org (Git repo owner) Date: Mon, 13 Feb 2012 12:35:07 +0000 Subject: [koha-commits] main Koha release repository branch new/bug_7345 created. v3.06.00-531-ge306dd8 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, new/bug_7345 has been created at e306dd85bda4a6144048978dad5ff5dde5455bfb (commit) - Log ----------------------------------------------------------------- commit e306dd85bda4a6144048978dad5ff5dde5455bfb Author: Marcel de Rooy Date: Mon Feb 13 12:24:56 2012 +0100 7392 last follow up Fixes typo for marcstd option in template commit 08156df33c91d9fc2a9c4a0fbba567c09cfaf91e Author: Paul Poulain Date: Mon Feb 13 12:21:59 2012 +0100 Bug 7345 DBrev numbering commit 9bd52ff781df32f27f8eedac2e6c91edef4fd446 Author: Paul Poulain Date: Mon Feb 13 12:21:33 2012 +0100 bug 7345 tiny change = replacing () by -- In the syspref description there is a () that could be confusing with possible values that are also displayed with () replacing them by -- to avoid any mistake commit 923c778e00632541e520c64c6c8cf00d0d1274e9 Author: Marcel de Rooy Date: Mon Jan 16 13:09:28 2012 +0100 7392 Followup on pref description Updating text only for description of opaccolorstylesheet and opaclayoutstylesheet. commit a5658c4647eaef731102b641fbd2c3ffdeae5618 Author: Katrin Fischer Date: Sat Jan 14 16:06:40 2012 +0100 Bug 7392: Follow-up Patch makes changes according to QA comments: - entering an unknown format code will generate no entry in the OPAC pull down - small change to the description of opaclayoutstylesheet system preference Signed-off-by: Jared Camins-Esakov commit 44cffb63e0e9eb5f49fa5b49b3c10eb0956c3e59 Author: Katrin Fischer Date: Sat Dec 31 17:28:34 2011 +0100 Bug 7392: Add system preference to define export options in OPAC NOTE: Patch depends on changes made for bug 7345 for the "marcstd" option. It adds a new system preference 'OpacExportOptions': The new system preference allows to give a list of | separated values to define, which download options are offered in OPAC. Possible options are listed in the system preference editor and include the new export option 'marcstd' from bug 7345. The sequence of the download options in the system preference will be the sequence in the OPAC pull down. If left empty, the export option will be hidden from OPAC. This patch creates a new include file for the OPAC with all the code that is common to the three detail views (regular, MARC, and ISBD). As a side effect of creating this include file, some inconsistencies in OpacSearchForTitleIn were fixed. {BIBLIONUMBER} and {CONTROLNUMBER} were broken for ISBD and MARC view before and should now be replaced with the correct values in all tabs. Signed-off-by: Jared Camins-Esakov Signed-off-by: Marcel de Rooy Resolved merge conflicts on sysprefs.sql and updatedatabase.pl. Feb 13, 2012: Rebased it again. commit 6378436089134f1d9b8015e991fcb81c7d8ead7c Author: Jared Camins-Esakov Date: Sat Dec 10 20:14:52 2011 -0500 Bug 7345: Enable exporting records sans private fields Add an option for marcstd to the opac-export.pl and catalogue/export.pl scripts. This new format removes all 9XX, X9X, XX9 fields and subfield $9 (with the exception of 490 in flavours of MARC other than UNIMARC). The work is done in C4::Record::marc2marc. This patch adds the new export option 'marcstd' for exporting MARC records without 9xx, x9x and xx9 fields and subfields to the staff detail page. Testing plan: 1. Export a record in "MARC (Unicode/UTF-8)" format as a control 2. In the OPAC, run the following jQuery to add the marcstd option to the UI: > $("#export #format").append(""); 3. Export the same record in "MARC (no 9xx)" format 4. Compare the two, noticing that any subfield $9 or fields including 9 (other than 490 in flavours of MARC other than UNIMARC) have been removed Signed-off-by: Marcel de Rooy Works as advertised now. Signed-off-by: Katrin Fischer Signed-off-by: Jared Camins-Esakov This patch squashes both the original patch and Katrin's follow-up adding marcstd as an export option on the staff client. Feb 13, 2012 (marcel): Amended this patch to resolved two definitions of $error in catalogue/export script. ----------------------------------------------------------------------- hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Mon Feb 13 13:51:01 2012 From: gitmaster at git.koha-community.org (Git repo owner) Date: Mon, 13 Feb 2012 12:51:01 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.06.00-531-ge306dd8 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 e306dd85bda4a6144048978dad5ff5dde5455bfb (commit) via 08156df33c91d9fc2a9c4a0fbba567c09cfaf91e (commit) via 9bd52ff781df32f27f8eedac2e6c91edef4fd446 (commit) via 923c778e00632541e520c64c6c8cf00d0d1274e9 (commit) via a5658c4647eaef731102b641fbd2c3ffdeae5618 (commit) via 44cffb63e0e9eb5f49fa5b49b3c10eb0956c3e59 (commit) via 6378436089134f1d9b8015e991fcb81c7d8ead7c (commit) from 1161079e1f14c681e82e139e72291af35d6f9b98 (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 ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: C4/Record.pm | 27 ++++++++- catalogue/export.pl | 6 ++- installer/data/mysql/sysprefs.sql | 1 + installer/data/mysql/updatedatabase.pl | 8 +++ .../intranet-tmpl/prog/en/includes/cat-toolbar.inc | 3 +- .../prog/en/modules/admin/preferences/opac.pref | 13 +++- .../prog/en/includes/opac-detail-sidebar.inc | 62 ++++++++++++++++++++ .../opac-tmpl/prog/en/modules/opac-ISBDdetail.tt | 56 +----------------- .../opac-tmpl/prog/en/modules/opac-MARCdetail.tt | 55 +----------------- koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tt | 55 +----------------- kohaversion.pl | 2 +- opac/opac-ISBDdetail.pl | 9 +++ opac/opac-MARCdetail.pl | 22 +++++-- opac/opac-detail.pl | 5 ++ opac/opac-export.pl | 4 + 15 files changed, 153 insertions(+), 175 deletions(-) create mode 100644 koha-tmpl/opac-tmpl/prog/en/includes/opac-detail-sidebar.inc hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Mon Feb 13 15:06:12 2012 From: gitmaster at git.koha-community.org (Git repo owner) Date: Mon, 13 Feb 2012 14:06:12 +0000 Subject: [koha-commits] main Koha release repository branch new/bug_5327 updated. v3.06.00-252-g181f3b3 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, new/bug_5327 has been updated via 181f3b36eec7ab46d54d0e73073dbdc919e4ce7a (commit) from 8aacb28fc02323367f33f96ca83730342fda97ea (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 181f3b36eec7ab46d54d0e73073dbdc919e4ce7a Author: Chris Cormack Date: Sat Feb 11 11:09:21 2012 +1300 Bug 5327 : Removing a broken test Signed-off-by: Jared Camins-Esakov ----------------------------------------------------------------------- Summary of changes: t/db_dependent/SIP_ILS.t | 4 ---- 1 files changed, 0 insertions(+), 4 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Mon Feb 13 15:09:24 2012 From: gitmaster at git.koha-community.org (Git repo owner) Date: Mon, 13 Feb 2012 14:09:24 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.06.00-533-g324615e 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 324615e396be7fadc8ba3cfa1a9f6025e900df3a (commit) via 181f3b36eec7ab46d54d0e73073dbdc919e4ce7a (commit) from e306dd85bda4a6144048978dad5ff5dde5455bfb (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 324615e396be7fadc8ba3cfa1a9f6025e900df3a Merge: e306dd8 181f3b3 Author: Paul Poulain Date: Mon Feb 13 15:06:16 2012 +0100 Merge remote-tracking branch 'origin/new/bug_5327' ----------------------------------------------------------------------- Summary of changes: t/db_dependent/SIP_ILS.t | 4 ---- 1 files changed, 0 insertions(+), 4 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Mon Feb 13 16:46:32 2012 From: gitmaster at git.koha-community.org (Git repo owner) Date: Mon, 13 Feb 2012 15:46:32 +0000 Subject: [koha-commits] main Koha release repository branch new/bug_5280 created. v3.06.00-535-g4a6ec50 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, new/bug_5280 has been created at 4a6ec50c625419cc0f3884142b7f4307cd2a4370 (commit) - Log ----------------------------------------------------------------- commit 4a6ec50c625419cc0f3884142b7f4307cd2a4370 Author: Owen Leonard Date: Wed Oct 5 12:04:12 2011 -0400 Fix for Bug 5280 - Fix password field so that the password is masked as it is entered This patch changes the password field to a password type input on member-password.pl and adds a confirmation field to both member-password.pl and memberentry.pl requiring that the password be re-entered to confirm. Client-side and server-side validation for the two password fields has been added to both pages. Multiple error messages can now be displayed together on member-password.pl. If the user wishes for Koha to suggest a random password on member-password.pl they can click a link which will remove the password-type input fields, replace them with text-type fields, and automatically fill them with the random password suggestion. Follow-up fix lets the members.js correctly handling errors when there are no mandatory fields LR followup: fixing slight error that corrects previously reported template error. Signed-off-by: Liz Rea Tested password setting/changing utilities - all work as expected and described. Passes prove t xt t/db_dependent tests congruent with current master failures (adds no new fails). Signed-off-by: Paul Poulain ----------------------------------------------------------------------- hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Mon Feb 13 17:55:16 2012 From: gitmaster at git.koha-community.org (Git repo owner) Date: Mon, 13 Feb 2012 16:55:16 +0000 Subject: [koha-commits] main Koha release repository branch new/bug_6838 created. v3.06.00-536-g2916dda 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, new/bug_6838 has been created at 2916ddae4ad32886831004d8efe373a62eda198e (commit) - Log ----------------------------------------------------------------- commit 2916ddae4ad32886831004d8efe373a62eda198e Author: Julian Maurice Date: Fri Sep 2 16:30:18 2011 +0200 Bug 6838: Add pagination and filtering on subscriptions table Use dataTables plugin Signed-off-by: Jared Camins-Esakov Signed-off-by: Owen Leonard Signed-off-by: Paul Poulain ----------------------------------------------------------------------- hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Mon Feb 13 18:12:26 2012 From: gitmaster at git.koha-community.org (Git repo owner) Date: Mon, 13 Feb 2012 17:12:26 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.06.00-536-g2916dda 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 2916ddae4ad32886831004d8efe373a62eda198e (commit) via 4a6ec50c625419cc0f3884142b7f4307cd2a4370 (commit) via 89893e8d4303127e266208d04cb2d135887bb644 (commit) from 324615e396be7fadc8ba3cfa1a9f6025e900df3a (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 ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: C4/Accounts.pm | 14 ++-- C4/Serials.pm | 2 - koha-tmpl/intranet-tmpl/prog/en/js/members.js | 15 ++++- .../prog/en/modules/members/member-password.tt | 52 +++++++++++++-- .../prog/en/modules/members/memberentrygen.tt | 70 ++++++++++++++++---- .../prog/en/modules/serials/serials-home.tt | 40 +++++++---- members/member-password.pl | 36 +++++----- members/memberentry.pl | 2 + 8 files changed, 169 insertions(+), 62 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Tue Feb 14 21:34:45 2012 From: gitmaster at git.koha-community.org (Git repo owner) Date: Tue, 14 Feb 2012 20:34:45 +0000 Subject: [koha-commits] main Koha release repository branch new/bug_6299 created. v3.06.00-540-ga9d260e 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, new/bug_6299 has been created at a9d260ee1fd20934e60259a5a09bb703bb41cad7 (commit) - Log ----------------------------------------------------------------- commit a9d260ee1fd20934e60259a5a09bb703bb41cad7 Author: Tomas Cohen Arazi Date: Thu Aug 4 17:47:42 2011 -0300 Bug 6299 - Advertise this addition during upgrade Signed-off-by: Marcel de Rooy August 10, 2011: Fixed some small typos. Signed-off-by: Paul Poulain Oct 7th, 2011: rebased for master Signed-off-by: Jared Camins-Esakov commit 1142b189f29808bae6f7f099f692b902795ab94b Author: Tomas Cohen Arazi Date: Wed Aug 10 11:46:17 2011 -0300 Bug 6299 - add es-ES Signed-off-by: Jared Camins-Esakov Confirmed that the RELTERMS authorised values category is populated. Not knowing Spanish I can't comment on the translations, but any errors can be corrected at a later date. commit 147a3f8b970450c97a41a4ef60f56c5f77748564 Author: Fr?d?ric Demians Date: Mon Jan 30 19:14:04 2012 +0100 Bug 6299 Add relator codes for fr-FR Signed-off-by: Jared Camins-Esakov Confirmed that the RELTERMS authorised values category is populated. Not knowing French I can't comment on the translations, but any errors can be corrected at a later date. commit 211a10c83ab36af3c299b05cd74864e6801bd072 Author: Tomas Cohen Arazi Date: Tue Jun 7 11:27:37 2011 -0300 Bug 6299 - Provide a list of authorized values for Relator terms Signed-off-by: Marcel de Rooy August 10,2011: Tested install and upgrade. Signed-off-by: Jared Camins-Esakov January 28, 2012: Removed untranslated non-en SQL relator term files. ----------------------------------------------------------------------- hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Tue Feb 14 21:40:39 2012 From: gitmaster at git.koha-community.org (Git repo owner) Date: Tue, 14 Feb 2012 20:40:39 +0000 Subject: [koha-commits] main Koha release repository branch new/bug_6299 updated. v3.06.00-541-gedee01d 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, new/bug_6299 has been updated via edee01dd0f18c479b0ee046ce5a866712af16174 (commit) from a9d260ee1fd20934e60259a5a09bb703bb41cad7 (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 edee01dd0f18c479b0ee046ce5a866712af16174 Author: Paul Poulain Date: Tue Feb 14 21:37:17 2012 +0100 Bug 6299 follow-up DBrev ----------------------------------------------------------------------- Summary of changes: installer/data/mysql/updatedatabase.pl | 4 ++-- kohaversion.pl | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Tue Feb 14 22:33:48 2012 From: gitmaster at git.koha-community.org (Git repo owner) Date: Tue, 14 Feb 2012 21:33:48 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.06.00-542-g0027fe0 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 0027fe0cc367632038f4562aaea22a582c785d9b (commit) via edee01dd0f18c479b0ee046ce5a866712af16174 (commit) via a9d260ee1fd20934e60259a5a09bb703bb41cad7 (commit) via 1142b189f29808bae6f7f099f692b902795ab94b (commit) via 147a3f8b970450c97a41a4ef60f56c5f77748564 (commit) via 211a10c83ab36af3c299b05cd74864e6801bd072 (commit) from 2916ddae4ad32886831004d8efe373a62eda198e (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 ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: .../data/mysql/en/optional/marc21_relatorterms.sql | 226 ++++++++++++++++++++ .../data/mysql/en/optional/marc21_relatorterms.txt | 1 + .../mysql/es-ES/optional/marc21_relatorterms.sql | 226 ++++++++++++++++++++ .../mysql/es-ES/optional/marc21_relatorterms.txt | 1 + .../marc21/Optionnel/marc21_relatorterms.sql | 206 ++++++++++++++++++ .../marc21/Optionnel/marc21_relatorterms.txt | 1 + installer/data/mysql/updatedatabase.pl | 7 +- koha-tmpl/opac-tmpl/prog/en/modules/opac-user.tt | 21 +- kohaversion.pl | 2 +- opac/opac-user.pl | 6 +- 10 files changed, 680 insertions(+), 17 deletions(-) create mode 100644 installer/data/mysql/en/optional/marc21_relatorterms.sql create mode 100644 installer/data/mysql/en/optional/marc21_relatorterms.txt create mode 100644 installer/data/mysql/es-ES/optional/marc21_relatorterms.sql create mode 100644 installer/data/mysql/es-ES/optional/marc21_relatorterms.txt create mode 100644 installer/data/mysql/fr-FR/marcflavour/marc21/Optionnel/marc21_relatorterms.sql create mode 100644 installer/data/mysql/fr-FR/marcflavour/marc21/Optionnel/marc21_relatorterms.txt hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Wed Feb 15 10:46:04 2012 From: gitmaster at git.koha-community.org (Git repo owner) Date: Wed, 15 Feb 2012 09:46:04 +0000 Subject: [koha-commits] main Koha release repository branch new/bug_7432 created. v3.06.00-545-gefd26a4 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, new/bug_7432 has been created at efd26a44d5640555f7c1a97e782e3661af7d77f0 (commit) - Log ----------------------------------------------------------------- commit efd26a44d5640555f7c1a97e782e3661af7d77f0 Author: Chris Cormack Date: Fri Feb 3 12:44:17 2012 +1300 Bug 7432 : Fixing caching for C4::Languages Signed-off-by: Jared Camins-Esakov Signed-off-by: Paul Poulain commit 516abc48962bde84c1c58ff6bf59d969c962aab9 Author: Chris Cormack Date: Fri Feb 3 12:39:43 2012 +1300 Bug 7432 : Fixing caching for SQLHelper Signed-off-by: Jared Camins-Esakov commit 70237c49ef1aced89dfaf56ad5c9a847c0dc9d83 Author: Chris Cormack Date: Fri Feb 3 12:35:21 2012 +1300 Bug 7432 : Fix how we are setting expiry time when caching Signed-off-by: Jared Camins-Esakov ----------------------------------------------------------------------- hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Wed Feb 15 10:49:48 2012 From: gitmaster at git.koha-community.org (Git repo owner) Date: Wed, 15 Feb 2012 09:49:48 +0000 Subject: [koha-commits] main Koha release repository branch new/bug_5327 updated. v3.06.00-254-g77c4307 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, new/bug_5327 has been updated via 77c430717681ad299917db85c878db8f21f2e4dc (commit) via d0bb27bf230fb06d4ad263574df811bb67d5d4a2 (commit) from 181f3b36eec7ab46d54d0e73073dbdc919e4ce7a (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 77c430717681ad299917db85c878db8f21f2e4dc Author: Duncan Tyler Date: Fri Dec 9 11:29:53 2011 +1300 Added coverage to unit test for TTParser http://bugs.koha-community.org/show_bug.cgi?id=5327 Signed-off-by: Katrin Fischer Test passes. Signed-off-by: Jared Camins-Esakov commit d0bb27bf230fb06d4ad263574df811bb67d5d4a2 Author: Chris Hall Date: Fri Dec 9 11:04:19 2011 +1300 Bug 5327: Patch removes unneeded self=shift from TTParser::unshift_token Removed unneeded self=shift from unshift_token (as peek and next do not take a self, makes interface more consistent) http://bugs.koha-community.org/show_bug.cgi?id=5327 Signed-off-by: Katrin Fischer Signed-off-by: Jared Camins-Esakov ----------------------------------------------------------------------- Summary of changes: C4/TTParser.pm | 1 - xt/tt_valid.t | 6 +++++- 2 files changed, 5 insertions(+), 2 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Wed Feb 15 10:51:15 2012 From: gitmaster at git.koha-community.org (Git repo owner) Date: Wed, 15 Feb 2012 09:51:15 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.06.00-548-g6f6bfb8 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 6f6bfb8aff59ae10b4bf7e8d4bdcb31c5b269458 (commit) via 77c430717681ad299917db85c878db8f21f2e4dc (commit) via d0bb27bf230fb06d4ad263574df811bb67d5d4a2 (commit) via efd26a44d5640555f7c1a97e782e3661af7d77f0 (commit) via 516abc48962bde84c1c58ff6bf59d969c962aab9 (commit) via 70237c49ef1aced89dfaf56ad5c9a847c0dc9d83 (commit) from 0027fe0cc367632038f4562aaea22a582c785d9b (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 6f6bfb8aff59ae10b4bf7e8d4bdcb31c5b269458 Merge: efd26a4 77c4307 Author: Paul Poulain Date: Wed Feb 15 10:49:53 2012 +0100 Merge remote-tracking branch 'origin/new/bug_5327' ----------------------------------------------------------------------- Summary of changes: C4/Biblio.pm | 9 +++++---- C4/Languages.pm | 17 +++++++++-------- C4/SQLHelper.pm | 11 ++++++----- C4/TTParser.pm | 1 - xt/tt_valid.t | 6 +++++- 5 files changed, 25 insertions(+), 19 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Wed Feb 15 13:55:44 2012 From: gitmaster at git.koha-community.org (Git repo owner) Date: Wed, 15 Feb 2012 12:55:44 +0000 Subject: [koha-commits] main Koha release repository branch new/bug_5327 updated. v3.06.00-256-g4fa0e4c 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, new/bug_5327 has been updated via 4fa0e4c88ca40cceeb072bc55f3194a09295e185 (commit) via 5a6cdd088fda0f9280dbb5cb343552e10237fa8d (commit) from 77c430717681ad299917db85c878db8f21f2e4dc (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 4fa0e4c88ca40cceeb072bc55f3194a09295e185 Author: Paul Poulain Date: Wed Feb 15 13:55:32 2012 +0100 Revert "Added coverage to unit test for TTParser" This reverts commit 77c430717681ad299917db85c878db8f21f2e4dc. commit 5a6cdd088fda0f9280dbb5cb343552e10237fa8d Author: Paul Poulain Date: Wed Feb 15 13:54:44 2012 +0100 Revert "Bug 5327: Patch removes unneeded self=shift from TTParser::unshift_token" This reverts commit d0bb27bf230fb06d4ad263574df811bb67d5d4a2. see : http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=5327#c171 ----------------------------------------------------------------------- Summary of changes: C4/TTParser.pm | 1 + xt/tt_valid.t | 6 +----- 2 files changed, 2 insertions(+), 5 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Wed Feb 15 13:56:40 2012 From: gitmaster at git.koha-community.org (Git repo owner) Date: Wed, 15 Feb 2012 12:56:40 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.06.00-551-g1ffbd26 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 1ffbd262b3479d46cb9afc91b26fdb4ff9c04a42 (commit) via 4fa0e4c88ca40cceeb072bc55f3194a09295e185 (commit) via 5a6cdd088fda0f9280dbb5cb343552e10237fa8d (commit) from 6f6bfb8aff59ae10b4bf7e8d4bdcb31c5b269458 (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 1ffbd262b3479d46cb9afc91b26fdb4ff9c04a42 Merge: 6f6bfb8 4fa0e4c Author: Paul Poulain Date: Wed Feb 15 13:55:48 2012 +0100 Merge remote-tracking branch 'origin/new/bug_5327' ----------------------------------------------------------------------- Summary of changes: C4/TTParser.pm | 1 + xt/tt_valid.t | 6 +----- 2 files changed, 2 insertions(+), 5 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Wed Feb 15 15:33:20 2012 From: gitmaster at git.koha-community.org (Git repo owner) Date: Wed, 15 Feb 2012 14:33:20 +0000 Subject: [koha-commits] main Koha release repository branch new/bug_6875 created. v3.06.00-558-ge780e06 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, new/bug_6875 has been created at e780e0669c8b2d2a50a7996ab76e584c4cd4c59d (commit) - Log ----------------------------------------------------------------- commit e780e0669c8b2d2a50a7996ab76e584c4cd4c59d Author: Paul Poulain Date: Fri Sep 16 18:02:58 2011 +0200 Bug 6875 de-nesting Auth.pm * removed use C4::Koha that is useless * moved "use C4::Members" to "require C4::Members" just before GetMemberDetails call. This will avoid loading C4::Member everytime a page is called by someone not logged * still to do = work on C4::VirtualShelves, that can be optimized, definetly ! Signed-off-by: Jared Camins-Esakov Rebased on latest master, 28 Jan 2012 Signed-off-by: Marcel de Rooy Please WAIT with virtual shelves. Working on that.. Tested and marked as Passed QA. commit 4d2cfa610e0adf22a2bd1dce2647aad15683a2b9 Author: Paul Poulain Date: Fri Sep 16 21:58:30 2011 +0200 Bug 6875 de-nesting C4::VirtualShelves * C4::Circulation is unused, removing it * C4::Members used only in ShelfPossibleAction, switching from use to require * C4::Auth used only in RefreshShelvesSummary, a sub called only in opac-addbybiblionumber.pl script, moving the require inside the sub Signed-off-by: Jared Camins-Esakov commit 58c46b27af601a893e1eabdfb5bd7d4d0d887f24 Author: Paul Poulain Date: Fri Sep 16 19:38:06 2011 +0200 Bug 6875 de-nesting C4::Heading C4::Search is needed only in authorities sub, moving it here and switching to require Signed-off-by: Jared Camins-Esakov Corrected call to SimpleSearch in both subs where it is used. Additional performance improvements are included in bug 7284. 28 Jan 2012 commit c52f0b7fdfc8ac3163cefc33c52c861bd7542da9 Author: Paul Poulain Date: Fri Sep 16 18:48:15 2011 +0200 Bug 6875 de-nesting C4/Serials * use C4::Branch is loaded only to call GetBranchNAme in PrepareSerialsData and set branchname in the hashresult. This sub PrepareSerialsData is used in the following scripts : opac/opac-serial-issues.pl: my $subscriptioninformation=PrepareSerialsData($subscriptions); => no use of branchname after serials/serials-collection.pl: $subscriptions=PrepareSerialsData(\@subscriptioninformation); => no use of branchname after => we can remove the ->{branchname} from the result, and remove the C4::Branch dependancy * moves use C4::Items to require C4::Items, to call AddItemFromMarc, when receiving a serial, with Recieving create an item set in the subscription. * removed use C4::Letters and C4::Search, that are useless Signed-off-by: Jared Camins-Esakov commit 6fbe49ce31926d42902d3748abbb844aac414ae6 Author: Paul Poulain Date: Sat Sep 17 00:40:03 2011 +0200 Bug 6875 cleaning opac-main.pl C4::VirtualShelves, C4::Branch and C4::Acquisition are useless, removing their loading Signed-off-by: Jared Camins-Esakov commit 056b5faa407df5ef30c56afb91b5a1801df478ae Author: Paul Poulain Date: Sat Sep 17 00:34:40 2011 +0200 Bug 6875 cleaning mainpage.pl AutoritiesMarc is loaded for nothing : we don't display authorities anywhere, so removing the dependancy as well as the useless code Signed-off-by: Jared Camins-Esakov commit 8165aeef777863d03f096f5547032d47d79cfa0f Author: Paul Poulain Date: Fri Sep 16 18:28:00 2011 +0200 Bug 6875 de-nesting C4::Koha.pm * removed use C4::Output, that was not used * moved use URI::split to getitemtypeimagelocation and switched to "require". Checked it still works through admin/itemtype.pl * moved use Business::ISBN to _isbn_cleanup.pl and switched to "require". Checked it still works with the following small script : use C4::Koha; print GetNormalizedISBN("1-56592-257-3"); (GetNormalizedISBN uses _isbn_cleanup) Signed-off-by: Jared Camins-Esakov ----------------------------------------------------------------------- hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Wed Feb 15 15:34:14 2012 From: gitmaster at git.koha-community.org (Git repo owner) Date: Wed, 15 Feb 2012 14:34:14 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.06.00-558-ge780e06 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 e780e0669c8b2d2a50a7996ab76e584c4cd4c59d (commit) via 4d2cfa610e0adf22a2bd1dce2647aad15683a2b9 (commit) via 58c46b27af601a893e1eabdfb5bd7d4d0d887f24 (commit) via c52f0b7fdfc8ac3163cefc33c52c861bd7542da9 (commit) via 6fbe49ce31926d42902d3748abbb844aac414ae6 (commit) via 056b5faa407df5ef30c56afb91b5a1801df478ae (commit) via 8165aeef777863d03f096f5547032d47d79cfa0f (commit) from 1ffbd262b3479d46cb9afc91b26fdb4ff9c04a42 (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 ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: C4/Auth.pm | 6 ++---- C4/Heading.pm | 7 ++++--- C4/Koha.pm | 7 +++---- C4/Serials.pm | 14 ++++---------- C4/VirtualShelves.pm | 8 +++----- mainpage.pl | 19 ------------------- opac/opac-main.pl | 3 --- 7 files changed, 16 insertions(+), 48 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Wed Feb 15 16:53:08 2012 From: gitmaster at git.koha-community.org (Git repo owner) Date: Wed, 15 Feb 2012 15:53:08 +0000 Subject: [koha-commits] main Koha release repository branch new/bug_7080 created. v3.06.00-559-g0f80707 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, new/bug_7080 has been created at 0f80707d7c7b609fab357b12913da242b212e63b (commit) - Log ----------------------------------------------------------------- commit 0f80707d7c7b609fab357b12913da242b212e63b Author: Owen Leonard Date: Fri Oct 21 10:19:30 2011 -0400 Bug 7080 - Revised - Clean up interface on fine payment screens - Move some content out of table cells - Improve table markup with , , and - Improve breadcrumb specificity on paycollect.pl - Add clearer messages for different actions (Pay selected fines, pay an individual fine, etc. - Add client-side warning to pay.pl when writing-off all - Correcting terminology: When a verb, "write off," when a noun: "Writeoff." Revision: Correcting tab label case according to Bug 2780 guidelines Signed-off-by: Katrin Fischer I checked all 4 fine tabs and performed different fine actions. The layout on all pages looks clean and correct. I tested the new client-side warning and made sure it's translatable. Labels have proper capitalization. Signed-off-by: Paul Poulain ----------------------------------------------------------------------- hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Wed Feb 15 17:11:38 2012 From: gitmaster at git.koha-community.org (Git repo owner) Date: Wed, 15 Feb 2012 16:11:38 +0000 Subject: [koha-commits] main Koha release repository branch new/bug_6924 created. v3.06.00-560-g2d67771 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, new/bug_6924 has been created at 2d67771157e9c07f5e907fc6507bbd9fabb3b82c (commit) - Log ----------------------------------------------------------------- commit 2d67771157e9c07f5e907fc6507bbd9fabb3b82c Author: Juan Romay Sieira Date: Tue Sep 27 11:16:27 2011 +0200 Previous and next functions are not used, since this code was removed from mas_subfields_structure.pl http://bugs.koha-community.org/show_bug.cgi?id=6924 Signed-off-by: Paul Poulain ----------------------------------------------------------------------- hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Wed Feb 15 17:23:31 2012 From: gitmaster at git.koha-community.org (Git repo owner) Date: Wed, 15 Feb 2012 16:23:31 +0000 Subject: [koha-commits] main Koha release repository branch new/bug_7238 updated. v3.06.00-499-g831e14e 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, new/bug_7238 has been updated via 831e14e89e7c4af998d5b7d7926b08a8eba22c76 (commit) from 43b3fb97015c16d159f67b758ff01483890b42d1 (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 831e14e89e7c4af998d5b7d7926b08a8eba22c76 Author: Robin Sheat Date: Fri Feb 10 12:55:09 2012 +1300 Bug 7238 - make packages deal with SIP config This moves the SIP config to the templates directory (on package building) in anticipation of making it configurable with package tools. Prevents it being installed into /etc. Signed-off-by: Jared Camins-Esakov ----------------------------------------------------------------------- Summary of changes: debian/rules | 1 + {etc => debian/templates}/SIPconfig.xml | 24 ++++++++++++------------ 2 files changed, 13 insertions(+), 12 deletions(-) copy {etc => debian/templates}/SIPconfig.xml (87%) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Thu Feb 16 15:51:28 2012 From: gitmaster at git.koha-community.org (Git repo owner) Date: Thu, 16 Feb 2012 14:51:28 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.06.00-562-gb1121b1 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 b1121b11b52f14b3356ab3cbc505b4fd9a450626 (commit) via 831e14e89e7c4af998d5b7d7926b08a8eba22c76 (commit) via 2d67771157e9c07f5e907fc6507bbd9fabb3b82c (commit) via 0f80707d7c7b609fab357b12913da242b212e63b (commit) from e780e0669c8b2d2a50a7996ab76e584c4cd4c59d (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 b1121b11b52f14b3356ab3cbc505b4fd9a450626 Merge: 2d67771 831e14e Author: Paul Poulain Date: Wed Feb 15 17:23:35 2012 +0100 Merge remote-tracking branch 'origin/new/bug_7238' ----------------------------------------------------------------------- Summary of changes: debian/rules | 1 + {etc => debian/templates}/SIPconfig.xml | 24 ++-- .../en/modules/admin/marc_subfields_structure.tt | 7 - .../prog/en/modules/members/mancredit.tt | 4 +- .../prog/en/modules/members/maninvoice.tt | 4 +- .../intranet-tmpl/prog/en/modules/members/pay.tt | 47 ++++--- .../prog/en/modules/members/paycollect.tt | 159 +++++++++----------- 7 files changed, 119 insertions(+), 127 deletions(-) copy {etc => debian/templates}/SIPconfig.xml (87%) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Thu Feb 16 18:25:39 2012 From: gitmaster at git.koha-community.org (Git repo owner) Date: Thu, 16 Feb 2012 17:25:39 +0000 Subject: [koha-commits] main Koha release repository branch new/bug_6875 updated. v3.06.00-559-gc004b88 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, new/bug_6875 has been updated via c004b88f5a907227af0249bd9516ea7e868a8f76 (commit) from e780e0669c8b2d2a50a7996ab76e584c4cd4c59d (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 c004b88f5a907227af0249bd9516ea7e868a8f76 Author: Nicole C. Engard Date: Wed Feb 15 14:48:33 2012 -0500 Bug 7545: Can't edit items This patch makes it so that you can click 'edit items' and actually edit items. Signed-off-by: Liz Rea Works as advertised. Signed-off-by: Liz Rea ----------------------------------------------------------------------- Summary of changes: cataloguing/additem.pl | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Thu Feb 16 18:45:05 2012 From: gitmaster at git.koha-community.org (Git repo owner) Date: Thu, 16 Feb 2012 17:45:05 +0000 Subject: [koha-commits] main Koha release repository branch new/bug_7018 created. v3.06.00-565-g0d037ef 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, new/bug_7018 has been created at 0d037efd358c5516466c5df99e565d5fd98d5a74 (commit) - Log ----------------------------------------------------------------- commit 0d037efd358c5516466c5df99e565d5fd98d5a74 Author: Kyle M Hall Date: Wed Feb 8 10:45:53 2012 -0500 Bug 7018 - need all acq permissions to search Single line fix. Changes permissions required for histsearch.pl from requiring * for acquisitions to only requiring group_manage, order_manage, and order_receive Signed-off-by: Nicole C. Engard Signed-off-by: Paul Poulain commit 2d8843a812cc46dabe14d929518ca1927ef8c472 Merge: b1121b1 c004b88 Author: Paul Poulain Date: Thu Feb 16 18:25:43 2012 +0100 Merge remote-tracking branch 'origin/new/bug_6875' ----------------------------------------------------------------------- hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Thu Feb 16 18:49:38 2012 From: gitmaster at git.koha-community.org (Git repo owner) Date: Thu, 16 Feb 2012 17:49:38 +0000 Subject: [koha-commits] main Koha release repository branch new/bug_6718 created. v3.06.00-566-g1d72628 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, new/bug_6718 has been created at 1d7262838077543af4dc8afde7e43188c0c432c4 (commit) - Log ----------------------------------------------------------------- commit 1d7262838077543af4dc8afde7e43188c0c432c4 Author: Maxime Pelletier Date: Tue Feb 7 11:10:32 2012 -0500 Bug 6718 No manager_id saved for writeoff fines. Signed-off-by: Liz Rea Tested per test plan. Passes prove xt t t/db_dependent Signed-off-by: Paul Poulain ----------------------------------------------------------------------- hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Thu Feb 16 19:00:25 2012 From: gitmaster at git.koha-community.org (Git repo owner) Date: Thu, 16 Feb 2012 18:00:25 +0000 Subject: [koha-commits] main Koha release repository branch new/bug_3264 created. v3.06.00-567-g795dc61 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, new/bug_3264 has been created at 795dc61f7526c3810173139004c741dc8c810382 (commit) - Log ----------------------------------------------------------------- commit 795dc61f7526c3810173139004c741dc8c810382 Author: Marcel de Rooy Date: Thu Jan 19 09:50:03 2012 +0100 Bug 3264 UnCloneField() / minus button in MARC editor can clear all subfields (authorities AND biblio) All subfields following the removed subfield were not saved. Problem is in C4/Biblio routine TransformHtmlToMarc. If the field is emptied, the param list contains a code param but no subfield param. The while loop handling the subfields could not handle that. Also added a FIXME because the whole routine depends on an assumption about the order of cgi parameters that is not strictly guaranteed. Signed-off-by: Jared Camins-Esakov I was unable to replicate the problem, but can confirm that the patch does not break anything under any of the following platforms/browsers: Mac OS X 10.6.8: Chrome 16.0.912.77 Firefox 9.0.1 Windows 7: Firefox 3.6.3 Firefox 9.0.1 IE 8.0.7600.16385 Ubuntu 11.10 Firefox 8.0 Chromium 15.0.874.106 (Developer Build 107270 Linux) Signed-off-by: Paul Poulain ----------------------------------------------------------------------- hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Thu Feb 16 19:00:36 2012 From: gitmaster at git.koha-community.org (Git repo owner) Date: Thu, 16 Feb 2012 18:00:36 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.06.00-567-g795dc61 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 795dc61f7526c3810173139004c741dc8c810382 (commit) via 1d7262838077543af4dc8afde7e43188c0c432c4 (commit) via 0d037efd358c5516466c5df99e565d5fd98d5a74 (commit) via 2d8843a812cc46dabe14d929518ca1927ef8c472 (commit) via c004b88f5a907227af0249bd9516ea7e868a8f76 (commit) from b1121b11b52f14b3356ab3cbc505b4fd9a450626 (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 ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: C4/Biblio.pm | 27 ++++++++++++++++----------- acqui/histsearch.pl | 2 +- cataloguing/additem.pl | 1 + members/pay.pl | 8 +++++--- 4 files changed, 23 insertions(+), 15 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Feb 17 09:08:08 2012 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 17 Feb 2012 08:08:08 +0000 Subject: [koha-commits] main Koha release repository branch new/bug_6875 updated. v3.06.00-560-g1ddc932 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, new/bug_6875 has been updated via 1ddc9322dfc13ef7f1e930692bfd2cb3771b102b (commit) from c004b88f5a907227af0249bd9516ea7e868a8f76 (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 1ddc9322dfc13ef7f1e930692bfd2cb3771b102b Author: Liz Rea Date: Wed Feb 15 14:13:49 2012 -0600 Bug 7546 - cannot view subscription detail This patch adds a C4::Search to subscription-detail.pl to compensate for a removed one from auth.pm during the denesting effort. Signed-off-by: Paul Poulain Bug 7546 Do not call routine as bareword Fixes compilation errors due to calling routine without parens Also nothing was gained (and obfuscation added) by forcing the return into a hash ref have changed variable to hash tidied up the if else chain These routines should be refactored out future Signed-off-by: Paul Poulain bug 7546 follow-up, enabled_staff_search_views problem * enabled_staff_search_views was not exported by C4::Search, should have been * serials/serials-edit.pl were also missing it Comments: * checked with for file in */*.pl; do perl -wc $file; done that no script was still having this problem Signed-off-by: Liz Rea Final sign off for all 3 patches Note: I had some problems with tests, but it is probably related to my data and not this patch. ----------------------------------------------------------------------- Summary of changes: C4/Search.pm | 1 + serials/serials-edit.pl | 14 ++++++++------ serials/subscription-detail.pl | 14 ++++++++------ 3 files changed, 17 insertions(+), 12 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Feb 17 09:12:32 2012 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 17 Feb 2012 08:12:32 +0000 Subject: [koha-commits] main Koha release repository branch new/bug_7551 created. v3.06.00-570-g497f49d 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, new/bug_7551 has been created at 497f49d8b69e0be9e192b48bf40f2f5ab6cc92ce (commit) - Log ----------------------------------------------------------------- commit 497f49d8b69e0be9e192b48bf40f2f5ab6cc92ce Author: Chris Cormack Date: Fri Feb 17 09:23:53 2012 +1300 Bug 7551 : Can only renew for the user you are logged in as now Signed-off-by: Owen Leonard Signed-off-by: Paul Poulain commit caa08b6b2a675a8c53f687cae1703c0d724bae34 Merge: 795dc61 1ddc932 Author: Paul Poulain Date: Fri Feb 17 09:08:16 2012 +0100 Merge remote-tracking branch 'origin/new/bug_6875' ----------------------------------------------------------------------- hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Feb 17 09:53:14 2012 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 17 Feb 2012 08:53:14 +0000 Subject: [koha-commits] main Koha release repository branch new/bug_7521 created. v3.06.00-571-gd9d3645 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, new/bug_7521 has been created at d9d364516b0bd5363c95b134520bb0379836be51 (commit) - Log ----------------------------------------------------------------- commit d9d364516b0bd5363c95b134520bb0379836be51 Author: Katrin Fischer Date: Fri Feb 10 07:17:33 2012 +0100 Bug 7521: Templates should use receive_serials permission Corrects templates to use permission receive_serials. Before patch: 1) Serial receive page (/cgi-bin/koha/serials/serials-edit.pl...) can only be accessed with full serials permissions. When one permission is missing, page can not be accessed. 2) Serial collection/Issue History page (/cgi-bin/koha/serials/serials-collection.pl...) can only be accessed with full serials permissions. After applying patch: 1) Serial receive page can only be accessed when user has receive_serials permission. 2) Edit and serial receive links are hidden, when user doesn't have serials_receive permission. Page is accessible with at least 1 serials permission. I will send a another patch to correct behaviour for the routing permission. Signed-off-by: Jared Camins-Esakov Signed-off-by: Paul Poulain ----------------------------------------------------------------------- hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Feb 17 09:55:27 2012 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 17 Feb 2012 08:55:27 +0000 Subject: [koha-commits] main Koha release repository branch new/bug_7489 created. v3.06.00-572-g0bc06f1 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, new/bug_7489 has been created at 0bc06f11a6e94b2c01593f29881c661cc6c03c59 (commit) - Log ----------------------------------------------------------------- commit 0bc06f11a6e94b2c01593f29881c661cc6c03c59 Author: Magnus Enger Date: Fri Feb 3 09:57:32 2012 +0100 Bug 7489 - Implement DisplayOPACiconsXSLT for NORMARC XSLT This patch actually hides the whole line that contains the icon in the result list, including "literary form" and "audience", but this is how the syspref works for MARC21 too, so I'm sticking with that. To test: - Set marcflavour = NORMARC - Set OPACXSLTResultsDisplay = on - Set DisplayOPACiconsXSLT = show - Check that icons and information about "Type", "Litter?r form" and "M?lgruppe" are displayed in results, "Type" and the icon in detail - Set DisplayOPACiconsXSLT = don't show - Check that icons and information is not displayed in result or detail Signed-off-by: Katrin Fischer Test plan worked nicely. Patch works as advertised. Signed-off-by: Paul Poulain ----------------------------------------------------------------------- hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Feb 17 09:57:36 2012 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 17 Feb 2012 08:57:36 +0000 Subject: [koha-commits] main Koha release repository branch new/bug_7406 created. v3.06.00-573-g3fcdd90 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, new/bug_7406 has been created at 3fcdd902f8fcd6d64fba8f434ae811d8e1a04fdd (commit) - Log ----------------------------------------------------------------- commit 3fcdd902f8fcd6d64fba8f434ae811d8e1a04fdd Author: Fr?d?ric Demians Date: Wed Feb 8 19:13:41 2012 +0100 Bug 7406 Fix saved reports display paging inconsistency Signed-off-by: Owen Leonard Signed-off-by: Paul Poulain ----------------------------------------------------------------------- hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Feb 17 10:07:10 2012 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 17 Feb 2012 09:07:10 +0000 Subject: [koha-commits] main Koha release repository branch new/bug_7114 created. v3.06.00-574-gc2be08f 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, new/bug_7114 has been created at c2be08f695a1a28c51276e233ac030fc5337484c (commit) - Log ----------------------------------------------------------------- commit c2be08f695a1a28c51276e233ac030fc5337484c Author: Garry Collum Date: Fri Jan 20 11:23:04 2012 -0500 Bug 7114: Fixes the Funds' page display after the Filter link is clicked. On the funds page there is a Fund Filters form and a menu underneath this form. When the form is hidden the contents of the page shift to the left overlapping the menu. The menu underneath the fund filters form must have been a later edition. This patch removes the line of javascript that shifts the contents of the page after the form is hidden. Signed-off-by: Katrin Fischer Patch fixes the broken Layout when clicking on 'Filters'. I am a bit confused by the link. I think it should toggle between different descriptions and perhaps even hide all of the left navigation. This way the funds table would get more room for display. Signed-off-by: Paul Poulain ----------------------------------------------------------------------- hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Feb 17 10:11:30 2012 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 17 Feb 2012 09:11:30 +0000 Subject: [koha-commits] main Koha release repository branch new/bug_7530 created. v3.06.00-575-g99f2f62 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, new/bug_7530 has been created at 99f2f62be926cf42812a639c4a5b3f458729aec3 (commit) - Log ----------------------------------------------------------------- commit 99f2f62be926cf42812a639c4a5b3f458729aec3 Author: Garry Collum Date: Sat Feb 11 12:37:13 2012 -0500 Bug 7530: Missing
  • tag in circ-menu.inc The address information of circ-menu.inc is not contained in
  • tags, this patch fixes it. Signed-off-by: Liz Rea verified new
  • in template. Looks good. Signed-off-by: Paul Poulain ----------------------------------------------------------------------- hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Feb 17 10:16:21 2012 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 17 Feb 2012 09:16:21 +0000 Subject: [koha-commits] main Koha release repository branch new/bug_7203 created. v3.06.00-576-g6a60642 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, new/bug_7203 has been created at 6a60642a9dbe3103854dc1edfe68a4765e3c03f8 (commit) - Log ----------------------------------------------------------------- commit 6a60642a9dbe3103854dc1edfe68a4765e3c03f8 Author: Garry Collum Date: Tue Jan 17 20:28:55 2012 -0500 Bug 7203: Fixes typo - 'Mange' to 'Manage' in several files. Found 3 instances of the typo while looking for the typo reference in Bug 7203. Fixed labels/label-edit-batch.tt, labels/label-edit-layout.tt, and patroncards/edit-layout.tt. Signed-off-by: Jared Camins-Esakov Signed-off-by: Paul Poulain ----------------------------------------------------------------------- hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Feb 17 10:17:45 2012 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 17 Feb 2012 09:17:45 +0000 Subject: [koha-commits] main Koha release repository branch new/bug_7367 updated. v3.06.00-325-g2ee63f4 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, new/bug_7367 has been updated via 2ee63f49979bc617d010ec4f22027e1120776713 (commit) from 9c0ce2bf3b01948b371c2389f958ba981a036031 (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 2ee63f49979bc617d010ec4f22027e1120776713 Author: Marcel de Rooy Date: Thu Feb 16 13:37:51 2012 +0100 7367: Make translation possible of Close this window Trivial change in two opac templates. ----------------------------------------------------------------------- Summary of changes: .../prog/en/modules/opac-downloadshelf.tt | 2 +- .../prog/en/modules/opac-sendshelfform.tt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Feb 17 10:22:02 2012 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 17 Feb 2012 09:22:02 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.06.00-578-ge931268 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 e93126834cddfb5e0f33f0f8df77e67ee2a68b48 (commit) via 2ee63f49979bc617d010ec4f22027e1120776713 (commit) via 6a60642a9dbe3103854dc1edfe68a4765e3c03f8 (commit) via 99f2f62be926cf42812a639c4a5b3f458729aec3 (commit) via c2be08f695a1a28c51276e233ac030fc5337484c (commit) via 3fcdd902f8fcd6d64fba8f434ae811d8e1a04fdd (commit) via 0bc06f11a6e94b2c01593f29881c661cc6c03c59 (commit) via d9d364516b0bd5363c95b134520bb0379836be51 (commit) via 497f49d8b69e0be9e192b48bf40f2f5ab6cc92ce (commit) via caa08b6b2a675a8c53f687cae1703c0d724bae34 (commit) via 1ddc9322dfc13ef7f1e930692bfd2cb3771b102b (commit) from 795dc61f7526c3810173139004c741dc8c810382 (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 e93126834cddfb5e0f33f0f8df77e67ee2a68b48 Merge: 6a60642 2ee63f4 Author: Paul Poulain Date: Fri Feb 17 10:17:49 2012 +0100 Merge remote-tracking branch 'origin/new/bug_7367' ----------------------------------------------------------------------- Summary of changes: C4/Search.pm | 1 + .../intranet-tmpl/prog/en/includes/circ-menu.inc | 2 +- .../prog/en/modules/admin/aqbudgets.tt | 1 - .../prog/en/modules/labels/label-edit-batch.tt | 2 +- .../prog/en/modules/labels/label-edit-layout.tt | 2 +- .../prog/en/modules/patroncards/edit-layout.tt | 2 +- .../en/modules/reports/guided_reports_start.tt | 2 +- .../prog/en/modules/serials/serials-collection.tt | 13 ++++++++++--- .../prog/en/modules/opac-downloadshelf.tt | 2 +- .../prog/en/modules/opac-sendshelfform.tt | 2 +- .../prog/en/xslt/NORMARCslim2OPACDetail.xsl | 5 ++++- .../prog/en/xslt/NORMARCslim2OPACResults.xsl | 4 ++++ opac/opac-renew.pl | 2 +- serials/serials-collection.pl | 2 +- serials/serials-edit.pl | 16 +++++++++------- serials/subscription-detail.pl | 14 ++++++++------ 16 files changed, 45 insertions(+), 27 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Feb 17 10:40:53 2012 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 17 Feb 2012 09:40:53 +0000 Subject: [koha-commits] main Koha release repository branch new/bug_5346 created. v3.06.00-580-gb5f7a1f 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, new/bug_5346 has been created at b5f7a1f8771fb0d98db3b39f1ef6315783c30238 (commit) - Log ----------------------------------------------------------------- commit b5f7a1f8771fb0d98db3b39f1ef6315783c30238 Author: Katrin Fischer Date: Mon Jan 23 07:43:11 2012 +0100 Bug 5346: Small display changes Changing display from: Suggested by Admin, Koha (from suggestion #2) To: Suggested by: Admin, Koha (suggestion #2) Adding some missing parentheses and deleting some additional spaces. Signed-off-by: Jonathan Druart Signed-off-by: Paul Poulain commit 0200639b0077398fe2ce2cbe915c5c73b6dd9a01 Author: Jonathan Druart Date: Wed Jan 18 14:16:16 2012 +0100 Bug 5346: Linking suggestions and orders. Display suggestion info in acquisition module: basket.pl neworderempty.pl orderreceive.pl parcel.pl To Test: Create a suggestion and accept it. Create a new order from this suggestion Receive this order For each step, check if suggestion info are visible. Signed-off-by: Katrin Fischer Test provides more unit tests, all complete successfully. perl t/db_dependent/Suggestions.t Note: test case should be cleaned up after running tests. Display changes are consistent and information about the suggestion is shown on every important screen now. I created an order from a suggestion and one from an existing record. No problems found. ----------------------------------------------------------------------- hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Feb 17 10:48:45 2012 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 17 Feb 2012 09:48:45 +0000 Subject: [koha-commits] main Koha release repository branch new/bug_6985 created. v3.06.00-581-g4490650 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, new/bug_6985 has been created at 4490650e2fc5dd4da6bd2e339434f1366beb610d (commit) - Log ----------------------------------------------------------------- commit 4490650e2fc5dd4da6bd2e339434f1366beb610d Author: Liz Rea Date: Wed Jan 25 14:41:03 2012 -0600 Bug 6985 - remove kw,wrdl from the search results To test: * Apply patch * Do a search in the OPAC, the result page should now say "Your search returned X results" instead of "Your search for "kw,wrdl:yyy" returned x results" * Do a search that will have no results, kw,wrdl should not appear in the text. Signed-off-by: Jared Camins-Esakov Signed-off-by: Adrien Saurat Signed-off-by: Paul Poulain ----------------------------------------------------------------------- hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Feb 17 10:58:13 2012 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 17 Feb 2012 09:58:13 +0000 Subject: [koha-commits] main Koha release repository branch new/bug_7201 created. v3.06.00-583-g647843c 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, new/bug_7201 has been created at 647843c3bba2fcd30b972e95b5b1952f38ff4ca0 (commit) - Log ----------------------------------------------------------------- commit 647843c3bba2fcd30b972e95b5b1952f38ff4ca0 Author: Paul Poulain Date: Fri Feb 17 10:58:01 2012 +0100 Bug 7201 follow-up, fixing some indentation mistakes commit 8b80b315c3689bd58bee4cb5fc3c0d843bd080eb Author: Srdjan Jankovic Date: Thu Feb 9 13:24:35 2012 +1300 bug_7201: Holds reports: add copynumber and enumchron Signed-off-by: Liz Rea Data is there and correct - very helpful patch, thanks! passes prove t xt t/db_dependent in line with current master failures. Signed-off-by: Paul Poulain ----------------------------------------------------------------------- hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Feb 17 10:59:46 2012 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 17 Feb 2012 09:59:46 +0000 Subject: [koha-commits] main Koha release repository branch new/bug_7246 created. v3.06.00-584-g1fd8c8a 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, new/bug_7246 has been created at 1fd8c8a4debf750476a2369e4440ac662b19f6b7 (commit) - Log ----------------------------------------------------------------- commit 1fd8c8a4debf750476a2369e4440ac662b19f6b7 Author: Paul Poulain Date: Wed Feb 1 15:15:02 2012 +0100 Bug 7246 add offset/length and where options to rebuild_zebra This patch reimplement a feature that is on biblibre/master for Koha-community/master It adds 4 parameters: * offset = the offset of record. Say 1000 to start rebuilding at the 1000th record of your database * length = how many records to export. Say 400 to export only 400 records * where = add a where clause to rebuild only a given itemtype, or anything you want to filter on Another improvement resulting from offset & length limit is the rebuild_zebra_sliced.zsh that will be submitted in another patch. rebuild_zebra_sliced will slice your all database in small chunks, and, if something went wrong for a given slice, will slice the slice, and repeat, until you reach a slice size of 1, showing which record is wrong in your database. Signed-off-by: Jared Camins-Esakov Removed mention of -l option for limiting number of items exported, as requested by QA manager. This can be re-added in a later patch. Signed-off-by: Paul Poulain ----------------------------------------------------------------------- hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Feb 17 11:02:58 2012 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 17 Feb 2012 10:02:58 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.06.00-584-g1fd8c8a 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 1fd8c8a4debf750476a2369e4440ac662b19f6b7 (commit) via 647843c3bba2fcd30b972e95b5b1952f38ff4ca0 (commit) via 8b80b315c3689bd58bee4cb5fc3c0d843bd080eb (commit) via 4490650e2fc5dd4da6bd2e339434f1366beb610d (commit) via b5f7a1f8771fb0d98db3b39f1ef6315783c30238 (commit) via 0200639b0077398fe2ce2cbe915c5c73b6dd9a01 (commit) from e93126834cddfb5e0f33f0f8df77e67ee2a68b48 (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 ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: C4/Suggestions.pm | 60 +++++++++++++++++++- acqui/basket.pl | 9 +++ acqui/neworderempty.pl | 7 ++- acqui/orderreceive.pl | 8 ++- acqui/parcel.pl | 13 ++++- circ/pendingreserves.pl | 8 ++- circ/view_holdsqueue.pl | 2 +- circ/waitingreserves.pl | 2 + .../intranet-tmpl/prog/en/modules/acqui/basket.tt | 5 ++ .../prog/en/modules/acqui/neworderempty.tt | 14 ++++- .../prog/en/modules/acqui/orderreceive.tt | 13 ++++ .../intranet-tmpl/prog/en/modules/acqui/parcel.tt | 10 +++ .../prog/en/modules/circ/pendingreserves.tt | 12 +++- .../prog/en/modules/circ/view_holdsqueue.tt | 6 ++- .../prog/en/modules/circ/waitingreserves.tt | 8 +++ koha-tmpl/opac-tmpl/prog/en/includes/masthead.inc | 4 +- misc/migration_tools/rebuild_zebra.pl | 29 ++++++++- t/db_dependent/Suggestions.t | 8 ++- 18 files changed, 198 insertions(+), 20 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Feb 17 11:15:08 2012 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 17 Feb 2012 10:15:08 +0000 Subject: [koha-commits] main Koha release repository branch new/bug_7289 created. v3.06.00-587-g72616e4 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, new/bug_7289 has been created at 72616e4f3fa85f65741f8bd50f06408428bc60c5 (commit) - Log ----------------------------------------------------------------- commit 72616e4f3fa85f65741f8bd50f06408428bc60c5 Author: Katrin Fischer Date: Sun Feb 12 19:27:57 2012 +0100 Bug 7289: Add biblioitems.editionstatement to missing sql files Follow-up for 7289 adding the new mapping to translated frameworks. http://bugs.koha-community.org/show_bug.cgi?id=7280 Signed-off-by: Jonathan Druart commit d96191ff9203f80f284f7023c4648c4e7108bf79 Author: Paul Poulain Date: Fri Feb 17 11:14:21 2012 +0100 Bug 7289 follow-up setting DBrev number commit cf999c10a4458ca61c790704c598b55d396bac46 Author: Jonathan Druart Date: Wed Jan 18 11:26:53 2012 +0100 Bug 7289: Adds editionstatement field in neworderempty Signed-off-by: Katrin Fischer Tested: Database update - existing mapping - no pre existing mapping Frameworks PROBLEM: some languages are still missing, I think only untranslated frameworks are included in this patch. Acquisition - created a new order with edition filled out - checked edition was saved to the correct field in cataloguing - modified edition and checked display in acquisition - edition also displays on basket summary page http://bugs.koha-community.org/show_bug.cgi?id=7280 ----------------------------------------------------------------------- hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Feb 17 11:17:44 2012 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 17 Feb 2012 10:17:44 +0000 Subject: [koha-commits] main Koha release repository branch new/bug_7312 created. v3.06.00-588-g91d0475 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, new/bug_7312 has been created at 91d0475a9b43dc3fbe6b373dc8dacd5db4bca9df (commit) - Log ----------------------------------------------------------------- commit 91d0475a9b43dc3fbe6b373dc8dacd5db4bca9df Author: Matthias Meusburger Date: Thu May 12 11:29:01 2011 +0200 Bug 7312: Adds ISSN to serials/subscription-bib-search.pl results Signed-off-by: Jared Camins-Esakov Signed-off-by: Paul Poulain ----------------------------------------------------------------------- hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Feb 17 11:21:54 2012 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 17 Feb 2012 10:21:54 +0000 Subject: [koha-commits] main Koha release repository branch new/bug_7409 created. v3.06.00-589-g4e8cd9a 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, new/bug_7409 has been created at 4e8cd9a9ddd3c76745a5102498d8836457173db5 (commit) - Log ----------------------------------------------------------------- commit 4e8cd9a9ddd3c76745a5102498d8836457173db5 Author: Robin Sheat Date: Fri Feb 10 16:10:28 2012 +1300 Bug 7409 - add unzip and perl-doc dependencies to package Signed-off-by: Jared Camins-Esakov Signed-off-by: Paul Poulain ----------------------------------------------------------------------- hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Feb 17 11:28:37 2012 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 17 Feb 2012 10:28:37 +0000 Subject: [koha-commits] main Koha release repository branch new/bug_7458 created. v3.06.00-590-gecc1e94 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, new/bug_7458 has been created at ecc1e94f35491ba392aa3bfd17118c55fa14e55b (commit) - Log ----------------------------------------------------------------- commit ecc1e94f35491ba392aa3bfd17118c55fa14e55b Author: Srdjan Jankovic Date: Wed Feb 8 15:12:05 2012 +1300 bug_7458: A call number plugin Signed-off-by: Melia Meggs A library using an inhouse callnumbering system wants to be able to generate the next available call number not already in use. This custom call number plugin returns the next callnumber not already in use once a correct prefix has been entered. The prefixes are four to six letters, space, then one or two numbers. ----------------------------------------------------------------------- hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Feb 17 11:34:19 2012 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 17 Feb 2012 10:34:19 +0000 Subject: [koha-commits] main Koha release repository branch new/bug_7509 created. v3.06.00-591-ge20fac3 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, new/bug_7509 has been created at e20fac39f899a288bd8efca62cf1e3e71ab8082b (commit) - Log ----------------------------------------------------------------- commit e20fac39f899a288bd8efca62cf1e3e71ab8082b Author: Ian Walls Date: Wed Feb 8 15:23:39 2012 +1300 Bug 7509: Added index on items itemcallnumber Comment from Liz: I couldn't get this update to fire - I found a small syntax error in the updatedatabase.pl for this, which I corrected with this patch. Functionally, all of this works as tested (once the typos were fixed), but this probably requires another sign-off. QA notes: rebased on latest master. Also added index name `itemcallnumber` to maintain consistency with all other indexes on items table. Signed-off-by: Jared Camins-Esakov Signed-off-by: Ian Walls Signed-off-by: Paul Poulain ----------------------------------------------------------------------- hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Feb 17 11:35:15 2012 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 17 Feb 2012 10:35:15 +0000 Subject: [koha-commits] main Koha release repository branch new/bug_7509 updated. v3.06.00-592-g7f5ba31 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, new/bug_7509 has been updated via 7f5ba31b0b3e3b2d7fa974613e9715c989a9ce60 (commit) from e20fac39f899a288bd8efca62cf1e3e71ab8082b (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 7f5ba31b0b3e3b2d7fa974613e9715c989a9ce60 Author: Paul Poulain Date: Fri Feb 17 11:35:06 2012 +0100 bug 7509 follow-up, DBRev number ----------------------------------------------------------------------- Summary of changes: installer/data/mysql/updatedatabase.pl | 2 +- kohaversion.pl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Feb 17 11:39:34 2012 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 17 Feb 2012 10:39:34 +0000 Subject: [koha-commits] main Koha release repository branch new/bug_7514 created. v3.06.00-593-g8ec812d 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, new/bug_7514 has been created at 8ec812d97de321d8100f8e80ccad06cc36840e12 (commit) - Log ----------------------------------------------------------------- commit 8ec812d97de321d8100f8e80ccad06cc36840e12 Author: Fr?d?ric Demians Date: Thu Feb 9 11:03:34 2012 +0100 Bug 7514 Choose OPAC language with URL parameter Signed-off-by: Katrin Fischer Tested: - with and without cookie set - different language codes http://.../cgi-bin/koha/opac-changelanguage.pl?language=de-DE will directly open the German OPAC. http://.../cgi-bin/koha/opac-changelanguage.pl?language=en will directly open the English OPAC. Signed-off-by: Paul Poulain ----------------------------------------------------------------------- hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Feb 17 11:49:18 2012 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 17 Feb 2012 10:49:18 +0000 Subject: [koha-commits] main Koha release repository branch new/bug_7532 created. v3.06.00-594-g70d95b5 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, new/bug_7532 has been created at 70d95b515e491e5526c7276f0af03d51ff236d40 (commit) - Log ----------------------------------------------------------------- commit 70d95b515e491e5526c7276f0af03d51ff236d40 Author: Robin Sheat Date: Sun Feb 12 16:36:34 2012 +1300 Bug 7532 - remove dependency on Date::ICal This removes the dependency on Date::ICal (which is largely unmaintained) and replaces it with DateTime::Format::ICal which can do the same job. It also updates all the docs and installation scripts to handle this change. Note that this causes a minor behaviour change: previously the generated times were converted to UTC, now they are left "floating" (that is, have no timezone attached) and so will appear as the local time when imported into a calendar. I don't anticipate this'll cause any issues however. Signed-off-by: Jared Camins-Esakov ----------------------------------------------------------------------- hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Feb 17 11:55:42 2012 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 17 Feb 2012 10:55:42 +0000 Subject: [koha-commits] main Koha release repository branch new/bug_7540 created. v3.06.00-595-gf81bdfe 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, new/bug_7540 has been created at f81bdfe63206632474a692d6075786b5e818cd04 (commit) - Log ----------------------------------------------------------------- commit f81bdfe63206632474a692d6075786b5e818cd04 Author: Robin Sheat Date: Wed Feb 15 12:34:30 2012 +1300 Bug 7540 - add id values to the legends in the patron entry form This adds the following IDs to the legends in the patron entry form: main_address_lgd contact_lgd alt_address_lgd alt_contact_lgd library_management_lgd library_setup_lgd opac_staff_login_lgd patron_messaging_prefs_lgd With these in place, then jquery like: $(document).ready(function(){ $('#main_address_lgd').text('Postal Address'); $('#alt_address_lgd').text('Residential Address'); }); in intranetuserjs can be used to rename things to taste. Signed-off-by: Liz Rea I see the id's in there, they appear consistent and complete. ----------------------------------------------------------------------- hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Feb 17 12:05:17 2012 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 17 Feb 2012 11:05:17 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.06.00-595-gf81bdfe 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 f81bdfe63206632474a692d6075786b5e818cd04 (commit) via 70d95b515e491e5526c7276f0af03d51ff236d40 (commit) via 8ec812d97de321d8100f8e80ccad06cc36840e12 (commit) via 7f5ba31b0b3e3b2d7fa974613e9715c989a9ce60 (commit) via e20fac39f899a288bd8efca62cf1e3e71ab8082b (commit) via ecc1e94f35491ba392aa3bfd17118c55fa14e55b (commit) via 4e8cd9a9ddd3c76745a5102498d8836457173db5 (commit) via 91d0475a9b43dc3fbe6b373dc8dacd5db4bca9df (commit) via 72616e4f3fa85f65741f8bd50f06408428bc60c5 (commit) via d96191ff9203f80f284f7023c4648c4e7108bf79 (commit) via cf999c10a4458ca61c790704c598b55d396bac46 (commit) from 1fd8c8a4debf750476a2369e4440ac662b19f6b7 (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 ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: C4/Installer/PerlDependencies.pm | 10 +- INSTALL.fedora7 | 3 +- acqui/addorder.pl | 1 + acqui/neworderempty.pl | 1 + cataloguing/value_builder/callnumber-KU.pl | 135 ++++++++++++++++++++ debian/control | 5 +- debian/control.in | 2 + install_misc/debian.packages | 2 +- install_misc/install_koha_on_fresh_debian | 2 +- install_misc/ubuntu.packages | 2 +- install_misc/ubuntu_maverick.packages | 2 +- .../marc21/mandatory/marc21_framework_DEFAULT.sql | 2 +- .../optional/marc21_simple_bib_frameworks.sql | 16 +- .../marc21/mandatory/marc21_framework_DEFAULT.sql | 2 +- .../marc21/optional/marc21_fastadd_framework.sql | 2 +- .../optional/marc21_simple_bib_frameworks.sql | 16 +- .../marc21/mandatory/marc21_framework_DEFAULT.sql | 2 +- .../marc21/optional/marc21_fastadd_framework.sql | 2 +- .../optional/marc21_simple_bib_frameworks.sql | 16 +- .../mandatory/unimarc_framework_DEFAULT.sql | 2 +- .../marc21/mandatory/marc21_framework_DEFAULT.sql | 2 +- .../marc21/optional/marc21_fastadd_framework.sql | 2 +- .../optional/marc21_simple_bib_frameworks.sql | 16 +- .../mandatory/unimarc_framework_DEFAULT.sql | 2 +- .../Obligatoire/marc21_framework_DEFAULT.sql | 2 +- .../Optionnel/marc21_simple_bib_frameworks.sql | 16 +- .../Obligatoire/framework_DEFAULT.sql | 2 +- .../marc21/mandatory/marc21_framework_DEFAULT.sql | 2 +- .../marc21/optional/marc21_fastadd_framework.sql | 2 +- .../optional/marc21_simple_bib_frameworks.sql | 16 +- .../unimarc/necessari/unimarc_framework.sql | 2 +- installer/data/mysql/kohastructure.sql | 1 + .../marc21/mandatory/marc21_framework_DEFAULT.sql | 2 +- .../marc21/optional/marc21_fastadd_framework.sql | 2 +- .../optional/marc21_simple_bib_frameworks.sql | 16 +- .../marcflavour/normarc/Obligatorisk/normarc.sql | 2 +- .../Valgfritt/normarc_fastadd_framework.sql | 2 +- .../marc21/mandatory/marc21_framework_DEFAULT.sql | 2 +- .../marc21/optional/marc21_fastadd_framework.sql | 2 +- .../optional/marc21_simple_bib_frameworks.sql | 16 +- .../mandatory/unimarc_framework_DEFAULT.sql | 2 +- .../mandatory/unimarc_bibliographic_[DEFAULT].sql | 2 +- .../mandatory/unimarc_bibliographic_[DEFAULT].sql | 2 +- .../optional/unimarc_bibliographic_[AUD].sql | 2 +- .../optional/unimarc_bibliographic_[BOOK].sql | 2 +- .../optional/unimarc_bibliographic_[EL].sql | 2 +- .../optional/unimarc_bibliographic_[NOTE].sql | 2 +- .../optional/unimarc_bibliographic_[PER].sql | 2 +- .../optional/unimarc_bibliographic_[TECH].sql | 2 +- installer/data/mysql/updatedatabase.pl | 34 +++++- .../intranet-tmpl/prog/en/modules/acqui/basket.tt | 2 + .../prog/en/modules/acqui/neworderempty.tt | 10 ++ .../prog/en/modules/members/memberentrygen.tt | 18 ++-- .../prog/en/modules/serials/result.tt | 5 + kohaversion.pl | 2 +- opac/opac-changelanguage.pl | 2 +- opac/opac-ics.pl | 39 +++--- serials/subscription-bib-search.pl | 1 + 58 files changed, 327 insertions(+), 138 deletions(-) create mode 100755 cataloguing/value_builder/callnumber-KU.pl hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Feb 17 18:41:00 2012 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 17 Feb 2012 17:41:00 +0000 Subject: [koha-commits] main Koha release repository branch new/bug_6137 created. v3.06.00-598-g46a5154 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, new/bug_6137 has been created at 46a5154df940cf10e6718aa87717fdb87ebca702 (commit) - Log ----------------------------------------------------------------- commit 46a5154df940cf10e6718aa87717fdb87ebca702 Author: Paul Poulain Date: Fri Feb 17 18:40:33 2012 +0100 Bug 6137 follow-up, moving new test to db_dependent directory commit 76be6208eeafbeb555103570f1484a64a7a12394 Author: Julian Maurice Date: Fri Jan 27 15:59:36 2012 +0100 Bug 6137: unit tests for C4::Circulation::_GetCircControlBranch Signed-off-by: Paul Poulain commit f4a5206ae059132f9623e1873c2450fa6152206a Author: biblibre Date: Tue Mar 8 10:28:38 2011 +0100 Bug 6137: fix a Circulation bug. userenv null Signed-off-by: Chris Cormack ----------------------------------------------------------------------- hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Feb 17 18:51:46 2012 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 17 Feb 2012 17:51:46 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.06.00-598-g46a5154 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 46a5154df940cf10e6718aa87717fdb87ebca702 (commit) via 76be6208eeafbeb555103570f1484a64a7a12394 (commit) via f4a5206ae059132f9623e1873c2450fa6152206a (commit) from f81bdfe63206632474a692d6075786b5e818cd04 (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 ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: C4/Circulation.pm | 4 +- t/db_dependent/Circulation.t | 110 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 112 insertions(+), 2 deletions(-) create mode 100755 t/db_dependent/Circulation.t hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Feb 17 18:57:56 2012 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 17 Feb 2012 17:57:56 +0000 Subject: [koha-commits] main Koha release repository branch new/bug_6496 created. v3.06.00-600-g30f4b81 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, new/bug_6496 has been created at 30f4b8158aeac2d707cec1854f4037e101da1bec (commit) - Log ----------------------------------------------------------------- commit 30f4b8158aeac2d707cec1854f4037e101da1bec Author: Robin Sheat Date: Thu Feb 2 18:21:44 2012 +1300 Bug 6496 - correct the order of the author display in the OPAC This sets the order the fields are displayed in to be as it is in the MARC (typically numerical order), rather than 100,700,110,710,... like it was. Basically, it's a port of the way it's done in the staff client. As such, it should be able to handle a lot more than it could previously, including relator codes. (replaces the previous commit, just removing an erronious comment and making the commit message more accurate) Conflicts: koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACDetail.xsl Signed-off-by: Jared Camins-Esakov Signed-off-by: Paul Poulain commit d3fd4368ae0b09eb8dda07b80e1e39a15e1f3b02 Author: Robin Sheat Date: Wed Aug 31 19:59:44 2011 +1200 Bug 6496 - tidy the display of 710 fields on XSLT This puts '--' between 710$b fields, and replaces the '.' with a '; ' if there are additional authors. Signed-off-by: Nicole C. Engard Signed-off-by: Jared Camins-Esakov ----------------------------------------------------------------------- hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Feb 17 19:21:54 2012 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 17 Feb 2012 18:21:54 +0000 Subject: [koha-commits] main Koha release repository branch new/bug_7113 created. v3.06.00-603-g5610087 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, new/bug_7113 has been created at 5610087eca463bcc494726ea82b8f3203fe9dba4 (commit) - Log ----------------------------------------------------------------- commit 5610087eca463bcc494726ea82b8f3203fe9dba4 Author: Katrin Fischer Date: Fri Jan 27 08:29:46 2012 +0100 Bug 7133: Late orders don't allow to select more than one order To test: Fix selection of orders from vendors 1) Make sure you have at least 2 late orders each for 2 different vendors 2) Filter list to show only late orders of one vendor 3) Use Check all/Uncheck all 4) Select more than 1 order manually 5) Remove filter on vendor, show all late orders 6) When checking an order from one vendor, checkboxes for other vendors get blocked 7) Check you can select all late orders for one vendor Display fix: show vendor id in first column instead of () 1) Veryfy first column of table looks something like: (2) 19/01/2012 (8 days) and has no empty () http://bugs.koha-community.org/show_bug.cgi?id=7113 Signed-off-by: Owen Leonard Signed-off-by: Paul Poulain commit c6bed376457011b6ed2edcf704048af04109797c Author: Katrin Fischer Date: Fri Jan 27 08:16:55 2012 +0100 Bug 7113: Fix 'Edit vendor' link on basketgroup page 'Edit vendor' didn't open the vendor page for editing. Signed-off-by: Owen Leonard commit 7fcff602f5fe294e78e3012fc12d600e43ca2443 Author: Owen Leonard Date: Fri Oct 28 14:43:43 2011 -0400 Bug 7113: Standardize vendor id name in templates and scripts New revision updates for current master and cleans up new instances introduced by recent commits. Signed-off-by: Katrin Fischer 2 problems found, fixing those in follo up patches: - late orders don't allow more than 1 order to be selected - basketgroups: 'Edit vendor' does the same as 'Manage orders' ----------------------------------------------------------------------- hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Mon Feb 20 15:29:00 2012 From: gitmaster at git.koha-community.org (Git repo owner) Date: Mon, 20 Feb 2012 14:29:00 +0000 Subject: [koha-commits] main Koha release repository branch new/bug_4054 created. v3.06.00-605-g945b39e 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, new/bug_4054 has been created at 945b39e01bbd736d6bffd53119347f7655a19874 (commit) - Log ----------------------------------------------------------------- commit 945b39e01bbd736d6bffd53119347f7655a19874 Author: Kyle M Hall Date: Tue Feb 14 13:49:54 2012 -0500 Bug 4054 - Double-clicking the 'place hold' button can result in duplicate holds - Part 2: OPAC This commit adds a new jquery function to functions.js, preventDoubleFormSubmit(). When used thusly: $('#form-id').preventDoubleFormSubmit(); It will prevent a submitted form from being submitted a second time. This commit uses said function to prevent double processing a hold request from the opac. Signed-off-by: Liz Rea Rapid clicking on the place hold button no longer causes duplicate holds! Passes prove t xt t/db_dependent in line with current master. Signed-off-by: Paul Poulain commit a64ca0a8cfbd70d9c924657a93d3f2dc84bf7704 Author: Kyle M Hall Date: Tue Feb 14 10:53:19 2012 -0500 Bug 4054 - Double-clicking the 'place hold' button can result in duplicate holds This commit adds a new jquery function to staff-global.js, preventDoubleFormSubmit(). When used thusly: $('#form-id').preventDoubleFormSubmit(); It will prevent a submitted form from being submitted a second time. It is currently only added to the Place Hold form in reserve/request.pl http://bugs.koha-community.org/show_bug.cgi?id=4045 Signed-off-by: Liz Rea Tested: Double clicking no longer causes identical double holds to be placed. passes prove t xt t/db_dependent in line with current master. Reminder: this will need to be added to the OPAC as well. ----------------------------------------------------------------------- hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Mon Feb 20 16:26:41 2012 From: gitmaster at git.koha-community.org (Git repo owner) Date: Mon, 20 Feb 2012 15:26:41 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.06.00-605-g945b39e 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 945b39e01bbd736d6bffd53119347f7655a19874 (commit) via a64ca0a8cfbd70d9c924657a93d3f2dc84bf7704 (commit) via 5610087eca463bcc494726ea82b8f3203fe9dba4 (commit) via c6bed376457011b6ed2edcf704048af04109797c (commit) via 7fcff602f5fe294e78e3012fc12d600e43ca2443 (commit) via 30f4b8158aeac2d707cec1854f4037e101da1bec (commit) via d3fd4368ae0b09eb8dda07b80e1e39a15e1f3b02 (commit) from 46a5154df940cf10e6718aa87717fdb87ebca702 (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 ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: acqui/basket.pl | 8 +- acqui/basketheader.pl | 4 +- acqui/booksellers.pl | 14 ++-- acqui/finishreceive.pl | 6 +- acqui/lateorders.pl | 13 ++- acqui/newordersuggestion.pl | 6 +- acqui/orderreceive.pl | 12 +- acqui/parcel.pl | 18 ++-- acqui/parcels.pl | 10 +- acqui/supplier.pl | 18 ++-- acqui/updatesupplier.pl | 8 +- admin/aqcontract.pl | 4 +- .../prog/en/includes/acquisitions-toolbar.inc | 24 ++-- .../prog/en/includes/suggestions-add-search.inc | 4 +- koha-tmpl/intranet-tmpl/prog/en/js/staff-global.js | 11 ++- .../prog/en/modules/acqui/addorderiso2709.tt | 2 +- .../intranet-tmpl/prog/en/modules/acqui/basket.tt | 4 +- .../prog/en/modules/acqui/basketgroup.tt | 10 +- .../prog/en/modules/acqui/basketheader.tt | 2 +- .../prog/en/modules/acqui/booksellers.tt | 8 +- .../prog/en/modules/acqui/histsearch.tt | 4 +- .../prog/en/modules/acqui/lateorders.tt | 12 +- .../prog/en/modules/acqui/neworderbiblio.tt | 2 +- .../prog/en/modules/acqui/neworderempty.tt | 2 +- .../prog/en/modules/acqui/newordersuggestion.tt | 6 +- .../intranet-tmpl/prog/en/modules/acqui/ordered.tt | 4 +- .../prog/en/modules/acqui/orderreceive.tt | 6 +- .../intranet-tmpl/prog/en/modules/acqui/parcel.tt | 24 ++-- .../intranet-tmpl/prog/en/modules/acqui/parcels.tt | 20 ++-- .../intranet-tmpl/prog/en/modules/acqui/spent.tt | 6 +- .../prog/en/modules/acqui/supplier.tt | 12 +- .../prog/en/modules/acqui/uncertainprice.tt | 4 +- .../prog/en/modules/acqui/z3950_search.tt | 3 +- .../prog/en/modules/admin/aqcontract.tt | 2 +- .../prog/en/modules/catalogue/moredetail.tt | 2 +- .../prog/en/modules/reserve/request.tt | 4 +- .../prog/en/xslt/MARC21slim2intranetDetail.xsl | 7 +- koha-tmpl/opac-tmpl/prog/en/js/script.js | 9 ++ .../opac-tmpl/prog/en/modules/opac-reserve.tt | 4 +- .../prog/en/xslt/MARC21slim2OPACDetail.xsl | 112 ++++++++++---------- 40 files changed, 230 insertions(+), 201 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Mon Feb 20 16:28:10 2012 From: gitmaster at git.koha-community.org (Git repo owner) Date: Mon, 20 Feb 2012 15:28:10 +0000 Subject: [koha-commits] main Koha release repository branch new/bug_6488 updated. v3.06.00-458-g2a8fe16 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, new/bug_6488 has been updated via 2a8fe16752e12505c55c9f8c08afe97afe460f7b (commit) from 1f66e9fa691f9cfd705375450a21c623e0155f52 (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 2a8fe16752e12505c55c9f8c08afe97afe460f7b Author: Liz Rea Date: Fri Feb 17 14:00:53 2012 -0600 Bug 6488 - followup - fixes issue with bibs with no items and serials being suppressed To test: * create a bib with no items * update your index serial records and your new bib with no items should be displayed. * add something to the OPACHiddenItems syspref (I like itype: [BK] from the test data) *** test both ways, with something in there and with the syspref empty. * add an item to your new bib that would be suppressed * update your index * search for the bib The item should not show * change the item into a state where it would no longer be suppressed * update your index * search for the bib The item should show in the opac * just for fun, delete your item * update your index * Search for the bib - it should still display. I tested on MARC21 - please test UNIMARC as well. Signed-off-by: Jared Camins-Esakov ----------------------------------------------------------------------- Summary of changes: C4/Search.pm | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Mon Feb 20 16:28:29 2012 From: gitmaster at git.koha-community.org (Git repo owner) Date: Mon, 20 Feb 2012 15:28:29 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.06.00-607-g803095a 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 803095a7989bd1cd4357ebe9736a19284d97b2db (commit) via 2a8fe16752e12505c55c9f8c08afe97afe460f7b (commit) from 945b39e01bbd736d6bffd53119347f7655a19874 (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 803095a7989bd1cd4357ebe9736a19284d97b2db Merge: 945b39e 2a8fe16 Author: Paul Poulain Date: Mon Feb 20 16:28:14 2012 +0100 Merge remote-tracking branch 'origin/new/bug_6488' ----------------------------------------------------------------------- Summary of changes: C4/Search.pm | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Mon Feb 20 16:32:50 2012 From: gitmaster at git.koha-community.org (Git repo owner) Date: Mon, 20 Feb 2012 15:32:50 +0000 Subject: [koha-commits] main Koha release repository branch new/bug_7554 created. v3.06.00-608-g853676b 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, new/bug_7554 has been created at 853676b2e3a4836c7e5e30eeece67ee7d3d81ed2 (commit) - Log ----------------------------------------------------------------- commit 853676b2e3a4836c7e5e30eeece67ee7d3d81ed2 Author: Jared Camins-Esakov Date: Fri Feb 17 12:50:47 2012 -0500 Bug 7554: Clean newlines in browse script Records with a newline in the title will break the Javascript search pagination on the OPAC without this patch. To test: 1. Import a record with a newline in the title (an example is attached to this bug) 2. Do a search that turns up the record and at least one other 3. View the detail page for one of the other records 4. Observe that there is a javascript error 5. Apply patch 6. Repeat search 7. Observe that there is no javascript error Signed-off-by: Chris Cormack Simple template change, works well Signed-off-by: Marcel de Rooy Signed-off-by: Paul Poulain ----------------------------------------------------------------------- hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Mon Feb 20 16:45:38 2012 From: gitmaster at git.koha-community.org (Git repo owner) Date: Mon, 20 Feb 2012 15:45:38 +0000 Subject: [koha-commits] main Koha release repository branch new/bug_6875 updated. v3.06.00-562-gdf5405c 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, new/bug_6875 has been updated via df5405c56e0f89dee44ed1cf1a3a761cf31efe3c (commit) via 49b167e8486e19a20f055e1ce9cde30f82cfc55e (commit) from 1ddc9322dfc13ef7f1e930692bfd2cb3771b102b (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 df5405c56e0f89dee44ed1cf1a3a761cf31efe3c Author: Paul Poulain Date: Fri Sep 16 20:20:37 2011 +0200 Bug 6875 de-nesting C4::Items C4::Branch is used only in CheckItemPresave, moving from a use to a require in the sub C4::Reserve: This package is loaded just for C4::Reserves::CheckReserves called in C4::Items::GetItemsInfo The GetItemsInfo stores the result of CheckReserves in a hash entry, count_reserve, that is used only in opac_detail to display the status of a hold. We could remove the reserve_count hash entry and inline C4::Reserves::CheckReserves directly from opac-detail.pl page in opac-detail.pl, instead of if( $itm->{'count_reserves'} eq "Waiting"){ $itm->{'waiting'} = 1; } write : if ( C4::Reserves::CheckReserves(<>) eq "Waiting"){ $itm->{'waiting'} = 1; } C4::Acquisition is used only in MoveItemFromBiblio, a sub that is rarely called. Moving from a use to a require in the sub C4::Charset is used only in _parse_unlinked_item_subfields_from_xml. Moving from a use to require in the sub Signed-off-by: Marcel de Rooy Checked opac-detail and cataloging. Code looks good. commit 49b167e8486e19a20f055e1ce9cde30f82cfc55e Author: Paul Poulain Date: Fri Sep 16 19:37:15 2011 +0200 Bug 6875 de nesting C4::Biblio C4::Biblio is used in many many places. The goal of this cleaning is to do from C4::Biblio a package with as many dependancies as possible. * C4::Heading is called only in 1 place, highly rarely used (only in 1 misc/link_bibs_to_authorities.pl), moving to require * PrepareItemrecordDisplay is a sub that is more related to Items, moving it here. It means some scripts that used this sub must be checked against use C4::Items * C4::Items is needed in EmbedItemsInMarcBiblio, moving it only in this sub, and switching to require * 2 subs are totally useless z3950_extended_services and set_service_options, removing them Signed-off-by: Marcel de Rooy No test plan included, but tested some opac and cataloging functions. Code looks good. Marked as Passed QA. ----------------------------------------------------------------------- Summary of changes: C4/Biblio.pm | 344 +-------------------------------- C4/Items.pm | 255 +++++++++++++++++++++++-- C4/Serials.pm | 5 +- acqui/neworderempty.pl | 1 + opac/opac-detail.pl | 9 +- t/db_dependent/lib/KohaTest/Biblio.pm | 3 - t/db_dependent/lib/KohaTest/Items.pm | 1 + 7 files changed, 251 insertions(+), 367 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Mon Feb 20 16:47:09 2012 From: gitmaster at git.koha-community.org (Git repo owner) Date: Mon, 20 Feb 2012 15:47:09 +0000 Subject: [koha-commits] main Koha release repository branch new/bug_3215 created. v3.06.00-611-gf7a525f 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, new/bug_3215 has been created at f7a525fa09008d98340739bd930fc48debcd306f (commit) - Log ----------------------------------------------------------------- commit f7a525fa09008d98340739bd930fc48debcd306f Merge: 853676b df5405c Author: Paul Poulain Date: Mon Feb 20 16:45:42 2012 +0100 Merge remote-tracking branch 'origin/new/bug_6875' ----------------------------------------------------------------------- hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Mon Feb 20 19:57:53 2012 From: gitmaster at git.koha-community.org (Git repo owner) Date: Mon, 20 Feb 2012 18:57:53 +0000 Subject: [koha-commits] main Koha release repository branch 3.4.x updated. v3.04.08-116-g0b0ab0e 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.4.x has been updated via 0b0ab0e7d724295d4f5980165b84a0cfe2db5f49 (commit) from 357ba9c5714b97e99b9b9c63f5a86f8e259bd887 (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 0b0ab0e7d724295d4f5980165b84a0cfe2db5f49 Author: Chris Nighswonger Date: Mon Feb 20 13:57:39 2012 -0500 Fixing installer/install.pl which somehow broke due to some git weirdness I assume. ----------------------------------------------------------------------- Summary of changes: installer/install.pl | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Mon Feb 20 20:20:27 2012 From: gitmaster at git.koha-community.org (Git repo owner) Date: Mon, 20 Feb 2012 19:20:27 +0000 Subject: [koha-commits] main Koha release repository branch 3.4.x updated. v3.04.08-117-g014ecff 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.4.x has been updated via 014ecffdbbcdfb742fd71e643a9d02fd895ee747 (commit) from 0b0ab0e7d724295d4f5980165b84a0cfe2db5f49 (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 014ecffdbbcdfb742fd71e643a9d02fd895ee747 Author: Chris Cormack Date: Wed Dec 7 09:17:35 2011 +1300 Bug 5327 : Fixing unit test for SQLHelper.pm Signed-off-by: Liz Rea Confirm that all SQLHelper tests pass. (cherry picked from commit dbe36a2bf361e1cda73f83cc5cfc79e71c6cf216) Signed-off-by: Chris Nighswonger ----------------------------------------------------------------------- Summary of changes: t/db_dependent/SQLHelper.t | 6 +----- 1 files changed, 1 insertions(+), 5 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Mon Feb 20 20:34:57 2012 From: gitmaster at git.koha-community.org (Git repo owner) Date: Mon, 20 Feb 2012 19:34:57 +0000 Subject: [koha-commits] main Koha release repository branch 3.6.x updated. v3.06.03-146-g52d83a1 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.6.x has been updated via 52d83a16cd636165d1de415ed1398c7f4a414b12 (commit) via 2266953a35f2e050b49066adf8f1da085e62be38 (commit) from eec9246f267e063bc1d3589a8303dcb1eb0de7fa (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 52d83a16cd636165d1de415ed1398c7f4a414b12 Author: Chris Nighswonger Date: Mon Feb 20 14:27:42 2012 -0500 Updating Version Number to 3.06.03.002 commit 2266953a35f2e050b49066adf8f1da085e62be38 Author: Srdjan Jankovic Date: Wed Dec 21 21:26:30 2011 +1300 bug_7090: AllowItemsOnHandCheckout syspref Observe AllowItemsOnHandCheckout syspref when using SIP self checkout Signed-off-by: Liz Rea To test: * place an item on hold for patron A * attempt to circulate that item to patron B (via SIP/selfcheck) syspref off: item should not circulate to patron B Syspref On: item should circulate to patron B Both conditions passed in our testing. Also verified that normal staff client behavior regarding this situation was preserved. It was. Signed-off-by: Chris Nighswonger -backported to 3.6.x ----------------------------------------------------------------------- Summary of changes: C4/Circulation.pm | 68 ++++++++++--------- C4/SIP/ILS/Transaction/Checkout.pm | 8 ++- installer/data/mysql/sysprefs.sql | 2 +- installer/data/mysql/updatedatabase.pl | 9 ++- .../en/modules/admin/preferences/circulation.pref | 6 ++ kohaversion.pl | 2 +- opac/sco/sco-main.pl | 16 ++++- 7 files changed, 72 insertions(+), 39 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Mon Feb 20 21:50:16 2012 From: gitmaster at git.koha-community.org (Git repo owner) Date: Mon, 20 Feb 2012 20:50:16 +0000 Subject: [koha-commits] main Koha release repository branch 3.6.x updated. v3.06.03-152-gc8ad799 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.6.x has been updated via c8ad799b3acb64de171e9d01ed29cbb68d5a1abc (commit) via 47998fc451e0ddafa63f287ac5233ba5cba4bbe6 (commit) via 332da8e4e7470c7ebdb33f27775219c129e505f4 (commit) via f0805a6f2d0a846d5d719a3c03db26441774d528 (commit) via 2b76d31c6d7fccac8333037b33e1d3fe54518dbc (commit) via f6b290211bb8efba786fa52544eab8581890f952 (commit) from 52d83a16cd636165d1de415ed1398c7f4a414b12 (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 c8ad799b3acb64de171e9d01ed29cbb68d5a1abc Author: Chris Nighswonger Date: Mon Feb 20 14:45:25 2012 -0500 Release Notes for 3.06.04.000 20 Feb 2012 19:45:25 Z commit 47998fc451e0ddafa63f287ac5233ba5cba4bbe6 Author: Chris Nighswonger Date: Mon Feb 20 14:44:30 2012 -0500 Revert "Bug 6836: Add jQuery dataTables plugin" This reverts commit 5f36947783cbe43a9550b3ffc839a2956d59ae94. -Part of Enh 6836 commit 332da8e4e7470c7ebdb33f27775219c129e505f4 Author: Chris Nighswonger Date: Mon Feb 20 14:44:00 2012 -0500 Revert "Bug 6836: followup CSS work" This reverts commit 8edc97a838f8ee49c099e3870a15e43d554e2b63. -Part of enh 6836 commit f0805a6f2d0a846d5d719a3c03db26441774d528 Author: Chris Nighswonger Date: Mon Feb 20 14:43:34 2012 -0500 Revert "Bug 6836: test case readingrec.pl" This reverts commit 0508e6fb86a48c8b99fdc63ccb2ebb1d5133c95a. -Part of Enh 6836 commit 2b76d31c6d7fccac8333037b33e1d3fe54518dbc Author: Chris Nighswonger Date: Mon Feb 20 14:43:01 2012 -0500 Revert "Bug 6836 follow-up fixing POD" This reverts commit 03e1c36dce6dc37f47c0927517b8bf646c214557. -Part of Enh 6836 commit f6b290211bb8efba786fa52544eab8581890f952 Author: Chris Nighswonger Date: Mon Feb 20 14:39:09 2012 -0500 Revert "Bug 6838: Add pagination and filtering on subscriptions table" This reverts commit e13db856d4ceac1bb9b195dd10391cd239c19296. -Part of DataTables Enhancement ----------------------------------------------------------------------- Summary of changes: C4/Serials.pm | 2 + C4/Utils/DataTables.pm | 284 --------------- koha-tmpl/intranet-tmpl/prog/en/css/datatables.css | 265 -------------- .../prog/en/includes/datatables-strings.inc | 17 - koha-tmpl/intranet-tmpl/prog/en/js/datatables.js | 384 -------------------- .../en/lib/jquery/plugins/jquery.dataTables.min.js | 153 -------- .../prog/en/modules/members/readingrec.tt | 26 +- .../prog/en/modules/serials/serials-home.tt | 40 +-- .../prog/img/datatables/back_disabled.jpg | Bin 612 -> 0 bytes .../prog/img/datatables/back_enabled.jpg | Bin 807 -> 0 bytes .../prog/img/datatables/forward_disabled.jpg | Bin 635 -> 0 bytes .../prog/img/datatables/forward_enabled.jpg | Bin 852 -> 0 bytes .../intranet-tmpl/prog/img/datatables/sort_asc.png | Bin 263 -> 0 bytes .../prog/img/datatables/sort_asc_disabled.png | Bin 252 -> 0 bytes .../prog/img/datatables/sort_both.png | Bin 282 -> 0 bytes .../prog/img/datatables/sort_desc.png | Bin 260 -> 0 bytes .../prog/img/datatables/sort_desc_disabled.png | Bin 251 -> 0 bytes koha-tmpl/opac-tmpl/prog/en/css/datatables.css | 265 -------------- .../prog/en/includes/datatables-strings.inc | 17 - koha-tmpl/opac-tmpl/prog/en/js/datatables.js | 384 -------------------- .../en/lib/jquery/plugins/jquery.dataTables.min.js | 153 -------- .../prog/images/datatables/back_disabled.jpg | Bin 612 -> 0 bytes .../prog/images/datatables/back_enabled.jpg | Bin 807 -> 0 bytes .../prog/images/datatables/forward_disabled.jpg | Bin 635 -> 0 bytes .../prog/images/datatables/forward_enabled.jpg | Bin 852 -> 0 bytes .../opac-tmpl/prog/images/datatables/sort_asc.png | Bin 263 -> 0 bytes .../prog/images/datatables/sort_asc_disabled.png | Bin 252 -> 0 bytes .../opac-tmpl/prog/images/datatables/sort_both.png | Bin 282 -> 0 bytes .../opac-tmpl/prog/images/datatables/sort_desc.png | Bin 260 -> 0 bytes .../prog/images/datatables/sort_desc_disabled.png | Bin 251 -> 0 bytes misc/release_notes/release_notes_3_6_4.txt | 263 +++++++++++++ 31 files changed, 296 insertions(+), 1957 deletions(-) delete mode 100644 C4/Utils/DataTables.pm delete mode 100644 koha-tmpl/intranet-tmpl/prog/en/css/datatables.css delete mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/datatables-strings.inc delete mode 100644 koha-tmpl/intranet-tmpl/prog/en/js/datatables.js delete mode 100644 koha-tmpl/intranet-tmpl/prog/en/lib/jquery/plugins/jquery.dataTables.min.js delete mode 100644 koha-tmpl/intranet-tmpl/prog/img/datatables/back_disabled.jpg delete mode 100644 koha-tmpl/intranet-tmpl/prog/img/datatables/back_enabled.jpg delete mode 100644 koha-tmpl/intranet-tmpl/prog/img/datatables/forward_disabled.jpg delete mode 100644 koha-tmpl/intranet-tmpl/prog/img/datatables/forward_enabled.jpg delete mode 100644 koha-tmpl/intranet-tmpl/prog/img/datatables/sort_asc.png delete mode 100644 koha-tmpl/intranet-tmpl/prog/img/datatables/sort_asc_disabled.png delete mode 100644 koha-tmpl/intranet-tmpl/prog/img/datatables/sort_both.png delete mode 100644 koha-tmpl/intranet-tmpl/prog/img/datatables/sort_desc.png delete mode 100644 koha-tmpl/intranet-tmpl/prog/img/datatables/sort_desc_disabled.png delete mode 100644 koha-tmpl/opac-tmpl/prog/en/css/datatables.css delete mode 100644 koha-tmpl/opac-tmpl/prog/en/includes/datatables-strings.inc delete mode 100644 koha-tmpl/opac-tmpl/prog/en/js/datatables.js delete mode 100644 koha-tmpl/opac-tmpl/prog/en/lib/jquery/plugins/jquery.dataTables.min.js delete mode 100644 koha-tmpl/opac-tmpl/prog/images/datatables/back_disabled.jpg delete mode 100644 koha-tmpl/opac-tmpl/prog/images/datatables/back_enabled.jpg delete mode 100644 koha-tmpl/opac-tmpl/prog/images/datatables/forward_disabled.jpg delete mode 100644 koha-tmpl/opac-tmpl/prog/images/datatables/forward_enabled.jpg delete mode 100644 koha-tmpl/opac-tmpl/prog/images/datatables/sort_asc.png delete mode 100644 koha-tmpl/opac-tmpl/prog/images/datatables/sort_asc_disabled.png delete mode 100644 koha-tmpl/opac-tmpl/prog/images/datatables/sort_both.png delete mode 100644 koha-tmpl/opac-tmpl/prog/images/datatables/sort_desc.png delete mode 100644 koha-tmpl/opac-tmpl/prog/images/datatables/sort_desc_disabled.png create mode 100644 misc/release_notes/release_notes_3_6_4.txt hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Mon Feb 20 21:59:45 2012 From: gitmaster at git.koha-community.org (Git repo owner) Date: Mon, 20 Feb 2012 20:59:45 +0000 Subject: [koha-commits] main Koha release repository branch 3.6.x updated. v3.06.03-153-g3c75824 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.6.x has been updated via 3c75824d319e88f9b7f534f42ffecad2170751ae (commit) from c8ad799b3acb64de171e9d01ed29cbb68d5a1abc (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 3c75824d319e88f9b7f534f42ffecad2170751ae Author: Liz Rea Date: Fri Feb 17 14:00:53 2012 -0600 Bug 6488 - followup - fixes issue with bibs with no items and serials being suppressed To test: * create a bib with no items * update your index serial records and your new bib with no items should be displayed. * add something to the OPACHiddenItems syspref (I like itype: [BK] from the test data) *** test both ways, with something in there and with the syspref empty. * add an item to your new bib that would be suppressed * update your index * search for the bib The item should not show * change the item into a state where it would no longer be suppressed * update your index * search for the bib The item should show in the opac * just for fun, delete your item * update your index * Search for the bib - it should still display. I tested on MARC21 - please test UNIMARC as well. Signed-off-by: Jared Camins-Esakov (cherry picked from commit 2a8fe16752e12505c55c9f8c08afe97afe460f7b) Signed-off-by: Chris Nighswonger ----------------------------------------------------------------------- Summary of changes: C4/Search.pm | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Mon Feb 20 22:01:18 2012 From: gitmaster at git.koha-community.org (Git repo owner) Date: Mon, 20 Feb 2012 21:01:18 +0000 Subject: [koha-commits] main Koha release repository branch 3.4.x updated. v3.04.08-118-gd8966e9 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.4.x has been updated via d8966e96619ed50fb17ce0d10dc53642853e65f7 (commit) from 014ecffdbbcdfb742fd71e643a9d02fd895ee747 (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 d8966e96619ed50fb17ce0d10dc53642853e65f7 Author: Liz Rea Date: Fri Feb 17 14:00:53 2012 -0600 Bug 6488 - followup - fixes issue with bibs with no items and serials being suppressed To test: * create a bib with no items * update your index serial records and your new bib with no items should be displayed. * add something to the OPACHiddenItems syspref (I like itype: [BK] from the test data) *** test both ways, with something in there and with the syspref empty. * add an item to your new bib that would be suppressed * update your index * search for the bib The item should not show * change the item into a state where it would no longer be suppressed * update your index * search for the bib The item should show in the opac * just for fun, delete your item * update your index * Search for the bib - it should still display. I tested on MARC21 - please test UNIMARC as well. Signed-off-by: Jared Camins-Esakov (cherry picked from commit 2a8fe16752e12505c55c9f8c08afe97afe460f7b) Signed-off-by: Chris Nighswonger ----------------------------------------------------------------------- Summary of changes: C4/Search.pm | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Mon Feb 20 22:25:27 2012 From: gitmaster at git.koha-community.org (Git repo owner) Date: Mon, 20 Feb 2012 21:25:27 +0000 Subject: [koha-commits] main Koha release repository branch new/bug_7231 created. v3.06.00-612-g39def35 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, new/bug_7231 has been created at 39def35275c3f2fa8eb4468e97b4c445e1f605fb (commit) - Log ----------------------------------------------------------------- commit 39def35275c3f2fa8eb4468e97b4c445e1f605fb Author: Srdjan Jankovic Date: Fri Jan 27 15:19:25 2012 +1300 bug_7231: Call GetMarcPrice() in acqui/neworderempty.pl for staged imports Signed-off-by: Kyle M Hall ----------------------------------------------------------------------- hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Mon Feb 20 22:34:51 2012 From: gitmaster at git.koha-community.org (Git repo owner) Date: Mon, 20 Feb 2012 21:34:51 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.06.00-612-g39def35 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 39def35275c3f2fa8eb4468e97b4c445e1f605fb (commit) via f7a525fa09008d98340739bd930fc48debcd306f (commit) via df5405c56e0f89dee44ed1cf1a3a761cf31efe3c (commit) via 49b167e8486e19a20f055e1ce9cde30f82cfc55e (commit) via 853676b2e3a4836c7e5e30eeece67ee7d3d81ed2 (commit) from 803095a7989bd1cd4357ebe9736a19284d97b2db (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 ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: C4/Biblio.pm | 344 +------------------- C4/Items.pm | 255 ++++++++++++++- C4/Serials.pm | 5 +- acqui/neworderempty.pl | 27 +-- koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tt | 2 +- opac/opac-detail.pl | 9 +- t/db_dependent/lib/KohaTest/Biblio.pm | 3 - t/db_dependent/lib/KohaTest/Items.pm | 1 + 8 files changed, 256 insertions(+), 390 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Tue Feb 21 02:09:56 2012 From: gitmaster at git.koha-community.org (Git repo owner) Date: Tue, 21 Feb 2012 01:09:56 +0000 Subject: [koha-commits] main Koha release repository branch 3.4.x updated. v3.04.08-119-ge0a7718 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.4.x has been updated via e0a77180b3a1b8f6eaaea7e1ada02035d8bac610 (commit) from d8966e96619ed50fb17ce0d10dc53642853e65f7 (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 e0a77180b3a1b8f6eaaea7e1ada02035d8bac610 Author: Chris Nighswonger Date: Mon Feb 20 20:08:17 2012 -0500 Release Notes for 3.04.09.000 21 Feb 2012 01:08:17 Z ----------------------------------------------------------------------- Summary of changes: misc/release_notes/release_notes_3_4_9.txt | 237 ++++++++++++++++++++++++++++ 1 files changed, 237 insertions(+), 0 deletions(-) create mode 100644 misc/release_notes/release_notes_3_4_9.txt hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Tue Feb 21 13:48:42 2012 From: gitmaster at git.koha-community.org (Git repo owner) Date: Tue, 21 Feb 2012 12:48:42 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.06.00-614-g6a520f7 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 6a520f7456001d014776c33409262c68a5c2f9ae (commit) via 52afe06ddd222fcd143bf34ba01daf01ba56674e (commit) from 39def35275c3f2fa8eb4468e97b4c445e1f605fb (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 6a520f7456001d014776c33409262c68a5c2f9ae Author: Paul Poulain Date: Tue Feb 21 13:16:11 2012 +0100 Bug 6193 follow-up of the follow-up = reindentation only commit 52afe06ddd222fcd143bf34ba01daf01ba56674e Author: Tomas Cohen Arazi Date: Fri Dec 30 09:10:36 2011 -0300 Bug 6193 - Follow up: use SetEnv and remove memcached from koha-conf.xml Signed-off-by: Jared Camins-Esakov Confirmed that memcached is still being used after the memcached configuration in koha-conf.xml was removed, and the following two lines were added to both virtual hosts in koha-httpd.conf: SetEnv MEMCACHED_SERVERS "127.0.0.1:11211" SetEnv MEMCACHED_NAMESPACE "KOHA" ----------------------------------------------------------------------- Summary of changes: C4/Auth.pm | 17 +++----------- C4/Biblio.pm | 11 ++------- C4/Context.pm | 60 ++++++++++++++++++++++++++++++++++++++--------------- C4/Languages.pm | 15 +++--------- etc/koha-conf.xml | 2 - 5 files changed, 54 insertions(+), 51 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Tue Feb 21 13:51:36 2012 From: gitmaster at git.koha-community.org (Git repo owner) Date: Tue, 21 Feb 2012 12:51:36 +0000 Subject: [koha-commits] main Koha release repository branch 3.6.x updated. v3.06.03-156-ga3cdfee 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.6.x has been updated via a3cdfee135af1d1af936157b51f3232106c8fac4 (commit) via e0055b2d0dbe43f07316ddb3ade2ad3ce1d95d5b (commit) via d75a9c057080cd6ddd581d5d642d397a5c3e4744 (commit) from 3c75824d319e88f9b7f534f42ffecad2170751ae (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 a3cdfee135af1d1af936157b51f3232106c8fac4 Author: Chris Nighswonger Date: Tue Feb 21 07:51:16 2012 -0500 Revert "Bug 7238 Followup - fix sip_run to require path to SIPconfig.xml" This reverts commit d76424a17cb246107dcfaf45fc41ae327c6b57e1. -Introduces changes to sip configuration commit e0055b2d0dbe43f07316ddb3ade2ad3ce1d95d5b Author: Chris Nighswonger Date: Tue Feb 21 07:51:01 2012 -0500 Revert "Bug 7238 : Shifting SIPconfig.xml to the etc dir and the scripts to misc/bin" This reverts commit 36cf50e27d39bc60c1a4fc4d76e88e5a088657bc. -Introduces changes to sip configuration commit d75a9c057080cd6ddd581d5d642d397a5c3e4744 Author: Chris Nighswonger Date: Tue Feb 21 07:50:47 2012 -0500 Revert "Bug 7238 - make packages deal with SIP config" This reverts commit 6b6440ad79c0614a94686ecc3a71d78f541e7efe. -Introduces changes to sip configuration ----------------------------------------------------------------------- Summary of changes: {etc => C4/SIP}/SIPconfig.xml | 0 {misc/bin => C4/SIP}/sip_run.sh | 15 ++---- {misc/bin => C4/SIP}/sip_shutdown.sh | 0 debian/rules | 1 - debian/templates/SIPconfig.xml | 84 ---------------------------------- 5 files changed, 5 insertions(+), 95 deletions(-) rename {etc => C4/SIP}/SIPconfig.xml (100%) rename {misc/bin => C4/SIP}/sip_run.sh (69%) rename {misc/bin => C4/SIP}/sip_shutdown.sh (100%) delete mode 100644 debian/templates/SIPconfig.xml hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Tue Feb 21 13:51:44 2012 From: gitmaster at git.koha-community.org (Git repo owner) Date: Tue, 21 Feb 2012 12:51:44 +0000 Subject: [koha-commits] main Koha release repository branch 3.4.x updated. v3.04.08-122-gaefc585 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.4.x has been updated via aefc58585340508d110094890410edc45edd91ec (commit) via 78e35d020116ca833c2b3cc4a15916d07ee84aa6 (commit) via a88096b6e891c6c17e8404ce39b237b70ffa1931 (commit) from e0a77180b3a1b8f6eaaea7e1ada02035d8bac610 (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 aefc58585340508d110094890410edc45edd91ec Author: Chris Nighswonger Date: Tue Feb 21 07:49:42 2012 -0500 Revert "Bug 7238 Followup - fix sip_run to require path to SIPconfig.xml" This reverts commit d76424a17cb246107dcfaf45fc41ae327c6b57e1. -Introduces changes to sip configuration commit 78e35d020116ca833c2b3cc4a15916d07ee84aa6 Author: Chris Nighswonger Date: Tue Feb 21 07:49:12 2012 -0500 Revert "Bug 7238 : Shifting SIPconfig.xml to the etc dir and the scripts to misc/bin" This reverts commit 36cf50e27d39bc60c1a4fc4d76e88e5a088657bc. -Introduces changes to sip configuration commit a88096b6e891c6c17e8404ce39b237b70ffa1931 Author: Chris Nighswonger Date: Tue Feb 21 07:48:11 2012 -0500 Revert "Bug 7238 - make packages deal with SIP config" This reverts commit 6b6440ad79c0614a94686ecc3a71d78f541e7efe. -Introduces changes to sip configuration ----------------------------------------------------------------------- Summary of changes: {etc => C4/SIP}/SIPconfig.xml | 0 {misc/bin => C4/SIP}/sip_run.sh | 15 ++---- {misc/bin => C4/SIP}/sip_shutdown.sh | 0 debian/rules | 1 - debian/templates/SIPconfig.xml | 84 ---------------------------------- 5 files changed, 5 insertions(+), 95 deletions(-) rename {etc => C4/SIP}/SIPconfig.xml (100%) rename {misc/bin => C4/SIP}/sip_run.sh (69%) rename {misc/bin => C4/SIP}/sip_shutdown.sh (100%) delete mode 100644 debian/templates/SIPconfig.xml hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Tue Feb 21 15:25:23 2012 From: gitmaster at git.koha-community.org (Git repo owner) Date: Tue, 21 Feb 2012 14:25:23 +0000 Subject: [koha-commits] main Koha release repository branch 3.6.x updated. v3.06.03-163-g31e4fe1 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.6.x has been updated via 31e4fe1321965d8f33050a2f7289e5d6fcb73ff7 (commit) via 3651d8e189ef62dba381c71f1d741db1957e5c09 (commit) via 923ac9f3a25f0d6beff3abc1797c759d61a51fb0 (commit) via 68521895b117147640887dee92b21add1eeb9406 (commit) via c69ec06c58e9cf1fcc88ca4156a28f2e63babd91 (commit) via 7d0c1139145bcda6aa115555884872c1b5f43801 (commit) via 6cd95c2938dfc0726a8764397c5bc7c576929e6d (commit) from a3cdfee135af1d1af936157b51f3232106c8fac4 (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 31e4fe1321965d8f33050a2f7289e5d6fcb73ff7 Author: Chris Nighswonger Date: Tue Feb 21 09:20:17 2012 -0500 Updating Version Number to 3.06.03.001 commit 3651d8e189ef62dba381c71f1d741db1957e5c09 Author: Chris Nighswonger Date: Tue Feb 21 09:19:15 2012 -0500 Revert "Bug 6299 - Provide a list of authorized values for Relator terms" This reverts commit ed6d4244074e08e28c40ce1fcf48d64492826b9b. -Reverting Enh 6299 commit 923ac9f3a25f0d6beff3abc1797c759d61a51fb0 Author: Chris Nighswonger Date: Tue Feb 21 09:18:48 2012 -0500 Revert "Bug 6299 Add relator codes for fr-FR" This reverts commit d5148aac15e6d80a19ad6dfc920ef9993ef7c144. -Reverting Enh 6299 commit 68521895b117147640887dee92b21add1eeb9406 Author: Chris Nighswonger Date: Tue Feb 21 09:18:14 2012 -0500 Revert "Bug 6299 - add es-ES" This reverts commit fa3a2cbedb24e793bf7ffd1ee8a3deff49010c9e. -Reverting Enh 6299 commit c69ec06c58e9cf1fcc88ca4156a28f2e63babd91 Author: Chris Nighswonger Date: Tue Feb 21 09:17:54 2012 -0500 Reverting Enh 6299 commit 7d0c1139145bcda6aa115555884872c1b5f43801 Author: Chris Nighswonger Date: Tue Feb 21 09:15:14 2012 -0500 Revert "Updating Version Number to 3.06.03.001" This reverts commit 0160ba05ac66e392800aad7caf5734667a223d87. -Removing enh 6299 commit 6cd95c2938dfc0726a8764397c5bc7c576929e6d Author: Chris Nighswonger Date: Tue Feb 21 09:14:35 2012 -0500 Revert "Updating Version Number to 3.06.03.002" This reverts commit 52d83a16cd636165d1de415ed1398c7f4a414b12. -Necessary to revert 6299 ----------------------------------------------------------------------- Summary of changes: .../data/mysql/en/optional/marc21_relatorterms.sql | 226 -------------------- .../data/mysql/en/optional/marc21_relatorterms.txt | 1 - .../mysql/es-ES/optional/marc21_relatorterms.sql | 226 -------------------- .../mysql/es-ES/optional/marc21_relatorterms.txt | 1 - .../marc21/Optionnel/marc21_relatorterms.sql | 206 ------------------ .../marc21/Optionnel/marc21_relatorterms.txt | 1 - installer/data/mysql/updatedatabase.pl | 6 - kohaversion.pl | 2 +- 8 files changed, 1 insertions(+), 668 deletions(-) delete mode 100644 installer/data/mysql/en/optional/marc21_relatorterms.sql delete mode 100644 installer/data/mysql/en/optional/marc21_relatorterms.txt delete mode 100644 installer/data/mysql/es-ES/optional/marc21_relatorterms.sql delete mode 100644 installer/data/mysql/es-ES/optional/marc21_relatorterms.txt delete mode 100644 installer/data/mysql/fr-FR/marcflavour/marc21/Optionnel/marc21_relatorterms.sql delete mode 100644 installer/data/mysql/fr-FR/marcflavour/marc21/Optionnel/marc21_relatorterms.txt hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Tue Feb 21 15:26:13 2012 From: gitmaster at git.koha-community.org (Git repo owner) Date: Tue, 21 Feb 2012 14:26:13 +0000 Subject: [koha-commits] main Koha release repository branch 3.6.x updated. v3.06.03-164-g3fb4fdc 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.6.x has been updated via 3fb4fdc6b0ae3850c261bac25649d4bd53e47d91 (commit) from 31e4fe1321965d8f33050a2f7289e5d6fcb73ff7 (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 3fb4fdc6b0ae3850c261bac25649d4bd53e47d91 Author: Chris Nighswonger Date: Tue Feb 21 09:26:00 2012 -0500 Release Notes for 3.06.04.000 21 Feb 2012 14:26:00 Z ----------------------------------------------------------------------- Summary of changes: misc/release_notes/release_notes_3_6_4.txt | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Tue Feb 21 15:30:25 2012 From: gitmaster at git.koha-community.org (Git repo owner) Date: Tue, 21 Feb 2012 14:30:25 +0000 Subject: [koha-commits] main Koha release repository branch 3.6.x updated. v3.06.03-165-gbbd2cbd 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.6.x has been updated via bbd2cbd2d90a62c496a57ea110dccaf32d050c43 (commit) from 3fb4fdc6b0ae3850c261bac25649d4bd53e47d91 (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 bbd2cbd2d90a62c496a57ea110dccaf32d050c43 Author: Chris Nighswonger Date: Tue Feb 21 09:30:21 2012 -0500 Fixing release notes to reflect reverted status of several Enh ----------------------------------------------------------------------- Summary of changes: misc/release_notes/release_notes_3_6_4.txt | 5 +---- 1 files changed, 1 insertions(+), 4 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Tue Feb 21 16:54:04 2012 From: gitmaster at git.koha-community.org (Git repo owner) Date: Tue, 21 Feb 2012 15:54:04 +0000 Subject: [koha-commits] main Koha release repository branch new/bug_7535 created. v3.06.00-615-gbbfaf82 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, new/bug_7535 has been created at bbfaf8264c815013cd37155c9aac283e3cb3cc4a (commit) - Log ----------------------------------------------------------------- commit bbfaf8264c815013cd37155c9aac283e3cb3cc4a Author: D Ruth Bavousett Date: Mon Feb 13 10:25:40 2012 -0500 Bug 7535: ampersands not showing properly in non-XSLT OPAC Jared's fix for Bug 3326 fixed this in the staff client, but not the OPAC; moving this one line fixes it both places. Signed-off-by: Liz Rea This can be replicated by indexing with -x OPACXSLTResults must be set to "normally" Reproduced original bug with rebuild-zebra.pl -x -b -w -r -v -v Patch corrects the issue, does not change intranet behavior. Signed-off-by: Paul Poulain ----------------------------------------------------------------------- hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Tue Feb 21 16:57:47 2012 From: gitmaster at git.koha-community.org (Git repo owner) Date: Tue, 21 Feb 2012 15:57:47 +0000 Subject: [koha-commits] main Koha release repository branch new/bug_7496 created. v3.06.00-616-gdcca2ce 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, new/bug_7496 has been created at dcca2ce791cb8b422b66dea60ef7e2337b64f4c0 (commit) - Log ----------------------------------------------------------------- commit dcca2ce791cb8b422b66dea60ef7e2337b64f4c0 Author: Owen Leonard Date: Fri Feb 17 10:52:31 2012 -0500 Bug 7496 - Personally identifying information sent in opac user TITLE Removing patron name from OPAC page tags. Making some other minor changes to improve <title> clarity and consistency. Signed-off-by: Liz Rea <wizzyrea at gmail.com> titles appear to be consistent passes prove xt Signed-off-by: Paul Poulain <paul.poulain at biblibre.com> ----------------------------------------------------------------------- hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Tue Feb 21 17:02:56 2012 From: gitmaster at git.koha-community.org (Git repo owner) Date: Tue, 21 Feb 2012 16:02:56 +0000 Subject: [koha-commits] main Koha release repository branch new/bug_7513 created. v3.06.00-617-gaa06364 Message-ID: <E1RzsB6-0000UU-IE@git.koha-community.org> 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, new/bug_7513 has been created at aa06364814d948c2efc2d6629032a24b5ad7232b (commit) - Log ----------------------------------------------------------------- commit aa06364814d948c2efc2d6629032a24b5ad7232b Author: BibLibre <dev_patches at biblibre.com> Date: Thu Feb 9 10:11:36 2012 +0100 Bug 7513 Marc Import Hangs On some record, the commit_biblio_file is creating wide character because as_xml is not used with correct parameter. This patch fixes that. To test on a UNIMARC Koha, stage attachment 7510 and then import. It hangs before the patch, it passes after. Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz> Signed-off-by: Paul Poulain <paul.poulain at biblibre.com> ----------------------------------------------------------------------- hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Tue Feb 21 17:36:07 2012 From: gitmaster at git.koha-community.org (Git repo owner) Date: Tue, 21 Feb 2012 16:36:07 +0000 Subject: [koha-commits] main Koha release repository branch new/bug_7454 created. v3.06.00-619-g766b60e Message-ID: <E1RzshD-0001KM-2i@git.koha-community.org> 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, new/bug_7454 has been created at 766b60e5b34baaca30dea8d2f64c9e3fed602c8f (commit) - Log ----------------------------------------------------------------- commit 766b60e5b34baaca30dea8d2f64c9e3fed602c8f Author: Colin Campbell <colin.campbell at ptfs-europe.com> Date: Tue Jan 17 14:46:09 2012 +0000 Bug 7454 Initialize return arrays in ILS/Transaction/RenewAll Explicitly clear these arrays and update them directly. In practice item numbers were already in them when called so that more items were being returned than were actually renewed (or failed) Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz> Functionally sound patch, and tested in production Signed-off-by: Paul Poulain <paul.poulain at biblibre.com> ----------------------------------------------------------------------- hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Tue Feb 21 17:37:42 2012 From: gitmaster at git.koha-community.org (Git repo owner) Date: Tue, 21 Feb 2012 16:37:42 +0000 Subject: [koha-commits] main Koha release repository branch new/bug_7552 created. v3.06.00-620-g5f2e1ba Message-ID: <E1Rzsik-0001LX-Qc@git.koha-community.org> 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, new/bug_7552 has been created at 5f2e1ba7b14b226cbe23438116d77be710dd88b0 (commit) - Log ----------------------------------------------------------------- commit 5f2e1ba7b14b226cbe23438116d77be710dd88b0 Author: Magnus Enger <magnus at enger.priv.no> Date: Fri Feb 17 15:03:52 2012 +0100 Bug 7552 - Remove wrong line endings in NORMARC record.abs Line endings contain erroneous \r 's. Also remove a useless comment at the top of the file. This patch was produced by doing the following operations: git config --global core.autocrlf true git rm --cached -r etc/zebradb/marc_defs/normarc/biblios/record.abs git diff --cached --name-only -z | xargs -0 git add as recommended here: http://help.github.com/line-endings/ First version of this file resulted in whitespaceerrors. Trying to fix that now. To test: - Open etc/zebradb/marc_defs/normarc/biblios/record.abs in a file editor that will let you search for \r - gedit seems to work nicely for this. Check that there are occurences of \r in the file - Apply the patch - Open etc/zebradb/marc_defs/normarc/biblios/record.abs in the editor and check that it can not find any \r Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz> Still a few \r But only on comments, safe to push Signed-off-by: Paul Poulain <paul.poulain at biblibre.com> ----------------------------------------------------------------------- hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Tue Feb 21 17:38:26 2012 From: gitmaster at git.koha-community.org (Git repo owner) Date: Tue, 21 Feb 2012 16:38:26 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.06.00-620-g5f2e1ba Message-ID: <E1RzsjS-0001MJ-IP@git.koha-community.org> 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 5f2e1ba7b14b226cbe23438116d77be710dd88b0 (commit) via 766b60e5b34baaca30dea8d2f64c9e3fed602c8f (commit) via 5dd94487ac7d62b7fae2aad79bdc5c330c6a998e (commit) via aa06364814d948c2efc2d6629032a24b5ad7232b (commit) via dcca2ce791cb8b422b66dea60ef7e2337b64f4c0 (commit) via bbfaf8264c815013cd37155c9aac283e3cb3cc4a (commit) from 6a520f7456001d014776c33409262c68a5c2f9ae (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 ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: C4/ImportBatch.pm | 2 +- C4/Output.pm | 2 +- C4/SIP/ILS/Transaction/RenewAll.pm | 6 +- etc/zebradb/marc_defs/normarc/biblios/record.abs | 651 ++++++++++---------- .../opac-tmpl/prog/en/modules/opac-account.tt | 2 +- .../opac-tmpl/prog/en/modules/opac-messaging.tt | 2 +- koha-tmpl/opac-tmpl/prog/en/modules/opac-passwd.tt | 2 +- .../opac-tmpl/prog/en/modules/opac-privacy.tt | 2 +- .../prog/en/modules/opac-readingrecord.tt | 2 +- .../opac-tmpl/prog/en/modules/opac-reserve.tt | 2 +- .../prog/en/modules/opac-search-history.tt | 2 +- .../opac-tmpl/prog/en/modules/opac-shelves.tt | 2 +- koha-tmpl/opac-tmpl/prog/en/modules/opac-user.tt | 5 +- .../opac-tmpl/prog/en/modules/opac-userdetails.tt | 2 +- .../opac-tmpl/prog/en/modules/opac-userupdate.tt | 5 +- tools/import_borrowers.pl | 2 +- 16 files changed, 342 insertions(+), 349 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Wed Feb 22 15:26:56 2012 From: gitmaster at git.koha-community.org (Git repo owner) Date: Wed, 22 Feb 2012 14:26:56 +0000 Subject: [koha-commits] main Koha release repository branch new/bug_7460 updated. v3.06.00-442-gd4e17b7 Message-ID: <E1S0D9j-00074t-RV@git.koha-community.org> 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, new/bug_7460 has been updated via d4e17b7974336c247f1c8b6c1a12bb184a674d80 (commit) from e824f847b9a002dec24b48f076ce2b7d4a9dd5d5 (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 d4e17b7974336c247f1c8b6c1a12bb184a674d80 Author: St?phane Delaune <stephane.delaune at biblibre.com> Date: Thu Feb 9 11:01:33 2012 +0100 Bug 7460: followup : Add template toolkit's FILTER html_line_break on staff details description's tab Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz> ----------------------------------------------------------------------- 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 Wed Feb 22 16:03:36 2012 From: gitmaster at git.koha-community.org (Git repo owner) Date: Wed, 22 Feb 2012 15:03:36 +0000 Subject: [koha-commits] main Koha release repository branch 3.6.x updated. v3.06.03-166-gb6af3f6 Message-ID: <E1S0DjE-0007iD-Tr@git.koha-community.org> This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "main Koha release repository". The branch, 3.6.x has been updated via b6af3f6f343ecafb25bddf66a262fc278b84ecbb (commit) from bbd2cbd2d90a62c496a57ea110dccaf32d050c43 (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 b6af3f6f343ecafb25bddf66a262fc278b84ecbb Author: D Ruth Bavousett <ruth at bywatersolutions.com> Date: Mon Feb 13 10:25:40 2012 -0500 Bug 7535: ampersands not showing properly in non-XSLT OPAC Jared's fix for Bug 3326 fixed this in the staff client, but not the OPAC; moving this one line fixes it both places. Signed-off-by: Liz Rea <wizzyrea at gmail.com> This can be replicated by indexing with -x OPACXSLTResults must be set to "normally" Reproduced original bug with rebuild-zebra.pl -x -b -w -r -v -v Patch corrects the issue, does not change intranet behavior. Signed-off-by: Paul Poulain <paul.poulain at biblibre.com> (cherry picked from commit bbfaf8264c815013cd37155c9aac283e3cb3cc4a) Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com> ----------------------------------------------------------------------- Summary of changes: C4/Output.pm | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Wed Feb 22 20:56:45 2012 From: gitmaster at git.koha-community.org (Git repo owner) Date: Wed, 22 Feb 2012 19:56:45 +0000 Subject: [koha-commits] main Koha release repository branch 3.6.x updated. v3.06.03-175-g286f988 Message-ID: <E1S0IIv-0001Dg-Ay@git.koha-community.org> This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "main Koha release repository". The branch, 3.6.x has been updated via 286f98830c7cf417e64a435de2d1a8acc713abd4 (commit) via ef213acf0b2568b5687ba2a593d629d6d9a43c71 (commit) via 0089e7c2ca24edf44b4b378e96626c02d0ab8935 (commit) via a209174da65016cfa894be19b31a483c8fd71aa8 (commit) via 94b1ca0fb18214261e28ea288ca84b61b6954763 (commit) via 207416fa43c18ac027510c65a86adeef15ec5ed1 (commit) via 105c387dc6b2823f6f4f8ee7613b816498c3fa08 (commit) via bc5971a71fd474d744c182d2c44e48bef275321c (commit) via e95f604fd5f79eb5a20eec399dbe14a9fa1dea56 (commit) from b6af3f6f343ecafb25bddf66a262fc278b84ecbb (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 286f98830c7cf417e64a435de2d1a8acc713abd4 Author: Chris Nighswonger <chris.nighswonger at gmail.com> Date: Wed Feb 22 14:44:29 2012 -0500 Revert "Bug 6875 de-nesting C4::Koha.pm" This reverts commit c29850630d22c75bd85352b8bd169158f23eaa89. -Unstable code commit ef213acf0b2568b5687ba2a593d629d6d9a43c71 Author: Chris Nighswonger <chris.nighswonger at gmail.com> Date: Wed Feb 22 14:44:06 2012 -0500 Revert "Bug 6875 cleaning mainpage.pl" This reverts commit b21eda0d42b3f2d10c77d17f4a5ac4960b4ada4f. -Unstable code commit 0089e7c2ca24edf44b4b378e96626c02d0ab8935 Author: Chris Nighswonger <chris.nighswonger at gmail.com> Date: Wed Feb 22 14:43:43 2012 -0500 Revert "Bug 6875 cleaning opac-main.pl" This reverts commit 27c4844a59cb603ad334d286fba7f32ea1eb72e1. -Unstable code commit a209174da65016cfa894be19b31a483c8fd71aa8 Author: Chris Nighswonger <chris.nighswonger at gmail.com> Date: Wed Feb 22 14:43:20 2012 -0500 Revert "Bug 6875 de-nesting C4/Serials" This reverts commit e84d5a7b37ebf4b47e01da3c504bbabe031c37e1. -Unstable code commit 94b1ca0fb18214261e28ea288ca84b61b6954763 Author: Chris Nighswonger <chris.nighswonger at gmail.com> Date: Wed Feb 22 14:42:56 2012 -0500 Revert "Bug 6875 de-nesting C4::Heading" This reverts commit 0e61cfb3a591aec28521f2fdd1a76fea904721ca. -Unstable code commit 207416fa43c18ac027510c65a86adeef15ec5ed1 Author: Chris Nighswonger <chris.nighswonger at gmail.com> Date: Wed Feb 22 14:42:33 2012 -0500 Revert "Bug 6875 de-nesting C4::VirtualShelves" This reverts commit 6eb50992e85146dbc021493d290de7294355c646. -Unstable code commit 105c387dc6b2823f6f4f8ee7613b816498c3fa08 Author: Chris Nighswonger <chris.nighswonger at gmail.com> Date: Wed Feb 22 14:42:08 2012 -0500 Revert "Bug 6875 de-nesting Auth.pm" This reverts commit 34d8c9765fa6b68e0c38be65d863c9bdd4b6a168. -Unstable code commit bc5971a71fd474d744c182d2c44e48bef275321c Author: Chris Nighswonger <chris.nighswonger at gmail.com> Date: Wed Feb 22 14:40:41 2012 -0500 Revert "Bug 7546 - cannot view subscription detail" This reverts commit f6c55445ed2ef6fe5eaf99831b9ec180d12707ec. -This is related to de-nesting work (Bug 6875) which is unstable commit e95f604fd5f79eb5a20eec399dbe14a9fa1dea56 Author: Chris Nighswonger <chris.nighswonger at gmail.com> Date: Wed Feb 22 14:39:03 2012 -0500 Revert "Bug 7545: Can't edit items" This reverts commit 57f25c57f02f260da08fe527308e1f5a5a01c8c7. -Tied to de-nesting work (Bug 6875) which is unstable ----------------------------------------------------------------------- Summary of changes: C4/Auth.pm | 6 ++++-- C4/Heading.pm | 7 +++---- C4/Koha.pm | 7 ++++--- C4/Search.pm | 1 - C4/Serials.pm | 14 ++++++++++---- C4/VirtualShelves.pm | 8 +++++--- cataloguing/additem.pl | 1 - mainpage.pl | 19 +++++++++++++++++++ opac/opac-main.pl | 3 +++ serials/serials-edit.pl | 14 ++++++-------- serials/subscription-detail.pl | 14 ++++++-------- 11 files changed, 60 insertions(+), 34 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Wed Feb 22 21:22:47 2012 From: gitmaster at git.koha-community.org (Git repo owner) Date: Wed, 22 Feb 2012 20:22:47 +0000 Subject: [koha-commits] main Koha release repository branch 3.6.x updated. v3.06.03-176-g8d9206a Message-ID: <E1S0Ii7-0001QY-2p@git.koha-community.org> This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "main Koha release repository". The branch, 3.6.x has been updated via 8d9206aad3c6a59f8d8003dcb529b539a7c70f05 (commit) from 286f98830c7cf417e64a435de2d1a8acc713abd4 (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 8d9206aad3c6a59f8d8003dcb529b539a7c70f05 Author: Chris Nighswonger <chris.nighswonger at gmail.com> Date: Wed Feb 22 15:14:40 2012 -0500 Release Notes for 3.06.04.000 22 Feb 2012 20:14:40 Z ----------------------------------------------------------------------- Summary of changes: misc/release_notes/release_notes_3_6_4.txt | 12 +++++------- 1 files changed, 5 insertions(+), 7 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Wed Feb 22 21:24:08 2012 From: gitmaster at git.koha-community.org (Git repo owner) Date: Wed, 22 Feb 2012 20:24:08 +0000 Subject: [koha-commits] main Koha release repository branch 3.6.x updated. v3.06.03-177-gd9f36a8 Message-ID: <E1S0IjQ-0001SO-3n@git.koha-community.org> This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "main Koha release repository". The branch, 3.6.x has been updated via d9f36a81ee730e731d0bdf8799c68413bfa8786e (commit) from 8d9206aad3c6a59f8d8003dcb529b539a7c70f05 (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 d9f36a81ee730e731d0bdf8799c68413bfa8786e Author: Chris Nighswonger <chris.nighswonger at gmail.com> Date: Wed Feb 22 15:24:05 2012 -0500 Fixing up release notes to reflect all reverts ----------------------------------------------------------------------- Summary of changes: misc/release_notes/release_notes_3_6_4.txt | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Mon Feb 27 11:19:14 2012 From: gitmaster at git.koha-community.org (Git repo owner) Date: Mon, 27 Feb 2012 10:19:14 +0000 Subject: [koha-commits] main Koha release repository branch new/bug_7606 created. v3.06.00-624-gbaec1da Message-ID: <E1S1xfm-0002CC-PJ@git.koha-community.org> 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, new/bug_7606 has been created at baec1daa103d72166a1e3040314d2767088b00f1 (commit) - Log ----------------------------------------------------------------- commit baec1daa103d72166a1e3040314d2767088b00f1 Author: Katrin Fischer <Katrin.Fischer.83 at web.de> Date: Sun Feb 26 15:14:27 2012 +0100 Bug 7606: Editing a vendor in acq creates a new vendor To test: Before patch: - editing a new vendor will create a new vendor After patch: - editing a vendor saves changes correctly, no new vendor is created Also: - after saving or cancelling an edit page redirects correctly - adding new vendors works correctly Signed-off-by: Nicole C. Engard <nengard at bywatersolutions.com> Followed test plan and all tests pass. Signed-off-by: Paul Poulain <paul.poulain at biblibre.com> This is a follow-up for 7113 commit 9cc9db0753645b3461a355b6a7a2669cccab2b6e Author: Paul Poulain <paul.poulain at biblibre.com> Date: Wed Feb 22 16:58:36 2012 +0100 Bug 6875 follow-up for Items/Biblio de-nesting the sub _find_value is used only in PrepareItemRecord sub, that has been moved to Items package This patch moves the _find_value in Items as well. Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de> Editing an already arrived serial issue with an attached item resulted in an error. After applying the patch it's fixed. commit 5baff558a53fabb7b719bf627064cf2c1680f246 Merge: 5f2e1ba d4e17b7 Author: Paul Poulain <paul.poulain at biblibre.com> Date: Wed Feb 22 15:27:00 2012 +0100 Merge remote-tracking branch 'origin/new/bug_7460' ----------------------------------------------------------------------- hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Mon Feb 27 11:23:03 2012 From: gitmaster at git.koha-community.org (Git repo owner) Date: Mon, 27 Feb 2012 10:23:03 +0000 Subject: [koha-commits] main Koha release repository branch new/bug_3916 created. v3.06.00-626-g11efb33 Message-ID: <E1S1xjT-0002EF-3n@git.koha-community.org> 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, new/bug_3916 has been created at 11efb334c20499d1d76289b222350e3b9ae8924b (commit) - Log ----------------------------------------------------------------- commit 11efb334c20499d1d76289b222350e3b9ae8924b Author: Sophie Meynieux <sophie.meynieux at biblibre.com> Date: Tue Feb 14 14:38:25 2012 +0100 Bug 3916 [follow-up] : Adding a default choice in every dropdown list, not only branches, to let the corresponding value unchanged Signed-off-by: Liz Rea <wizzyrea at gmail.com> Patch works as advertised Signed-off-by: Paul Poulain <paul.poulain at biblibre.com> commit 35b344b609ec40bce5daad49dbe98c492a88b0ed Author: Fr?d?ric Demians <f.demians at tamil.fr> Date: Fri Feb 24 13:04:05 2012 +0100 Bug 6895 Diacritics in Pootle/po files are broken in source text To test: git checkout 3.6.x cd misc/translator ./tmpl_process3.pl update -i ../../koha-tmpl/opac-tmpl/prog/en/ \ -s ./po/fr-FR-i-opac-t-prog-v-3006000.po -r po/fr-FR-i-opac-t-prog-v-3006000.po contains broken diacritics for NORMARC strings for example Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz> Signed-off-by: Paul Poulain <paul.poulain at biblibre.com> fixes regression caused by bug 6752 ----------------------------------------------------------------------- hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Mon Feb 27 11:30:34 2012 From: gitmaster at git.koha-community.org (Git repo owner) Date: Mon, 27 Feb 2012 10:30:34 +0000 Subject: [koha-commits] main Koha release repository branch new/bug_7559 created. v3.06.00-627-gdacbb54 Message-ID: <E1S1xqk-0002Hd-Nq@git.koha-community.org> 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, new/bug_7559 has been created at dacbb54a2fc84ed0154241bdbc1ecace6997ae5c (commit) - Log ----------------------------------------------------------------- commit dacbb54a2fc84ed0154241bdbc1ecace6997ae5c Author: Katrin Fischer <Katrin.Fischer.83 at web.de> Date: Sun Feb 19 17:48:49 2012 +0100 Bug 7559: Edit links for patron attributes and message preferences broken Edit links below sections for patron attributes and enhanced messaging preferences are broken and the page is empty except for the heading. To test: 1) Verify all edit links on the page lead to the correct sections of the patron empty record. 2) Verify the edit link from the toolbar still works correctly. Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com> Signed-off-by: Paul Poulain <paul.poulain at biblibre.com> This fixes a bug caused by bug 6190 (removal of unwanted fields) ----------------------------------------------------------------------- hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Mon Feb 27 11:31:37 2012 From: gitmaster at git.koha-community.org (Git repo owner) Date: Mon, 27 Feb 2012 10:31:37 +0000 Subject: [koha-commits] main Koha release repository branch new/bug_7558 created. v3.06.00-628-ga80fc79 Message-ID: <E1S1xrk-0002J2-TK@git.koha-community.org> 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, new/bug_7558 has been created at a80fc7903ce35158611c21b1a2703936b8afb163 (commit) - Log ----------------------------------------------------------------- commit a80fc7903ce35158611c21b1a2703936b8afb163 Author: Katrin Fischer <Katrin.Fischer.83 at web.de> Date: Sun Feb 19 18:01:04 2012 +0100 Bug 7558: Serial issue note doubled up in full history Removes the note behind the status, because there is a separate column. To test: - Add a subscription - Receive an issue, add a note for it - Search record in OPAC and check the full history tab for the note Signed-off-by: Julian Maurice <julian.maurice at biblibre.com> Signed-off-by: Paul Poulain <paul.poulain at biblibre.com> ----------------------------------------------------------------------- hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Mon Feb 27 11:32:15 2012 From: gitmaster at git.koha-community.org (Git repo owner) Date: Mon, 27 Feb 2012 10:32:15 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.06.00-628-ga80fc79 Message-ID: <E1S1xsN-0002K0-Pv@git.koha-community.org> 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 a80fc7903ce35158611c21b1a2703936b8afb163 (commit) via dacbb54a2fc84ed0154241bdbc1ecace6997ae5c (commit) via 11efb334c20499d1d76289b222350e3b9ae8924b (commit) via 35b344b609ec40bce5daad49dbe98c492a88b0ed (commit) via baec1daa103d72166a1e3040314d2767088b00f1 (commit) via 9cc9db0753645b3461a355b6a7a2669cccab2b6e (commit) via 5baff558a53fabb7b719bf627064cf2c1680f246 (commit) via d4e17b7974336c247f1c8b6c1a12bb184a674d80 (commit) from 5f2e1ba7b14b226cbe23438116d77be710dd88b0 (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 ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: C4/Biblio.pm | 39 -------------------- C4/Items.pm | 39 ++++++++++++++++++++ acqui/updatesupplier.pl | 10 +++--- .../prog/en/modules/acqui/supplier.tt | 2 +- .../prog/en/modules/catalogue/detail.tt | 2 +- .../prog/en/modules/members/memberentrygen.tt | 9 ++--- .../prog/en/modules/opac-full-serial-issues.tt | 1 - misc/translator/xgettext.pl | 2 +- tools/batchMod.pl | 3 +- 9 files changed, 53 insertions(+), 54 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Mon Feb 27 11:33:45 2012 From: gitmaster at git.koha-community.org (Git repo owner) Date: Mon, 27 Feb 2012 10:33:45 +0000 Subject: [koha-commits] main Koha release repository branch new/bug_7110 created. v3.06.00-629-g355d57d Message-ID: <E1S1xtp-0002Lh-QC@git.koha-community.org> 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, new/bug_7110 has been created at 355d57da366584991f7228a41fe0dc800e3a84ed (commit) - Log ----------------------------------------------------------------- commit 355d57da366584991f7228a41fe0dc800e3a84ed Author: Liz Rea <lrea at nekls.org> Date: Fri Feb 17 08:56:26 2012 -0500 Bug 7110 - Renewal messages still displays in OPAC if OpacRenewalAllowed is disabled. To test: Set a patron with fines over the stated limit in OPACFineNoRenewals. With OpacRenewalAllowed set to ALLOW - log into the OPAC and verify the message that renewals are disallowed is displayed - verify that renewals are disallowed in the interface. - remove or pay the fines, verify the message goes away and that OPAC renewals are re-allowed for your patron. With OPACFineNoRenewals set to Don't Allow - verify the message is not shown, even with the patron's fines over the threshold in OPACFineNoRenewals. - remove or pay the fines, verify that renewals are still disallowed Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de> Stepped through the test plan and found no problems. Signed-off-by: Paul Poulain <paul.poulain at biblibre.com> ----------------------------------------------------------------------- hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Mon Feb 27 11:35:08 2012 From: gitmaster at git.koha-community.org (Git repo owner) Date: Mon, 27 Feb 2012 10:35:08 +0000 Subject: [koha-commits] main Koha release repository branch new/bug_7453 updated. v3.06.00-503-g37d9f43 Message-ID: <E1S1xvA-0002Mt-D5@git.koha-community.org> 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, new/bug_7453 has been updated via 37d9f43620144f36f9aefe06d0512eaebac42270 (commit) from a406a5cbb08c351992280cfd77d98afe7543f329 (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 37d9f43620144f36f9aefe06d0512eaebac42270 Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl> Date: Thu Feb 23 09:46:32 2012 +0100 7453 Followup for borrower without expiry date While it should be impossible now to have a patron without expiry date, I still had one. It does not hurt to add a simple check on expiry date defined before calling delta days on null values and breaking the opac login. Trivial change. Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl> Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de> Tested by deleting the expirydate from my own patron record. Missing expiry date now no longer breaks the summary page in the patron account on OPAC. Signed-off-by: Paul Poulain <paul.poulain at biblibre.com> ----------------------------------------------------------------------- Summary of changes: opac/opac-user.pl | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Mon Feb 27 11:38:28 2012 From: gitmaster at git.koha-community.org (Git repo owner) Date: Mon, 27 Feb 2012 10:38:28 +0000 Subject: [koha-commits] main Koha release repository branch new/bug_7585 created. v3.06.00-632-g628eec4 Message-ID: <E1S1xyO-0002On-CO@git.koha-community.org> 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, new/bug_7585 has been created at 628eec49266580e17273481b5e81785e108bd04c (commit) - Log ----------------------------------------------------------------- commit 628eec49266580e17273481b5e81785e108bd04c Author: Chris Nighswonger <cnighswonger at foundations.edu> Date: Thu Feb 23 10:25:13 2012 -0500 Bug 7585 - Correct MARC 008 Value Builder Char 06 Default This patch changes the default value of the 06 char in 008 from 't' to 'b.' This change allows for a valid 008 field if no dates are entered in 07-14. To test: 1. Create a new MARC record (prior to patch application). 2. Click on the 008 field to auto-populate. 3. Note that the 06 char is 't'. 4. Apply patch. 5. Create a new MARC record. 6. Click on the 008 field to auto-populate. 7. Note that the 06 char is now 'b'. Signed-off-by: Liz Rea <wizzyrea at gmail.com> Confirm fix works per test plan. commit 734c63222bf807200c1b7bd4dbdcf4f12acd2db9 Merge: 355d57d 37d9f43 Author: Paul Poulain <paul.poulain at biblibre.com> Date: Mon Feb 27 11:35:12 2012 +0100 Merge remote-tracking branch 'origin/new/bug_7453' ----------------------------------------------------------------------- hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Mon Feb 27 11:44:49 2012 From: gitmaster at git.koha-community.org (Git repo owner) Date: Mon, 27 Feb 2012 10:44:49 +0000 Subject: [koha-commits] main Koha release repository branch new/bug_7576 created. v3.06.00-633-ga529262 Message-ID: <E1S1y4X-0002T2-Le@git.koha-community.org> 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, new/bug_7576 has been created at a529262501df8c0c0342829a2f33bd2bcfb19ec6 (commit) - Log ----------------------------------------------------------------- commit a529262501df8c0c0342829a2f33bd2bcfb19ec6 Author: Katrin Fischer <Katrin.Fischer.83 at web.de> Date: Thu Feb 23 08:21:10 2012 +0100 Bug 7576: Add ISSN to SearchForTitleIn preference Adds a new placeholder {ISSN} to the system preference SearchForTitleIn. For a record with multiple ISSNs only the first ISSN will be used. Addition: Makes a small change to GetMarcControlnumber so that it checks for NORMARC too. If you set your system preference to NORMARC, it should output {CONTROLNUMBER} correctly now. For testing add following code to the system preference and check output of SearchForTitleIn for different records in your OPAC and all 3 available views (normal, MARC and ISBD): <li>ISSN: {ISSN}</li> <li>ISBN: {ISBN}</li> <li>001: {CONTROLNUMBER}</li> Patch also includes some unit tests: perl t/db_dependent/Biblio.t Signed-off-by: Magnus Enger <magnus at enger.priv.no> Tested with marcflavour = NORMARC, on one book and one periodical record. * Book - Before the patch: ISSN: {ISSN} ISBN: 0375726446 001: - After the patch: ISSN: ISBN: 0375726446 001: 022976914 * Journal - Before the patch: ISSN: {ISSN} ISBN: 001: - After the patch: ISSN: 1890-6931 ISBN: 001: 080721370 Looks good in all 3 views! Thanks for fixing the 001 thing for NORMARC! Also tested with marcflavour = MARC21, on the same records with the same good results. Signing off! Signed-off-by: Paul Poulain <paul.poulain at biblibre.com> Tested marcflavour= UNIMARC, works fine too ----------------------------------------------------------------------- hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Mon Feb 27 12:12:56 2012 From: gitmaster at git.koha-community.org (Git repo owner) Date: Mon, 27 Feb 2012 11:12:56 +0000 Subject: [koha-commits] main Koha release repository branch new/bug_3215 updated. v3.06.00-612-g95ead9a Message-ID: <E1S1yVk-0002Zv-HN@git.koha-community.org> 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, new/bug_3215 has been updated via 95ead9a42be498da827812e64795f403f4f9e6c7 (commit) from f7a525fa09008d98340739bd930fc48debcd306f (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 95ead9a42be498da827812e64795f403f4f9e6c7 Author: Owen Leonard <oleonard at myacpl.org> Date: Fri Jan 20 15:28:09 2012 -0500 Bug 3215 [REBASED] It would be nice if "Add to Cart" changed to "Remove from Cart" "Add to Cart" links in the OPAC should reflect whether a title is already in the Cart. On the results, list, and detail pages the "Add to Cart" link will say "In your cart (remove)" if the title is in your cart. The "(remove)" link will remove the title. This patch adds a check of the biblionumbers in the cart to the relevant scripts and sets a variable for the template governing whether to show "Add to cart" or "In your cart." Pages to test: - the search results page - any detail page (normal, MARC, ISBD) - any list contents page (/cgi-bin/koha/opac-shelves.pl?viewshelf=XX) Situations to test: - Add a single item to the Cart from the above pages The link should change from "Add to cart" to "In your cart (remove)" The count of items in your cart should reflect the addition, and the notification box should appear. - Remove a single item from the Cart from the above pages The link should change from "In your cart (remove)" to "Add to cart." The count of items in your cart should reflect the removal, and the notification box should appear. - View an item which is already in the cart from the above pages The cart links should reflect whether the title is already in the cart. - Remove one or more items from the Cart via the cart pop-up window View the above pages as you do so to verify that the operation is reflected immediately by the state of the "in your cart" links. - Empty the Cart from the cart pop-up window View the above pages as you do so to verify that the operation is reflected immediately by the state of the "in your cart" links. Tested in Firefox 9, Chrome 16, IE 7, and Opera 11.6 on Win 7 Signed-off-by: Paul Poulain <paul.poulain at biblibre.com> ----------------------------------------------------------------------- Summary of changes: C4/VirtualShelves/Page.pm | 11 ++++ koha-tmpl/opac-tmpl/prog/en/css/opac.css | 16 ++++++ .../opac-tmpl/prog/en/includes/doc-head-close.inc | 3 + .../prog/en/includes/opac-detail-sidebar.inc | 6 ++- koha-tmpl/opac-tmpl/prog/en/js/basket.js | 50 +++++++++++++++++++- .../opac-tmpl/prog/en/modules/opac-results.tt | 8 +++- .../opac-tmpl/prog/en/modules/opac-shelves.tt | 9 +++- opac/opac-ISBDdetail.pl | 11 ++++ opac/opac-MARCdetail.pl | 11 ++++ opac/opac-detail.pl | 11 ++++ opac/opac-search.pl | 12 +++++ 11 files changed, 142 insertions(+), 6 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Mon Feb 27 12:13:07 2012 From: gitmaster at git.koha-community.org (Git repo owner) Date: Mon, 27 Feb 2012 11:13:07 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.06.00-635-g80c2021 Message-ID: <E1S1yVv-0002am-Iv@git.koha-community.org> 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 80c202170aa06f8be8b0a2a528e15d1341bcb59d (commit) via 95ead9a42be498da827812e64795f403f4f9e6c7 (commit) via a529262501df8c0c0342829a2f33bd2bcfb19ec6 (commit) via 628eec49266580e17273481b5e81785e108bd04c (commit) via 734c63222bf807200c1b7bd4dbdcf4f12acd2db9 (commit) via 37d9f43620144f36f9aefe06d0512eaebac42270 (commit) via 355d57da366584991f7228a41fe0dc800e3a84ed (commit) from a80fc7903ce35158611c21b1a2703936b8afb163 (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 80c202170aa06f8be8b0a2a528e15d1341bcb59d Merge: a529262 95ead9a Author: Paul Poulain <paul.poulain at biblibre.com> Date: Mon Feb 27 12:12:59 2012 +0100 Merge remote-tracking branch 'origin/new/bug_3215' ----------------------------------------------------------------------- Summary of changes: C4/Biblio.pm | 41 +++++++++++++--- C4/VirtualShelves/Page.pm | 11 ++++ cataloguing/value_builder/marc21_field_008.pl | 5 +- .../prog/en/modules/admin/preferences/opac.pref | 2 +- koha-tmpl/opac-tmpl/prog/en/css/opac.css | 16 ++++++ .../opac-tmpl/prog/en/includes/doc-head-close.inc | 3 + .../prog/en/includes/opac-detail-sidebar.inc | 6 ++- koha-tmpl/opac-tmpl/prog/en/js/basket.js | 50 +++++++++++++++++++- .../opac-tmpl/prog/en/modules/opac-results.tt | 8 +++- .../opac-tmpl/prog/en/modules/opac-shelves.tt | 9 +++- koha-tmpl/opac-tmpl/prog/en/modules/opac-user.tt | 4 +- opac/opac-ISBDdetail.pl | 16 ++++++- opac/opac-MARCdetail.pl | 16 ++++++- opac/opac-detail.pl | 18 ++++++- opac/opac-search.pl | 12 +++++ opac/opac-user.pl | 2 +- t/db_dependent/Biblio.t | 44 ++++++++++++++++- 17 files changed, 238 insertions(+), 25 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Mon Feb 27 15:10:06 2012 From: gitmaster at git.koha-community.org (Git repo owner) Date: Mon, 27 Feb 2012 14:10:06 +0000 Subject: [koha-commits] main Koha release repository branch new/bug_7467 created. v3.06.00-637-gb420247 Message-ID: <E1S21HC-0003Oc-27@git.koha-community.org> 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, new/bug_7467 has been created at b420247f2db1ad72a27c8807b6cb9610006fe8b7 (commit) - Log ----------------------------------------------------------------- commit b420247f2db1ad72a27c8807b6cb9610006fe8b7 Author: Kyle M Hall <kyle at bywatersolutions.com> Date: Mon Feb 20 09:48:05 2012 -0500 bug_7467: Printing Transfer Slips for transfers that do not have holds - Addendum: Use for automatic transfers as well. Signed-off-by: Paul Poulain <paul.poulain at biblibre.com> commit f771cc8e265b20760c813f592b3f82ee400c2f99 Author: Srdjan Jankovic <srdjan at catalyst.net.nz> Date: Wed Jan 25 18:58:58 2012 +1300 bug_7467: Printing Transfer Slips for transfers that do not have holds Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com> ----------------------------------------------------------------------- hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Mon Feb 27 15:15:46 2012 From: gitmaster at git.koha-community.org (Git repo owner) Date: Mon, 27 Feb 2012 14:15:46 +0000 Subject: [koha-commits] main Koha release repository branch new/bug_3901 created. v3.06.00-638-g953b8a5 Message-ID: <E1S21Mg-0003R0-MF@git.koha-community.org> 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, new/bug_3901 has been created at 953b8a5af91308a52c872af639bab9071df7a47a (commit) - Log ----------------------------------------------------------------- commit 953b8a5af91308a52c872af639bab9071df7a47a Author: Katrin Fischer <Katrin.Fischer.83 at web.de> Date: Sun Feb 19 15:36:02 2012 +0100 Bug 3901: Rollover on serials summary showing 9999999 For Rollover 9999999 the planning tab on the subscription will now show 'Never'. Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com> Signed-off-by: Paul Poulain <paul.poulain at biblibre.com> ----------------------------------------------------------------------- hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Mon Feb 27 15:38:50 2012 From: gitmaster at git.koha-community.org (Git repo owner) Date: Mon, 27 Feb 2012 14:38:50 +0000 Subject: [koha-commits] main Koha release repository branch new/bug_6008 created. v3.06.00-639-g2b2a034 Message-ID: <E1S21iz-0003kN-VT@git.koha-community.org> 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, new/bug_6008 has been created at 2b2a034ca8f36b3b1d4dc9de8ca5f28bf40a7ca2 (commit) - Log ----------------------------------------------------------------- commit 2b2a034ca8f36b3b1d4dc9de8ca5f28bf40a7ca2 Author: Salvador Zaragoza Rubio <salvazm at masmedios.com> Date: Wed Mar 30 17:40:43 2011 +0200 Bug 6008 - Locating mysql/psql commands on Installer.pm In Installer.pm when is looking for the system command to dump a file into the database it might fail if the web user doesn't have it in its path. So we add before a search with "which" and "whereis" commands, if they fail the command is itself without path. E.g.: with OpenBSD 4.8 the web user "www" doesn't have the path to the installed mysql bin: /usr/local/bin/mysql and fails in the web installer. Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz> Seems to work fine, has a good default for if it fails to find that path Signed-off-by: Paul Poulain <paul.poulain at biblibre.com> tested on my linux box, no visible change, worked before, work after. Will hopefully improve behaviour for OpenBSD ----------------------------------------------------------------------- hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Mon Feb 27 16:18:15 2012 From: gitmaster at git.koha-community.org (Git repo owner) Date: Mon, 27 Feb 2012 15:18:15 +0000 Subject: [koha-commits] main Koha release repository branch new/bug_6039 created. v3.06.00-642-gc55c58e Message-ID: <E1S22L9-0003uP-Lf@git.koha-community.org> 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, new/bug_6039 has been created at c55c58ee4b674ef6bd62c4d495d8ee8c799c968a (commit) - Log ----------------------------------------------------------------- commit c55c58ee4b674ef6bd62c4d495d8ee8c799c968a Author: Paul Poulain <paul.poulain at biblibre.com> Date: Mon Feb 27 16:17:42 2012 +0100 Bug 6039 follow-up, DBrev number commit 8b171f693d1f2489337a9ae81a9e57bc58c58488 Author: Kyle M Hall <kyle at bywatersolutions.com> Date: Mon Feb 20 12:20:19 2012 -0500 bug 6039: Cancel All waiting holds button - Addendum: Add redirect to refresh list after canceling all holds. Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz> Signed-off-by: Paul Poulain <paul.poulain at biblibre.com> commit b17653355c3c6eb55b35bb983f4128c7665005dc Author: Srdjan Jankovic <srdjan at catalyst.net.nz> Date: Fri Feb 10 14:02:03 2012 +1300 bug 6039: Cancel All waiting holds button TransferWhenCancelAllWaitingHolds syspref Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com> ----------------------------------------------------------------------- hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Mon Feb 27 16:23:27 2012 From: gitmaster at git.koha-community.org (Git repo owner) Date: Mon, 27 Feb 2012 15:23:27 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.06.00-642-gc55c58e Message-ID: <E1S22QB-0003w7-KD@git.koha-community.org> 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 c55c58ee4b674ef6bd62c4d495d8ee8c799c968a (commit) via 8b171f693d1f2489337a9ae81a9e57bc58c58488 (commit) via b17653355c3c6eb55b35bb983f4128c7665005dc (commit) via 2b2a034ca8f36b3b1d4dc9de8ca5f28bf40a7ca2 (commit) via 953b8a5af91308a52c872af639bab9071df7a47a (commit) via b420247f2db1ad72a27c8807b6cb9610006fe8b7 (commit) via f771cc8e265b20760c813f592b3f82ee400c2f99 (commit) from 80c202170aa06f8be8b0a2a528e15d1341bcb59d (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 ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: C4/Installer.pm | 13 ++- circ/returns.pl | 2 + circ/{hold-transfer-slip.pl => transfer-slip.pl} | 35 +++---- circ/waitingreserves.pl | 108 +++++++++++++------ installer/data/mysql/sysprefs.sql | 1 + installer/data/mysql/updatedatabase.pl | 7 ++ .../en/modules/admin/preferences/circulation.pref | 6 + .../intranet-tmpl/prog/en/modules/circ/returns.tt | 7 +- .../prog/en/modules/circ/transfer-slip.tt | 24 +++++ .../prog/en/modules/circ/waitingreserves.tt | 20 +++- .../prog/en/modules/serials/subscription-detail.tt | 12 ++- kohaversion.pl | 2 +- 12 files changed, 171 insertions(+), 66 deletions(-) mode change 100644 => 100755 C4/Installer.pm copy circ/{hold-transfer-slip.pl => transfer-slip.pl} (69%) create mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/circ/transfer-slip.tt hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Mon Feb 27 18:05:47 2012 From: gitmaster at git.koha-community.org (Git repo owner) Date: Mon, 27 Feb 2012 17:05:47 +0000 Subject: [koha-commits] main Koha release repository branch new/bug_7318 created. v3.06.00-643-gcef7c1b Message-ID: <E1S241D-0004Yw-LO@git.koha-community.org> 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, new/bug_7318 has been created at cef7c1b40b403c4bcf0c02b13b60d704e4c8cd83 (commit) - Log ----------------------------------------------------------------- commit cef7c1b40b403c4bcf0c02b13b60d704e4c8cd83 Author: Garry Collum <gcollum at gmail.com> Date: Sat Jan 21 13:37:19 2012 -0500 Bug 7318: Fixes category display in patroncards Patron Search results. Category description and type were not being sent to the template. This patch fixes that issue, which also fixes the display. The display was showing 'Category Description (category type)'. It now displays 'Category Description (category code) to be consistent with the search label. This patch also assigns an empty string to $member to get rid of some 'uninitialized' errors in the logs. Signed-off-by: Liz Rea <wizzyrea at gmail.com> Confirm this patch fixes the display issue. Passes prove xt Signed-off-by: Paul Poulain <paul.poulain at biblibre.com> ----------------------------------------------------------------------- hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Mon Feb 27 18:24:18 2012 From: gitmaster at git.koha-community.org (Git repo owner) Date: Mon, 27 Feb 2012 17:24:18 +0000 Subject: [koha-commits] main Koha release repository branch new/bug_7523 created. v3.06.00-644-g88a2079 Message-ID: <E1S24J8-0004iE-4X@git.koha-community.org> 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, new/bug_7523 has been created at 88a2079a48867680af02eb92007eae4c95fe1fb0 (commit) - Log ----------------------------------------------------------------- commit 88a2079a48867680af02eb92007eae4c95fe1fb0 Author: Katrin Fischer <Katrin.Fischer.83 at web.de> Date: Sun Feb 19 09:37:14 2012 +0100 Bug 7523: Improve checks for routing permissions - system preference RoutingSerials and user permission routing should be taken into account - print routing list should be independent from routing permission To test, compare to master and check: 1) If system preference RoutingSerials is OFF, routing list functionality is not visible in the templates. 2) If system preference RoutingSerials is ON, but user doesn't have routing permission, routing list functionality is not visible in templates, with exception of 'print list' on the serial collection page. 3) If system preference RoutingSerials is ON and user has routing permissions, all routing links are visible (serial collection, serials navigation, result list of serial search) Additional changes: Changed labels on templates to match HTML4 rule from coding guidelines. http://wiki.koha-community.org/wiki/Coding_Guidelines#Upper_and_Lower_cases_in_strings Signed-off-by: Julian Maurice <julian.maurice at biblibre.com> Signed-off-by: Paul Poulain <paul.poulain at biblibre.com> ----------------------------------------------------------------------- hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Mon Feb 27 18:27:28 2012 From: gitmaster at git.koha-community.org (Git repo owner) Date: Mon, 27 Feb 2012 17:27:28 +0000 Subject: [koha-commits] main Koha release repository branch new/bug_7544 created. v3.06.00-645-ga958d0a Message-ID: <E1S24MC-0004jB-I8@git.koha-community.org> 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, new/bug_7544 has been created at a958d0a685134941746df418bd4bc40d5a9786bc (commit) - Log ----------------------------------------------------------------- commit a958d0a685134941746df418bd4bc40d5a9786bc Author: Kyle M Hall <kyle at bywatersolutions.com> Date: Wed Feb 15 10:44:20 2012 -0500 Bug 7544 - Add ability search borrowers only on email / phone This commit adds a new pulldown field to the patron quick search. This pulldown "Search Fields" can have any number of field combinations to search on. The combinations added in this commit are: Standard: Default, searches on original fields Email: Searches on email, emailpro, and B_email Borrower Number: Searches on borrowernumber Phone Number: Searches on phone, phonepro, B_phone, altcontactphone, and mobile Signed-off-by: Nicole C. Engard <nengard at bywatersolutions.com> Tested by running searches on all the new fields, and the old fields with limits on branch and category. The seach on phone number could be a bit more inclusive, but it works with and without symbols so I give my sign off on this patch. Signed-off-by: Liz Rea <wizzyrea at gmail.com> Documentation should note that phone numbers should be searched only on the numbers of a phone number, and separate the area code and exchange with spaces, regardless of how the number is entered in the database. So no dashes or parentheses in the phone search, and the last 7 search works with spaces, i.e. xxx xxxx. Signed-off-by: Paul Poulain <paul.poulain at biblibre.com> ----------------------------------------------------------------------- hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Mon Feb 27 18:31:05 2012 From: gitmaster at git.koha-community.org (Git repo owner) Date: Mon, 27 Feb 2012 17:31:05 +0000 Subject: [koha-commits] main Koha release repository branch new/bug_7575 created. v3.06.00-646-g2bf2e18 Message-ID: <E1S24Ph-0004kr-HW@git.koha-community.org> 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, new/bug_7575 has been created at 2bf2e1807889c5f4e791a458230a57978e9ea137 (commit) - Log ----------------------------------------------------------------- commit 2bf2e1807889c5f4e791a458230a57978e9ea137 Author: Chris Hall <chrish at catalyst.net.nz> Date: Wed Feb 22 16:47:47 2012 +1300 Bug 7575 Opac search results print alignment Signed-off-by: Owen Leonard <oleonard at myacpl.org> Signed-off-by: Paul Poulain <paul.poulain at biblibre.com> ----------------------------------------------------------------------- hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Mon Feb 27 18:32:19 2012 From: gitmaster at git.koha-community.org (Git repo owner) Date: Mon, 27 Feb 2012 17:32:19 +0000 Subject: [koha-commits] main Koha release repository branch new/bug_7579 created. v3.06.00-647-g99f686e Message-ID: <E1S24Qt-0004mY-1f@git.koha-community.org> 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, new/bug_7579 has been created at 99f686ea8323aa47eeb12ffb2c85cf5da0ad1d65 (commit) - Log ----------------------------------------------------------------- commit 99f686ea8323aa47eeb12ffb2c85cf5da0ad1d65 Author: Kyle M Hall <kyle at bywatersolutions.com> Date: Wed Feb 22 10:08:24 2012 -0500 Bug 7579 - Icons for authorized values/item types not showing in OPAC The functions getitemtypeimagedir and getitemtypeimagesrc in Koha.pm were using the system preference 'template' when they should be using 'opacthemes' instead. Signed-off-by: Julian Maurice <julian.maurice at biblibre.com> Signed-off-by: Paul Poulain <paul.poulain at biblibre.com> ----------------------------------------------------------------------- hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Mon Feb 27 18:36:30 2012 From: gitmaster at git.koha-community.org (Git repo owner) Date: Mon, 27 Feb 2012 17:36:30 +0000 Subject: [koha-commits] main Koha release repository branch new/bug_7582 created. v3.06.00-648-g1a5afaa Message-ID: <E1S24Uv-0004oM-UK@git.koha-community.org> 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, new/bug_7582 has been created at 1a5afaa26d374144d1ebde6bcf9c69b97c048a5d (commit) - Log ----------------------------------------------------------------- commit 1a5afaa26d374144d1ebde6bcf9c69b97c048a5d Author: Owen Leonard <oleonard at myacpl.org> Date: Wed Feb 22 12:24:54 2012 -0500 Bug 7582 - When adding a Z39.50 server the "checked" option should use a checkbox Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com> Signed-off-by: Paul Poulain <paul.poulain at biblibre.com> ----------------------------------------------------------------------- hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Mon Feb 27 18:36:45 2012 From: gitmaster at git.koha-community.org (Git repo owner) Date: Mon, 27 Feb 2012 17:36:45 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.06.00-648-g1a5afaa Message-ID: <E1S24VA-0004p8-VV@git.koha-community.org> 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 1a5afaa26d374144d1ebde6bcf9c69b97c048a5d (commit) via 99f686ea8323aa47eeb12ffb2c85cf5da0ad1d65 (commit) via 2bf2e1807889c5f4e791a458230a57978e9ea137 (commit) via a958d0a685134941746df418bd4bc40d5a9786bc (commit) via 88a2079a48867680af02eb92007eae4c95fe1fb0 (commit) via cef7c1b40b403c4bcf0c02b13b60d704e4c8cd83 (commit) from c55c58ee4b674ef6bd62c4d495d8ee8c799c968a (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 ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: C4/Koha.pm | 4 +- admin/z3950servers.pl | 3 +- .../prog/en/includes/patron-search.inc | 11 ++++++- .../prog/en/includes/serials-menu.inc | 14 ++++---- .../prog/en/modules/admin/z3950servers.tt | 12 +++++-- .../prog/en/modules/patroncards/members-search.tt | 2 +- .../prog/en/modules/serials/routing-preview.tt | 4 +- .../prog/en/modules/serials/serials-collection.tt | 30 +++++++++++-------- .../prog/en/modules/serials/serials-edit.tt | 10 +++--- .../prog/en/modules/serials/serials-home.tt | 28 +++++++++--------- koha-tmpl/opac-tmpl/prog/en/css/print.css | 9 ++++- members/member.pl | 5 ++- patroncards/members-search.pl | 18 +++++++++-- serials/routing-preview.pl | 4 +- serials/serials-collection.pl | 1 + serials/subscription-detail.pl | 1 + 16 files changed, 97 insertions(+), 59 deletions(-) hooks/post-receive -- main Koha release repository