From gitmaster at git.koha-community.org Fri Apr 1 00:26:34 2016 From: gitmaster at git.koha-community.org (Git repo owner) Date: Thu, 31 Mar 2016 22:26:34 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.22.00-1061-gc74678a 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 c74678a1d239aaf91906039ccb3db940df4a0b41 (commit) from 4a605225cc3116f5a244303106567340a8d1e1b0 (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 c74678a1d239aaf91906039ccb3db940df4a0b41 Author: Alex Arnaud Date: Wed Feb 24 10:13:40 2016 +0100 Bug 15889: LDAP authentication: Only update mapped attributes Test plan: - Update your configuration file to use LDAP authentication and enable update (1) option, - login with an existing user with extended attrbitutes that are not in LDAP mapping, - check that all attributes are still here. Signed-off-by: Chris Signed-off-by: Philippe Blouin Signed-off-by: Jesse Weaver ----------------------------------------------------------------------- Summary of changes: C4/Auth_with_ldap.pm | 18 +++++---------- t/db_dependent/Auth_with_ldap.t | 48 +++++++++++++++++++++++++++++++++++++-- 2 files changed, 52 insertions(+), 14 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Apr 1 09:03:55 2016 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 01 Apr 2016 07:03:55 +0000 Subject: [koha-commits] main Koha release repository branch 3.22.x updated. v3.22.05-1-gea6c6f4 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.22.x has been updated via ea6c6f4155d457fe839f6097732219b07c7a9b9d (commit) from 7b2175b2cda21452f20900ba232760941401513e (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 ea6c6f4155d457fe839f6097732219b07c7a9b9d Author: Owen Leonard Date: Thu Mar 24 12:55:04 2016 -0400 Bug 16146 - ACQ: Previewed records in Z39.50 search results are wrong For 3.22.x only: This patch fixes a bug which was fixed in cataloging by Bug 6367 and fixed in master by Bug 15318. A misplaced line of JavaScript means that the popup menu of options shown when clicking in a table cell links to the wrong record. To test: 1. Apply the patch and navigate to Acquisitions. 2. Locate an exsiting basket or create a new one. 3. Add to the basket using the option to order from an external source.. 4. Perform a search which will return multiple results. 5. Test the "MARC" and "Card" links for multiple results and confirm that the correct data is shown each time. 6. Click anywhere in the results table to show the hidden menu and test the "Preview MARC," "Preview card," and "Order" links it displays, confirming that the actions complete using the correct record. Signed-off-by: Jonathan Druart Signed-off-by: Katrin Fischer Signed-off-by: Julian Maurice ----------------------------------------------------------------------- Summary of changes: koha-tmpl/intranet-tmpl/prog/en/modules/acqui/z3950_search.tt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Apr 1 14:07:59 2016 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 01 Apr 2016 12:07:59 +0000 Subject: [koha-commits] main Koha release repository branch 3.22.x updated. v3.22.05-3-ge7180f5 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.22.x has been updated via e7180f557074f43236faa618e2d08d09ece2cb28 (commit) via d8ba2e95c43f3ce0cc66f0900288cf99e1f5bfc6 (commit) from ea6c6f4155d457fe839f6097732219b07c7a9b9d (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 e7180f557074f43236faa618e2d08d09ece2cb28 Author: Marcel de Rooy Date: Fri Mar 25 09:15:14 2016 +0100 Bug 16084: [QA Follow-up] Correct three occurrences of __KOHA_CONF_DIR__ This bug correctly inserts substitutions for this variable. Four occurrences will now be changed. The line for log4perl.conf is now correct, but the three other changes point to a location that does not exist: /etc/koha/sites/$instance/zebradb. That should just be: /etc/koha/zebradb. All three cases concern the explain files. Signed-off-by: Marcel de Rooy Signed-off-by: Brendan Gallagher brendan at bywatersolutions.com (cherry picked from commit aa369c80c15b1699ddb89794c04bf0c3c0451b91) Signed-off-by: Julian Maurice commit d8ba2e95c43f3ce0cc66f0900288cf99e1f5bfc6 Author: Tomas Cohen Arazi Date: Wed Mar 16 16:21:32 2016 -0300 Bug 16084: log4perl.conf not properly set on packages - Run koha-create to create an instance or just fire kohadevbox:ansible => FAIL: Notice the instance's koha-conf.xml points to __KOHA_CONF_DIR__ instead of /etc/koha/sites/kohadev/ on the log4perl entry. => FAIL: the /etc/koha/sites/kohadev/log4perl.conf contains __LOG_DIR__ instead of /var/log/koha/kohadev/ - Apply this patch and pick the koha-conf-site.xml.in and koha-create files - Create a new instance => SUCCESS: All placeholders are filled correctly. - Sign off Regards Signed-off-by: Jonathan Druart Signed-off-by: Marcel de Rooy Signed-off-by: Brendan Gallagher brendan at bywatersolutions.com (cherry picked from commit 360cdea29559d84d1f82f0e1e102f18fc8475bb4) Signed-off-by: Julian Maurice ----------------------------------------------------------------------- Summary of changes: debian/scripts/koha-create | 4 +++- debian/templates/koha-conf-site.xml.in | 8 ++++---- 2 files changed, 7 insertions(+), 5 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Apr 1 14:14:25 2016 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 01 Apr 2016 12:14:25 +0000 Subject: [koha-commits] main Koha release repository branch 3.22.x updated. v3.22.05-4-g2159e7d 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.22.x has been updated via 2159e7d880e67ae8d29037485623fbdf973112a4 (commit) from e7180f557074f43236faa618e2d08d09ece2cb28 (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 2159e7d880e67ae8d29037485623fbdf973112a4 Author: Alex Arnaud Date: Wed Feb 24 10:13:40 2016 +0100 Bug 15889: LDAP authentication: Only update mapped attributes Test plan: - Update your configuration file to use LDAP authentication and enable update (1) option, - login with an existing user with extended attrbitutes that are not in LDAP mapping, - check that all attributes are still here. Signed-off-by: Chris Signed-off-by: Philippe Blouin Signed-off-by: Jesse Weaver (cherry picked from commit c74678a1d239aaf91906039ccb3db940df4a0b41) Signed-off-by: Julian Maurice ----------------------------------------------------------------------- Summary of changes: C4/Auth_with_ldap.pm | 18 +++++---------- t/db_dependent/Auth_with_ldap.t | 48 +++++++++++++++++++++++++++++++++++++-- 2 files changed, 52 insertions(+), 14 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Apr 1 14:53:18 2016 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 01 Apr 2016 12:53:18 +0000 Subject: [koha-commits] main Koha release repository branch 3.22.x updated. v3.22.05-5-g99d0743 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.22.x has been updated via 99d07437e1b145a2f11040541becb6bcae1541ac (commit) from 2159e7d880e67ae8d29037485623fbdf973112a4 (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 99d07437e1b145a2f11040541becb6bcae1541ac Author: Jonathan Druart Date: Tue Mar 29 08:14:33 2016 +0100 Bug 16151: Restore the ability to place holds from lists at the OPAC This patch fixes a bug introduced by bug 14544. Holds can not be placed from lists at the OPAC, the action results in a crash: Can't call method "field" on an undefined value at /home/koha/src/C4/Items.pm line 1504. at /home/koha/src/opac/opac-reserve.pl line 601 Before 14544, the checkboxes were named 'ACT-$BIBNUM', something like REM-4242. Now we can retrieve the biblionumber from the value. Test plan: Select a public list check some titles and click on the 'Place hold' link you should able to process the reservation Signed-off-by: Marc V?ron Signed-off-by: Tomas Cohen Arazi Signed-off-by: Brendan A Gallagher (cherry picked from commit 1ae64b97b39f5554e2d2360de9582a3e445854c5) Signed-off-by: Julian Maurice ----------------------------------------------------------------------- Summary of changes: koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shelves.tt | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Apr 1 14:55:51 2016 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 01 Apr 2016 12:55:51 +0000 Subject: [koha-commits] main Koha release repository branch 3.22.x updated. v3.22.05-6-gbd6e5a4 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.22.x has been updated via bd6e5a4c32496c94b0f90010fdc6b8dc047ea64f (commit) from 99d07437e1b145a2f11040541becb6bcae1541ac (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 bd6e5a4c32496c94b0f90010fdc6b8dc047ea64f Author: Marc V?ron Date: Thu Mar 24 11:59:27 2016 +0100 Bug 14614: Multiple URLs (856) in cart/list email are broken To reproduce: - Add multiple subfields 856 u to a bilbio - Add this biblio to a cart and send it as mail (from Staff client and from OPAC) Result: Links in mail body are broken To test - Apply patch - Send carts again (from Staff client and from OPAC) - Result: In mail body, links display separated with blank-pipe-blank like http://bla.com | http://blabla.com | http://blablabla.com - Change one of the 856 u to not to be a link, e.g. ??? - Send carts again - Verify that in mail body ??? correctly display as text. (Amended to make it work for OPAC as well, MV) Signed-off-by: Owen Leonard Signed-off-by: Tomas Cohen Arazi Signed-off-by: Brendan A Gallagher (cherry picked from commit d135499d2893fe1000c627f433395989d7d9e022) Signed-off-by: Julian Maurice ----------------------------------------------------------------------- Summary of changes: koha-tmpl/intranet-tmpl/prog/en/modules/basket/sendbasket.tt | 2 +- koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-sendbasket.tt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Apr 1 14:58:26 2016 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 01 Apr 2016 12:58:26 +0000 Subject: [koha-commits] main Koha release repository branch 3.22.x updated. v3.22.05-7-gddd1bbe 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.22.x has been updated via ddd1bbebeadc3bed0fd592bc04621a0dc3fb08c6 (commit) from bd6e5a4c32496c94b0f90010fdc6b8dc047ea64f (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 ddd1bbebeadc3bed0fd592bc04621a0dc3fb08c6 Author: Marcel de Rooy Date: Mon Feb 1 13:48:06 2016 +0100 Bug 15713: Restart zebra when rotating logfiles Somehow, it may happen that Zebra keeps writing to the old rotated logfile with extension .log.1. I must add that although I saw that happen (a new log was created and was empty, while Zebra kept writing to log.1 for weeks), I cannot reproduce it every time. By stopping the zebra server in prerotate and starting it again in postrotate, this should not happen at all. In practice, this implies that your Zebra server is restarted once a week. Note: The existing sharedscripts directive makes sure that these actions are not executed for all individual logfiles but once for all matching logfiles (even when running multiple instances). Test plan: [1] Apply the change in koha-common.logrotate to the file /etc/logrotate.d/koha-common. [2] Run logrotate -f /etc/logrotate.conf (forcing a logrotate). [3] Check in zebra-error.log that your zebra server was stopped ('killed by signal 15'). [4] Verify that your Zebra server runs (read: has been restarted). (Do a search..) Signed-off-by: Marcel de Rooy Signed-off-by: Marc V?ron Signed-off-by: Jonathan Druart Signed-off-by: Brendan Gallagher brendan at bywatersolutions.com (cherry picked from commit af47f00636848e1115b08652abcaec6b789bf672) Signed-off-by: Julian Maurice ----------------------------------------------------------------------- Summary of changes: debian/koha-common.logrotate | 4 ++++ 1 file changed, 4 insertions(+) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Apr 1 15:02:26 2016 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 01 Apr 2016 13:02:26 +0000 Subject: [koha-commits] main Koha release repository branch 3.22.x updated. v3.22.05-8-g9478a0b 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.22.x has been updated via 9478a0bf1eb43e0b82fb7c8ea84a4b503b9f81ce (commit) from ddd1bbebeadc3bed0fd592bc04621a0dc3fb08c6 (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 9478a0bf1eb43e0b82fb7c8ea84a4b503b9f81ce Author: Jonathan Druart Date: Mon Mar 21 15:49:25 2016 +0000 Bug 16040: Update fnReloadAjax DT plugin to fix quotes deletion When deleting quotes, the table is not regenerated and a JS error is raised. That is because we are not using an up-to-date plugin Test plan: Delete a quote and confirm you do not get a JS error Works as expected. Signed-off-by: Marc V?ron Signed-off-by: Katrin Fischer Signed-off-by: Brendan A Gallagher (cherry picked from commit 908a751e2cadcda0ceafa2efdd2cf0104a323467) Signed-off-by: Julian Maurice ----------------------------------------------------------------------- Summary of changes: .../lib/jquery/plugins/dataTables.fnReloadAjax.js | 150 +++++++++++++------- 1 file changed, 101 insertions(+), 49 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Apr 1 15:05:01 2016 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 01 Apr 2016 13:05:01 +0000 Subject: [koha-commits] main Koha release repository branch 3.22.x updated. v3.22.05-9-gbcf2d8d 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.22.x has been updated via bcf2d8d15494fa63df91bcd6099a9ba39a258e32 (commit) from 9478a0bf1eb43e0b82fb7c8ea84a4b503b9f81ce (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 bcf2d8d15494fa63df91bcd6099a9ba39a258e32 Author: Jonathan Druart Date: Wed Mar 16 10:01:18 2016 +0000 Bug 16082: Display a friendly "patron does not exist" message if that's the case - circulation.pl The major part of pages you can access from a patron detail page (menu) does not take into consideration the 'patron does not exist' case. If the borrowernumber is linked to a deleted patron, a friendly message should be displayed instead of an empty patron detail page. Test plan: Go on circ/circulation.pl?borrowernumber=424242 and circ/circulation.pl?borrowernumber=424242&batch=1 Notice the difference before and after this patch Signed-off-by: Marc V?ron Signed-off-by: Katrin Fischer Signed-off-by: Brendan Gallagher brendan at bywatersolutions.com (cherry picked from commit 7aedcf643e6f7793b4ebf55b1c7cdec7ec04a25d) Signed-off-by: Julian Maurice ----------------------------------------------------------------------- Summary of changes: circ/circulation.pl | 2 +- .../prog/en/modules/circ/circulation.tt | 16 ++++++----- .../en/modules/circ/circulation_batch_checkouts.tt | 28 +++++++++++++------- 3 files changed, 28 insertions(+), 18 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Apr 1 20:35:45 2016 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 01 Apr 2016 18:35:45 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.22.00-1062-g065ea15 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 065ea152d4600aed1fca04988aceae6ddeede4fa (commit) from c74678a1d239aaf91906039ccb3db940df4a0b41 (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 065ea152d4600aed1fca04988aceae6ddeede4fa Author: Mark Tompsett Date: Fri Apr 1 10:19:45 2016 -0400 Bug 16186: t/db_dependent/Circulation_Issuingrule.t is failing TEST PLAN --------- 1) prove t/db_dependent/Circulation_Issuingrule.t -- fails 2) apply patch 3) prove t/db_dependent/Circulation_Issuingrule.t -- pass 4) git diff origin/master -- t/db_dependent/Circulation_Issuingrule.t -- notice that bug 5876 and bug 9129 combined to cause this 5) run koha qa test tools Signed-off-by: Tomas Cohen Arazi Signed-off-by: Brendan A Gallagher ----------------------------------------------------------------------- Summary of changes: t/db_dependent/Circulation_Issuingrule.t | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Apr 1 20:39:24 2016 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 01 Apr 2016 18:39:24 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.22.00-1063-g93efeab 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 93efeab13e25aea7e467b112983536833c69ceea (commit) from 065ea152d4600aed1fca04988aceae6ddeede4fa (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 93efeab13e25aea7e467b112983536833c69ceea Author: Tomas Cohen Arazi Date: Wed Mar 23 15:53:01 2016 -0300 Bug 16138: Restart plack when rotating logfiles On log rotation Starman/Plack keeps failing (Auth.pm related problems) due to permission issues: Could not compile /usr/share/koha/opac/cgi-bin/opac/opac-search.pl: Can't locate Authen/CAS/Client/Response/Failure.pm : ./Authen/CAS/Client/Response/Failure.pm: Permission denied at /usr/share/perl/5.20/base.pm line 97. ...propagated at /usr/share/perl/5.20/base.pm line 106. BEGIN failed--compilation aborted at /usr/share/perl5/Authen/CAS/Client/Response.pm line 68. Compilation failed in require at /usr/share/perl5/Authen/CAS/Client.pm line 8. BEGIN failed--compilation aborted at /usr/share/perl5/Authen/CAS/Client.pm line 8. Compilation failed in require at /usr/share/koha/lib/C4/Auth_with_cas.pm line 25. BEGIN failed--compilation aborted at /usr/share/koha/lib/C4/Auth_with_cas.pm line 25. Compilation failed in require at /usr/share/koha/lib/C4/Auth.pm line 63. BEGIN failed--compilation aborted at /usr/share/koha/lib/C4/Auth.pm line 90. Compilation failed in require at /usr/share/koha/opac/cgi-bin/opac/opac-search.pl line 34. BEGIN failed--compilation aborted at /usr/share/koha/opac/cgi-bin/opac/opac-search.pl line 34. As we do with zebra daemons, starman should be restarted as it doesn't handle log file rotation gracefully[1]. I'm not sure how to reproduce it on a dev environment. [1] https://github.com/miyagawa/Starman/issues/55 Signed-off-by: Mirko Tietgen Signed-off-by: Martin Renvoize Signed-off-by: Brendan A Gallagher ----------------------------------------------------------------------- Summary of changes: debian/koha-common.logrotate | 2 ++ 1 file changed, 2 insertions(+) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Apr 1 20:40:38 2016 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 01 Apr 2016 18:40:38 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.22.00-1064-gda052b3 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 da052b3d10d71cb1256693fbd3166caaa4b53f41 (commit) from 93efeab13e25aea7e467b112983536833c69ceea (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 da052b3d10d71cb1256693fbd3166caaa4b53f41 Author: Tomas Cohen Arazi Date: Tue Mar 22 17:17:59 2016 -0300 Bug 16129: Remove URL::Encode dependency This patch makes the PayPal integration feature independent from the URL::Encode library, which is absent in some supported distributions. It uses the URI package which is already a Koha dependency. To test: - Apply the patch - Notice there are no deps for URL::Encode - Follow the steps from the original patch => SUCCESS: It works as expected - Sign-off :-D Note: I deleted the line in which $amount_to_pay was url-encoded, because that's one of the things query_form does (and the variable is only used as a parameter to it). Sponsored-by: ByWater Solutions Signed-off-by: Nick Clemens Signed-off-by: Martin Renvoize Signed-off-by: Brendan A Gallagher ----------------------------------------------------------------------- Summary of changes: C4/Installer/PerlDependencies.pm | 5 ----- opac/opac-account-pay-paypal-return.pl | 11 +++++++---- opac/opac-account-pay.pl | 13 ++++++------- 3 files changed, 13 insertions(+), 16 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Apr 1 20:57:02 2016 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 01 Apr 2016 18:57:02 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.22.00-1065-g2d961b5 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 2d961b5ad434438c4ba52b62132c2f1b58b9a981 (commit) from da052b3d10d71cb1256693fbd3166caaa4b53f41 (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 2d961b5ad434438c4ba52b62132c2f1b58b9a981 Author: Jonathan Druart Date: Mon Mar 21 15:25:41 2016 +0000 Bug 16056: Do not crash when searching for an authority if zebra's index is not up-to-date This patch fixes a regression introduced by commit 7e70202d34d75f988fbaea9b911347417c203aac Bug 15381: Remove GetAuthType and GetAuthTypeCode This first version will reintroduce the same behavior as before bug 15381: the record will be displayed even if it's no in the DB Test plan: Search for authorities delete one The zebra's index is not updated yet and the results will contain the record you have deleted. Signed-off-by: Tomas Cohen Arazi Signed-off-by: Brendan A Gallagher ----------------------------------------------------------------------- Summary of changes: C4/AuthoritiesMarc.pm | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Apr 1 20:58:20 2016 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 01 Apr 2016 18:58:20 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.22.00-1066-g73b3968 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 73b3968dce3b9bdc95b12eb68fc813c83bcba3e8 (commit) from 2d961b5ad434438c4ba52b62132c2f1b58b9a981 (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 73b3968dce3b9bdc95b12eb68fc813c83bcba3e8 Author: Jonathan Druart Date: Thu Mar 31 09:06:14 2016 +0100 Bug 16178: Fix tests for xt/single_quotes.t Caused by commit 9c5c1bc9f104b125e06b3805ce510024e6ad34ac Bug 15206: Make strings translatable Test plan: prove xt/single_quotes.t should return green Signed-off-by: Nick Clemens Signed-off-by: Marcel de Rooy Signed-off-by: Brendan A Gallagher ----------------------------------------------------------------------- Summary of changes: .../intranet-tmpl/prog/en/modules/members/memberentrygen.tt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Apr 1 21:00:51 2016 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 01 Apr 2016 19:00:51 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.22.00-1067-gfc66eed 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 fc66eedcc429e1eb8175d6e95bc5e921d8b94664 (commit) from 73b3968dce3b9bdc95b12eb68fc813c83bcba3e8 (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 fc66eedcc429e1eb8175d6e95bc5e921d8b94664 Author: Jonathan Druart Date: Thu Mar 31 08:59:29 2016 +0100 Bug 16177: Fix tests for ColumnsSsettings.t This failure has been introduced by commit 243b797dd11bc0ac1f475195ab765ffbf2220f8b Bug 15285: Update common files This is because the cannot_be_modified key is not always created by C4::Utils::DataTables::ColumnsSettings subroutines Test plan: prove t/db_dependent/ColumnsSettings.t should return green And you can also test a table where the feature is set and a column cannot be modified from the admin page. NOTE: Works as described. I was pondering this potential solution when I found it in bugzilla. Signed-off-by: Mark Tompsett Signed-off-by: Marcel de Rooy Signed-off-by: Brendan A Gallagher ----------------------------------------------------------------------- Summary of changes: C4/Utils/DataTables/ColumnsSettings.pm | 3 +++ t/db_dependent/ColumnsSettings.t | 5 +++++ 2 files changed, 8 insertions(+) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Apr 1 21:02:58 2016 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 01 Apr 2016 19:02:58 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.22.00-1068-gab930af 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 ab930af344735d9833ee22903045948f490b836b (commit) from fc66eedcc429e1eb8175d6e95bc5e921d8b94664 (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 ab930af344735d9833ee22903045948f490b836b Author: Jonathan Druart Date: Thu Mar 31 08:27:02 2016 +0100 Bug 16176: Fix a test about OpenLibrarySearch Introduced by bug 6624: When C4::UsageStats::BuildReport is modified, the tests should be too. Test plan: prove t/db_dependent/UsageStats.t should return green Signed-off-by: Mark Tompsett Signed-off-by: Marcel de Rooy Note that if we maintain this list of sysprefs at two places, we will probably have this test failing regularly.. Signed-off-by: Brendan A Gallagher ----------------------------------------------------------------------- Summary of changes: t/db_dependent/UsageStats.t | 1 + 1 file changed, 1 insertion(+) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Apr 1 21:04:02 2016 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 01 Apr 2016 19:04:02 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.22.00-1071-gcc4d982 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 cc4d9822a1bbb66c493ebd2b0def32de2d18a523 (commit) via 5c3a58e20863abde22ca2e57233cdf49cc6982e0 (commit) via b6cd9ab8968b7b1b534606f0ad380f75bfa476aa (commit) from ab930af344735d9833ee22903045948f490b836b (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 cc4d9822a1bbb66c493ebd2b0def32de2d18a523 Author: Tomas Cohen Arazi Date: Thu Mar 31 11:21:14 2016 -0300 Bug 16174: (QA followup) Fix remaining tests Signed-off-by: Tomas Cohen Arazi Signed-off-by: Mark Tompsett Signed-off-by: Marcel de Rooy Signed-off-by: Brendan A Gallagher commit 5c3a58e20863abde22ca2e57233cdf49cc6982e0 Author: Tomas Cohen Arazi Date: Wed Mar 30 16:11:19 2016 -0300 Bug 16174: icondirectories.t broken due to bug 15527 This patch fixes it. To test: - Run $ prove xt/author/icondirectories.t => FAIL: Tests fail: Failed test 'opac_icon_directory: koha-tmpl/opac-tmpl/xslt/itemtypeimg exists' - Apply the patch - Run $ prove xt/author/icondirectories.t => SUCCESS: Tests pass and don't raise warnings. - Sign off Signed-off-by: Mark Tompsett Signed-off-by: Marcel de Rooy Signed-off-by: Brendan A Gallagher commit b6cd9ab8968b7b1b534606f0ad380f75bfa476aa Author: Tomas Cohen Arazi Date: Wed Mar 30 15:15:02 2016 -0300 Bug 16174: Warning in tt_valid.t due to bug 15527 Bug 15527 introduced a new directory (xslt) on the top level OPAC templates directory. The tt_valid.t script should include that top level dir on the list of excluded dirs so it doesn't look for themes there. To test: - Run $ prove xt/tt_valid.t => FAIL: You get the following warning: Can't stat koha-tmpl/opac-tmpl/xslt/en: No such file or directory at xt/tt_valid.t line 8 - Apply the patch - Run $ prove xt/tt_valid.t => SUCCESS: Tests pass and don't raise warnings. Signed-off-by: Mark Tompsett Signed-off-by: Marcel de Rooy Signed-off-by: Brendan A Gallagher ----------------------------------------------------------------------- Summary of changes: xt/author/icondirectories.t | 2 +- xt/author/translatable-templates.t | 2 +- xt/author/valid-templates.t | 2 +- xt/single_quotes.t | 2 +- xt/tt_valid.t | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Apr 1 21:05:16 2016 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 01 Apr 2016 19:05:16 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.22.00-1072-gfcbd810 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 fcbd81049f590e5fc0c31030bcdb1311951c1444 (commit) from cc4d9822a1bbb66c493ebd2b0def32de2d18a523 (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 fcbd81049f590e5fc0c31030bcdb1311951c1444 Author: David Cook Date: Fri Feb 5 16:09:45 2016 +1100 Bug 15745: C4::Matcher gets CCL parsing error if term contains ? (question mark) Signed-off-by: Olli-Antti Kivilahti Also fixes ! and + Rebased to master Signed-off-by: Tomas Cohen Arazi It makes perfect sense and works as expected. This part of the code is too under-tested so no point requiring a regression test for such a simple change. Signed-off-by: Brendan A Gallagher ----------------------------------------------------------------------- Summary of changes: C4/Matcher.pm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Apr 1 21:06:32 2016 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 01 Apr 2016 19:06:32 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.22.00-1073-g42d0659 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 42d065937627a705b813eba577f519416f356d99 (commit) from fcbd81049f590e5fc0c31030bcdb1311951c1444 (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 42d065937627a705b813eba577f519416f356d99 Author: Mark Tompsett Date: Fri Apr 1 09:31:41 2016 -0400 Bug 16185: t/db_dependent/Reports_Guided.t is failing TEST PLAN --------- 1) prove t/db_dependent/Reports_Guided.t -- fails -- note the failure has a scalar function-like bracketing 2) apply patch 3) prove t/db_dependent/Reports_Guided.t -- passes 4) git diff origin/master -- note all scalars have been changed to not have function-like brackets which could be incorrectly parsed. 5) run koha qa test tools Signed-off-by: Tomas Cohen Arazi Signed-off-by: Brendan A Gallagher ----------------------------------------------------------------------- Summary of changes: t/db_dependent/Reports_Guided.t | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Apr 1 21:07:15 2016 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 01 Apr 2016 19:07:15 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.22.00-1074-g714d773 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 714d773900587eb1d2ac7e73ef4f1463c9805dc5 (commit) from 42d065937627a705b813eba577f519416f356d99 (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 714d773900587eb1d2ac7e73ef4f1463c9805dc5 Author: Tomas Cohen Arazi Date: Wed Mar 30 12:46:30 2016 -0300 Bug 16173: db_structure.t shouldn't have a fixed number of tests This patch makes db_structure.t more flexible regarding how many tests are run. This is important because it would fail on each db structure change, masking potential real problems. To test: - Run $ prove t/db_dependent/db_structure.t => FAIL: the number of tests ran doesn't match what is expected - Apply the patch - Run $ prove t/db_dependent/db_structure.t => SUCCESS: Tests count is not an issue [1] - Sign off [1] Right now the tests run successfuly, they might fail if a real bug is introduced on the DB structure, in the meantime. Signed-off-by: Mark Tompsett Signed-off-by: Marcel de Rooy Signed-off-by: Brendan A Gallagher ----------------------------------------------------------------------- Summary of changes: t/db_dependent/db_structure.t | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Apr 1 21:11:55 2016 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 01 Apr 2016 19:11:55 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.22.00-1075-g6e8d242 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 6e8d24231c03775422f403a76ca41ccf22f40558 (commit) from 714d773900587eb1d2ac7e73ef4f1463c9805dc5 (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 6e8d24231c03775422f403a76ca41ccf22f40558 Author: Jonathan Druart Date: Tue Mar 15 09:38:20 2016 +0000 Bug 16068: Do not cache overridden prefs These prefs do not need to be cached, a quick access to $ENV permit to get the value. Signed-off-by: Jacek Ablewicz Signed-off-by: Martin Renvoize Signed-off-by: Brendan A Gallagher ----------------------------------------------------------------------- Summary of changes: C4/Context.pm | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Apr 1 21:16:07 2016 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 01 Apr 2016 19:16:07 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.22.00-1077-g85ea73d 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 85ea73db9d181f9feaf99fa6a94da8a3da570909 (commit) via b3311913b3b51faed300af98016c25cbd507fb44 (commit) from 6e8d24231c03775422f403a76ca41ccf22f40558 (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 85ea73db9d181f9feaf99fa6a94da8a3da570909 Author: Joonas Kylm?l? Date: Mon Aug 31 09:41:34 2015 +0000 Bug 11807: (follow-up) remove date conversions To test 1/ Apply both patches 2/ This patch lets you easily configure mappings for categorycode values. These mapping will be used when updating the user's account after a successful LDAP login. Here is an example configuration : STU ... STUDENT EMPLOYEE 3/ With this configuration, LDAP users with the usertype value "EMP" on the LDAP server should have the "EMPLOYEE" categorycode in Koha. Signed-off-by: Chris Signed-off-by: Martin Renvoize Signed-off-by: Brendan A Gallagher commit b3311913b3b51faed300af98016c25cbd507fb44 Author: Fr?d?rick Date: Wed Feb 19 12:02:41 2014 -0500 Bug 11807 : Add support for categorycode conversions when updating an user using a LDAP server. To test 1/ Apply both patches 2/ This patch lets you easily configure mappings for categorycode values. These mapping will be used when updating the user's account after a successful LDAP login. Here is an example configuration : STU ... STUDENT EMPLOYEE 3/ With this configuration, LDAP users with the usertype value "EMP" on the LDAP server should have the "EMPLOYEE" categorycode in Koha. Signed-off-by: Chris Signed-off-by: Martin Renvoize Signed-off-by: Brendan A Gallagher ----------------------------------------------------------------------- Summary of changes: C4/Auth_with_ldap.pm | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Apr 1 21:25:28 2016 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 01 Apr 2016 19:25:28 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.22.00-1080-ge22e5c7 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 e22e5c74af4921e0fdda7f83cd1c68dfb63f0829 (commit) via 9472711921968dc5ae620fbfeacd1c828b6ed93a (commit) via 722a098eac97bb714d120f63fe7cd558bf1b79f5 (commit) from 85ea73db9d181f9feaf99fa6a94da8a3da570909 (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 e22e5c74af4921e0fdda7f83cd1c68dfb63f0829 Author: Mark Tompsett Date: Mon Feb 8 17:54:12 2016 -0500 Bug 10988: Tabs vs Spaces qa failure patch Run Koha QA Test tools and discovered this failed because of tabs. Rather than fail this and wait forever for it to get fixed, this patches it, and I'll mark it as signed off anyways. Signed-off-by: Mark Tompsett Signed-off-by: Martin Renvoize Signed-off-by: Brendan A Gallagher commit 9472711921968dc5ae620fbfeacd1c828b6ed93a Author: Nicholas van Oudtshoorn Date: Mon Jan 11 17:01:02 2016 +0800 Bug 10988 - Fix some wording Fix some outdated wording in googleopenidconnect Signed-off-by: Mark Tompsett Signed-off-by: Martin Renvoize Signed-off-by: Brendan A Gallagher commit 722a098eac97bb714d120f63fe7cd558bf1b79f5 Author: Nicholas van Oudtshoorn Date: Mon Jan 11 16:47:41 2016 +0800 Bug 10988 - Fixes for comments 57 and 58 Test Plan (remains the same): 0) Back up your database 1) Apply all these patches 2) In your mysql client use your Koha database and execute: > DELETE FROM systempreferences; > SOURCE ~/kohaclone/installer/data/mysql/sysprefs.sql; -- Should be no errors. > SELECT * FROM systempreferences LIKE 'GoogleO%'; -- Should see 4 entries. > QUIT; 3) Restore your database 4) Run ./installer/data/mysql/updatedatabase.pl; 5) In your mysql client use your Koha database and execute: > SELECT * FROM systempreferences LIKE 'GoogleO%'; -- Should see the same 4 entries. 6) Log into the staff client 7) Home -> Koha administration -> Global system preferences 8) -> OPAC -- make sure your OPACBaseURL is set (e.g. https://opac.koha.ca) 9) -> Administration -- There should be a 'Google OAuth2' section with the ability to set those 4 system preferences. 10) In a new tab, go to https://console.developers.google.com/project 11) Click 'Create Project' 12) Type in a project name that won't freak users out, like your library name (e.g. South Pole Library). 13) Click the 'Create' button. 14) Click the 'APIs & auth' in the left frame. 15) Click 'Credentials' 16) Click 'Create new Client ID' 17) Select 'Web application' and click 'Configure consent screen'. 18) Select the Email Address. 19) Put it a meaningful string into the Product Name (e.g. South Pole Library Authentication) 20) Fill in the other fields as desired (or not) 21) Click 'Save' 22) Change the 'AUTHORIZED JAVASCRIPT ORIGINS' to your OPACBaseURL. (http://library.yourDNS.org) 23) Change the 'AUTHORIZED REDIRECT URIS' to point to the new googleoauth2 script (http://library.yourDNS.org/cgi-bin/koha/svc/auth/googleopenidconnect) 24) Click 'Create Client ID' 25) Copy and paste the 'CLIENT ID' into the GoogleOAuth2ClientID system preference. 26) Copy and paste the 'CLIENT SECRET' into the GoogleOAuth2ClientSecret system preference. 27) Change the GoogleOpenIDConnect preference to 'Use'. 28) Click 'Save all Administration preferences' 29) In the OPAC, click 'Log in to your account'. -- You should get a confirmation request, if you are already logged in, OR a login screen if you are not. -- You need to have the primary email address set to one authenticated by Google in order to log in. 30) Run koha qa test tools Signed-off-by: Mark Tompsett Signed-off-by: Martin Renvoize Signed-off-by: Brendan A Gallagher ----------------------------------------------------------------------- Summary of changes: C4/Auth.pm | 7 + .../mysql/atomicupdate/googleopenidconnect.sql | 5 + installer/data/mysql/sysprefs.sql | 4 + .../prog/en/modules/admin/preferences/admin.pref | 18 ++ .../opac-tmpl/bootstrap/en/includes/masthead.inc | 2 + .../opac-tmpl/bootstrap/en/modules/opac-auth.tt | 11 + opac/svc/auth/googleopenidconnect | 233 ++++++++++++++++++++ 7 files changed, 280 insertions(+) create mode 100644 installer/data/mysql/atomicupdate/googleopenidconnect.sql create mode 100755 opac/svc/auth/googleopenidconnect hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Apr 1 21:39:21 2016 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 01 Apr 2016 19:39:21 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.22.00-1081-g7a3c995 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 7a3c9951bb0daac178220a97f1a1d373c6036619 (commit) from e22e5c74af4921e0fdda7f83cd1c68dfb63f0829 (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 7a3c9951bb0daac178220a97f1a1d373c6036619 Author: Brendan A Gallagher Date: Fri Apr 1 19:46:47 2016 +0000 DBRev Bug 10988 - Allow login via Google OAuth2 (OpenID Connect) Signed-off-by: Brendan A Gallagher ----------------------------------------------------------------------- Summary of changes: Koha.pm | 2 +- installer/data/mysql/atomicupdate/googleopenidconnect.sql | 5 ----- installer/data/mysql/updatedatabase.pl | 12 ++++++++++++ 3 files changed, 13 insertions(+), 6 deletions(-) delete mode 100644 installer/data/mysql/atomicupdate/googleopenidconnect.sql hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Apr 1 21:54:12 2016 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 01 Apr 2016 19:54:12 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.22.00-1086-g9658085 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 9658085d1eafae6fe7f51fb1b39452fbb6f9bf4d (commit) via f99cc395f51e0c25ed2903626b86e24226146cbc (commit) via b11d2f43f98848a9f444418273c85ae736888a25 (commit) via 621742d4c6c9f3b8ea526ddde14fa5b46ae42721 (commit) via 7f9d5b27aef81bdbb1f0dd26faa0f498a6d6c2eb (commit) from 7a3c9951bb0daac178220a97f1a1d373c6036619 (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 9658085d1eafae6fe7f51fb1b39452fbb6f9bf4d Author: Nick Clemens Date: Thu Mar 31 15:53:31 2016 +0000 Bug 10612: (QA followup) Rename not_borrowered_since to not_borrowed_since Signed-off-by: Katrin Fischer Signed-off-by: Brendan A Gallagher commit f99cc395f51e0c25ed2903626b86e24226146cbc Author: Nick Clemens Date: Wed Mar 30 21:06:49 2016 +0000 Bug 10612 - Unit tests Signed-off-by: Katrin Fischer Signed-off-by: Brendan A Gallagher commit b11d2f43f98848a9f444418273c85ae736888a25 Author: Katrin Fischer Date: Mon Mar 28 22:31:37 2016 +0200 Bug 10612: Follow-up - correcting icon to be Font Awesome - check print icon on the patron list summary page is correct Signed-off-by: Katrin Fischer Signed-off-by: Brendan A Gallagher commit 621742d4c6c9f3b8ea526ddde14fa5b46ae42721 Author: Owen Leonard Date: Wed Mar 9 11:48:39 2016 -0500 Bug 10612 [Follow-up] Combine and clarify menu items This follow-up patch for Bug 10612 moves all list operations into one menu while (hopefully) clarifying the labels for each. Also in this patch: Changed datatables sorting configuration to use the "nosort" attribute. To test, apply the patch and go to Tools -> Patron lists. - On a patron list with no patrons, confirm that the "Actions" menu lists "Add patrons," "Edit list," and "Delete list." - On a patron list containing one or more patrons, confirm that the "Actions" menu /also/ has these options: "Print patron cards," "Batch edit patrons," and "Batch delete patrons." - Confirm that the "actions" column is not sortable. - Test logging in as a user who has various combinations of permission to batch edit and batch delete. Signed-off-by: Nick Clemens Signed-off-by: Katrin Fischer Signed-off-by: Brendan A Gallagher commit 7f9d5b27aef81bdbb1f0dd26faa0f498a6d6c2eb Author: Kyle M Hall Date: Wed Jun 11 08:11:48 2014 -0400 Bug 10612 - Add ability to delete patrons with batch patron deletion tool This patch adds the ability to select a patron list for deletetion when using the Batch patron deletion/anonymization tool. It also adds buttons to the the patron lists table to access both the batch deletion and batch modification directly from the lists view. This is a squash of previous patches but now adds a patron_list_id parameter to C4::Members::GetBorrowersToExpunge and uses that routine to fetch patrons from a list. Test Plan: 1) Apply this patch 2) Create a list of patrons with the new Patron Lists feature 3) Try using the batch edit link form the lists table 4) Try using the batch delete link from the lists table 5) Verify previous functionality has not changed Signed-off-by: Owen Leonard Patron batches are correctly passed to the edit and delete pages. Signed-off-by: Katrin Fischer Signed-off-by: Brendan A Gallagher ----------------------------------------------------------------------- Summary of changes: C4/Members.pm | 31 +++-- .../prog/en/modules/patron_lists/lists.tt | 29 ++++- .../prog/en/modules/tools/cleanborrowers.tt | 29 +++-- misc/cronjobs/delete_patrons.pl | 2 +- t/db_dependent/Members.t | 130 +++++++++++++++++++- tools/cleanborrowers.pl | 81 +++++++----- 6 files changed, 242 insertions(+), 60 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Apr 1 23:16:42 2016 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 01 Apr 2016 21:16:42 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.22.00-1095-g5182400 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 51824008595a5a79ad08052b8035ea5d00654476 (commit) via 9f9e0ea002dfbf9da92285edbea2df975b6d7de9 (commit) via 10e5a58c5b8e771e947ef16b593fd3b9d753b624 (commit) via acb68d21601774d03ada576956c73c44036267ac (commit) via 07e098ef675f9fc6c177492b1cb7ba197d1e1fb7 (commit) via c2ec238d9f282612ef5a79a8e5bfa9600b7273f9 (commit) via fec34d29d5afe3bd4a62c5ebf0a02daf9381ef69 (commit) via b131304975f9670d4a0e88ef455243cbb0f2bf4e (commit) via e2e991634854d940405593cb1e05945de2295d4c (commit) from 9658085d1eafae6fe7f51fb1b39452fbb6f9bf4d (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 51824008595a5a79ad08052b8035ea5d00654476 Author: Brendan A Gallagher Date: Fri Apr 1 21:20:56 2016 +0000 Bug 7736 - RM followup fixing/removing on .tt Signed-off-by: Brendan A Gallagher commit 9f9e0ea002dfbf9da92285edbea2df975b6d7de9 Author: Brendan A Gallagher Date: Fri Apr 1 20:54:09 2016 +0000 DBRev Bug 7736 - Edifact QUOTE and ORDER functionality Signed-off-by: Brendan A Gallagher commit 10e5a58c5b8e771e947ef16b593fd3b9d753b624 Author: Colin Campbell Date: Fri Mar 18 11:31:41 2016 +0000 Bug 7736 amend edi_cron.pl to use new style call to Context Bug 9006 changed the api for retrieving config values from C4::Context after the removal of Autoload This changes the syntax used to retrieve logdir to reflect the correct syntax Signed-off-by: Brendan A Gallagher commit acb68d21601774d03ada576956c73c44036267ac Author: Kyle M Hall Date: Fri Mar 11 14:01:24 2016 +0000 Bug 7736 [QA Followup] - Fix spelling and pod errors Signed-off-by: Kyle M Hall Signed-off-by: Brendan A Gallagher commit 07e098ef675f9fc6c177492b1cb7ba197d1e1fb7 Author: Kyle M Hall Date: Fri Mar 11 11:58:47 2016 +0000 Bug 7736 [QA Followup] - Fix SQL, Add description field for Library EANs Signed-off-by: Kyle M Hall Signed-off-by: Brendan A Gallagher commit c2ec238d9f282612ef5a79a8e5bfa9600b7273f9 Author: Kyle M Hall Date: Thu Mar 10 19:35:02 2016 +0000 Bug 7736 [QA Followup] - Fix column headers, values and spelling Signed-off-by: Kyle M Hall Signed-off-by: Brendan A Gallagher commit fec34d29d5afe3bd4a62c5ebf0a02daf9381ef69 Author: Kyle M Hall Date: Thu Mar 10 16:58:09 2016 +0000 Bug 7736 [QA Followup] - Fix collation Signed-off-by: Kyle M Hall Signed-off-by: Brendan A Gallagher commit b131304975f9670d4a0e88ef455243cbb0f2bf4e Author: Zeno Tajoli Date: Tue Oct 27 12:32:52 2015 +0100 Bug 7736 Add Edifact order fields to Acquisition.t Modification in Acquisition.t to support in test the new fields of the table aqorders: line_item_id, suppliers_reference_number, suppliers_reference_qualifier, suppliers_report Original patch by Zeno Tajoli I amended to include the report field (ColinC) Signed-off-by: Paul Johnson Signed-off-by: Sally Healey Signed-off-by: Kyle M Hall Signed-off-by: Brendan A Gallagher commit e2e991634854d940405593cb1e05945de2295d4c Author: Colin Campbell Date: Wed Jan 20 11:31:31 2016 +0000 Bug 7736: Support Ordering via Edifact EDI messages Add support for processing incoming Edifact Quotes, Invoices and order responses and generating and transmission of Edifact Orders. Basic workflow is that an incoming quote generates an aquisition basket in Koha, with each line corresponding to an order record The user can then generate an edifact order from this (or another) basket, which is transferred to the vendor's site The supplier generates an invoice on despatch and this will result in corresponding invoices being generated in Koha The orderlines on the invoice are receipted automatically. We also support order response messages. This may include simple order acknowledgements, supplier reports/amendments on availability. Cancellation messages cause the koha order to be cancelled, other messages are recorded against the order Which messages are to be supported/processed is specifiable on a vendor by vendor basis via the admin screens You can also specify auto order i.e. to generate orders from quotes without user intervention - This reflects existing workflows where most work is done on the suppliers website then generating a dummy quote Received messages are stored in the edifact_messages table and the original can be viewed via the online Database changes are in installer/data/mysql/atomicchanges/edifact.sql Note new perl dependencies: Net::SFTP:Foreign Text::Unidecode Signed-off-by: Paul Johnson Signed-off-by: Sally Healey Signed-off-by: Kyle M Hall Signed-off-by: Brendan A Gallagher ----------------------------------------------------------------------- Summary of changes: C4/Acquisition.pm | 6 +- C4/Installer/PerlDependencies.pm | 10 + Koha.pm | 2 +- Koha/EDI.pm | 1150 ++++++++++++++++++++ Koha/Edifact.pm | 337 ++++++ Koha/Edifact/Line.pm | 864 +++++++++++++++ Koha/Edifact/Message.pm | 249 +++++ Koha/Edifact/Order.pm | 832 ++++++++++++++ Koha/Edifact/Segment.pm | 204 ++++ Koha/Edifact/Transport.pm | 479 ++++++++ Koha/Schema/Result/Aqbasket.pm | 19 +- Koha/Schema/Result/Aqbookseller.pm | 36 +- Koha/Schema/Result/Aqbudget.pm | 19 +- Koha/Schema/Result/Aqinvoice.pm | 32 +- Koha/Schema/Result/Aqorder.pm | 37 +- Koha/Schema/Result/Branch.pm | 21 +- Koha/Schema/Result/EdifactEan.pm | 119 ++ Koha/Schema/Result/EdifactMessage.pm | 202 ++++ Koha/Schema/Result/MsgInvoice.pm | 115 ++ Koha/Schema/Result/VendorEdiAccount.pm | 249 +++++ acqui/basket.pl | 77 ++ acqui/basketgroup.pl | 17 + acqui/edi_ean.pl | 64 ++ acqui/edifactmsgs.pl | 62 ++ acqui/edimsg.pl | 72 ++ acqui/invoices.pl | 4 +- admin/edi_accounts.pl | 155 +++ admin/edi_ean_accounts.pl | 161 +++ installer/data/mysql/kohastructure.sql | 76 ++ installer/data/mysql/sysprefs.sql | 1 + installer/data/mysql/updatedatabase.pl | 108 ++ installer/data/mysql/userpermissions.sql | 1 + .../prog/en/includes/acquisitions-menu.inc | 3 + .../intranet-tmpl/prog/en/includes/admin-menu.inc | 2 + .../intranet-tmpl/prog/en/modules/acqui/basket.tt | 38 +- .../prog/en/modules/acqui/basketgroup.tt | 2 + .../intranet-tmpl/prog/en/modules/acqui/edi_ean.tt | 39 + .../prog/en/modules/acqui/edifactmsgs.tt | 90 ++ .../intranet-tmpl/prog/en/modules/acqui/edimsg.tt | 35 + .../prog/en/modules/admin/admin-home.tt | 5 + .../prog/en/modules/admin/edi_accounts.tt | 306 ++++++ .../prog/en/modules/admin/edi_ean_accounts.tt | 168 +++ .../prog/en/modules/tools/tools-home.tt | 5 + misc/cronjobs/edi_cron.pl | 163 +++ misc/cronjobs/remove_temporary_edifiles.pl | 41 + t/EdiInvoice.t | 75 ++ t/Edifact.t | 121 ++ t/Ediorder.t | 56 + t/Ediordrsp.t | 59 + t/db_dependent/Acquisition.t | 12 + t/edi_testfiles/BLSINV337023.CEI | 1 + t/edi_testfiles/QUOTES_413514.CEQ | 1 + t/edi_testfiles/ordrsp1.CEA | 1 + t/edi_testfiles/ordrsp2.CEA | 1 + t/edi_testfiles/ordrsp3.CEA | 1 + t/edi_testfiles/ordrsp4.CEA | 1 + t/edi_testfiles/prquotes_73050_20140430.CEQ | 1 + 57 files changed, 6988 insertions(+), 19 deletions(-) create mode 100644 Koha/EDI.pm create mode 100644 Koha/Edifact.pm create mode 100644 Koha/Edifact/Line.pm create mode 100644 Koha/Edifact/Message.pm create mode 100644 Koha/Edifact/Order.pm create mode 100644 Koha/Edifact/Segment.pm create mode 100644 Koha/Edifact/Transport.pm create mode 100644 Koha/Schema/Result/EdifactEan.pm create mode 100644 Koha/Schema/Result/EdifactMessage.pm create mode 100644 Koha/Schema/Result/MsgInvoice.pm create mode 100644 Koha/Schema/Result/VendorEdiAccount.pm create mode 100755 acqui/edi_ean.pl create mode 100755 acqui/edifactmsgs.pl create mode 100755 acqui/edimsg.pl create mode 100755 admin/edi_accounts.pl create mode 100755 admin/edi_ean_accounts.pl create mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/acqui/edi_ean.tt create mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/acqui/edifactmsgs.tt create mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/acqui/edimsg.tt create mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/admin/edi_accounts.tt create mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/admin/edi_ean_accounts.tt create mode 100755 misc/cronjobs/edi_cron.pl create mode 100755 misc/cronjobs/remove_temporary_edifiles.pl create mode 100755 t/EdiInvoice.t create mode 100755 t/Edifact.t create mode 100755 t/Ediorder.t create mode 100755 t/Ediordrsp.t create mode 100644 t/edi_testfiles/BLSINV337023.CEI create mode 100644 t/edi_testfiles/QUOTES_413514.CEQ create mode 100644 t/edi_testfiles/ordrsp1.CEA create mode 100644 t/edi_testfiles/ordrsp2.CEA create mode 100644 t/edi_testfiles/ordrsp3.CEA create mode 100644 t/edi_testfiles/ordrsp4.CEA create mode 100644 t/edi_testfiles/prquotes_73050_20140430.CEQ hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Apr 1 23:27:53 2016 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 01 Apr 2016 21:27:53 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.22.00-1096-gfb0d0dd 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 fb0d0ddf392d65f6689e91d698ced25b3a0965d4 (commit) from 51824008595a5a79ad08052b8035ea5d00654476 (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 fb0d0ddf392d65f6689e91d698ced25b3a0965d4 Author: Kyle M Hall Date: Mon Dec 21 13:05:45 2015 +0000 Bug 15630 - Make Edifact module pluggable Koha's EDIFACT module works great for many European vendors, but does not work will for US vendors, which have a much different interpretation of 'standard'. In fact, each vendor may require different arrangements of values in EDIFACT messages. It would be impossible to encompass all these requirements within Koha's EDIFACT module itself. Instead, we should allow the module to be pluggable, so versions of the module can be developed for vendors that require EDIFACT messages that don't conform to the standard set by Koha's EDIFACT module. Test Plan: 1) Apply this patch 2) Run updatedatabase 3) Enable Koha plugins 4) Install the Edifact stub plugin available at https://github.com/bywatersolutions/koha-plugin-edifact-stub 5) Edit the EDI Vendor account, assign the plugin to a Vendor EDI account 6) Test EDI functionality ( ORDER, INVOICE ), there should be no errors or changes to the EDIFACT message input or output Signed-off-by: Jason DeShaw Signed-off-by: Martin Renvoize Signed-off-by: Brendan A Gallagher ----------------------------------------------------------------------- Summary of changes: Koha/EDI.pm | 53 ++++++++++++++++---- Koha/Plugins.pm | 2 +- Koha/Schema/Result/VendorEdiAccount.pm | 21 +++++--- admin/edi_accounts.pl | 5 ++ installer/data/mysql/kohastructure.sql | 1 + .../prog/en/modules/admin/edi_accounts.tt | 13 +++++ misc/cronjobs/edi_cron.pl | 37 +++++++++++++- 7 files changed, 112 insertions(+), 20 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Apr 1 23:58:23 2016 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 01 Apr 2016 21:58:23 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.22.00-1097-g932f5c2 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 932f5c2ad558bde7bc613a15aeb24f3c16d9fd48 (commit) from fb0d0ddf392d65f6689e91d698ced25b3a0965d4 (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 932f5c2ad558bde7bc613a15aeb24f3c16d9fd48 Author: Brendan A Gallagher Date: Fri Apr 1 22:05:12 2016 +0000 Updating the Schema for bugs 7736 and 15630 Signed-off-by: Brendan A Gallagher ----------------------------------------------------------------------- Summary of changes: Koha/Schema/Result/VendorEdiAccount.pm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Mon Apr 4 22:35:13 2016 From: gitmaster at git.koha-community.org (Git repo owner) Date: Mon, 04 Apr 2016 20:35:13 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.22.00-1098-g7e1b0c2 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 7e1b0c25cdc9906cc32dbee721236b9d934a19a7 (commit) from 932f5c2ad558bde7bc613a15aeb24f3c16d9fd48 (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 7e1b0c25cdc9906cc32dbee721236b9d934a19a7 Author: Tomas Cohen Arazi Date: Mon Apr 4 09:59:34 2016 -0300 Bug 7736: (QA followup) Add missing body id and class Signed-off-by: Tomas Cohen Arazi Signed-off-by: Brendan Gallagher brendan at bywatersolutions.com ----------------------------------------------------------------------- Summary of changes: koha-tmpl/intranet-tmpl/prog/en/modules/acqui/edi_ean.tt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Tue Apr 5 09:18:46 2016 From: gitmaster at git.koha-community.org (Git repo owner) Date: Tue, 05 Apr 2016 07:18:46 +0000 Subject: [koha-commits] main Koha release repository branch 3.20.x updated. v3.20.10-2-g0ed4d36 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.20.x has been updated via 0ed4d365fa7bc235a4d5546ec77a578a5e20cc7a (commit) via 0ca64dc7714f87d4192c0f48efc78a62245bbe87 (commit) from 746dfe072b164ab7e408ed017c433e4b17cab5ff (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 0ed4d365fa7bc235a4d5546ec77a578a5e20cc7a Author: Jonathan Druart Date: Thu Sep 17 08:40:19 2015 +0100 Bug 14841: Fine column is not manage by columns settings Bug 9481 added the "Fine" columns to the checkouts table and bug 13492 added the columns settings to these table. They overlapped each others in the bugs queue. Test plan: Confirm that you are able to hide/show the "Fine" columns on both checkouts table. Signed-off-by: Joonas Kylm?l? Signed-off-by: Katrin Fischer Signed-off-by: Tomas Cohen Arazi (cherry picked from commit f94afd5e6c5bbc6669cf74177aad0da9f492a3d1) Signed-off-by: Fr?d?ric Demians commit 0ca64dc7714f87d4192c0f48efc78a62245bbe87 Author: Jonathan Druart Date: Thu Sep 17 08:34:28 2015 +0100 Bug 14841: Columns settings are not taken into account for checkout table / moremember There is a typo member vs members in the template when retrieving the existing settings. So that all columns are displayed, even the ones which are hidden (sort_order, due_date_unformatted, etc.) Test plan: 0/ Does not apply this patch 1/ Go on the columns config page and check some fields not to display by default for Patrons > moremember > issues-table 2/ Go on the patron detail page (with checkouts), click on the "show/hide columns" button (top right of the table). Confirm that the config is not taken into account and that it's ugly (hidden columns are displayed) 3/ Apply this patch 4/ Everything should be fine now :) Signed-off-by: Joonas Kylm?l? Signed-off-by: Katrin Fischer Signed-off-by: Tomas Cohen Arazi (cherry picked from commit 8b7e1f45832e3b8d079612d973916310766aa93a) Signed-off-by: Fr?d?ric Demians ----------------------------------------------------------------------- Summary of changes: admin/columns_settings.yml | 4 ++++ koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Tue Apr 5 17:07:11 2016 From: gitmaster at git.koha-community.org (Git repo owner) Date: Tue, 05 Apr 2016 15:07:11 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.22.00-1100-gea4a243 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 ea4a2436e274d8f0a5082ef6b6944c400ad69d88 (commit) via faaa2cbcdb1970866be4f8a7001bf2de305823a9 (commit) from 7e1b0c25cdc9906cc32dbee721236b9d934a19a7 (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 ea4a2436e274d8f0a5082ef6b6944c400ad69d88 Author: Jonathan Druart Date: Mon Apr 4 11:31:21 2016 +0100 Bug 15967: Use the email template if the print template does not exist From commit 581759e985c170db0edb4a895cda641930e5ac11 Bug 14133: Print notices should be generated with the print template """ IMPORTANT NOTE: This test plan does not take into account the notices generated for the staff ("These messages were not sent directly to the patrons."). However the behavior will also change, the print template will be used in all cases. Is it what we want? """ Yes, it is what we want. But if the print template does not exist, the notice is not generated, we'd like to get the email template instead. Test plan: - Remove the print template for the letter you use for overdues - Define an overdue rule to send an email - Remove the email address for the patron which has overdues - Execute the overdue_notices script The staff should get an email notice and a print notice (using the email template) should be generated for the patron Signed-off-by: Nick Clemens Signed-off-by: Katrin Fischer Signed-off-by: Brendan A Gallagher commit faaa2cbcdb1970866be4f8a7001bf2de305823a9 Author: Jonathan Druart Date: Thu Mar 3 08:58:06 2016 +0000 Bug 15967: Fix regression from bug 14133 - notify the library if patron is not Regression introduced by bug 14133, see but 14133 comment 13. Test plan: Without this patch applied, if a patron cannot be notified (no email address or sms number), the print notice generated for the library was not. With this patch applied, the print notice should be generated using the print template Signed-off-by: Nick Clemens Signed-off-by: Katrin Fischer Signed-off-by: Brendan A Gallagher ----------------------------------------------------------------------- Summary of changes: misc/cronjobs/overdue_notices.pl | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Tue Apr 5 17:09:06 2016 From: gitmaster at git.koha-community.org (Git repo owner) Date: Tue, 05 Apr 2016 15:09:06 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.22.00-1101-gaa66deb 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 aa66debec6fcdbdadd643386749a61229167aa62 (commit) from ea4a2436e274d8f0a5082ef6b6944c400ad69d88 (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 aa66debec6fcdbdadd643386749a61229167aa62 Author: John Seymour Date: Wed Feb 10 22:38:15 2016 -0500 Bug 14633: Patch to control.ini to add or dependency to libapache2-mpm-itk The other attachment was not a patch which could be applied by 'git bz'. This corrects that. Signed-off-by: Chris Cormack debian/update-control will need to be run after this is applied, but it works well Signed-off-by: Tomas Cohen Arazi Signed-off-by: Brendan A Gallagher ----------------------------------------------------------------------- Summary of changes: debian/control.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Tue Apr 5 17:10:21 2016 From: gitmaster at git.koha-community.org (Git repo owner) Date: Tue, 05 Apr 2016 15:10:21 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.22.00-1102-gc8f6d8d 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 c8f6d8d009e09ba403790586dadcb5e74080d150 (commit) from aa66debec6fcdbdadd643386749a61229167aa62 (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 c8f6d8d009e09ba403790586dadcb5e74080d150 Author: Bernardo Gonzalez Kriegel Date: Mon Apr 4 10:59:37 2016 -0300 Bug 16194: Do not consider xslt as valid theme dir in LangInstaller.pm Bug 15527 add an xslt dir, LangInstaller.pm must ingnore that dir. To test: 1) Verify the problem on current master Update translation for any lang, will see errors 2) Apply the patch 3) Update again, no errors Signed-off-by: Tomas Cohen Arazi Works as expected. Signed-off-by: Katrin Fischer Signed-off-by: Brendan A Gallagher ----------------------------------------------------------------------- Summary of changes: misc/translator/LangInstaller.pm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Tue Apr 5 17:49:57 2016 From: gitmaster at git.koha-community.org (Git repo owner) Date: Tue, 05 Apr 2016 15:49:57 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.22.00-1103-gc84fe12 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 c84fe12d5e0651023448a31d93dcb5224f476c8d (commit) from c8f6d8d009e09ba403790586dadcb5e74080d150 (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 c84fe12d5e0651023448a31d93dcb5224f476c8d Author: Brendan A Gallagher Date: Tue Apr 5 15:57:05 2016 +0000 DBrev adding in the missing update DBversion = "3.23.00.046"; Signed-off-by: Brendan A Gallagher ----------------------------------------------------------------------- Summary of changes: Koha.pm | 2 +- installer/data/mysql/updatedatabase.pl | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Tue Apr 5 18:13:26 2016 From: gitmaster at git.koha-community.org (Git repo owner) Date: Tue, 05 Apr 2016 16:13:26 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.22.00-1104-gb14c46c 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 b14c46c9428c74c9519223870d6442b8427ac699 (commit) from c84fe12d5e0651023448a31d93dcb5224f476c8d (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 b14c46c9428c74c9519223870d6442b8427ac699 Author: Brendan A Gallagher Date: Tue Apr 5 16:21:03 2016 +0000 DBRev fix - "" was wrong smartquotes. fixed Signed-off-by: Brendan A Gallagher ----------------------------------------------------------------------- Summary of changes: installer/data/mysql/updatedatabase.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Wed Apr 6 14:45:36 2016 From: gitmaster at git.koha-community.org (Git repo owner) Date: Wed, 06 Apr 2016 12:45:36 +0000 Subject: [koha-commits] main Koha release repository branch 3.22.x updated. v3.22.05-10-g50c84aa 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.22.x has been updated via 50c84aa4ce4614655a0fdc5c75a0e98694b4fa9c (commit) from bcf2d8d15494fa63df91bcd6099a9ba39a258e32 (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 50c84aa4ce4614655a0fdc5c75a0e98694b4fa9c Author: John Seymour Date: Wed Feb 10 22:38:15 2016 -0500 Bug 14633: Patch to control.ini to add or dependency to libapache2-mpm-itk The other attachment was not a patch which could be applied by 'git bz'. This corrects that. Signed-off-by: Chris Cormack debian/update-control will need to be run after this is applied, but it works well Signed-off-by: Tomas Cohen Arazi Signed-off-by: Brendan A Gallagher (cherry picked from commit aa66debec6fcdbdadd643386749a61229167aa62) Signed-off-by: Julian Maurice ----------------------------------------------------------------------- Summary of changes: debian/control.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Wed Apr 6 14:53:52 2016 From: gitmaster at git.koha-community.org (Git repo owner) Date: Wed, 06 Apr 2016 12:53:52 +0000 Subject: [koha-commits] main Koha release repository branch 3.22.x updated. v3.22.05-12-g03c9871 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.22.x has been updated via 03c9871ada24643ce8874a17980d18798f212c95 (commit) via 8664af5e20716d1a849b1deb26e48927b4921c5a (commit) from 50c84aa4ce4614655a0fdc5c75a0e98694b4fa9c (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 03c9871ada24643ce8874a17980d18798f212c95 Author: Jonathan Druart Date: Mon Apr 4 11:31:21 2016 +0100 Bug 15967: Use the email template if the print template does not exist From commit 581759e985c170db0edb4a895cda641930e5ac11 Bug 14133: Print notices should be generated with the print template """ IMPORTANT NOTE: This test plan does not take into account the notices generated for the staff ("These messages were not sent directly to the patrons."). However the behavior will also change, the print template will be used in all cases. Is it what we want? """ Yes, it is what we want. But if the print template does not exist, the notice is not generated, we'd like to get the email template instead. Test plan: - Remove the print template for the letter you use for overdues - Define an overdue rule to send an email - Remove the email address for the patron which has overdues - Execute the overdue_notices script The staff should get an email notice and a print notice (using the email template) should be generated for the patron Signed-off-by: Nick Clemens Signed-off-by: Katrin Fischer Signed-off-by: Brendan A Gallagher (cherry picked from commit ea4a2436e274d8f0a5082ef6b6944c400ad69d88) Signed-off-by: Julian Maurice commit 8664af5e20716d1a849b1deb26e48927b4921c5a Author: Jonathan Druart Date: Thu Mar 3 08:58:06 2016 +0000 Bug 15967: Fix regression from bug 14133 - notify the library if patron is not Regression introduced by bug 14133, see but 14133 comment 13. Test plan: Without this patch applied, if a patron cannot be notified (no email address or sms number), the print notice generated for the library was not. With this patch applied, the print notice should be generated using the print template Signed-off-by: Nick Clemens Signed-off-by: Katrin Fischer Signed-off-by: Brendan A Gallagher (cherry picked from commit faaa2cbcdb1970866be4f8a7001bf2de305823a9) Signed-off-by: Julian Maurice ----------------------------------------------------------------------- Summary of changes: misc/cronjobs/overdue_notices.pl | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Wed Apr 6 15:09:11 2016 From: gitmaster at git.koha-community.org (Git repo owner) Date: Wed, 06 Apr 2016 13:09:11 +0000 Subject: [koha-commits] main Koha release repository branch 3.22.x updated. v3.22.05-13-g07c842d 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.22.x has been updated via 07c842de0faa0cb33206f374b78d5b8a75c58604 (commit) from 03c9871ada24643ce8874a17980d18798f212c95 (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 07c842de0faa0cb33206f374b78d5b8a75c58604 Author: Jonathan Druart Date: Tue Mar 15 09:38:20 2016 +0000 Bug 16068: Do not cache overridden prefs These prefs do not need to be cached, a quick access to $ENV permit to get the value. Signed-off-by: Jacek Ablewicz Signed-off-by: Martin Renvoize Signed-off-by: Brendan A Gallagher (cherry picked from commit 6e8d24231c03775422f403a76ca41ccf22f40558) Signed-off-by: Julian Maurice ----------------------------------------------------------------------- Summary of changes: C4/Context.pm | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Wed Apr 6 15:12:54 2016 From: gitmaster at git.koha-community.org (Git repo owner) Date: Wed, 06 Apr 2016 13:12:54 +0000 Subject: [koha-commits] main Koha release repository branch 3.22.x updated. v3.22.05-14-g107e6de 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.22.x has been updated via 107e6de672a57ad88fe1315aba2845856a73b64e (commit) from 07c842de0faa0cb33206f374b78d5b8a75c58604 (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 107e6de672a57ad88fe1315aba2845856a73b64e Author: Tomas Cohen Arazi Date: Wed Mar 23 15:53:01 2016 -0300 Bug 16138: Restart plack when rotating logfiles On log rotation Starman/Plack keeps failing (Auth.pm related problems) due to permission issues: Could not compile /usr/share/koha/opac/cgi-bin/opac/opac-search.pl: Can't locate Authen/CAS/Client/Response/Failure.pm : ./Authen/CAS/Client/Response/Failure.pm: Permission denied at /usr/share/perl/5.20/base.pm line 97. ...propagated at /usr/share/perl/5.20/base.pm line 106. BEGIN failed--compilation aborted at /usr/share/perl5/Authen/CAS/Client/Response.pm line 68. Compilation failed in require at /usr/share/perl5/Authen/CAS/Client.pm line 8. BEGIN failed--compilation aborted at /usr/share/perl5/Authen/CAS/Client.pm line 8. Compilation failed in require at /usr/share/koha/lib/C4/Auth_with_cas.pm line 25. BEGIN failed--compilation aborted at /usr/share/koha/lib/C4/Auth_with_cas.pm line 25. Compilation failed in require at /usr/share/koha/lib/C4/Auth.pm line 63. BEGIN failed--compilation aborted at /usr/share/koha/lib/C4/Auth.pm line 90. Compilation failed in require at /usr/share/koha/opac/cgi-bin/opac/opac-search.pl line 34. BEGIN failed--compilation aborted at /usr/share/koha/opac/cgi-bin/opac/opac-search.pl line 34. As we do with zebra daemons, starman should be restarted as it doesn't handle log file rotation gracefully[1]. I'm not sure how to reproduce it on a dev environment. [1] https://github.com/miyagawa/Starman/issues/55 Signed-off-by: Mirko Tietgen Signed-off-by: Martin Renvoize Signed-off-by: Brendan A Gallagher (cherry picked from commit 93efeab13e25aea7e467b112983536833c69ceea) Signed-off-by: Julian Maurice ----------------------------------------------------------------------- Summary of changes: debian/koha-common.logrotate | 2 ++ 1 file changed, 2 insertions(+) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Wed Apr 6 15:20:22 2016 From: gitmaster at git.koha-community.org (Git repo owner) Date: Wed, 06 Apr 2016 13:20:22 +0000 Subject: [koha-commits] main Koha release repository branch 3.22.x updated. v3.22.05-15-g8073799 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.22.x has been updated via 80737996ec728d0cb6264f35a2a98a6f33ee445f (commit) from 107e6de672a57ad88fe1315aba2845856a73b64e (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 80737996ec728d0cb6264f35a2a98a6f33ee445f Author: Marc V?ron Date: Wed Feb 10 17:21:40 2016 +0100 Bug 11498 - Prevent bypassing sco timeout with print dialog This patch prevents bypassing the self check timeout with the print dialog. To test: - Set syspref 'WebVasedSelfCheck' to 'Enable' - Set syspref 'SelfCheckoutReceivePrompt' to 'Show' - Set syspref 'SelfCheckTimeout' to 20 seconds - Apply patch - Go to SCO page (/cgi-bin/koha/sco/sco-main.pl) - Enter card number - Click 'Finish'. Dialog "Would you like to pritn a receipt?' appears. - Confirm printing without waiting 20 seconds => Result: Print slip, SCO page shows 'Please enter your card number' - Enter card number again - Click 'Finish'. Dialog "Would you like to pritn a receipt?' appears. - Wait > 20 seconds (value of SelfCheckTimeout) and then confirm. => Result: Message appears "Timeout while waiting for print confirmation" - Click on OK. => Result: Self checkout page refreshes (shows 'Please enter your card number') Signed-off-by: Mirko Tietgen Signed-off-by: Katrin Fischer https://bugs.koha-community.org/show_bug.cgi?id=11497 Signed-off-by: Brendan A Gallagher (cherry picked from commit 7f8037f642913d94ebec70413c6fd8cadfdf938d) Signed-off-by: Julian Maurice ----------------------------------------------------------------------- Summary of changes: koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/sco-main.tt | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Wed Apr 6 15:41:24 2016 From: gitmaster at git.koha-community.org (Git repo owner) Date: Wed, 06 Apr 2016 13:41:24 +0000 Subject: [koha-commits] main Koha release repository branch 3.22.x updated. v3.22.05-16-g5808b3d 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.22.x has been updated via 5808b3de5b40bf964813b0c3509f7f7cd0429422 (commit) from 80737996ec728d0cb6264f35a2a98a6f33ee445f (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 5808b3de5b40bf964813b0c3509f7f7cd0429422 Author: Jonathan Druart Date: Wed Mar 30 10:55:02 2016 +0100 Bug 14158: www search tests - Cleanup at the end When something wrong happen, the parent process is waiting for the children to finish, but they have been zombified and the test hangs. To fix that, we should ensure that the cleanup is correctly done and that the processes are correctly killed. Test plan: export KOHA_USER=koha export KOHA_PASS=koha export KOHA_INTRANET_URL=http://do_not_exist_but_its_expected export KOHA_OPAC_URL=http://another_url prove t/db_dependent/www/search_utf8.t Without this patch, the tests will hang With the patch applied, they won't! Signed-off-by: Tomas Cohen Arazi Signed-off-by: Brendan A Gallagher (cherry picked from commit 8255a18edc9c2eee52b01bfa20114b088b9bf555) Signed-off-by: Julian Maurice ----------------------------------------------------------------------- Summary of changes: t/db_dependent/www/search_utf8.t | 5 +++++ 1 file changed, 5 insertions(+) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Wed Apr 6 15:48:58 2016 From: gitmaster at git.koha-community.org (Git repo owner) Date: Wed, 06 Apr 2016 13:48:58 +0000 Subject: [koha-commits] main Koha release repository branch 3.22.x updated. v3.22.05-18-g97de8be 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.22.x has been updated via 97de8be7046833a3a1e6ced3e3d512c89ca8cb85 (commit) via 7e7b170febb55dfdc01d1864eaa48a1646210cc0 (commit) from 5808b3de5b40bf964813b0c3509f7f7cd0429422 (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 97de8be7046833a3a1e6ced3e3d512c89ca8cb85 Author: Jonathan Druart Date: Tue Mar 1 12:13:22 2016 +0000 Bug 14441: TrackClicks cuts off/breaks URLs (XSLT) Same test plan as previous patch, but for opac defail and result using the XSLT views. Signed-off-by: Katrin Fischer I am amazed! Signed-off-by: Brendan A Gallagher (cherry picked from commit ee0abde76e78713233a9fcd31fbb6f80b5a9610c) Signed-off-by: Julian Maurice commit 7e7b170febb55dfdc01d1864eaa48a1646210cc0 Author: Mason James Date: Tue Mar 1 16:26:06 2016 +1300 Bug 14441 - TrackClicks cuts off/breaks URLs to test... 1/ set TrackClicks syspref to 'track' 2/ add a problematic multipart url to an item's 'url' field example url: http://foo.corg?key1=val1&key2=val2 3/ test url in opac-detail.pl - url is corrupt 4/ apply patch - url is corrct Signed-off-by: Katrin Fischer Only fixes the item URLs - a follow-up for the URLs in the bibliographic record (856 for MARC21) is still needed. Signed-off-by: Brendan A Gallagher (cherry picked from commit de2a298a0623408c064ed0edbe47795740c814f4) Signed-off-by: Julian Maurice ----------------------------------------------------------------------- Summary of changes: koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt | 6 +++--- .../opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACDetail.xsl | 5 +++-- .../opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACResults.xsl | 9 +++++---- .../opac-tmpl/bootstrap/en/xslt/NORMARCslim2OPACDetail.xsl | 5 +++-- .../opac-tmpl/bootstrap/en/xslt/NORMARCslim2OPACResults.xsl | 5 +++-- 5 files changed, 17 insertions(+), 13 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Wed Apr 6 15:51:03 2016 From: gitmaster at git.koha-community.org (Git repo owner) Date: Wed, 06 Apr 2016 13:51:03 +0000 Subject: [koha-commits] main Koha release repository branch 3.22.x updated. v3.22.05-19-gc4c7ea4 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.22.x has been updated via c4c7ea475b813d97595a6114ef2e31028ec6efe5 (commit) from 97de8be7046833a3a1e6ced3e3d512c89ca8cb85 (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 c4c7ea475b813d97595a6114ef2e31028ec6efe5 Author: Jonathan Druart Date: Wed Mar 30 11:30:01 2016 +0100 Bug 15323: Use fixtures for the active currency prove t/Prices.t fails after bug 15084 has been pushed It's caused by commit 1538e9ecf47642c4974693ff499c3e95e4d71977 Bug 15084: Replace C4::Budgets::GetCurrencies with Koha::Acquisition::Currencies->search Koha::Number::Price->_format_params calls Koha::Acquisition::Currencies->get_active, which requests the DB. The currency data should be mocked. Test plan: sudo service mysql stop prove t/Prices.t should return green Signed-off-by: Tomas Cohen Arazi Patch works as expected and passes the qa-tools tests. Signed-off-by: Katrin Fischer Signed-off-by: Brendan A Gallagher (cherry picked from commit 0a14e22d59343475ed6970b82b474a80e43d8e29) Signed-off-by: Julian Maurice ----------------------------------------------------------------------- Summary of changes: t/Prices.t | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Wed Apr 6 16:24:30 2016 From: gitmaster at git.koha-community.org (Git repo owner) Date: Wed, 06 Apr 2016 14:24:30 +0000 Subject: [koha-commits] main Koha release repository branch 3.22.x updated. v3.22.05-21-g40507ce 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.22.x has been updated via 40507ce1529a237ec5c51837805100e89e96db9c (commit) via 8374e3e87119dae08521d68fd99b9975f164e4ec (commit) from c4c7ea475b813d97595a6114ef2e31028ec6efe5 (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 40507ce1529a237ec5c51837805100e89e96db9c Author: Jonathan Druart Date: Tue Mar 8 11:58:24 2016 +0000 Bug 15741: Fix rounding in total fines calculations C4::Members::GetMemberAccountRecords wrongly casts float to integer It's common to use sprintf in Perl to do this job. % perl -e 'print int(1000*64.60)."\n"'; 64599 % perl -e 'print sprintf("%.0f", 1000*64.60)."\n"'; 64600 Test plan: 1) Create manual invoice for 64.60 (or 1.14, 1.36, ...) 2) Try to pay it using "Pay amount" or "Pay selected" buttons Signed-off-by: Sally Healey Signed-off-by: Katrin Fischer Signed-off-by: Tomas Cohen Arazi Signed-off-by: Brendan A Gallagher (cherry picked from commit 92fbb1f3d0f2bdb070a1b647c96edbce5b28a377) Signed-off-by: Julian Maurice commit 8374e3e87119dae08521d68fd99b9975f164e4ec Author: Tomas Cohen Arazi Date: Wed Mar 23 20:28:56 2016 -0300 Bug 15741: (regression tests) Rounding is not calculated correctly Signed-off-by: Tomas Cohen Arazi Signed-off-by: Brendan A Gallagher (cherry picked from commit f1e1eaa32870a5954a1151973bae3dbe3f3b8122) Signed-off-by: Julian Maurice ----------------------------------------------------------------------- Summary of changes: C4/Members.pm | 2 +- t/db_dependent/Members.t | 31 ++++++++++++++++++++++++++++++- 2 files changed, 31 insertions(+), 2 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Wed Apr 6 16:30:50 2016 From: gitmaster at git.koha-community.org (Git repo owner) Date: Wed, 06 Apr 2016 14:30:50 +0000 Subject: [koha-commits] main Koha release repository branch 3.22.x updated. v3.22.05-22-g7212c9f 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.22.x has been updated via 7212c9f41e635a3be54dc2356696b1e9ce6a370f (commit) from 40507ce1529a237ec5c51837805100e89e96db9c (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 7212c9f41e635a3be54dc2356696b1e9ce6a370f Author: David Cook Date: Fri Feb 5 16:09:45 2016 +1100 Bug 15745: C4::Matcher gets CCL parsing error if term contains ? (question mark) Signed-off-by: Olli-Antti Kivilahti Also fixes ! and + Rebased to master Signed-off-by: Tomas Cohen Arazi It makes perfect sense and works as expected. This part of the code is too under-tested so no point requiring a regression test for such a simple change. Signed-off-by: Brendan A Gallagher (cherry picked from commit fcbd81049f590e5fc0c31030bcdb1311951c1444) Signed-off-by: Julian Maurice ----------------------------------------------------------------------- Summary of changes: C4/Matcher.pm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Wed Apr 6 16:39:35 2016 From: gitmaster at git.koha-community.org (Git repo owner) Date: Wed, 06 Apr 2016 14:39:35 +0000 Subject: [koha-commits] main Koha release repository branch 3.22.x updated. v3.22.05-23-g60e601b 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.22.x has been updated via 60e601bf5f485a46b36bf14d2145adf9c25fe098 (commit) from 7212c9f41e635a3be54dc2356696b1e9ce6a370f (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 60e601bf5f485a46b36bf14d2145adf9c25fe098 Author: Jonathan Druart Date: Tue Feb 9 17:02:05 2016 +0000 Bug 15773: Fix and standardise checkboxes code in framework When creating a new subfield for an authority framework, the checkboxes don't behave as they should. If you click on the 'repeatable', 'mandatory' or 'is url' checkbox's label, the checkbox from the second tab will be checked/unchecked. This is caused by a non-unique id of the input element. I have found this bug when working on the removal of CGI::checkbox in both admin/auth_subfields_structure.pl and admin/marc_subfields_structure.pl scripts. This patch remove the use of CGI::checkbox as well as the generation of html code from these 2 pl scripts (which should be avoided). The code these scripts are now pretty similar. Test plan: Add/modify/remove subfield for a MARC framework and an Authority framework. Use as many field as possible and confirm that the values are correctly inserted/displayed. Signed-off-by: Hector Castro Works as advertised Signed-off-by: Katrin Fischer Signed-off-by: Brendan Gallagher brendan at bywatersolutions.com (cherry picked from commit 39597b86ae299a9b4c0c1e8221f51f9e8dd300ed) Signed-off-by: Julian Maurice ----------------------------------------------------------------------- Summary of changes: admin/auth_subfields_structure.pl | 179 ++++++------------- admin/marc_subfields_structure.pl | 183 ++++++-------------- .../en/modules/admin/auth_subfields_structure.tt | 99 +++++++---- .../en/modules/admin/marc_subfields_structure.tt | 74 +++++--- 4 files changed, 209 insertions(+), 326 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Wed Apr 6 16:59:14 2016 From: gitmaster at git.koha-community.org (Git repo owner) Date: Wed, 06 Apr 2016 14:59:14 +0000 Subject: [koha-commits] main Koha release repository branch 3.22.x updated. v3.22.05-24-g3779c5a 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.22.x has been updated via 3779c5a70966a5bfac95f1b69406e197f8a790e8 (commit) from 60e601bf5f485a46b36bf14d2145adf9c25fe098 (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 3779c5a70966a5bfac95f1b69406e197f8a790e8 Author: Mark Tompsett Date: Fri Apr 1 09:31:41 2016 -0400 Bug 16185: t/db_dependent/Reports_Guided.t is failing TEST PLAN --------- 1) prove t/db_dependent/Reports_Guided.t -- fails -- note the failure has a scalar function-like bracketing 2) apply patch 3) prove t/db_dependent/Reports_Guided.t -- passes 4) git diff origin/master -- note all scalars have been changed to not have function-like brackets which could be incorrectly parsed. 5) run koha qa test tools Signed-off-by: Tomas Cohen Arazi Signed-off-by: Brendan A Gallagher (cherry picked from commit 42d065937627a705b813eba577f519416f356d99) Signed-off-by: Julian Maurice ----------------------------------------------------------------------- Summary of changes: t/db_dependent/Reports_Guided.t | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Wed Apr 6 23:53:13 2016 From: gitmaster at git.koha-community.org (Git repo owner) Date: Wed, 06 Apr 2016 21:53:13 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.22.00-1105-g22a33b7 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 22a33b7868bf1f0b312d548c5abdb642bfa72d6e (commit) from b14c46c9428c74c9519223870d6442b8427ac699 (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 22a33b7868bf1f0b312d548c5abdb642bfa72d6e Author: Owen Leonard Date: Wed Apr 6 10:31:09 2016 -0400 Bug 16215: Missing closing quote in checkout template This patch adds a missing closing quote to the circulation template. To see the affect of this bug: - Log in to Koha with an account which does not have the 'force_checkout' permission. - Locate a barcode which is checked out to a patron. - Open a different patron account for checkout. - Try to check out the barcode to that different patron. You see a "Cannot check out" dialog which breaks the structure of the rest of the page. To test, apply the patch and repeat the steps above. The issue should be fixed. Signed-off-by: Hector Castro Works as advertised Signed-off-by: Jonathan Druart Signed-off-by: Brendan A Gallagher ----------------------------------------------------------------------- Summary of changes: koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Wed Apr 6 23:57:53 2016 From: gitmaster at git.koha-community.org (Git repo owner) Date: Wed, 06 Apr 2016 21:57:53 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.22.00-1106-g833afc1 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 833afc12454cfebefe22ec57722e7c36ada01dea (commit) from 22a33b7868bf1f0b312d548c5abdb642bfa72d6e (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 833afc12454cfebefe22ec57722e7c36ada01dea Author: Jonathan Druart Date: Tue Apr 5 08:27:46 2016 +0100 Bug 16198: Fix regression in OPAC suggestions Introduced by commit d564d3732d95455b4626dfa8ca711cd658003c17 Bug 15629: Koha::Libraries - Remove GetBranchInfo If the branchcodesuggestedby is not defined, the find won't return anything and ->branchname on an undefined value will raise Can't call method "branchname" on an undefined value at /home/katrin/kohaclone/opac/opac-suggestions.pl line 153. Test plan: -Staff Create a patron Use this patron to create a suggestion Delete the patron -OPAC Logout and trigger opac/opac-suggestions.pl Without this patch, you will get an error With this patch applied, everything should be ok Signed-off-by: Bernardo Gonzalez Kriegel Works ok following test plan No errors Signed-off-by: Katrin Fischer Signed-off-by: Brendan A Gallagher ----------------------------------------------------------------------- Summary of changes: opac/opac-suggestions.pl | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Wed Apr 6 23:59:57 2016 From: gitmaster at git.koha-community.org (Git repo owner) Date: Wed, 06 Apr 2016 21:59:57 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.22.00-1107-g6a86cbf 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 6a86cbff039dacd050d6a57bf4b853ea589b6fdc (commit) from 833afc12454cfebefe22ec57722e7c36ada01dea (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 6a86cbff039dacd050d6a57bf4b853ea589b6fdc Author: Colin Campbell Date: Wed Apr 6 18:45:42 2016 +0100 Bug 7736: (QA followup) Remove obsolete Schema module msg_invoice is not used merged into patch in error Signed-off-by: Jesse Weaver Signed-off-by: Brendan A Gallagher ----------------------------------------------------------------------- Summary of changes: Koha/Schema/Result/MsgInvoice.pm | 115 -------------------------------------- 1 file changed, 115 deletions(-) delete mode 100644 Koha/Schema/Result/MsgInvoice.pm hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Thu Apr 7 00:01:32 2016 From: gitmaster at git.koha-community.org (Git repo owner) Date: Wed, 06 Apr 2016 22:01:32 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.22.00-1108-ge916ded 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 e916ded09756ba4902a25e9e68fe536614419c87 (commit) from 6a86cbff039dacd050d6a57bf4b853ea589b6fdc (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 e916ded09756ba4902a25e9e68fe536614419c87 Author: Julian Maurice Date: Wed Apr 6 16:12:16 2016 +0200 Bug 16214: Fix typo 'To.jon' -> 'To.json' Bug 15722 introduces a regression in serials patron search results, causing the surname to not be displayed To reproduce: 1. Create a routing list for a subscription 2. Click on "Add recipients" button 3. Run a search 4. Check that surname is not displayed Signed-off-by: Jonathan Druart Signed-off-by: Brendan A Gallagher ----------------------------------------------------------------------- Summary of changes: .../intranet-tmpl/prog/en/modules/serials/tables/members_results.tt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Thu Apr 7 00:02:26 2016 From: gitmaster at git.koha-community.org (Git repo owner) Date: Wed, 06 Apr 2016 22:02:26 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.22.00-1109-g2c68980 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 2c68980467009a9d19116440d4f28356707e9e7c (commit) from e916ded09756ba4902a25e9e68fe536614419c87 (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 2c68980467009a9d19116440d4f28356707e9e7c Author: Mason James Date: Fri Apr 1 15:56:34 2016 +1300 Bug 16184 - Report bor_issues_top shows incorrect number of rows TEST PLAN --------- 1) Have at least 6 patrons with checkouts and some checkins. 2) Reports -> Patrons with the most checkouts 3) Click 'Submit' (default is 5) -- more than 5 entries listed. 4) Apply patch 5) Refresh page -- only 5 entries listed. 6) Run koha qa test tools NOTE: While this works, I'd be much happier with a refactor as it would also speed up the report. See comment #5. Signed-off-by: Mark Tompsett Signed-off-by: Katrin Fischer Signed-off-by: Brendan A Gallagher ----------------------------------------------------------------------- Summary of changes: reports/bor_issues_top.pl | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Thu Apr 7 00:03:38 2016 From: gitmaster at git.koha-community.org (Git repo owner) Date: Wed, 06 Apr 2016 22:03:38 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.22.00-1110-gc2f92f6 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 c2f92f68d84753d62880e17e9d1bd19c8b9bff47 (commit) from 2c68980467009a9d19116440d4f28356707e9e7c (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 c2f92f68d84753d62880e17e9d1bd19c8b9bff47 Author: Alex Arnaud Date: Wed Mar 30 16:49:10 2016 +0200 Bug 16171 - Show many media in html5media tabs Signed-off-by: Mirko Tietgen Signed-off-by: Katrin Fischer Signed-off-by: Brendan A Gallagher ----------------------------------------------------------------------- Summary of changes: .../intranet-tmpl/prog/en/modules/catalogue/detail.tt | 12 ++++++------ .../opac-tmpl/bootstrap/en/modules/opac-detail.tt | 16 ++++++++-------- 2 files changed, 14 insertions(+), 14 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Thu Apr 7 01:40:15 2016 From: gitmaster at git.koha-community.org (Git repo owner) Date: Wed, 06 Apr 2016 23:40:15 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.22.00-1111-g5b909a8 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 5b909a82693d452d233e95d7598092aa5ee14c17 (commit) from c2f92f68d84753d62880e17e9d1bd19c8b9bff47 (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 5b909a82693d452d233e95d7598092aa5ee14c17 Author: Mark Tompsett Date: Fri Apr 1 17:59:29 2016 -0400 Bug 16191: t/Ris.t is noisy TEST PLAN --------- 1) prove t/Ris.t -- very noisy 2) apply patch 3) prove t/Ris.t -- just one confusing noise. 4) run koha qa test tools Signed-off-by: Marc V?ron Signed-off-by: Jonathan Druart Signed-off-by: Brendan Gallagher brendan at bywatersolutions.com ----------------------------------------------------------------------- Summary of changes: C4/Ris.pm | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Thu Apr 7 01:42:37 2016 From: gitmaster at git.koha-community.org (Git repo owner) Date: Wed, 06 Apr 2016 23:42:37 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.22.00-1112-ge4d0363 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 e4d0363bc72403b4eea69cd7375e06ee2ecd729d (commit) from 5b909a82693d452d233e95d7598092aa5ee14c17 (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 e4d0363bc72403b4eea69cd7375e06ee2ecd729d Author: Nick Clemens Date: Fri Feb 26 21:08:55 2016 +0000 Bug 15928 - Show unlinked guarantor To test: 1 - Add guarantor data to patron account by typing it in but do not 'Set to patron' 2 - Note it is not displayed on patron details 3 - Apply patch 4 - Note the info is displayed 5 - Test that linked guarantors show as expected Signed-off-by: Marc V?ron Signed-off-by: Jonathan Druart Amended-patch: Correct some indents/spaces Signed-off-by: Brendan Gallagher brendan at bywatersolutions.com ----------------------------------------------------------------------- Summary of changes: koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt | 6 +++++- members/moremember.pl | 7 +++++++ 2 files changed, 12 insertions(+), 1 deletion(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Thu Apr 7 01:50:03 2016 From: gitmaster at git.koha-community.org (Git repo owner) Date: Wed, 06 Apr 2016 23:50:03 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.22.00-1113-g5ecdd8c 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 5ecdd8c6a3f1dfbb8d498921d62100dd6bdb921f (commit) from e4d0363bc72403b4eea69cd7375e06ee2ecd729d (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 5ecdd8c6a3f1dfbb8d498921d62100dd6bdb921f Author: Owen Leonard Date: Tue Apr 5 11:43:58 2016 -0400 Bug 16205 - MARC editor settings menu should use a Font Awesome icon When I added the MARC editor settings menu in Bug 15859 I accidentally used a Glyphicon. This patch corrects it to use a Font Awesome icon. To test, apply the patch and open the basic cataloging editor. The "Settings" menu should use a Font Awesome icon instead of a Glyphicon. Signed-off-by: Hector Castro Icons changed Signed-off-by: Tomas Cohen Arazi Works as expected, no qa errors Signed-off-by: Brendan Gallagher brendan at bywatersolutions.com ----------------------------------------------------------------------- Summary of changes: koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Thu Apr 7 01:51:47 2016 From: gitmaster at git.koha-community.org (Git repo owner) Date: Wed, 06 Apr 2016 23:51:47 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.22.00-1114-g88dc70f 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 88dc70f7e691da61742f79c46c601de82a1d7e56 (commit) from 5ecdd8c6a3f1dfbb8d498921d62100dd6bdb921f (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 88dc70f7e691da61742f79c46c601de82a1d7e56 Author: Jonathan Druart Date: Tue Apr 5 07:52:50 2016 +0100 Bug 16199: Remove C4::Ris::charconv This subroutine always returns what has been sent in parameter. It is unecessary and can be removed. Test plan: prove t/Ris.t should not be noisy Export a catalogue record in Ris should generate the same file with and without this patch NOTE: With/Without were identical in my testing. t/Ris.t is nicely silenced. Signed-off-by: Mark Tompsett Signed-off-by: Tomas Cohen Arazi Signed-off-by: Brendan Gallagher brendan at bywatersolutions.com ----------------------------------------------------------------------- Summary of changes: C4/Ris.pm | 53 ++++++++++++++++------------------------------------- t/Ris.t | 5 +---- 2 files changed, 17 insertions(+), 41 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Thu Apr 7 01:52:41 2016 From: gitmaster at git.koha-community.org (Git repo owner) Date: Wed, 06 Apr 2016 23:52:41 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.22.00-1115-g94d0ed6 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 94d0ed61150257308b160025dfdd06e18ebd4ae6 (commit) from 88dc70f7e691da61742f79c46c601de82a1d7e56 (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 94d0ed61150257308b160025dfdd06e18ebd4ae6 Author: Aleisha Date: Mon Apr 4 00:48:11 2016 +0000 Bug 16193: Typo in Automatic item modifications by age To test: 1) Go to Tools -> Automatic item modifications by age 2) Click Edit 3) Add a rule if you have none, otherwise notice button 'Submit theses rules' and typo (theses) 4) Apply patch, refresh page 5) Confirm button now says 'Submit these rules' (typo is fixed) Sponsored-by: Catalyst IT Signed-off-by: Owen Leonard Signed-off-by: Jonathan Druart Signed-off-by: Brendan Gallagher brendan at bywatersolutions.com ----------------------------------------------------------------------- Summary of changes: .../prog/en/modules/tools/automatic_item_modification_by_age.tt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Thu Apr 7 01:54:09 2016 From: gitmaster at git.koha-community.org (Git repo owner) Date: Wed, 06 Apr 2016 23:54:09 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.22.00-1116-gdde8856 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 dde885675418644a201d00c044233a6387d46c72 (commit) from 94d0ed61150257308b160025dfdd06e18ebd4ae6 (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 dde885675418644a201d00c044233a6387d46c72 Author: Aleisha Date: Thu Mar 31 21:42:06 2016 +0000 Bug 16183: Confirm message upon deleting patron messages To test: 1) Go to a patron circulation page and add a message 2) Click '[Delete]' 3) Confirm that a confirm dialog shows up and 'Cancel' and 'OK' do what is expected. Sponsored-by: Catalyst IT Signed-off-by: Owen Leonard Signed-off-by: Jonathan Druart Signed-off-by: Brendan Gallagher brendan at bywatersolutions.com ----------------------------------------------------------------------- Summary of changes: koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Thu Apr 7 01:55:51 2016 From: gitmaster at git.koha-community.org (Git repo owner) Date: Wed, 06 Apr 2016 23:55:51 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.22.00-1117-geb04d17 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 eb04d174d91201b05b6e348dc672f9351dc0aaf0 (commit) from dde885675418644a201d00c044233a6387d46c72 (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 eb04d174d91201b05b6e348dc672f9351dc0aaf0 Author: Jacek Ablewicz Date: Wed Mar 30 12:21:03 2016 +0200 Bug 16168: Eliminate unneeded C4::Context->dbh calls in C4/Biblio.pm Right now, ->dbh calls are actually quite expensive (they involve DB connection health checks, each and every time). Some speed-sensitive subroutines inside C4/Biblio.pm (GetMarcStructure, GetAuthorisedValueDesc) have this statement my $dbh = C4::Context->dbh; on top of the code, but they don't always/don't usually need DB handle - not at that stage at least. This trivial patch eliminates unneeded ->dbh calls in those subroutines. With it, average GetMarcStructure() running time goes down from 14 miliseconds to 9 miliseconds (on top of Bug 16166), it also makes catalogue search profiling a bit easier. Test plan: 1) apply patch 2) ensure that catalogue searches are still working 3) run t/*Biblio* tests Signed-off-by: Jonathan Druart Signed-off-by: Katrin Fischer Signed-off-by: Brendan Gallagher brendan at bywatersolutions.com ----------------------------------------------------------------------- Summary of changes: C4/Biblio.pm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Thu Apr 7 01:56:18 2016 From: gitmaster at git.koha-community.org (Git repo owner) Date: Wed, 06 Apr 2016 23:56:18 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.22.00-1118-gc564f30 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 c564f30155cac18cf6b7b26a549303f65e9e33a3 (commit) from eb04d174d91201b05b6e348dc672f9351dc0aaf0 (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 c564f30155cac18cf6b7b26a549303f65e9e33a3 Author: Jonathan Druart Date: Wed Mar 30 11:58:31 2016 +0100 Bug 16169: Change prototype for C4::Biblio::TransformMarcToKoha subroutines should not take $dbh in parameter. C4::Biblio::TransformMarcToKoha has it and does not use it. Test plan: Look at the patch and confirm that all occurrences of TransformMarcToKoha have been modified. Signed-off-by: Jacek Ablewicz Signed-off-by: Katrin Fischer Signed-off-by: Brendan Gallagher brendan at bywatersolutions.com ----------------------------------------------------------------------- Summary of changes: C4/AuthoritiesMarc.pm | 2 +- C4/Biblio.pm | 9 ++++----- C4/ImportBatch.pm | 4 ++-- C4/Items.pm | 6 +++--- C4/Matcher.pm | 2 +- C4/Search.pm | 8 ++++---- acqui/neworderbiblio.pl | 2 +- cataloguing/additem.pl | 6 +++--- cataloguing/value_builder/marc21_linking_section.pl | 2 +- cataloguing/value_builder/unimarc_field_4XX.pl | 2 +- circ/circulation.pl | 3 +-- labels/label-item-search.pl | 2 +- misc/batchRebuildBiblioTables.pl | 2 +- opac/opac-ISBDdetail.pl | 2 +- opac/opac-MARCdetail.pl | 2 +- serials/subscription-bib-search.pl | 2 +- t/Biblio.t | 2 +- 17 files changed, 28 insertions(+), 30 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Thu Apr 7 01:57:40 2016 From: gitmaster at git.koha-community.org (Git repo owner) Date: Wed, 06 Apr 2016 23:57:40 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.22.00-1119-g57cf173 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 57cf173c0cdd40aee7187d6d0f9878ecb492032a (commit) from c564f30155cac18cf6b7b26a549303f65e9e33a3 (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 57cf173c0cdd40aee7187d6d0f9878ecb492032a Author: Aleisha Date: Wed Mar 30 00:02:09 2016 +0000 Bug 16164: Making check expiration actions buttons EDIT: Using same font awesome icon for 'Renew' as in other places To test: 1) Go to Serials -> Check expiration 2) Put in a date where one or more subscriptions will expire prior to this date 3) Confirm that column heading is now 'Actions' 4) Confirm that Edit and Renew now show as font awesome buttons 5) Confirm that the buttons don't wrap on narrower browsers 6) Confirm the buttons still work as expected Sponsored-by: Catalyst IT Signed-off-by: Marc V?ron Signed-off-by: Katrin Fischer Signed-off-by: Brendan Gallagher brendan at bywatersolutions.com ----------------------------------------------------------------------- Summary of changes: .../intranet-tmpl/prog/en/modules/serials/checkexpiration.tt | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Thu Apr 7 02:01:04 2016 From: gitmaster at git.koha-community.org (Git repo owner) Date: Thu, 07 Apr 2016 00:01:04 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.22.00-1120-g6ffb20f 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 6ffb20f7283d602a87a2f7d60bdfcea8bff242fc (commit) from 57cf173c0cdd40aee7187d6d0f9878ecb492032a (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 6ffb20f7283d602a87a2f7d60bdfcea8bff242fc Author: Aleisha Date: Tue Mar 29 23:37:19 2016 +0000 Bug 16161: Confirm message when deleting definition To test: 1) Go to Reports -> View dictionary 2) Attempt to delete definiton. Confirm that a confirm messages comes up and works as expected. Sponsored-by: Catalyst IT NOTE: confirmation message didn't exist before patch. confirmation message appeared after patch. both options worked as expected. Signed-off-by: Mark Tompsett Signed-off-by: Katrin Fischer Signed-off-by: Brendan Gallagher brendan at bywatersolutions.com ----------------------------------------------------------------------- Summary of changes: koha-tmpl/intranet-tmpl/prog/en/modules/reports/dictionary.tt | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Thu Apr 7 02:01:48 2016 From: gitmaster at git.koha-community.org (Git repo owner) Date: Thu, 07 Apr 2016 00:01:48 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.22.00-1121-gefff8e5 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 efff8e5143c1aa3bc560faba7b03e5f2a6fbaec7 (commit) from 6ffb20f7283d602a87a2f7d60bdfcea8bff242fc (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 efff8e5143c1aa3bc560faba7b03e5f2a6fbaec7 Author: Aleisha Date: Tue Mar 29 23:44:56 2016 +0000 Bug 16162: Making dictionary 'Delete' a button EDIT: This patch should have gotten rid of those tabs EDIT2: Will now apply with patch on Bug 16161 To test: 1) Apply Bug 16161 first 2) Go to Reports -> View dictionary 3) Confirm that the 'Delete definition' button now just says 'Delete' and is styled as a font awesome button. 4) Confirm that the button does not wrap on narrower browsers. 5) Confirm that column heading is now 'Action'. 6) Confirm that button deletes as expected. (If you're wondering about the missing confirm message upon delete, see Bug 16161.) Sponsored-by: Catalyst IT Tested on top of Bug 16161 Signed-off-by: Marc V?ron Signed-off-by: Katrin Fischer Signed-off-by: Brendan Gallagher brendan at bywatersolutions.com ----------------------------------------------------------------------- Summary of changes: koha-tmpl/intranet-tmpl/prog/en/modules/reports/dictionary.tt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Thu Apr 7 02:08:08 2016 From: gitmaster at git.koha-community.org (Git repo owner) Date: Thu, 07 Apr 2016 00:08:08 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.22.00-1122-gb64e6be 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 b64e6be1c4f3dbdcde41ac8f4766b4d1f962610d (commit) from efff8e5143c1aa3bc560faba7b03e5f2a6fbaec7 (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 b64e6be1c4f3dbdcde41ac8f4766b4d1f962610d Author: Jonathan Druart Date: Tue Mar 29 14:58:01 2016 +0100 Bug 16157: Move the selected flag from GetAuthorisedValues to the templates From C4::Koha::GetAuthorisedValues # TODO: the "selected" feature should be replaced by a utility function # somewhere else, it doesn't belong in here. For starters it makes # caching much more complicated. Or just let the UI logic handle it, it's # what it's for. Indeed, it's not a job for a subroutine, the template should take care of that. Note that a perf gain could be won with this patch \o/ Test plan: - Edit an itemtype and check the value of the "Search category" dropdown list - Edit a patron attribute type and check the value of the "Class" dropdown list - Detail for a catalogue record, the Status column should be correctly populated if items are damaged and/or lost - Item details for a catalogue record, the lost, damaged and withdrawn value should be correctly displayed - Edit a patron, the "street type" should be correctly selected - Create a patron attribute type linked to an authorised value list. - Edit a patron, set a value for this attribute, edit it again. The correct value should be selected. - Search for subscriptions. The 'Location' dropdown list should behave correctly (select the entry you have choosen before, etc.) - Edit a subscription, the location dropdown list should select the correct value. - Edit and view a suggestion with a 'reason for suggestion' set (you should have at least 1 OPAC_SUG AV defined) Followed test plan, works as expected Signed-off-by: Marc V?ron Signed-off-by: Katrin Fischer Signed-off-by: Brendan Gallagher brendan at bywatersolutions.com ----------------------------------------------------------------------- Summary of changes: C4/Koha.pm | 26 ++------------ Koha/Template/Plugin/AuthorisedValues.pm | 4 +-- admin/itemtypes.pl | 2 +- admin/patron-attr-types.pl | 18 ++++------ catalogue/detail.pl | 4 +-- catalogue/moredetail.pl | 6 ++-- .../prog/en/includes/av-build-dropbox.inc | 2 ++ .../en/includes/member-main-address-style-de.inc | 2 +- .../en/includes/member-main-address-style-us.inc | 2 +- .../prog/en/modules/admin/itemtypes.tt | 6 ++-- .../prog/en/modules/admin/patron-attr-types.tt | 2 +- .../prog/en/modules/catalogue/detail.tt | 4 +-- .../prog/en/modules/catalogue/moredetail.tt | 8 ++--- .../prog/en/modules/members/memberentrygen.tt | 2 +- .../prog/en/modules/serials/serials-collection.tt | 3 +- .../prog/en/modules/serials/serials-edit.tt | 3 +- .../prog/en/modules/serials/serials-search.tt | 38 +++++--------------- .../prog/en/modules/serials/subscription-add.tt | 2 +- .../prog/en/modules/suggestion/suggestion.tt | 20 ++++++++--- .../bootstrap/en/includes/opac-topissues.inc | 4 +-- members/memberentry.pl | 2 +- opac/opac-search.pl | 2 +- serials/serials-collection.pl | 12 ++----- serials/serials-edit.pl | 8 ++--- serials/serials-search.pl | 2 +- serials/subscription-add.pl | 2 +- suggestion/suggestion.pl | 2 +- t/db_dependent/Koha.t | 8 +---- 28 files changed, 74 insertions(+), 122 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Thu Apr 7 02:11:01 2016 From: gitmaster at git.koha-community.org (Git repo owner) Date: Thu, 07 Apr 2016 00:11:01 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.22.00-1123-g4fa84cf 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 4fa84cf713517883ff29b7472c9c75a7f1d717f6 (commit) from b64e6be1c4f3dbdcde41ac8f4766b4d1f962610d (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 4fa84cf713517883ff29b7472c9c75a7f1d717f6 Author: Alex Sassmannshausen Date: Thu Mar 17 13:35:22 2016 +0100 Bug 16087: Add Koha::OldIssues objects. * Koha/OldIssue.pm: New file. * Koha/OldIssues.pm: New file. https://bugs.koha-community.org/show_bug.cgi?id=16087 Signed-off-by: Bernardo Gonzalez Kriegel Nothing to test, new files. No errors Signed-off-by: Jonathan Druart Signed-off-by: Brendan Gallagher brendan at bywatersolutions.com ----------------------------------------------------------------------- Summary of changes: Koha/{Localization.pm => OldIssue.pm} | 4 ++-- Koha/{Localizations.pm => OldIssues.pm} | 9 ++++----- 2 files changed, 6 insertions(+), 7 deletions(-) copy Koha/{Localization.pm => OldIssue.pm} (93%) copy Koha/{Localizations.pm => OldIssues.pm} (87%) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Thu Apr 7 06:59:14 2016 From: gitmaster at git.koha-community.org (Git repo owner) Date: Thu, 07 Apr 2016 04:59:14 +0000 Subject: [koha-commits] main Koha release repository branch 3.22.x updated. v3.22.05-26-g11ba213 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.22.x has been updated via 11ba21369dc99ba2b1ae4d4fbe4af572e6af40e4 (commit) via eba74c8e51a52432362150c38d674f661a6228e8 (commit) from 3779c5a70966a5bfac95f1b69406e197f8a790e8 (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 11ba21369dc99ba2b1ae4d4fbe4af572e6af40e4 Author: Julian Maurice Date: Wed Apr 6 16:12:16 2016 +0200 Bug 16214: Fix typo 'To.jon' -> 'To.json' Bug 15722 introduces a regression in serials patron search results, causing the surname to not be displayed To reproduce: 1. Create a routing list for a subscription 2. Click on "Add recipients" button 3. Run a search 4. Check that surname is not displayed Signed-off-by: Jonathan Druart Signed-off-by: Brendan A Gallagher (cherry picked from commit e916ded09756ba4902a25e9e68fe536614419c87) Signed-off-by: Julian Maurice commit eba74c8e51a52432362150c38d674f661a6228e8 Author: Jonathan Druart Date: Tue Mar 8 14:09:09 2016 +0000 Bug 15722: Escape patron infos for JSON in patron searches If patron infos contain invalid JSON chars (\t for instance), the results won't appear. The solution is to escape these info. Test plan: Edit patron infos in DB (update borrowers set surname="foobar\t" where borrowernumber=42) Search for foobar (you should have more than 1 result) Without this patch, DT retrieves a bad formatted JSON and the results won't appear. With this patch, the table result appears Signed-off-by: Kyle M Hall Signed-off-by: Katrin Fischer Signed-off-by: Brendan A Gallagher (cherry picked from commit cd20b61a7c845110e518e6dedc12ac50efebe4aa) Signed-off-by: Julian Maurice ----------------------------------------------------------------------- Summary of changes: .../intranet-tmpl/prog/en/modules/acqui/tables/members_results.tt | 2 +- .../intranet-tmpl/prog/en/modules/members/tables/members_results.tt | 2 +- .../prog/en/modules/patroncards/tables/members_results.tt | 2 +- .../intranet-tmpl/prog/en/modules/serials/tables/members_results.tt | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Thu Apr 7 07:21:07 2016 From: gitmaster at git.koha-community.org (Git repo owner) Date: Thu, 07 Apr 2016 05:21:07 +0000 Subject: [koha-commits] main Koha release repository branch 3.22.x updated. v3.22.05-27-g7020021 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.22.x has been updated via 702002129787ceb2cdae61f6dc2352dff1afa84d (commit) from 11ba21369dc99ba2b1ae4d4fbe4af572e6af40e4 (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 702002129787ceb2cdae61f6dc2352dff1afa84d Author: Alex Arnaud Date: Wed Feb 17 12:27:14 2016 +0100 Bug 15838 - Subscription duplicating: Reset fields from SubscriptionDuplicateDroppedInput syspef by getting them using name instead of id How I tested: Verified bug with start and end date (were not cleared without patch). After applying the patch all fields defined in SubscriptionDuplicateDroppedInput were cleared as expected. Signed-off-by: Marc V?ron Signed-off-by: Jonathan Druart Signed-off-by: Brendan Gallagher brendan at bywatersolutions.com (cherry picked from commit 873a49f13b79bf1f5f7163f217cfc3a317ce602f) Signed-off-by: Julian Maurice ----------------------------------------------------------------------- Summary of changes: koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Thu Apr 7 07:25:40 2016 From: gitmaster at git.koha-community.org (Git repo owner) Date: Thu, 07 Apr 2016 05:25:40 +0000 Subject: [koha-commits] main Koha release repository branch 3.22.x updated. v3.22.05-28-g887bb8c 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.22.x has been updated via 887bb8c92fbda53713dd0862124b533ce64ece1f (commit) from 702002129787ceb2cdae61f6dc2352dff1afa84d (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 887bb8c92fbda53713dd0862124b533ce64ece1f Author: Aleisha Date: Sun Mar 20 23:24:18 2016 +0000 Bug 15866: Add confirm message for deleting rotating collection from toolbar To test: 1) Go to Tools -> Rotating Collections 2) Click on any rotating collection ('Add or remove items' from drop down menu) 3) Click 'Delete' from toolbar. Validate you are now asked to confirm your deletion. Check that cancel works, then check that confirm works. Sponsored-by: Catalyst IT Signed-off-by: Marc V?ron Signed-off-by: Katrin Fischer I've added the word 'rotating' before collection, to make it clear for translators what is meant here. Signed-off-by: Brendan A Gallagher (cherry picked from commit a48d166bbf506287355c9fceea2633159308c530) Signed-off-by: Julian Maurice ----------------------------------------------------------------------- Summary of changes: .../en/includes/rotating-collections-toolbar.inc | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Thu Apr 7 07:26:50 2016 From: gitmaster at git.koha-community.org (Git repo owner) Date: Thu, 07 Apr 2016 05:26:50 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.22.00-1125-gc266985 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 c2669856becef61f83144b91faf35a9635300dad (commit) via 5e17091e926ad493c64e95ec5407e4ff6120b70c (commit) from 4fa84cf713517883ff29b7472c9c75a7f1d717f6 (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 c2669856becef61f83144b91faf35a9635300dad Author: Jonathan Druart Date: Wed Apr 6 13:09:31 2016 +0100 Bug 16086: Add tests for Koha::Issues Signed-off-by: Jonathan Druart Signed-off-by: Brendan Gallagher brendan at bywatersolutions.com commit 5e17091e926ad493c64e95ec5407e4ff6120b70c Author: Alex Sassmannshausen Date: Thu Mar 17 13:20:32 2016 +0100 Bug 16086: Add Issues Koha object. * Koha/Issue.pm: New file. * Koha/Issues.pm: New file. https://bugs.koha-community.org/show_bug.cgi?id=16086 Signed-off-by: Bernardo Gonzalez Kriegel Nothing to test, no errors. Signed-off-by: Jonathan Druart Signed-off-by: Brendan Gallagher brendan at bywatersolutions.com ----------------------------------------------------------------------- Summary of changes: Koha/{OldIssue.pm => Issue.pm} | 4 +-- Koha/{OldIssues.pm => Issues.pm} | 8 ++--- t/db_dependent/Koha/Issues.t | 60 ++++++++++++++++++++++++++++++++++++++ 3 files changed, 66 insertions(+), 6 deletions(-) copy Koha/{OldIssue.pm => Issue.pm} (94%) copy Koha/{OldIssues.pm => Issues.pm} (89%) create mode 100644 t/db_dependent/Koha/Issues.t hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Thu Apr 7 07:28:12 2016 From: gitmaster at git.koha-community.org (Git repo owner) Date: Thu, 07 Apr 2016 05:28:12 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.22.00-1127-gcbe3ded 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 cbe3dedc4f91a91e40f9e648c9de2358c68379cb (commit) via a3557fd0f25371246445ff2e327eaa5df5bf6e8f (commit) from c2669856becef61f83144b91faf35a9635300dad (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 cbe3dedc4f91a91e40f9e648c9de2358c68379cb Author: Nick Clemens Date: Wed Feb 24 17:56:23 2016 +0000 Bug 15877 - Unit tests Signed-off-by: Srdjan Signed-off-by: Jonathan Druart Signed-off-by: Brendan Gallagher brendan at bywatersolutions.com commit a3557fd0f25371246445ff2e327eaa5df5bf6e8f Author: Nick Clemens Date: Wed Feb 24 17:10:02 2016 +0000 Bug 15877 - C4::Barcodes does not correctly calculate db_max for 'annual' barcodes This patch alters the MySQL query to remove a max statement which incorrectly groups full annual barcodes with numeric values. Signed-off-by: Srdjan Signed-off-by: Jonathan Druart Signed-off-by: Brendan Gallagher brendan at bywatersolutions.com ----------------------------------------------------------------------- Summary of changes: C4/Barcodes/annual.pm | 4 +-- t/db_dependent/Barcodes.t | 61 ++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 62 insertions(+), 3 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Thu Apr 7 07:29:55 2016 From: gitmaster at git.koha-community.org (Git repo owner) Date: Thu, 07 Apr 2016 05:29:55 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.22.00-1128-g928c0af 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 928c0af2b6a2c7aa6ed54019c5bd7dbddbccf4ee (commit) from cbe3dedc4f91a91e40f9e648c9de2358c68379cb (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 928c0af2b6a2c7aa6ed54019c5bd7dbddbccf4ee Author: Aleisha Date: Tue Feb 16 02:07:59 2016 +0000 Bug 15824 - 'Done' button is unclear on batch item modification and deletion EDIT: Making sure the messages and the buttons show the same text, as per Comment 6. To test: MODIFICATION 1) Go to a biblio record page (ie http://localhost:8081/cgi-bin/koha/catalogue/detail.pl?biblionumber=1) 2) Click edit -> Edit items in a batch 3) Click Save (you don't need to make any changes) 4) Validate 'Done' button. Confirm that there is now a link in dialog message box which takes you back to the record detail page. 5) Go to a biblio record page 6) Select one or some or all items in the record 7) Click modify selected items 8) Click Save 9) Validate 'Done' button. Confirm that there is now a link in dialog message box which takes you back to the record detail page. 10) Go to batch item modification (http://localhost:8081/cgi-bin/koha/tools/batchMod.pl) 11) Write some barcodes into the barcode list and click Continue 12) Click Save 13) Validate 'Done' button. Confirm that there is now a link in dialog message box which takes you back to the batch item mod page. DELETION 14) Go to a biblio record page (ie http://localhost:8081/cgi-bin/koha/catalogue/detail.pl?biblionumber=1) 15) Click edit -> Delete items in a batch 16) Unselect all the items so you don't actually delete them, then click Delete selected items 17) Validate 'Done' button. Confirm that there is now a link in dialog message box which takes you back to the record detail page. 18) Go to a biblio record page 19) Select one or some or all items in the record 20) Click Delete selected items 21) Unselect all the items so you don't actually delete them, then click Delete selected items 22) Validate 'Done' button. Confirm that there is now a link in dialog message box which takes you back to the record detail page. 23) Go to batch item deletion (http://localhost:8081/cgi-bin/koha/tools/batchMod.pl?del=1) 24) Write some barcodes into the barcode list and click Continue 25) Unselect all the items so you don't actually delete them, then click Delete selected items 26) Validate 'Done' button. Confirm that there is now a link in dialog message box which takes you back to the batch item deletion page. Signed-off-by: Owen Leonard Followed test plan, works as expected. Signed-off-by: Marc V?ron Signed-off-by: Jonathan Druart Signed-off-by: Brendan Gallagher brendan at bywatersolutions.com ----------------------------------------------------------------------- Summary of changes: .../prog/en/modules/tools/batchMod-del.tt | 13 ++++++++++--- .../prog/en/modules/tools/batchMod-edit.tt | 17 +++++++++++++---- 2 files changed, 23 insertions(+), 7 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Thu Apr 7 07:30:49 2016 From: gitmaster at git.koha-community.org (Git repo owner) Date: Thu, 07 Apr 2016 05:30:49 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.22.00-1131-gdcc1c0d 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 dcc1c0debdad0d0f9f8b717392839de616bb044b (commit) via 315ddf201368376f6fcbbf3dbc64e76ce50fdc8a (commit) via 4b271fad9b2db1e265e7419064750d3b6fdc0c2a (commit) from 928c0af2b6a2c7aa6ed54019c5bd7dbddbccf4ee (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 dcc1c0debdad0d0f9f8b717392839de616bb044b Author: Jonathan Druart Date: Mon Apr 4 10:23:09 2016 +0100 Bug 15008: Fix swap options-explanation values Signed-off-by: Jonathan Druart Signed-off-by: Brendan Gallagher brendan at bywatersolutions.com commit 315ddf201368376f6fcbbf3dbc64e76ce50fdc8a Author: Nick Clemens Date: Fri Apr 1 15:21:30 2016 +0000 Bug 15008 - (QA followup) Add sysprefs.sql changes for new installations Signed-off-by: Jonathan Druart Signed-off-by: Brendan Gallagher brendan at bywatersolutions.com commit 4b271fad9b2db1e265e7419064750d3b6fdc0c2a Author: Nick Clemens Date: Fri Feb 26 01:00:30 2016 +0000 Bug 15008 - Add custom HTML areas to circulation and reports home pages To test: 1 - Apply patch 2 - run updatedatabase.pl 3 - Add some html to the two new prefs IntranetReportsHomeHTML and IntranetCirculationHomeHTML 4 - View the reports and circulation homepages and confirm your changes show Sponsored by Northeast Kansas Library System, NEKLS (http://nekls.org/) Followed test plan, works as expected. Signed-off-by: Marc V?ron Signed-off-by: Jonathan Druart Signed-off-by: Brendan Gallagher brendan at bywatersolutions.com ----------------------------------------------------------------------- Summary of changes: ..._15008_add_custom_html_areas_to_circ_and_reports_home.sql | 2 ++ installer/data/mysql/sysprefs.sql | 2 ++ .../prog/en/modules/admin/preferences/staff_client.pref | 10 ++++++++++ .../intranet-tmpl/prog/en/modules/circ/circulation-home.tt | 4 ++++ .../intranet-tmpl/prog/en/modules/reports/reports-home.tt | 5 +++++ 5 files changed, 23 insertions(+) create mode 100644 installer/data/mysql/atomicupdate/bug_15008_add_custom_html_areas_to_circ_and_reports_home.sql hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Thu Apr 7 07:37:05 2016 From: gitmaster at git.koha-community.org (Git repo owner) Date: Thu, 07 Apr 2016 05:37:05 +0000 Subject: [koha-commits] main Koha release repository branch 3.22.x updated. v3.22.05-29-g9fddbc0 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.22.x has been updated via 9fddbc045da2dc25389e924262bd8f6e2bc99bfd (commit) from 887bb8c92fbda53713dd0862124b533ce64ece1f (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 9fddbc045da2dc25389e924262bd8f6e2bc99bfd Author: Julian Maurice Date: Thu Apr 7 07:43:21 2016 +0200 Bug 15868: Ask for confirmation when deleting a MMT action Test plan: Create marc modification template Add an action Delete it With this patch you must get a confirmation mesg Signed-off-by: Julian Maurice ----------------------------------------------------------------------- Summary of changes: .../prog/en/modules/tools/marc_modification_templates.tt | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Thu Apr 7 07:37:50 2016 From: gitmaster at git.koha-community.org (Git repo owner) Date: Thu, 07 Apr 2016 05:37:50 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.22.00-1132-ge126fc0 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 e126fc0a1956e1eb1207378bc4a2e745e991f559 (commit) from dcc1c0debdad0d0f9f8b717392839de616bb044b (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 e126fc0a1956e1eb1207378bc4a2e745e991f559 Author: Brendan Gallagher Date: Thu Apr 7 05:45:42 2016 +0000 DBRev for Bug 15008 - Add custom HTML areas to circulation and reports home pages Signed-off-by: Brendan Gallagher ----------------------------------------------------------------------- Summary of changes: Koha.pm | 2 +- ...008_add_custom_html_areas_to_circ_and_reports_home.sql | 2 -- installer/data/mysql/updatedatabase.pl | 13 +++++++++++++ 3 files changed, 14 insertions(+), 3 deletions(-) delete mode 100644 installer/data/mysql/atomicupdate/bug_15008_add_custom_html_areas_to_circ_and_reports_home.sql hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Thu Apr 7 07:40:21 2016 From: gitmaster at git.koha-community.org (Git repo owner) Date: Thu, 07 Apr 2016 05:40:21 +0000 Subject: [koha-commits] main Koha release repository branch 3.22.x updated. v3.22.05-30-g9a7c374 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.22.x has been updated via 9a7c37473042cbc0c533ea12e95273b7471d22a3 (commit) from 9fddbc045da2dc25389e924262bd8f6e2bc99bfd (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 9a7c37473042cbc0c533ea12e95273b7471d22a3 Author: Nick Clemens Date: Tue Feb 23 20:41:57 2016 +0000 Bug 15888 - Syndetics Reviews preference should not enable LibraryThing reviews To test: 1 - Enable Syndetics Reviews without a LibraryThing ID 2 - Check page source and note you have a stanza for LTFL tabbed reveiws 3 - Apply patch 4 - Reload page and note LTFL tabbed reviews are not present 5 - Enter a LibraryThing ID and not the tab is restored. Signed-off-by: Chris Cormack Signed-off-by: Katrin Fischer Signed-off-by: Brendan A Gallagher (cherry picked from commit 541a03cf6daace451f78e614b8019382dcd52acc) Signed-off-by: Julian Maurice ----------------------------------------------------------------------- Summary of changes: .../opac-tmpl/bootstrap/en/modules/opac-detail.tt | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Thu Apr 7 09:38:43 2016 From: gitmaster at git.koha-community.org (Git repo owner) Date: Thu, 07 Apr 2016 07:38:43 +0000 Subject: [koha-commits] main Koha release repository branch 3.22.x updated. v3.22.05-31-gcf2fdd5 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.22.x has been updated via cf2fdd529bf3feb687014798234ed3410c416182 (commit) from 9a7c37473042cbc0c533ea12e95273b7471d22a3 (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 cf2fdd529bf3feb687014798234ed3410c416182 Author: Julian Maurice Date: Wed Mar 23 14:07:09 2016 +0100 Bug 16134: t::lib::Mocks::mock_preference should be case-insensitive Test plan: 1. prove t/db_dependent/Auth_with_cas.t => FAIL 2. Apply patch 3. prove t/db_dependent/Auth_with_cas.t => SUCCESS Signed-off-by: Jonathan Druart Signed-off-by: Katrin Fischer Signed-off-by: Brendan A Gallagher (cherry picked from commit 300bf096bda90a0f17c6615798957fa7f588b36e) Signed-off-by: Julian Maurice ----------------------------------------------------------------------- Summary of changes: t/lib/Mocks.pm | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Thu Apr 7 09:48:30 2016 From: gitmaster at git.koha-community.org (Git repo owner) Date: Thu, 07 Apr 2016 07:48:30 +0000 Subject: [koha-commits] main Koha release repository branch 3.22.x updated. v3.22.05-32-g180ef9d 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.22.x has been updated via 180ef9d5faded902c5869887f59a0d9e4807974b (commit) from cf2fdd529bf3feb687014798234ed3410c416182 (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 180ef9d5faded902c5869887f59a0d9e4807974b Author: Tomas Cohen Arazi Date: Wed Mar 23 23:43:17 2016 -0300 Bug 16143: Make opac-shelves.pl generate OPAC itype images path This patch makes icons point to the OPAC path instead of intranet's. To test: - On current master/3.22.x - Have some itemtypes with icons set - Have some biblios matching the itemtypes - Add them to a public list - Do a search in the OPAC for any of those biblios => SUCCESS: icons show correctly - Choose the list => FAIL: icons fail to show, URL points to /intranet-tmpl/.... - Apply the patch, reload => SUCCESS: icons show correctly - Sign off :-D Sponsored-by: American Numismatic Society NOTE: I had to set item-level_itypes to 'biblio record' in order to trigger this. My icon's showed, but the path was wrong. This patch corrects it. Signed-off-by: Mark Tompsett Signed-off-by: Katrin Fischer Signed-off-by: Brendan A Gallagher (cherry picked from commit 630301673605733429c4ae79e125053cf4169376) Signed-off-by: Julian Maurice ----------------------------------------------------------------------- Summary of changes: opac/opac-shelves.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Thu Apr 7 09:51:45 2016 From: gitmaster at git.koha-community.org (Git repo owner) Date: Thu, 07 Apr 2016 07:51:45 +0000 Subject: [koha-commits] main Koha release repository branch 3.22.x updated. v3.22.05-33-g0c37ebe 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.22.x has been updated via 0c37ebee17b81f31838c28f0690cea07b314a893 (commit) from 180ef9d5faded902c5869887f59a0d9e4807974b (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 0c37ebee17b81f31838c28f0690cea07b314a893 Author: Alex Arnaud Date: Wed Mar 30 16:49:10 2016 +0200 Bug 16171 - Show many media in html5media tabs Signed-off-by: Mirko Tietgen Signed-off-by: Katrin Fischer Signed-off-by: Brendan A Gallagher (cherry picked from commit c2f92f68d84753d62880e17e9d1bd19c8b9bff47) Signed-off-by: Julian Maurice ----------------------------------------------------------------------- Summary of changes: .../intranet-tmpl/prog/en/modules/catalogue/detail.tt | 12 ++++++------ .../opac-tmpl/bootstrap/en/modules/opac-detail.tt | 16 ++++++++-------- 2 files changed, 14 insertions(+), 14 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Thu Apr 7 10:14:04 2016 From: gitmaster at git.koha-community.org (Git repo owner) Date: Thu, 07 Apr 2016 08:14:04 +0000 Subject: [koha-commits] main Koha release repository branch 3.22.x updated. v3.22.05-34-gbd4659d 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.22.x has been updated via bd4659d09f92135a7956496c44af555b5938c8c3 (commit) from 0c37ebee17b81f31838c28f0690cea07b314a893 (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 bd4659d09f92135a7956496c44af555b5938c8c3 Author: Mason James Date: Fri Apr 1 15:56:34 2016 +1300 Bug 16184 - Report bor_issues_top shows incorrect number of rows TEST PLAN --------- 1) Have at least 6 patrons with checkouts and some checkins. 2) Reports -> Patrons with the most checkouts 3) Click 'Submit' (default is 5) -- more than 5 entries listed. 4) Apply patch 5) Refresh page -- only 5 entries listed. 6) Run koha qa test tools NOTE: While this works, I'd be much happier with a refactor as it would also speed up the report. See comment #5. Signed-off-by: Mark Tompsett Signed-off-by: Katrin Fischer Signed-off-by: Brendan A Gallagher (cherry picked from commit 2c68980467009a9d19116440d4f28356707e9e7c) Signed-off-by: Julian Maurice ----------------------------------------------------------------------- Summary of changes: reports/bor_issues_top.pl | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Thu Apr 7 10:17:07 2016 From: gitmaster at git.koha-community.org (Git repo owner) Date: Thu, 07 Apr 2016 08:17:07 +0000 Subject: [koha-commits] main Koha release repository branch 3.22.x updated. v3.22.05-35-g8695bfb 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.22.x has been updated via 8695bfbb6cf896227ff07ca5cbb6bd3a3de7d5fe (commit) from bd4659d09f92135a7956496c44af555b5938c8c3 (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 8695bfbb6cf896227ff07ca5cbb6bd3a3de7d5fe Author: Aleisha Date: Thu Mar 17 22:34:08 2016 +0000 Bug 15421: Show 'Duplicate' and 'Schedule' on Reports toolbar To test: 1) Go to Reports -> Use saved 2) Click 'Show' on the dropdown for any report 3) Confirm that 'Duplicate and 'Schedule' are now on the toolbar and work as expected Sponsored-by: Catalyst IT Signed-off-by: Marc V?ron Signed-off-by: Katrin Fischer Signed-off-by: Brendan Gallagher brendan at bywatersolutions.com (cherry picked from commit a9d7292a103918ecddcfabc430ea07cdd3513148) Signed-off-by: Julian Maurice ----------------------------------------------------------------------- Summary of changes: .../intranet-tmpl/prog/en/includes/reports-toolbar.inc | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Thu Apr 7 23:28:47 2016 From: gitmaster at git.koha-community.org (Git repo owner) Date: Thu, 07 Apr 2016 21:28:47 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.22.00-1134-g2a8c689 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 2a8c68936dd7fd5c82af339db968eb67cb93a082 (commit) via 690ab60da27fb9792feecbfa399b86c1b7a53d41 (commit) from e126fc0a1956e1eb1207378bc4a2e745e991f559 (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 2a8c68936dd7fd5c82af339db968eb67cb93a082 Author: Barton Chittenden Date: Thu Apr 7 08:22:40 2016 -0700 Bug 14277: (QA followup) Silent GRS-1 tests changed ocurrences of 'lex' to 'lexile-number' in record.abs Edits were made to the deprecated file record.abs *solely* to quiet warnings in tests -- this makes sense until GRS-1 code is removed from Koha. Signed-off-by: Tomas Cohen Arazi Signed-off-by: Jesse Weaver commit 690ab60da27fb9792feecbfa399b86c1b7a53d41 Author: Barton Chittenden Date: Thu Dec 17 09:17:23 2015 -0800 Bug 14277: add zebra indexes for lexile that respect 521 indicator 1. Added the following indexes: Interest-age-level | 591$a ind1=1 Interest-grade-level | 591$a ind1=2 lexile-number | 591$a ind1=8 Reading-grade-level | 591$a ind1=0 Moved 'lex' from a zebra index to a ccl alias to lexile-number. Changed the handling of st-numeric in C4/Search.pm to allow for search ranges. Signed-off-by: Nick Clemens Signed-off-by: Hector Castro Works as advertised Signed-off-by: Tomas Cohen Arazi Signed-off-by: Jesse Weaver ----------------------------------------------------------------------- Summary of changes: C4/Search.pm | 14 ++++++- etc/zebradb/biblios/etc/bib1.att | 6 ++- etc/zebradb/ccl.properties | 6 ++- .../marc21/biblios/biblio-koha-indexdefs.xml | 24 ++++++++--- .../marc21/biblios/biblio-zebra-indexdefs.xsl | 43 ++++++++++++++++---- etc/zebradb/marc_defs/marc21/biblios/record.abs | 2 +- 6 files changed, 78 insertions(+), 17 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Apr 8 07:37:44 2016 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 08 Apr 2016 05:37:44 +0000 Subject: [koha-commits] main Koha release repository branch 3.22.x updated. v3.22.05-38-g1c1d955 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.22.x has been updated via 1c1d9558eb6df6f44e96d204e8e6683e3ae04491 (commit) via 182838a54498b4a00a4077779458cf005f5ec444 (commit) via 279732365eb07bf9f9929402aadd837c16f131b6 (commit) from 8695bfbb6cf896227ff07ca5cbb6bd3a3de7d5fe (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 1c1d9558eb6df6f44e96d204e8e6683e3ae04491 Author: Owen Leonard Date: Fri Mar 18 09:41:15 2016 -0400 Bug 15984 - Correct templates which use the phrase "issuing rules" This patch corrects two places in the templates where the phrase "issuing rules" is used instead of "circulation and fine rules." To test, apply the patch and view the help pages for Administration -> Circulation and fine rules; and Tools -> Automatic item modification by age. Confirm that the term "circulation and fine rules" is used instead of "issuing rules." Signed-off-by: Marc V?ron Signed-off-by: Jonathan Druart Signed-off-by: Brendan Gallagher brendan at bywatersolutions.com (cherry picked from commit 98a9e30f040661e0a67a594f72abd8ab02cf9ad6) Signed-off-by: Julian Maurice commit 182838a54498b4a00a4077779458cf005f5ec444 Author: Jonathan Druart Date: Fri Feb 12 11:49:28 2016 +0000 Bug 14076: Do not use CGI->param in list context - opac-authorities-home.pl See bug 15809 for more info on why we should not use CGI->param in list context. Note: I have not found any places where several values for the same params are passed to this script but, just in case, this patch won't change this ability. Test plan: Do an authority search at the OPAC Test with several values of the form. Confirm that the results are always the same before and after this patch. Signed-off-by: Mark Tompsett Signed-off-by: Marcel de Rooy Signed-off-by: Brendan Gallagher brendan at bywatersolutions.com (cherry picked from commit 3fa2b10150a9ea2db2897be1246cba3785c55e55) Signed-off-by: Julian Maurice commit 279732365eb07bf9f9929402aadd837c16f131b6 Author: Jonathan Druart Date: Fri Feb 12 11:32:02 2016 +0000 Bug 15809: Redefine multi_param is CGI < 4.08 is used On debian Jessie, the CGI version is >= 4.08 Since this version, the param method raise a warning "CGI::param called in list context". Indeed, it can cause vulnerability if called in list context https://metacpan.org/pod/CGI#Fetching-the-value-or-values-of-a-single-named-parameter http://blog.gerv.net/2014/10/new-class-of-vulnerability-in-perl-web-applications/ There is a long journey to get rid of these warnings. First I suggest to redefine the multi_param method when the CGI version installed is < 4.08, it will allow us to move the wrong ->param calls to ->multi_param without waiting for everybody to upgrade. The different ways to call these 2 methods are: my $foo = $cgi->param('foo'); # OK my @foo = $cgi->param('foo'); # NOK, will raise the warning my @foo = $cgi->multi_param('foo'); #OK $template->param( foo => $cgi->param('foo') ); # NOK, will raise the warning # and vulnerable $template->param( foo => scalar $cgi->param('foo') ); # OK Signed-off-by: Mark Tompsett Signed-off-by: Marcel de Rooy Tested a call to multi_param with CGI < 4.08. With reference to the comments on Bugzilla, this workaround is arguable, but provides a base to move to multi_param. If we come up with a better solution, it should be easy to adjust. Signed-off-by: Brendan Gallagher brendan at bywatersolutions.com (cherry picked from commit 94dde6b48d6e20a5260ea49f9b98ec884c2c25b5) Signed-off-by: Julian Maurice ----------------------------------------------------------------------- Summary of changes: C4/Context.pm | 9 +++++++++ .../intranet-tmpl/prog/en/modules/help/admin/smart-rules.tt | 2 +- opac/opac-authorities-home.pl | 11 ++++++----- 3 files changed, 16 insertions(+), 6 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Apr 8 07:43:41 2016 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 08 Apr 2016 05:43:41 +0000 Subject: [koha-commits] main Koha release repository branch 3.22.x updated. v3.22.05-39-ge0ad205 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.22.x has been updated via e0ad205512af9dba2a9d5cad70bf6fdffecc6e17 (commit) from 1c1d9558eb6df6f44e96d204e8e6683e3ae04491 (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 e0ad205512af9dba2a9d5cad70bf6fdffecc6e17 Author: Aleisha Date: Sun Mar 13 23:40:53 2016 +0000 Bug 16029: Hide patron toolbar if patron does not exist To test: 1) Create a patron, take note of the borrower number 2) Delete the patron 3) Navigate to the page of the patron you just deleted by typing the url (ie /cgi-bin/koha/members/moremember.pl?borrowernumber=X) 4) Confirm that the patron toolbar is not showing on the page 5) The message now has a link that says 'Find another patron?'. Click this link and confirm you are taken to the member home pgae. Sponsored-by: Catalyst IT Followed test plan, works as expected. Signed-off-by: Marc V?ron Signed-off-by: Jonathan Druart Signed-off-by: Brendan Gallagher brendan at bywatersolutions.com (cherry picked from commit 1870141874667d854f9b5508c563169baefb2328) Signed-off-by: Julian Maurice ----------------------------------------------------------------------- Summary of changes: koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Apr 8 07:58:55 2016 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 08 Apr 2016 05:58:55 +0000 Subject: [koha-commits] main Koha release repository branch 3.22.x updated. v3.22.05-41-gc514e1f 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.22.x has been updated via c514e1fee2890660caa36c1dae62bcfbc6f72fc3 (commit) via 730cfb59258841572d19ffd9eedf36571edc100a (commit) from e0ad205512af9dba2a9d5cad70bf6fdffecc6e17 (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 c514e1fee2890660caa36c1dae62bcfbc6f72fc3 Author: Owen Leonard Date: Thu Mar 17 09:08:39 2016 -0400 Bug 16047 [Follow-up] Software error on deleting a group with no category code This follow-up take the original patch a little further, making category name required on the entry form as well. Without a category name there is no label in the interface when selecting a category. That doens't make any sense. Also changed on the group entry form: - Added "required" attribute to labels on required fields. - Changed "Update" submit button label to "Submit." - Added a "Cancel" link. - Added the "validated" class to the form so that our built-in validation script will process it (not strictly necessary but makes the validation appearance more consistent). Followed test plan, form displays and behaves as expected. Signed-off-by: Marc V?ron Signed-off-by: Katrin Fischer Signed-off-by: Brendan Gallagher brendan at bywatersolutions.com (cherry picked from commit df127ebad814ad1710b161b85a69d408de95de85) Signed-off-by: Julian Maurice commit 730cfb59258841572d19ffd9eedf36571edc100a Author: Aleisha Date: Thu Mar 10 21:49:57 2016 +0000 Bug 16047: Making category code a required field on creating a group This will prevent users from creating a group without a category code, which causes a software error when you try to delete it To test: 1) Go to Admin -> Libraries and groups 2) Create new group without category code 3) Attempt to delete the group you just created and notice software error 4) Apply patch 5) Create new group without category code 6) Notice you now cannot save the group without putting in a category code Sponsored-by: Catalyst IT Signed-off-by: Owen Leonard Signed-off-by: Katrin Fischer Signed-off-by: Brendan Gallagher brendan at bywatersolutions.com (cherry picked from commit 577aa86eb96160088c70008bfe85ae2c0820f547) Signed-off-by: Julian Maurice ----------------------------------------------------------------------- Summary of changes: .../intranet-tmpl/prog/en/modules/admin/branches.tt | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Apr 8 09:08:29 2016 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 08 Apr 2016 07:08:29 +0000 Subject: [koha-commits] main Koha release repository branch 3.22.x updated. v3.22.05-42-gfdc3f10 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.22.x has been updated via fdc3f105b5c29fb70cd1588edadebd9467c28684 (commit) from c514e1fee2890660caa36c1dae62bcfbc6f72fc3 (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 fdc3f105b5c29fb70cd1588edadebd9467c28684 Author: Owen Leonard Date: Wed Mar 9 10:02:08 2016 -0500 Bug 16023 - Use Font Awesome icons on audio alerts page The audio alerts management page uses Glyphicons in a few places. This patch replaces them with Font Awesome icons. To test, apply the patch for Bug 15886 if necessary and enable the AudioAlerts system preference. - Go to Administration -> Audio alerts - Confirm that icons for "Edit" and "Delete selected" look correct. - Edit an existing alert and confirm that the "play" button looks correct and works correctly. Signed-off-by: Marc V?ron Signed-off-by: Jonathan Druart Signed-off-by: Mark Tompsett Signed-off-by: Katrin Fischer Signed-off-by: Brendan Gallagher brendan at bywatersolutions.com (cherry picked from commit 5d266693edc042c0a2f795588058ae8b3d12da22) Signed-off-by: Julian Maurice ----------------------------------------------------------------------- Summary of changes: koha-tmpl/intranet-tmpl/prog/en/modules/admin/audio_alerts.tt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Apr 8 09:08:53 2016 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 08 Apr 2016 07:08:53 +0000 Subject: [koha-commits] main Koha release repository branch 3.22.x updated. v3.22.05-43-gaf42fd5 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.22.x has been updated via af42fd5e81c7ce2764dc9796293e9815f9809b54 (commit) from fdc3f105b5c29fb70cd1588edadebd9467c28684 (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 af42fd5e81c7ce2764dc9796293e9815f9809b54 Author: Mark Tompsett Date: Fri Apr 1 17:59:29 2016 -0400 Bug 16191: t/Ris.t is noisy TEST PLAN --------- 1) prove t/Ris.t -- very noisy 2) apply patch 3) prove t/Ris.t -- just one confusing noise. 4) run koha qa test tools Signed-off-by: Marc V?ron Signed-off-by: Jonathan Druart Signed-off-by: Brendan Gallagher brendan at bywatersolutions.com (cherry picked from commit 5b909a82693d452d233e95d7598092aa5ee14c17) Signed-off-by: Julian Maurice ----------------------------------------------------------------------- Summary of changes: C4/Ris.pm | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Apr 8 09:10:19 2016 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 08 Apr 2016 07:10:19 +0000 Subject: [koha-commits] main Koha release repository branch 3.22.x updated. v3.22.05-44-g626ef10 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.22.x has been updated via 626ef1091e67800208d4461aa9234e82c2464f01 (commit) from af42fd5e81c7ce2764dc9796293e9815f9809b54 (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 626ef1091e67800208d4461aa9234e82c2464f01 Author: Aleisha Date: Sun Mar 20 23:37:38 2016 +0000 Bug 15861: Isolated 'The' in help files untranslatable Changes made: help/reports/reports-home.tt Line 11: Koha database schema: shows the entire Koha database structure so that you can write effective SQL Queries Line 12: Koha reports library: lists reports written by Koha users around the world. help/rotating_collections/rotatingCollections.tt Line 7: Important: AutomaticItemReturn (system preference) must be set to .. TEST PLAN --------- 1) Log in to staff client 2) Click 'Reports' 3) Click 'Help' -- Notice the two lines starting with 'The' 4) Click 'Tools' 5) Click 'Rotating collections' in the Catalog column 6) Click 'Help' -- Notice the Important has a 'The' 7) Apply patch 8) Repeat steps 2-6 -- Notice the wording has changed to eliminate 'The' 9) Run koha qa test tools Sponsored-by: Catalyst IT Signed-off-by: Mark Tompsett Signed-off-by: Katrin Fischer Signed-off-by: Brendan Gallagher brendan at bywatersolutions.com (cherry picked from commit b72f9b8c51eb11861b931f193628460e2219a4fc) Signed-off-by: Julian Maurice ----------------------------------------------------------------------- Summary of changes: .../intranet-tmpl/prog/en/modules/help/reports/reports-home.tt | 6 +++--- .../en/modules/help/rotating_collections/rotatingCollections.tt | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Apr 8 09:12:50 2016 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 08 Apr 2016 07:12:50 +0000 Subject: [koha-commits] main Koha release repository branch 3.22.x updated. v3.22.05-45-g23c8356 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.22.x has been updated via 23c83561d5a51d572f008ab6d8cae9309f50cd29 (commit) from 626ef1091e67800208d4461aa9234e82c2464f01 (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 23c83561d5a51d572f008ab6d8cae9309f50cd29 Author: Owen Leonard Date: Wed Mar 9 10:27:03 2016 -0500 Bug 16025 [Revised] Use Font Awesome icons on item types localization page The item types localization page uses a Glyphicon. This patch converts it to a Font Awesome icon. Also changed in this patch: "Delete" text has been added to the delete link, and a dummy "href" attribute has been added to the link so that it triggers the right kind of cursor. The deletion confirmation JavaScript has been edited to ignore the default click action. To test, apply the patch and go to Administration -> Item types. - Edit any existing item type and click the "Translate into other languages" link. - If there is not an existing translation, add one. Close the modal window and click the "Translate into other languages" link again to redisplay it. - Confirm that there is a "Delete" link next to your translation which is styled correctly. - Confirm that the behavior of the "Delete" link is correct both when confirming and when canceling. Revision adds the "actions" class to the table cell with the delete link to prevent a line break between the icon and the text. Signed-off-by: Marc V?ron Signed-off-by: Jonathan Druart Signed-off-by: Brendan Gallagher brendan at bywatersolutions.com (cherry picked from commit dfb8982ca79595297c7430243ad90b77e21d8a67) Signed-off-by: Julian Maurice ----------------------------------------------------------------------- Summary of changes: koha-tmpl/intranet-tmpl/prog/en/modules/admin/localization.tt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Apr 8 09:13:55 2016 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 08 Apr 2016 07:13:55 +0000 Subject: [koha-commits] main Koha release repository branch 3.22.x updated. v3.22.05-46-ge9c3ec1 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.22.x has been updated via e9c3ec1925ae0293b2b7ab1b79ac9dc31df77536 (commit) from 23c83561d5a51d572f008ab6d8cae9309f50cd29 (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 e9c3ec1925ae0293b2b7ab1b79ac9dc31df77536 Author: Owen Leonard Date: Mon Mar 14 12:41:58 2016 -0400 Bug 16027 - Use Font Awesome icons in the professional cataloging interface The professional cataloging interface uses Glyphicons. They should be replaced with Font Awesome icons. I have replaced the "Import record" icon as per the discussion on Bug 15966 about which icon better expresses import vs. export. To test, apply the patch and go to Cataloging -> Advanced editor. - Confirm that the icons in the toolbar look correct. - Click the "Macros" button and confirm that toolbar buttons in the modal look correct. - Click the "Advanced" link in the left-hand sidebar and confirm that the buttons in that modal look correct. - Click the "Save" button without adding anything to the blank record. Confirm that the "Missing..." error messages are styled with the correct icon. Signed-off-by: Mark Tompsett Signed-off-by: Jonathan Druart Signed-off-by: Brendan A Gallagher (cherry picked from commit 5fb78052f4e3cd3bb5562fcc2471628438a0fe77) Signed-off-by: Julian Maurice ----------------------------------------------------------------------- Summary of changes: .../lib/koha/cateditor/marc-editor.js | 2 +- .../prog/en/modules/cataloguing/editor.tt | 22 ++++++++++---------- 2 files changed, 12 insertions(+), 12 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Apr 8 09:15:54 2016 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 08 Apr 2016 07:15:54 +0000 Subject: [koha-commits] main Koha release repository branch 3.22.x updated. v3.22.05-47-gc6a0491 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.22.x has been updated via c6a049167f9f1b4d4df81520900b23d2b9e0ea46 (commit) from e9c3ec1925ae0293b2b7ab1b79ac9dc31df77536 (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 c6a049167f9f1b4d4df81520900b23d2b9e0ea46 Author: Marc V?ron Date: Wed Mar 23 08:11:49 2016 +0100 Bug 16133: Translatability of database administrator account warning This patch removes sentence splitting of the database administrator warning with a button styled link. Additionally, it uses the same wording as in the warning on the 'About' page. To test: - Apply patch - Log in to Staff client as database administration user - Verify that the wording of the warning is the same as on the About page (Tab 'System information') - Verify that the link to the patron administration page is styled as a button and behaves correctly NOTE: Actually, the category is irrelevant. But I like the improved message. Categories may or may not be set up at the initial log in. Signed-off-by: Mark Tompsett Signed-off-by: Katrin Fischer Signed-off-by: Brendan A Gallagher (cherry picked from commit e53b80dedf91617f9eecb9defd2d6f5222f03d65) Signed-off-by: Julian Maurice ----------------------------------------------------------------------- Summary of changes: koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Apr 8 09:47:35 2016 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 08 Apr 2016 07:47:35 +0000 Subject: [koha-commits] main Koha release repository branch 3.22.x updated. v3.22.05-53-gb8c5192 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.22.x has been updated via b8c5192ec70e3b87644dd84cf87144370c2410bf (commit) via 4ec4e13ed7a443c631943eeb57c9c591ece886b2 (commit) via 120ee9461d780142832e455d316031b8fa88f285 (commit) via 304b35fce9db1c53f3718b136eef249636526ce7 (commit) via c45c6a3e6bef27410790dc50953c5aefd423a49f (commit) via a14515ee0d768b0fe5e0cdb1569daa82adc4f714 (commit) from c6a049167f9f1b4d4df81520900b23d2b9e0ea46 (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 b8c5192ec70e3b87644dd84cf87144370c2410bf Author: Marcel de Rooy Date: Fri Mar 4 11:25:27 2016 +0100 Bug 13871: [QA Follow-up] Add $server for FID_SCREEN_MSG When you are ready, you still see that small detail. Signed-off-by: Marcel de Rooy Signed-off-by: Brendan A Gallagher (cherry picked from commit 617b72a54eb80fd7ea5e55be9484cf1dbf5e292f) Signed-off-by: Julian Maurice commit 4ec4e13ed7a443c631943eeb57c9c591ece886b2 Author: Marcel de Rooy Date: Sat Feb 27 14:40:44 2016 +0100 Bug 13871: [QA Follow-up] Adjust Patron Info Request Conform QA comment, Patron Info request is slightly adjusted to be consistent with changes to Patron Status request. If the cardnumber is ok and the password is wrong, BL=N is reported but also add 'Invalid password' in AF. Additionally, an invalid card number is reported in AF. Test plan: [1] Send patron info request for invalid card. [2] Idem for valid card, no password. [3] Idem for valid card, good password. [4] Idem for valid card, wrong password. Signed-off-by: Marcel de Rooy Verified by telnetting SIP server. And tested additionally with the new unit test of bug 15956. Signed-off-by: Brendan A Gallagher (cherry picked from commit b02aa7c4217ed75c42b95bd6af11a49472737144) Signed-off-by: Julian Maurice commit 120ee9461d780142832e455d316031b8fa88f285 Author: Marcel de Rooy Date: Sat Feb 27 14:26:51 2016 +0100 Bug 13871: [QA Follow-up] Adjust Patron Status Request Conform QA comment on Bugzilla, we do this: [1] Attribute for overdrive mode/invalid credentials is not really needed. We can always pass a screen message that card or password is invalid. [2] If the cardnumber is correct and the password is wrong, we should still honour the request. The bad password is recognized by BLN and an additional message in AF. Signed-off-by: Marcel de Rooy Verified by telnetting SIP server. And tested additionally with the new unit test of bug 15956. Signed-off-by: Brendan A Gallagher (cherry picked from commit a32a5c4e0843ec8e08e8c75118f648cbbfdb762c) Signed-off-by: Julian Maurice commit 304b35fce9db1c53f3718b136eef249636526ce7 Author: Mason James Date: Mon Mar 23 12:06:27 2015 +1300 Bug 13871 - OverDrive message when user authentication fails NOTE: apply this patch after the additional perltidy patch this patch is basically a small work-around to fix some confusing login text, when users enter incorrect auth details via Overdrive's website with this option disabled (default) there is no change to SIP's behaviour to test... 1/ configure your overdrive account to talk to your Koha's SIP service 2/ start Koha's SIP 3/ enter a correct username and correct password in overdrive see overdrive display '(1) Greetings from Koha' (good) 4/ enter a correct username and *incorrect* password in overdrive see overdrive display '(1) Greetings from Koha' (bad) 5/ enter an incorrect username in overdrive see overdrive display '(1)' (badder) 6/ apply patch, enable 'overdrive-mode' in Koha's SIPConfig.xml example... --------------------- --------------------- 7/ restart SIP 8/ enter a correct username and correct password see overdrive display '(1) Greetings from Koha' 9/ enter a correct username and *incorrect* password see overdrive display '(1) Invalid patron or patron password' 10/ enter an incorrect username and incorrect password see overdrive display '(1) Invalid patron or patron password' http://bugs.koha-community.org/show_bug.cgi?id=1387 Signed-off-by: Kyle M Hall Signed-off-by: Marcel de Rooy Signed-off-by: Brendan A Gallagher (cherry picked from commit 8637627dc9c99b2f1e47b4748c7e4360dbaac5f1) Signed-off-by: Julian Maurice commit c45c6a3e6bef27410790dc50953c5aefd423a49f Author: Mason James Date: Mon Mar 23 14:30:26 2015 +1300 Bug 13871: [TITLE_AMENDED] Additional changes The original perltidy patch from Mason has been amended. The perltidy itself has been moved to a separate patch with the current perltidyrc applied. As noted on Bugzilla, the original perltidy patch included some extra changes: [1] You prefix timestamp with Sip This is not actually needed (it is imported), but if we should prefix it, we should prefix now with C4::SIP::Sip. But you only changed two occurrences (out of 26). So I remove these two changes. [2] You remove the $server parameter from two calls of maybe_add: A closer look at the remaining code tells me that $server is always passed to maybe_add for FID_SCREEN_MSG. So this only left me the current whitespace change. But at least we documented what we did or did not, and why.. Signed-off-by: Marcel de Rooy Signed-off-by: Brendan A Gallagher (cherry picked from commit 42e731857d53134f91ecf0099ae6b7c13393166c) Signed-off-by: Julian Maurice commit a14515ee0d768b0fe5e0cdb1569daa82adc4f714 Author: Marcel de Rooy Date: Fri Feb 26 09:42:13 2016 +0100 Bug 13871: Adjusted perl tidy on MsgType.pm Run perltidy pro=xt/perltidyrc on the file. Signed-off-by: Marcel de Rooy Signed-off-by: Brendan A Gallagher (cherry picked from commit a5babb0effb760aa1d0d9de83ce8bb690099678c) Signed-off-by: Julian Maurice ----------------------------------------------------------------------- Summary of changes: C4/SIP/Sip/MsgType.pm | 2128 ++++++++++++++++++++++++------------------------- 1 file changed, 1064 insertions(+), 1064 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Mon Apr 11 21:55:13 2016 From: gitmaster at git.koha-community.org (Git repo owner) Date: Mon, 11 Apr 2016 19:55:13 +0000 Subject: [koha-commits] main Koha release repository branch new_12478_elasticsearch updated. v3.22.00-1210-g4ac570e 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_12478_elasticsearch has been updated discards cdd7262f306cc7ef03aaa1e6ed7d9125da526556 (commit) discards ddf7826953d4d914ee3b60143879d1283f6152f0 (commit) discards 16f8d8930947eebf226b8b613f55bda788ec5007 (commit) discards 6cac402aba3a55b67ec10f1f6004ff5a07df4976 (commit) discards 82b6ab638487d17751f66f5762cda07fa7a04d5b (commit) discards ae308d156b90a5c475c5510fb09daff2d2cc0554 (commit) discards 3cbb03fe78b890908f488cce21e7568578876b72 (commit) discards 85d4368fa488bac1cd0668bb60f7732d913d2c9b (commit) discards ffca5ccf0fb8855af95bf872538b4d86f4e3a342 (commit) discards bc86e055e058f032ee90adb053a8dea7d56097bf (commit) discards f864bb72bc34fcd4d02cf8c75a2c71398ace0d5e (commit) discards cfc531792fe34b52417539f48dea24fe2735f778 (commit) discards 80239b2160749932d7bd947bb196c21a3235837b (commit) discards 3c519997a6f34b065f4f060f6d9e5e6005571930 (commit) discards c5cb9d2da4a87af5905cc552f7ccddfa184e8ae7 (commit) discards c8bae291a438e00658274bc78bb1b1a59cb2b7a5 (commit) discards d09446507cf3d55da5c53374db758252f1222726 (commit) discards f581f79171b47c2a539658d647dfcf1f2aa17435 (commit) discards ffe985ff4c73f52a70f120aad3f02267620bbb71 (commit) discards 2726daa7ff72a8b9aead7c7dc0c447735037575c (commit) discards c34565be1d77accf33cc7dc020a37ea5e1d6ae72 (commit) discards db9833f24ffacb4670c7dc16a9c8fed10603deab (commit) discards f72e10f2b867f43cd5e3aadc934d33a7161ff5a5 (commit) discards 6fb917b200de49b133571589097a5a31f169ebf0 (commit) discards 34d07502e16db8f5a6368c0d98c1ddb50a1a14f0 (commit) discards eecb6ebbd72f976d9ea40cd4103f6bd9b4a725d4 (commit) discards 86cf330fe7359f50aaf629e012989aa289077d74 (commit) discards fb73cc3497856b8af219350bc52bb991f003c9c8 (commit) discards 9569cb35c27473514d084c65609cb3e39bd442e5 (commit) discards 2fcb1a9861f460718a10c08b9a2db85acdbe50a3 (commit) discards a815ca96072bc541053ae9e343463c72f69dbbe0 (commit) discards 53ab361d875a157f2f6a870cc139d272ef077eab (commit) discards 441fce709e0a95f762fe36c56d1d62e4f056d13c (commit) discards 0cfba8b64f7a05bb6ebea1a15b68a5dd7596c2cb (commit) discards 54f8597dcf06169809b4aba52452582fd4cc53ca (commit) discards ce31411c0ff8c052a6e3a1c2c2c2824f95a5e208 (commit) discards ce80a9140102381a8d0c7699f51c85c7e73b9e4c (commit) discards dab73524ae9612a2e3fb6fd1a3fdef851f4141b4 (commit) discards a93de2b9cc6363c32ddf084f118276a7f6f5e5c4 (commit) discards f2e76e3b0ea928f80432f2df4cc2b279d51f85dd (commit) discards 8281a83ee699ddb915c50fc87c53d0321a7dc1df (commit) discards 3ce6cc2e81da01241cf11020c14c2b091a6fa519 (commit) discards be88c7b28dd6748c359aa125cb75686ae3aee5ca (commit) discards a4f9f5a3236ccd3b8afd9c10a61a3be093332fc6 (commit) discards b943688b8954ec70501202e286144da26a24b975 (commit) discards bd748bb75c72d618e808f8991d57a22c8c72dabb (commit) discards ad87d1b0472a6eccba71c41286d4ecf546d09417 (commit) discards 3ea5a774024f40493b8fac2d0d4a1402039e1c49 (commit) discards d2c468e43d00de0241c58223cd1003aacbca59d4 (commit) discards e2f6bddab0430c0c199a555eeb9d6061cf8a2c7b (commit) discards d9a403cbf479738c98c1397b39e2ca001eb9196c (commit) discards 46db0b584c37656d6a4d1f03b4c6e20ab7c73a62 (commit) discards bac56d58976ba6bc8d7a6a675a3f6c31a617b064 (commit) discards 031389d0b783cfa9292367cabba5e22237492b25 (commit) discards 772017e56c0a7df322d49bbbfad4f65842daa490 (commit) discards 84f5ff93d45f11f540bcd7b83a1c48457028f040 (commit) discards 27ffcb4af17de8faaa756838877e4ed60817127c (commit) discards 05d3cd4a689e1704443c81629b77d8535fca92c8 (commit) discards f0d128a2b611cf677b2369cb2ef48d5ea9f490c4 (commit) discards a4723befdb9a7b5b145749f6d55ca2a8778e6458 (commit) discards 7a938d68d6bae9ee7ca154077bd3420a0f7ee9d2 (commit) discards 77418f46bd987562b560e82d49e5e82ec82edbb4 (commit) discards 01cb60e487300d95cddcd598c462bd0482c8a471 (commit) discards 9ab9a6d4e1a273f31fd469f12efb83bea582cefa (commit) discards ef7e022248bccd54e9b1442d0867cf02773c4880 (commit) discards 250aea3a844deb7dc77baea5d488c75cb6f77a5f (commit) discards 7cc8782f50b4b5779d8bd4e57e439d1bf70455e2 (commit) discards 157375edb689d145b8dee39e76c2a3892f408fa1 (commit) discards fc1cb0c750993f427c9940ac1ed417659ecfb3d4 (commit) discards 71caaca6a4d1f3f1f4510c9565a55043cdce210e (commit) discards 6ec42f56b7856b82c69e85a703db1aa8c3045c7e (commit) discards df1aedd3ef1cdcd6f66ec19c6f6c75491bd2f45b (commit) discards 03da06d0f8b9394f617c055c4edfb00166105a40 (commit) discards f8bc1b15465cb7adc34e1902309013b0a0dcdac1 (commit) discards b2e0913d516c54a7ff192da44d68a6e33877fb0f (commit) via 4ac570eb24006b18642173b7aca31f543a0d2eeb (commit) via 250dc547df1bf4ad4e75068ce00b4149442c0d9e (commit) via 4a285d605994c23d1459c3ca2260af6473c5ff09 (commit) via fe8732c00ce0becc932e058e42d94fa8f6ae3978 (commit) via ec997b167683a8aa5d13787ba0c2212d75d67a14 (commit) via 81745baacf01dbfae583ae93b7146af6b4993236 (commit) via 7c29a3700f8d81d1e06062af7931ab82147d5952 (commit) via 05b4deac1d160b53a83e29ca37bbd97fa371c2be (commit) via d860d4cec00edbf1719a3e14aa84e319005bf98e (commit) via 6e59bb6a9c5270d3ed4c039443ea4f2e07a07ed7 (commit) via a266bb81fa84ce0eadf8af644df5c5b4acd2933b (commit) via 368ca9514a9e36143fb2ac050063f2bbb1772f33 (commit) via 359f73ad4460f2cdfc05d92a683b9d08e0ba10b2 (commit) via 2dab71e2c7c0016efc0c259c016425ea30ed6dac (commit) via a2a99b4124c680d038ba6ec7ce1ecabc2b078aa3 (commit) via 9f5c48f2db12aefb555e9359fe32c8eae1022815 (commit) via 4655f320abcb25e5ea8b5031acdbfb0d6f622d30 (commit) via 1d05f858ff358573ab2b419b19c0f010d01804c5 (commit) via 020b3577e7d7c9bf104ef0d5614bd00455205647 (commit) via d6fd9338c192d77ef537510c87301f6f1f12704e (commit) via 9ea0fbeb5f5b5bcde0610c436c61dc7e4fa1e73c (commit) via 95acf0e02dad248e62686157b29af6a3d4bca4ef (commit) via d2d8180af17a36c85ec01088e52f108c2188c97e (commit) via 79b5b795cfc61163576abe853851648586d47abc (commit) via c264281013d9786c298a6cb349c647c4b56e7736 (commit) via 56dfbaae14cff8789cf18bfaf032831adb86f61e (commit) via 1437acb11840594847ee586e607f8027b611dde6 (commit) via 4111b19f5d30d1aab7cafe59bdb6e65984eb4899 (commit) via dc826c386261b0ba2ea4de8123d13c6898a86bad (commit) via 34f996a1fbe8d059adc714a2d624ab07324b38ef (commit) via 9f44c9bed18a5726ae20982c150708df43d45966 (commit) via f1cfbf915e8a19ded36861b3585a214a520b3576 (commit) via b4802e9ee1c3dfa18dc971264f5252d9573afd04 (commit) via cf1486f3b497e6587b3fd11c171039eab8d2b530 (commit) via 4adfe53d384b8a56e17a4440212d73b8a7abd68f (commit) via 1ff93724531e0dcbf7f39823db712f030050f1e1 (commit) via f964d2968dfe316f2b2c5a6d50e39dcf01074327 (commit) via 7081f9ebdb5934e87b9ff9a0b4356a94b97658a8 (commit) via 5311cb493bff5efab81473d23a7e893f4e5f9bb4 (commit) via 91a9b3259e33194944922eae05481c001d3d2a98 (commit) via 5dfe59a0b29d4762abe84e3ef0267229e07fabd1 (commit) via f6ed0368dfd81742e46e85406d9ff72d92e43ae5 (commit) via bb29e5eec727f281f24126c64817d89b29a0581e (commit) via ffb9fdb71e98d50d585056f0d6442fbc391dd331 (commit) via 7e5e555c10e27b9ab7f3363608106a01c95ca928 (commit) via 99eab8d03d36960b06034ead101c9216931f9e7c (commit) via 1efbf4b0ae546470f0bfe8e98bb0cb11077471c3 (commit) via 8b603e28db3e8ad74d487c860492984aba2666d9 (commit) via 0114c65f51c3a7aeb7fff730e5d04e37d0fd4359 (commit) via 10cae9f9ede68d47840682caf4e0b3629cbd1001 (commit) via d757b41918a6544328d0321185451754bfcf32e3 (commit) via 9f08c44d6f43f9eefcc699dc6801fb7c51991e72 (commit) via 5a427acd83181984cbaabe215b374d4e562c74ca (commit) via f97de074fd5141f83638272ce40fb5a97c983fe6 (commit) via 0f99e289daa87d5165b457c4b2cb687e4ca750a9 (commit) via f5fc92dbfaa1e194cff18bb12b17e3334ecd9d06 (commit) via ca8da11885abc5748f3d1a9aad8d39ec20e2f5c4 (commit) via 2ccfe19e589ae19ce2ec339bb0beb54d718d131a (commit) via 621d49dca4d6ebc29610a1f033f64869a7aa3fa0 (commit) via 42aa7956e21b680f523a30ef4637b5c7099c6b53 (commit) via 6f19658f3845ebcc1d062ddfb7f32056c9d11f97 (commit) via d63ae171c963c0cecc6579f0fd9863b0ee101515 (commit) via 1dbcd721fc332e2e5cc888ad878bda0b5913ae9a (commit) via 9fae4b8cabc526dcee89668c2034012ec9ea7d93 (commit) via d154d58636df582c09f490cf9330a44dc64e45c1 (commit) via 26f091f46efe8eb5deb2a79fb846d6b866b89ce3 (commit) via 66a84c64d5ef3e1f43b78dcc310db632e016558d (commit) via 18f8602ccd2b038a5109b4dd6d12032d7e226117 (commit) via 8142564fe865e79ce371f7b14f06e8a7dfce2e0e (commit) via d77aa33e42e5bf1003fddfa30a2e57dce699909b (commit) via c08b01d14d6be2ea81d0738056d0bdfb381bfab1 (commit) via 892a0f50c894ddf92067df9809f414dcd5e42346 (commit) via ed0fb72100b84852982943f51c8d071bdb28cc0c (commit) via 3e933016f8dc604289cfd80a9025ad2e74954ca5 (commit) via 51ec4ef201ce7eb265739a7bcabb6b36b4f0913e (commit) via 6674e2db283a225415979e6786f8691c0c92d5e4 (commit) via 2a8c68936dd7fd5c82af339db968eb67cb93a082 (commit) via 690ab60da27fb9792feecbfa399b86c1b7a53d41 (commit) via e126fc0a1956e1eb1207378bc4a2e745e991f559 (commit) via dcc1c0debdad0d0f9f8b717392839de616bb044b (commit) via 315ddf201368376f6fcbbf3dbc64e76ce50fdc8a (commit) via 4b271fad9b2db1e265e7419064750d3b6fdc0c2a (commit) via 928c0af2b6a2c7aa6ed54019c5bd7dbddbccf4ee (commit) via cbe3dedc4f91a91e40f9e648c9de2358c68379cb (commit) via a3557fd0f25371246445ff2e327eaa5df5bf6e8f (commit) via c2669856becef61f83144b91faf35a9635300dad (commit) via 5e17091e926ad493c64e95ec5407e4ff6120b70c (commit) via 4fa84cf713517883ff29b7472c9c75a7f1d717f6 (commit) via b64e6be1c4f3dbdcde41ac8f4766b4d1f962610d (commit) via efff8e5143c1aa3bc560faba7b03e5f2a6fbaec7 (commit) via 6ffb20f7283d602a87a2f7d60bdfcea8bff242fc (commit) via 57cf173c0cdd40aee7187d6d0f9878ecb492032a (commit) via c564f30155cac18cf6b7b26a549303f65e9e33a3 (commit) via eb04d174d91201b05b6e348dc672f9351dc0aaf0 (commit) via dde885675418644a201d00c044233a6387d46c72 (commit) via 94d0ed61150257308b160025dfdd06e18ebd4ae6 (commit) via 88dc70f7e691da61742f79c46c601de82a1d7e56 (commit) via 5ecdd8c6a3f1dfbb8d498921d62100dd6bdb921f (commit) via e4d0363bc72403b4eea69cd7375e06ee2ecd729d (commit) via 5b909a82693d452d233e95d7598092aa5ee14c17 (commit) via c2f92f68d84753d62880e17e9d1bd19c8b9bff47 (commit) via 2c68980467009a9d19116440d4f28356707e9e7c (commit) via e916ded09756ba4902a25e9e68fe536614419c87 (commit) via 6a86cbff039dacd050d6a57bf4b853ea589b6fdc (commit) via 833afc12454cfebefe22ec57722e7c36ada01dea (commit) via 22a33b7868bf1f0b312d548c5abdb642bfa72d6e (commit) via b14c46c9428c74c9519223870d6442b8427ac699 (commit) via c84fe12d5e0651023448a31d93dcb5224f476c8d (commit) via c8f6d8d009e09ba403790586dadcb5e74080d150 (commit) via aa66debec6fcdbdadd643386749a61229167aa62 (commit) via ea4a2436e274d8f0a5082ef6b6944c400ad69d88 (commit) via faaa2cbcdb1970866be4f8a7001bf2de305823a9 (commit) via 7e1b0c25cdc9906cc32dbee721236b9d934a19a7 (commit) via 932f5c2ad558bde7bc613a15aeb24f3c16d9fd48 (commit) via fb0d0ddf392d65f6689e91d698ced25b3a0965d4 (commit) via 51824008595a5a79ad08052b8035ea5d00654476 (commit) via 9f9e0ea002dfbf9da92285edbea2df975b6d7de9 (commit) via 10e5a58c5b8e771e947ef16b593fd3b9d753b624 (commit) via acb68d21601774d03ada576956c73c44036267ac (commit) via 07e098ef675f9fc6c177492b1cb7ba197d1e1fb7 (commit) via c2ec238d9f282612ef5a79a8e5bfa9600b7273f9 (commit) via fec34d29d5afe3bd4a62c5ebf0a02daf9381ef69 (commit) via b131304975f9670d4a0e88ef455243cbb0f2bf4e (commit) via e2e991634854d940405593cb1e05945de2295d4c (commit) via 9658085d1eafae6fe7f51fb1b39452fbb6f9bf4d (commit) via f99cc395f51e0c25ed2903626b86e24226146cbc (commit) via b11d2f43f98848a9f444418273c85ae736888a25 (commit) via 621742d4c6c9f3b8ea526ddde14fa5b46ae42721 (commit) via 7f9d5b27aef81bdbb1f0dd26faa0f498a6d6c2eb (commit) via 7a3c9951bb0daac178220a97f1a1d373c6036619 (commit) via e22e5c74af4921e0fdda7f83cd1c68dfb63f0829 (commit) via 9472711921968dc5ae620fbfeacd1c828b6ed93a (commit) via 722a098eac97bb714d120f63fe7cd558bf1b79f5 (commit) via 85ea73db9d181f9feaf99fa6a94da8a3da570909 (commit) via b3311913b3b51faed300af98016c25cbd507fb44 (commit) via 6e8d24231c03775422f403a76ca41ccf22f40558 (commit) via 714d773900587eb1d2ac7e73ef4f1463c9805dc5 (commit) via 42d065937627a705b813eba577f519416f356d99 (commit) via fcbd81049f590e5fc0c31030bcdb1311951c1444 (commit) via cc4d9822a1bbb66c493ebd2b0def32de2d18a523 (commit) via 5c3a58e20863abde22ca2e57233cdf49cc6982e0 (commit) via b6cd9ab8968b7b1b534606f0ad380f75bfa476aa (commit) via ab930af344735d9833ee22903045948f490b836b (commit) via fc66eedcc429e1eb8175d6e95bc5e921d8b94664 (commit) via 73b3968dce3b9bdc95b12eb68fc813c83bcba3e8 (commit) via 2d961b5ad434438c4ba52b62132c2f1b58b9a981 (commit) via da052b3d10d71cb1256693fbd3166caaa4b53f41 (commit) via 93efeab13e25aea7e467b112983536833c69ceea (commit) via 065ea152d4600aed1fca04988aceae6ddeede4fa (commit) via c74678a1d239aaf91906039ccb3db940df4a0b41 (commit) via 4a605225cc3116f5a244303106567340a8d1e1b0 (commit) via ead5b9c0e2d7030abfcef27aa8fb8fabf012f5b2 (commit) via f39b79982dcd4514d7b84ef5cbe5bbbd669af9cc (commit) via 59266cbd614a698cd34c2418ef68907e4d14fc6c (commit) via 6167cf012825fc51c5dc61c4c7224774a048d4ac (commit) via 19f9673a3b7343992822c033e6699e8ff531fd20 (commit) via 09c7a9c3af3ac7cde90e6e055fe2a233d71466e9 (commit) via 79fa6ec68a45a7112cbae763458381f9c53835c6 (commit) via 9a987ab5f0da632fe0730a8029c07a403fa135ad (commit) via aba733cf7fcd6057f6ccf3a9ba1ea39060722774 (commit) via d995613eaf22647aea860b411d1d0b10ddaf9149 (commit) via 0c9ce8ea51bf89970ce8ff33d25d5122392ab2b6 (commit) via f321e68c3947fbbaadea8ccffcb82b52393338b0 (commit) via 9548f14236a51b8b6e6d80d8a4547876cc2ead96 (commit) via 7f8037f642913d94ebec70413c6fd8cadfdf938d (commit) via 181a85fe1513ce070e319e9d042578d96418dc17 (commit) via 0a14e22d59343475ed6970b82b474a80e43d8e29 (commit) via 7661629e9804cb3b0c1249a80bd5b797da2a0482 (commit) via 5ebad0049311e94ae7e2466a17c1e88b8adc3c34 (commit) via 7ba7039c33c1c8f3c46a765ab0f535251afd977f (commit) via 18644009c6a953074f77929597d6ebd6fc4f871d (commit) via ffb5e5ec118ead43e563dc4748fd1cb267167176 (commit) via 038b5f8156cf8ed123b7e28a25c31f35630b95e7 (commit) via d5f7f4072454e7c816d901de341bcc29401122ae (commit) via b56520fa0db3285f3c44da2cb7f4eb7f9b2f836f (commit) via b1f4707165f30b6afd2d545d32b69322cb5399f2 (commit) via 4a012f863ec568f5cc6470e5ab7d1b8e5fe9b25a (commit) via 09d298a211fdaadbdeda2a80e5c35d9343916df2 (commit) via 6a04ba598fb6f14aa1183fa1c5840cce7696d8e5 (commit) via 8255a18edc9c2eee52b01bfa20114b088b9bf555 (commit) via 6325277c64ce119ac2854389678694f4815de8be (commit) via 1ae64b97b39f5554e2d2360de9582a3e445854c5 (commit) via c75271a741632b4aa9af0c6c342cdbf1c77e699f (commit) via 0303fa7de6fd8f9552440fa9824e402daf8e24b8 (commit) via 2f0fc5f45abdd9ee31a2bebf40a634a397fdfd93 (commit) via e428ff001d7e877b4f666444add9236fcb491d38 (commit) via 56cb727aecf9b55e95be6f4dc5218b472e4dcca3 (commit) via f45d488ba6774838bb9d9e19727b3ace1b254cf7 (commit) via 9712a7448e94df8e22debca0670fa4e604ea0d4f (commit) via 3fa2b10150a9ea2db2897be1246cba3785c55e55 (commit) via 873a49f13b79bf1f5f7163f217cfc3a317ce602f (commit) via a186dcfd84da4b22fb59eb97d9889f9d7fa3571b (commit) via aa369c80c15b1699ddb89794c04bf0c3c0451b91 (commit) via 360cdea29559d84d1f82f0e1e102f18fc8475bb4 (commit) via ee0abde76e78713233a9fcd31fbb6f80b5a9610c (commit) via de2a298a0623408c064ed0edbe47795740c814f4 (commit) via 5fa1257a2e6bf09ece1be64edaaa16b7303f0a55 (commit) via 4e1289a55d7eee0987216a306278cba8c2d66036 (commit) via c9170233c976b3ac05f8712fdc2c9aa25973f34f (commit) via 590f174560029db99a5123597418675959936a07 (commit) via 25ffd8b215972add6f8ea0e6e38c3ac530745f23 (commit) via 902ea66d247f08eb717f7e696781a3ec956c91f6 (commit) via b0bbace4dd8c19488110bf5c06817077abaa3f1c (commit) via 2e0af6e6df279aa08603e9696d35fc7def7bd7d3 (commit) via 3bfe541d0d97cdad08f9be2cff20c04a03424a25 (commit) via bbfe394bb6e1ac8851b3c73826ea6fa5e7a0c94c (commit) via dda7a0a25ff480abda219084686e8138341fbba3 (commit) via ffb17a2914c43e536155856a86fed374b7f26e9c (commit) via dd8d1347f91ac16a34d4674d86055b1e8875c9a8 (commit) via d2417856b9f3dae1be6063e5651579fa5ef497b2 (commit) via ab531790e394d5e89c031143029ee9f3b66e12dc (commit) via 13f26489f7859ef00fe932c84191cba0a3ac4144 (commit) via ea0258be0dbf3113286a8ad112756e47a83fdab1 (commit) via 3cfedcf2381375b29fe9ea83099181f0623cba76 (commit) via 4c0e3096774d27bd267cd69f5183af30f09a2555 (commit) via 798d38e4c7de0c920070b5db2249030cc9cb742c (commit) via 017699c345725ea7012f1b84181dc053e20efd98 (commit) via 3830d78d4699ff0b86be15372f668631f1c1fc95 (commit) via e497224429944411c3aca589a9e8c28da0d199f2 (commit) via 93a6e31439d5610371a8124d3c401aff2245ec91 (commit) via 5f7e9e9d7ff33b9fd8ad68c556e9658eb9c52ba7 (commit) via c147c874f7c2d49a0c9499286df8df3f5ca16e94 (commit) via 6cb68b471dc1bf7658dfc1aa73aa23ce685342a8 (commit) via 04d25147b256508bedc2c986728ef928a3b03cc3 (commit) via 5fb78052f4e3cd3bb5562fcc2471628438a0fe77 (commit) via e53b80dedf91617f9eecb9defd2d6f5222f03d65 (commit) via cd20b61a7c845110e518e6dedc12ac50efebe4aa (commit) via 92fbb1f3d0f2bdb070a1b647c96edbce5b28a377 (commit) via f1e1eaa32870a5954a1151973bae3dbe3f3b8122 (commit) via 541a03cf6daace451f78e614b8019382dcd52acc (commit) via aed235cbf561fa64c015b4cdc8a8fd55aaa721ba (commit) via 692d1a1053276b2c6312d25fd2a940fa748db739 (commit) via 300bf096bda90a0f17c6615798957fa7f588b36e (commit) via 0f8792961cbe6b35a2042b9dc8005578d66b111b (commit) via 630301673605733429c4ae79e125053cf4169376 (commit) via d135499d2893fe1000c627f433395989d7d9e022 (commit) via 908a751e2cadcda0ceafa2efdd2cf0104a323467 (commit) via 7678c98bdfaa7a1562918ce32e6abf3da1eb6b25 (commit) via 622f1f28719a5248025b3f26d23463bf3d657fb7 (commit) via e48e72920b0b6c6838fe0645ea31a4c6b7a0982f (commit) via 870104ce117f8c4a303107fb24c8c3d2b7a886b0 (commit) via 2c07ea19c91b4c6dfdd878129ec248cafe156449 (commit) via 05a354f9e16ccee7bba90b2242ac888f37f56f05 (commit) via 47b516501eb6b88b4c88a7f40b08c9c2ed0de74f (commit) This update added new revisions after undoing existing revisions. That is to say, the old revision is not a strict subset of the new revision. This situation occurs when you --force push a change and generate a repository containing something like this: * -- * -- B -- O -- O -- O (cdd7262f306cc7ef03aaa1e6ed7d9125da526556) \ N -- N -- N (4ac570eb24006b18642173b7aca31f543a0d2eeb) When this happens we assume that you've already had alert emails for all of the O revisions, and so we here report only the revisions in the N branch from the common base, B. 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 4ac570eb24006b18642173b7aca31f543a0d2eeb Author: Jonathan Druart Date: Mon Apr 11 08:11:11 2016 +0100 Bug 12478: Define simple_search_compat for Zebra When Zebra is defined as the search engine, the authority search is broken (Can't locate object method "simple_search_compat" via package "Koha::SearchEngine::Zebra::Search" at /home/koha/koha/C4/AuthoritiesMarc.pm line 357.) simple_search_compat is not defined in Koha::SearchEngine::Zebra::Search, it should be a wrapper for C4::Search::SimpleSearch commit 250dc547df1bf4ad4e75068ce00b4149442c0d9e Author: Jonathan Druart Date: Tue Oct 13 10:45:32 2015 +0100 Bug 12478: Display facet terms ordered by number of occurrences By default ES returns the facet terms ordered by most used, which makes sense. This patch removes resort done in the scripts (catalogue/search.pl and opac/opac-search.pl) and moves it to the module. For Zebra it's now done in C4::Search::getRecords, and there is no change to expect (still alphabetically). On the Elastic search side, we could imagine to let the library define the order of the facets. The facet terms are now sorted by most used. To test easily this change, turn on the displayFacetCount pref. commit 4a285d605994c23d1459c3ca2260af6473c5ff09 Author: Robin Sheat Date: Tue Oct 13 17:21:36 2015 +1300 Revert "Bug 12478: Display facet terms ordered by number of occurrences" This reverts commit cd4905c2969b067476881016d0b03271f0bcc7c8. This commit caused an error in C4::Search::GetFacets when running in zebra mode. Conflicts: Koha/SearchEngine/Elasticsearch/Search.pm commit fe8732c00ce0becc932e058e42d94fa8f6ae3978 Author: Jonathan Druart Date: Mon Oct 12 17:03:38 2015 +0100 Bug 12478: Remove previous mappings file (sql) commit ec997b167683a8aa5d13787ba0c2212d75d67a14 Author: Jonathan Druart Date: Mon Oct 12 16:54:12 2015 +0100 Bug 12478: Manually add the many_to_many relationships This will create the add_to_* accessors for us. commit 81745baacf01dbfae583ae93b7146af6b4993236 Author: Jonathan Druart Date: Mon Oct 12 16:52:11 2015 +0100 Bug 12478: update the schema These files have been generated with the misc/devel/update_dbix_class_files.pl script. commit 7c29a3700f8d81d1e06062af7931ab82147d5952 Author: Jonathan Druart Date: Mon Oct 12 16:46:16 2015 +0100 Bug 12478: Move mapping attributes to the join table To make things consistent, the attributes of the mappings (sort, suggestible, facet) should be moved to the join tables (search_marc_to_field). Indeed the search_marc_map could represent a mapping for several search fields with different attributes. Before this change it was not possible. commit 05b4deac1d160b53a83e29ca37bbd97fa371c2be Author: Jonathan Druart Date: Fri Sep 25 15:48:50 2015 +0100 Bug 12478: Add Koha::SearchField[s] and Koha::SearchMarcMap[s] classes This was initially submited on bug 14899, but we will need it here. commit d860d4cec00edbf1719a3e14aa84e319005bf98e Author: Jonathan Druart Date: Mon Oct 12 17:11:28 2015 +0100 Bug 12478: Add the yaml mappings file This should facilitate the modification of the mappings. The yaml format is more readable than sql. commit 6e59bb6a9c5270d3ed4c039443ea4f2e07a07ed7 Author: Robin Sheat Date: Thu Oct 8 17:02:21 2015 +1300 Bug 12478: "fix" notforloan commit a266bb81fa84ce0eadf8af644df5c5b4acd2933b Author: Jonathan Druart Date: Mon Oct 5 17:15:01 2015 +0100 Bug 12478: Take the FacetMaxCount pref into account The system preference FacetMaxCount should work as expected with ES. commit 368ca9514a9e36143fb2ac050063f2bbb1772f33 Author: Jonathan Druart Date: Mon Oct 5 11:34:54 2015 +0100 Bug 12478: Remove empty limit parameter If no limit are passed, the url will contain '&limit=' anyway. It is not necessary and can be avoided easily Test plan: 1/ Search for a term in your catalogue 2/ Hover over a link in the facet area 3/ The link is cgi-bin/koha/opac-search.pl?idx=kw&q=your_term&limit=&limit=[...] With this patch, the empty limit parameter does not appear. commit 359f73ad4460f2cdfc05d92a683b9d08e0ba10b2 Author: Jonathan Druart Date: Mon Oct 5 15:29:52 2015 +0100 Bug 12478: Display facet terms ordered by number of occurrences By default ES returns the facet terms ordered by most used, which makes sense. This patch removes resort done in the scripts (catalogue/search.pl and opac/opac-search.pl) and moves it to the module. For Zebra it's now done in C4::Search::getRecords, and there is no change to expect (still alphabetically). On the Elastic search side, we could imagine to let the library define the order of the facets. The facet terms are now sorted by most used. To test easily this change, turn on the displayFacetCount pref. commit 2dab71e2c7c0016efc0c259c016425ea30ed6dac Author: Jonathan Druart Date: Mon Oct 5 12:50:52 2015 +0100 Bug 12478: facets - Display description instead of code for locations commit a2a99b4124c680d038ba6ec7ce1ecabc2b078aa3 Author: Jonathan Druart Date: Mon Oct 5 12:51:37 2015 +0100 Bug 12478: Add Koha::AuthorisedValue[s] class These 2 classes come from bug 10363. commit 9f5c48f2db12aefb555e9359fe32c8eae1022815 Author: Jonathan Druart Date: Mon Oct 5 12:17:09 2015 +0100 Bug 12478: Use the new Koha::ItemTypes to retrieve itypes descriptions commit 4655f320abcb25e5ea8b5031acdbfb0d6f622d30 Author: Jonathan Druart Date: Tue Sep 15 17:02:28 2015 +0100 Bug 12478: Add Koha::ItemType[s] classes These 2 classes come from bug 14828. Tests in t/db_dependent/Koha/ItemTypes.t should be updated. commit 1d05f858ff358573ab2b419b19c0f010d01804c5 Author: Jonathan Druart Date: Mon Oct 5 10:58:50 2015 +0100 Bug 12478: (follow-up) Display the correct number of facets This patch fixes a side-effect of the previous "Display the correct number of facets (5 instead of 6)" patch. If you ask for more facets ('show more' link) and that the number of facets is > 5 but < 10, 1 facet will be missing. commit 020b3577e7d7c9bf104ef0d5614bd00455205647 Author: Robin Sheat Date: Mon Oct 5 17:44:14 2015 +1300 Bug 12478: abort early if there's no elasticserch definition commit d6fd9338c192d77ef537510c87301f6f1f12704e Author: Robin Sheat Date: Mon Oct 5 16:21:42 2015 +1300 Bug 14899: schema changes to make the database better commit 9ea0fbeb5f5b5bcde0610c436c61dc7e4fa1e73c Author: Jonathan Druart Date: Fri Sep 25 16:06:07 2015 +0100 Bug 14899: DB changes This patch applies several changes to the DB structure introduced by the previous ES patch set: 1/ Add a search_field.label column => It will be easier to understand what the search_field does. Indeed, some are not user friendly: acqdate, an, pl, ff8-23, ln, etc. TODO later: Update the labels with correct values (at the moment label=name) 2/ Update the foreign key search_marc_to_field.search_marc_map_id with on delete cascase. This will permit to automatically remove the entries in search_marc_to_field when they are deleted in search_marc_map. 3/ Remove the index_name_2 unique constraint on the search_marc_map table. I don't understand how this could be useful, it was defined like (index_name, marc_type, marc_field), so it means a mapping cannot be defined twice with different values for facet, suggestible and sort. This limitation does not seem to make sense. Robin, please correct me if I am wrong :) commit 95acf0e02dad248e62686157b29af6a3d4bca4ef Author: Robin Sheat Date: Fri Oct 2 15:23:07 2015 +1300 Bug 12478: add location, su-geo, se to facets commit d2d8180af17a36c85ec01088e52f108c2188c97e Author: Robin Sheat Date: Thu Oct 1 15:53:44 2015 +1300 Bug 12478: fix errors from rebase and new upstream version commit 79b5b795cfc61163576abe853851648586d47abc Author: Robin Sheat Date: Wed Sep 30 15:46:18 2015 +1300 Bug 12478: fix some issues on rebase There were rebase conflicts that it was just easier to postpone until afterwards. commit c264281013d9786c298a6cb349c647c4b56e7736 Author: Jonathan Druart Date: Fri Sep 4 13:00:48 2015 +0100 Bug 12478: Fix error on indexing a specific record % perl misc/search_tools/rebuild_elastic_search.pl -bn 42 Can't locate object method "idnumber" via package "MARC::Record" at misc/search_tools/rebuild_elastic_search.pl line 171. commit 56dfbaae14cff8789cf18bfaf032831adb86f61e Author: Jonathan Druart Date: Fri Aug 28 11:59:26 2015 +0100 Bug 12478: Fix encoding issue on facets Filer on "?lez, Ts." => Can't escape \x{015A}, try uri_escape_utf8() instead at /home/koha/src/Koha/SearchEngine/Elasticsearch/QueryBuilder.pm line 221. commit 1437acb11840594847ee586e607f8027b611dde6 Author: Jonathan Druart Date: Fri Aug 28 11:29:23 2015 +0100 Bug 12478: Do not display the 'Show more' links if no more facet available commit 4111b19f5d30d1aab7cafe59bdb6e65984eb4899 Author: Jonathan Druart Date: Fri Aug 28 11:24:24 2015 +0100 Bug 12478: Display the correct number of facets (5 instead of 6) The loop on facet entries was wrong, it should stop after 5 iterations. commit dc826c386261b0ba2ea4de8123d13c6898a86bad Author: Jonathan Druart Date: Fri Aug 28 11:13:45 2015 +0100 Bug 12478: Remove Solr occurrences reintroduced by a previous patch commit 34f996a1fbe8d059adc714a2d624ab07324b38ef Author: Jonathan Druart Date: Fri Aug 28 11:13:07 2015 +0100 Bug 12478: Fix pod in the rebuild_ES.pl script commit 9f44c9bed18a5726ae20982c150708df43d45966 Author: Jonathan Druart Date: Fri Aug 28 11:08:27 2015 +0100 Bug 12478: Fix the verbose flag on reindexing commit f1cfbf915e8a19ded36861b3585a214a520b3576 Author: Jonathan Druart Date: Fri Aug 28 11:07:51 2015 +0100 Bug 12478: Change the commit count to 5k It will improve the indexing time. commit b4802e9ee1c3dfa18dc971264f5252d9573afd04 Author: Jonathan Druart Date: Fri Aug 28 11:07:04 2015 +0100 Bug 12478: Fix the UNIMARC and NORMARC indexing 1/ This patch fixes a major issue on UNIMARC and NORMARC installations (Compulsive c/p on insert into insert into search_marc_to_field for unimarc and normarc) 2/ After fixing that, I got invalid marc path at /usr/share/perl5/Catmandu/Fix/marc_map.pm line 35. on reindexing. It was caused by some "" values instead of NULL. 3/ Then, a "duplicate entry" error was caused by 3 lines for Local-number. It seems to be an error, 1 is enough (I suppose 0909 was an error too). Note that the following is not fixed by this patch: MariaDB [koha_es_unimarc]> insert into search_field (name, type) select distinct mapping, type from elasticsearch_mapping; Query OK, 73 rows affected, 57 warnings (0.05 sec) Records: 73 Duplicates: 0 Warnings: 57 MariaDB [koha_es_unimarc]> show warnings; +---------+------+--------------------------------------------+ | Level | Code | Message | +---------+------+--------------------------------------------+ | Warning | 1265 | Data truncated for column 'type' at row 1 | commit cf1486f3b497e6587b3fd11c171039eab8d2b530 Author: Robin Sheat Date: Fri Sep 25 15:11:29 2015 +1200 Bug 12478: allow more granular sorting configuration This allows sorting to be configured within a field. For example, while many values are included for search on author, sorting should only be done on the main entry values. This permits that by have a sort value, which can be true, false, or null. true and null are pretty much the same, but false means that a field isn't available for sorting on. By default (null), fields can be sorted on. commit 4adfe53d384b8a56e17a4440212d73b8a7abd68f Author: Robin Sheat Date: Thu Aug 27 16:13:16 2015 +1200 Bug 12478: pull the SQL updates from the browse interface Hopefully will reduce the rate of conflicts down the road. We'll see. commit 1ff93724531e0dcbf7f39823db712f030050f1e1 Author: Robin Sheat Date: Wed Aug 26 17:29:17 2015 +1200 Bug 12478: pull the SQL updates from the browse interface commit f964d2968dfe316f2b2c5a6d50e39dcf01074327 Author: Robin Sheat Date: Tue Aug 25 17:03:08 2015 +1200 Bug 12478: the facet "show more" links work properly now commit 7081f9ebdb5934e87b9ff9a0b4356a94b97658a8 Author: Robin Sheat Date: Tue Aug 25 15:13:51 2015 +1200 Bug 12478: add the lenient option to the query_string query It doesn't really help. commit 5311cb493bff5efab81473d23a7e893f4e5f9bb4 Author: Robin Sheat Date: Thu Aug 20 18:12:42 2015 +1200 Bug 12478: improve error reporting a bit commit 91a9b3259e33194944922eae05481c001d3d2a98 Author: Robin Sheat Date: Mon Aug 3 17:55:54 2015 +1200 Bug 12478: update to support new Cat::Store::ES commit 5dfe59a0b29d4762abe84e3ef0267229e07fabd1 Author: Robin Sheat Date: Fri Jul 17 14:38:19 2015 +1200 Bug 12478: ES is now updated when records are updated/deleted commit f6ed0368dfd81742e46e85406d9ff72d92e43ae5 Author: Robin Sheat Date: Fri Jul 10 15:19:21 2015 +1200 Bug 12478: fix capitalisation issue with index names commit bb29e5eec727f281f24126c64817d89b29a0581e Author: Robin Sheat Date: Wed Jul 8 16:34:12 2015 +1200 Bug 12478: make things using SimpleSearch use the new version commit ffb9fdb71e98d50d585056f0d6442fbc391dd331 Author: Robin Sheat Date: Fri Jun 19 15:55:46 2015 +1200 Bug 12478: a replacement to the SimpleSearch interface implemented commit 7e5e555c10e27b9ab7f3363608106a01c95ca928 Author: Robin Sheat Date: Wed Jun 17 15:37:29 2015 +1200 Bug 12478: fix issue with authority sort order being weird commit 99eab8d03d36960b06034ead101c9216931f9e7c Author: Robin Sheat Date: Mon Jun 15 17:35:41 2015 +1200 Bug 12478: auth search works in the staff client Some issues with sort order though. commit 1efbf4b0ae546470f0bfe8e98bb0cb11077471c3 Author: Robin Sheat Date: Mon Jun 15 15:12:39 2015 +1200 Bug 12478: starting authority search in staff client commit 8b603e28db3e8ad74d487c860492984aba2666d9 Author: Robin Sheat Date: Fri Jun 12 15:19:39 2015 +1200 Bug 12478: fix issues with the conversion SQL commit 0114c65f51c3a7aeb7fff730e5d04e37d0fd4359 Author: Robin Sheat Date: Wed Jun 10 14:35:33 2015 +1200 Bug 12478: change the schema for storing mappings This makes the mapping schema a proper many-to-many relational structure, which is a little more fiddly to work with, but will make things like editors for it easier to write. commit 10cae9f9ede68d47840682caf4e0b3629cbd1001 Author: Robin Sheat Date: Fri Jun 5 14:29:31 2015 +1200 Bug 12478: fix multi-choice stuff in advanced search This means that things like itype get "OR"ed together, rather than "AND"ed like other things. commit d757b41918a6544328d0321185451754bfcf32e3 Author: Robin Sheat Date: Thu May 14 15:15:04 2015 +1200 Bug 12478: starting to add search to staff client commit 9f08c44d6f43f9eefcc699dc6801fb7c51991e72 Author: Robin Sheat Date: Tue Mar 31 17:26:49 2015 +1300 Bug 12478: fix wrong counts/results for authority searches commit 5a427acd83181984cbaabe215b374d4e562c74ca Author: Robin Sheat Date: Wed Mar 25 17:29:14 2015 +1300 Bug 12478: fix issues caused by rebasing commit f97de074fd5141f83638272ce40fb5a97c983fe6 Author: Robin Sheat Date: Tue Mar 17 17:23:56 2015 +1300 Bug 12478: reinstate zebra compatibility for auth search commit 0f99e289daa87d5165b457c4b2cb687e4ca750a9 Author: Robin Sheat Date: Fri Mar 13 15:27:24 2015 +1300 Bug 12478: paging is fixed now too commit f5fc92dbfaa1e194cff18bb12b17e3334ecd9d06 Author: Robin Sheat Date: Fri Mar 13 15:22:53 2015 +1300 Bug 12478: sort is sorted commit ca8da11885abc5748f3d1a9aad8d39ec20e2f5c4 Author: Robin Sheat Date: Thu Mar 12 18:11:30 2015 +1300 Bug 12478: phrase searching for authorities is happier commit 2ccfe19e589ae19ce2ec339bb0beb54d718d131a Author: Robin Sheat Date: Wed Mar 11 16:14:14 2015 +1300 Bug 12478: fix the way counting is done commit 621d49dca4d6ebc29610a1f033f64869a7aa3fa0 Author: Robin Sheat Date: Tue Mar 10 18:12:51 2015 +1300 Bug 12478: authority paging works commit 42aa7956e21b680f523a30ef4637b5c7099c6b53 Author: Robin Sheat Date: Tue Mar 10 17:32:08 2015 +1300 Bug 12478: working on authority results commit 6f19658f3845ebcc1d062ddfb7f32056c9d11f97 Author: Robin Sheat Date: Wed Mar 4 18:19:25 2015 +1300 Bug 12478: make authid get to the templates properly commit d63ae171c963c0cecc6579f0fd9863b0ee101515 Author: Robin Sheat Date: Wed Mar 4 17:38:18 2015 +1300 Bug 12478: basic auth search and display is working commit 1dbcd721fc332e2e5cc888ad878bda0b5913ae9a Author: Robin Sheat Date: Tue Mar 3 14:02:19 2015 +1300 Bug 12478: more authorities commit 9fae4b8cabc526dcee89668c2034012ec9ea7d93 Author: Robin Sheat Date: Tue Feb 24 14:43:01 2015 +1300 Bug 12478 - more authorites commit d154d58636df582c09f490cf9330a44dc64e45c1 Author: Robin Sheat Date: Tue Feb 17 18:38:07 2015 +1300 Bug 12478 - more authority searching Queries are being built, but they seem to be wrong as no results are returned. commit 26f091f46efe8eb5deb2a79fb846d6b866b89ce3 Author: Robin Sheat Date: Wed Feb 4 16:42:12 2015 +1300 Bug 12478 - more authority query building commit 66a84c64d5ef3e1f43b78dcc310db632e016558d Author: Robin Sheat Date: Tue Feb 3 14:40:50 2015 +1300 Bug 12478 - fix syntax errors so that stuff runs commit 18f8602ccd2b038a5109b4dd6d12032d7e226117 Author: Robin Sheat Date: Fri Jan 30 16:06:46 2015 +1300 Bug 12478 - authority work in progress commit 8142564fe865e79ce371f7b14f06e8a7dfce2e0e Author: Robin Sheat Date: Wed Nov 19 15:05:12 2014 +1300 Bug 12478 - fix issue with class loading commit d77aa33e42e5bf1003fddfa30a2e57dce699909b Author: Robin Sheat Date: Wed Nov 19 14:07:20 2014 +1300 Bug 12478 - fix error in configuration loading commit c08b01d14d6be2ea81d0738056d0bdfb381bfab1 Author: Robin Sheat Date: Wed Nov 12 17:27:14 2014 +1300 Bug 12478 - fix error in SQL commit 892a0f50c894ddf92067df9809f414dcd5e42346 Author: Robin Sheat Date: Tue Sep 23 17:32:57 2014 +1200 Bug 12478 - add test cases commit ed0fb72100b84852982943f51c8d071bdb28cc0c Author: Robin Sheat Date: Thu Sep 4 13:42:26 2014 +1200 Bug 12478 - authorities can now be stored in ES (Not fetched yet though.) commit 3e933016f8dc604289cfd80a9025ad2e74954ca5 Author: Robin Sheat Date: Mon Aug 25 15:55:50 2014 +1200 Bug 12478 - set up database tables for elasticsearch This sets up the database changes needed to run ES. This isn't intended to be ready for upstreaming, just to make testing easier. commit 51ec4ef201ce7eb265739a7bcabb6b36b4f0913e Author: Robin Sheat Date: Tue Sep 16 17:38:43 2014 +1200 Bug 12478 - pile of elasticsearch code commit 6674e2db283a225415979e6786f8691c0c92d5e4 Author: Robin Sheat Date: Tue Sep 16 17:34:25 2014 +1200 Bug 12478 - add some base objects that the ES code will depend on ----------------------------------------------------------------------- Summary of changes: C4/Accounts.pm | 4 +- C4/Acquisition.pm | 10 +- C4/Auth.pm | 10 +- C4/Auth_with_cas.pm | 3 +- C4/Auth_with_ldap.pm | 38 +- C4/Auth_with_shibboleth.pm | 3 +- C4/AuthoritiesMarc.pm | 13 +- C4/AuthoritiesMarc/MARC21.pm | 1 - C4/AuthoritiesMarc/UNIMARC.pm | 1 - C4/BackgroundJob.pm | 5 - C4/Barcodes.pm | 3 +- C4/Barcodes/EAN13.pm | 3 +- C4/Barcodes/annual.pm | 7 +- C4/Barcodes/hbyymmincr.pm | 3 +- C4/Barcodes/incremental.pm | 3 +- C4/Biblio.pm | 15 +- C4/Bookseller.pm | 2 - C4/Boolean.pm | 1 - C4/Branch.pm | 4 +- C4/Breeding.pm | 4 +- C4/Budgets.pm | 4 +- C4/Calendar.pm | 2 +- C4/Charset.pm | 4 +- C4/Circulation.pm | 3 +- C4/ClassSortRoutine.pm | 4 +- C4/ClassSortRoutine/Dewey.pm | 3 - C4/ClassSortRoutine/Generic.pm | 3 - C4/ClassSortRoutine/LCC.pm | 3 - C4/ClassSource.pm | 4 +- C4/Context.pm | 29 +- C4/Contract.pm | 4 +- C4/CourseReserves.pm | 2 +- C4/Creators.pm | 1 - C4/Creators/Batch.pm | 3 - C4/Creators/Layout.pm | 3 - C4/Creators/Lib.pm | 1 - C4/Creators/PDF.pm | 3 - C4/Creators/Profile.pm | 3 - C4/Creators/Template.pm | 3 - C4/Csv.pm | 4 +- C4/Debug.pm | 3 +- C4/External/Amazon.pm | 3 +- C4/External/BakerTaylor.pm | 4 +- C4/External/OverDrive.pm | 1 - C4/External/Syndetics.pm | 3 +- C4/Heading.pm | 1 - C4/Heading/MARC21.pm | 1 - C4/Heading/UNIMARC.pm | 1 - C4/HoldsQueue.pm | 3 +- C4/ILSDI/Services.pm | 6 + C4/Images.pm | 4 +- C4/ImportBatch.pm | 8 +- C4/ImportExportFramework.pm | 3 +- C4/InstallAuth.pm | 4 +- C4/Installer.pm | 1 - C4/Installer/PerlDependencies.pm | 15 +- C4/Installer/PerlModules.pm | 1 - C4/Items.pm | 15 +- C4/Koha.pm | 29 +- C4/Labels.pm | 1 - C4/Labels/Batch.pm | 3 - C4/Labels/Label.pm | 3 - C4/Labels/Layout.pm | 3 - C4/Labels/Profile.pm | 3 - C4/Labels/Template.pm | 3 - C4/Languages.pm | 3 +- C4/Letters.pm | 4 +- C4/Log.pm | 4 +- C4/MarcModificationTemplates.pm | 3 +- C4/Matcher.pm | 14 +- C4/Members.pm | 36 +- C4/Members/AttributeTypes.pm | 5 - C4/Members/Attributes.pm | 4 +- C4/Members/Messaging.pm | 5 - C4/NewsChannels.pm | 3 +- C4/Output.pm | 4 +- C4/Overdues.pm | 4 +- C4/Patroncards.pm | 1 - C4/Patroncards/Batch.pm | 3 - C4/Patroncards/Layout.pm | 3 - C4/Patroncards/Lib.pm | 1 - C4/Patroncards/Patroncard.pm | 3 - C4/Patroncards/Profile.pm | 3 - C4/Patroncards/Template.pm | 3 - C4/Print.pm | 4 +- C4/Ratings.pm | 3 +- C4/Record.pm | 4 +- C4/Reports.pm | 4 +- C4/Reports/Guided.pm | 4 +- C4/Reserves.pm | 4 +- C4/Review.pm | 4 +- C4/Ris.pm | 68 +- C4/RotatingCollections.pm | 4 +- C4/SIP/ILS/Item.pm | 1 - C4/SIP/ILS/Patron.pm | 34 +- C4/SIP/ILS/Transaction/Checkout.pm | 1 - C4/SIP/ILS/Transaction/FeePayment.pm | 1 - C4/SIP/ILS/Transaction/Hold.pm | 1 - C4/SIP/Sip.pm | 3 +- C4/SIP/Sip/MsgType.pm | 9 +- C4/SIP/t/SIPtest.pm | 2 +- C4/SMS.pm | 4 - C4/Scheduler.pm | 4 +- C4/Scrubber.pm | 1 - C4/Search.pm | 26 +- C4/Serials.pm | 3 +- C4/Serials/Frequency.pm | 4 +- C4/Serials/Numberpattern.pm | 4 +- C4/ShelfBrowser.pm | 3 +- C4/Stats.pm | 4 +- C4/Suggestions.pm | 1 - C4/Tags.pm | 3 +- C4/TmplToken.pm | 1 - C4/TmplTokenType.pm | 3 +- C4/Utils/DataTables.pm | 3 +- C4/Utils/DataTables/ColumnsSettings.pm | 3 + C4/XISBN.pm | 3 +- C4/XSLT.pm | 3 +- Koha.pm | 2 +- Koha/AuthUtils.pm | 1 - Koha/Cache.pm | 49 +- Koha/Calendar.pm | 4 - Koha/DateUtils.pm | 1 - Koha/EDI.pm | 1181 ++++ Koha/Edifact.pm | 337 + Koha/Edifact/Line.pm | 864 +++ Koha/Edifact/Message.pm | 249 + Koha/Edifact/Order.pm | 832 +++ Koha/Edifact/Segment.pm | 204 + Koha/Edifact/Transport.pm | 479 ++ Koha/Filter/MARC/EmbedSeeFromHeadings.pm | 1 - Koha/Filter/MARC/Null.pm | 1 - Koha/Filter/MARC/ViewPolicy.pm | 267 + Koha/Issue.pm | 28 + Koha/Issues.pm | 33 + Koha/Misc/Files.pm | 2 - Koha/NorwegianPatronDB.pm | 1 - Koha/OAI/Server/Repository.pm | 1 + Koha/OldIssue.pm | 28 + Koha/OldIssues.pm | 33 + Koha/Patron.pm | 4 +- Koha/Patron/Files.pm | 6 - Koha/Patron/Password/Recovery.pm | 4 +- Koha/Plugins.pm | 2 +- Koha/RecordProcessor.pm | 6 +- Koha/RecordProcessor/Base.pm | 1 - Koha/Schema/Result/Aqbasket.pm | 19 +- Koha/Schema/Result/Aqbookseller.pm | 36 +- Koha/Schema/Result/Aqbudget.pm | 19 +- Koha/Schema/Result/Aqinvoice.pm | 32 +- Koha/Schema/Result/Aqorder.pm | 37 +- Koha/Schema/Result/Branch.pm | 21 +- Koha/Schema/Result/Deleteditem.pm | 11 +- Koha/Schema/Result/EdifactEan.pm | 119 + Koha/Schema/Result/EdifactMessage.pm | 202 + Koha/Schema/Result/Item.pm | 11 +- Koha/Schema/Result/OverduerulesTransportType.pm | 12 +- Koha/Schema/Result/VendorEdiAccount.pm | 258 + Koha/SearchEngine/Zebra/Search.pm | 12 + Koha/SimpleMARC.pm | 1 - Koha/Template/Plugin/AuthorisedValues.pm | 4 +- Koha/Template/Plugin/Cache.pm | 2 - acqui/basket.pl | 77 + acqui/basketgroup.pl | 17 + acqui/edi_ean.pl | 64 + acqui/edifactmsgs.pl | 62 + acqui/edimsg.pl | 72 + acqui/invoices.pl | 4 +- acqui/neworderbiblio.pl | 2 +- acqui/pdfformat/layout2pages.pm | 6 +- acqui/pdfformat/layout2pagesde.pm | 6 +- acqui/pdfformat/layout3pages.pm | 6 +- acqui/pdfformat/layout3pagesfr.pm | 6 +- admin/aqbudgetperiods.pl | 19 +- admin/branches.pl | 16 +- admin/edi_accounts.pl | 160 + admin/edi_ean_accounts.pl | 161 + admin/itemtypes.pl | 2 +- admin/patron-attr-types.pl | 18 +- catalogue/detail.pl | 36 +- catalogue/moredetail.pl | 6 +- cataloguing/additem.pl | 6 +- .../value_builder/marc21_linking_section.pl | 2 +- cataloguing/value_builder/unimarc_field_4XX.pl | 2 +- circ/circulation.pl | 17 +- circ/returns.pl | 8 +- debian/control.in | 4 +- debian/koha-common.logrotate | 2 + debian/scripts/koha-create | 4 +- debian/templates/koha-conf-site.xml.in | 8 +- debian/templates/plack.psgi | 2 +- etc/SIPconfig.xml | 3 +- etc/zebradb/biblios/etc/bib1.att | 6 +- etc/zebradb/ccl.properties | 6 +- .../marc21/biblios/biblio-koha-indexdefs.xml | 24 +- .../marc21/biblios/biblio-zebra-indexdefs.xsl | 43 +- etc/zebradb/marc_defs/marc21/biblios/record.abs | 2 +- install_misc/UpgradeBackup.pm | 3 +- installer/data/mysql/backfill_statistics.pl | 3 +- installer/data/mysql/kohastructure.sql | 82 +- installer/data/mysql/sysprefs.sql | 31 +- installer/data/mysql/updatedatabase.pl | 190 +- installer/data/mysql/userpermissions.sql | 1 + .../lib/jquery/plugins/dataTables.fnReloadAjax.js | 150 +- .../lib/koha/cateditor/marc-editor.js | 2 +- .../intranet-tmpl/prog/en/css/staff-global.css | 20 +- .../prog/en/includes/acquisitions-menu.inc | 3 + .../intranet-tmpl/prog/en/includes/admin-menu.inc | 2 + .../prog/en/includes/av-build-dropbox.inc | 2 + .../prog/en/includes/columns_settings.inc | 4 - .../intranet-tmpl/prog/en/includes/datatables.inc | 1 + .../en/includes/member-main-address-style-de.inc | 2 +- .../en/includes/member-main-address-style-us.inc | 2 +- .../prog/en/includes/reports-toolbar.inc | 6 +- .../intranet-tmpl/prog/en/js/biblio_framework.js | 76 + koha-tmpl/intranet-tmpl/prog/en/modules/about.tt | 4 + .../intranet-tmpl/prog/en/modules/acqui/basket.tt | 38 +- .../prog/en/modules/acqui/basketgroup.tt | 2 + .../prog/en/modules/acqui/booksellers.tt | 8 +- .../intranet-tmpl/prog/en/modules/acqui/edi_ean.tt | 39 + .../prog/en/modules/acqui/edifactmsgs.tt | 90 + .../intranet-tmpl/prog/en/modules/acqui/edimsg.tt | 35 + .../prog/en/modules/acqui/newordersuggestion.tt | 6 +- .../prog/en/modules/acqui/supplier.tt | 4 +- .../en/modules/acqui/tables/members_results.tt | 2 +- .../prog/en/modules/admin/admin-home.tt | 5 + .../prog/en/modules/admin/aqbudgetperiods.tt | 10 +- .../prog/en/modules/admin/aqbudgets.tt | 2 +- .../prog/en/modules/admin/biblio_framework.tt | 84 +- .../en/modules/admin/branch_transfer_limits.tt | 1 - .../prog/en/modules/admin/branches.tt | 12 +- .../prog/en/modules/admin/categories.tt | 2 +- .../prog/en/modules/admin/classsources.tt | 3 - .../prog/en/modules/admin/edi_accounts.tt | 319 + .../prog/en/modules/admin/edi_ean_accounts.tt | 168 + .../prog/en/modules/admin/itemtypes.tt | 6 +- .../prog/en/modules/admin/patron-attr-types.tt | 2 +- .../prog/en/modules/admin/preferences/admin.pref | 18 + .../en/modules/admin/preferences/staff_client.pref | 10 + .../prog/en/modules/authorities/detail.tt | 8 +- .../en/modules/authorities/searchresultlist.tt | 63 +- .../prog/en/modules/basket/sendbasket.tt | 2 +- .../prog/en/modules/catalogue/advsearch.tt | 4 +- .../prog/en/modules/catalogue/detail.tt | 21 +- .../prog/en/modules/catalogue/itemsearch.tt | 2 +- .../prog/en/modules/catalogue/moredetail.tt | 8 +- .../prog/en/modules/cataloguing/addbiblio.tt | 2 +- .../prog/en/modules/cataloguing/editor.tt | 22 +- .../prog/en/modules/circ/circulation-home.tt | 4 + .../prog/en/modules/circ/circulation.tt | 31 +- .../prog/en/modules/circ/transferstoreceive.tt | 2 +- .../prog/en/modules/common/patron_search.tt | 2 +- .../tools/automatic_item_modification_by_age.tt | 8 +- .../intranet-tmpl/prog/en/modules/intranet-main.tt | 13 +- .../prog/en/modules/labels/label-edit-batch.tt | 4 +- .../prog/en/modules/labels/label-manage.tt | 2 +- .../prog/en/modules/members/member.tt | 2 +- .../prog/en/modules/members/memberentrygen.tt | 10 +- .../prog/en/modules/members/moremember.tt | 6 +- .../en/modules/members/tables/members_results.tt | 4 +- .../prog/en/modules/patron_lists/list.tt | 3 +- .../prog/en/modules/patron_lists/lists.tt | 29 +- .../modules/patroncards/tables/members_results.tt | 2 +- .../prog/en/modules/reports/acquisitions_stats.tt | 12 +- .../prog/en/modules/reports/borrowers_out.tt | 2 +- .../prog/en/modules/reports/borrowers_stats.tt | 2 +- .../prog/en/modules/reports/cat_issues_top.tt | 2 +- .../prog/en/modules/reports/dictionary.tt | 13 +- .../en/modules/reports/guided_reports_start.tt | 4 +- .../prog/en/modules/reports/issues_stats.tt | 6 +- .../prog/en/modules/reports/itemtypes.tt | 2 +- .../prog/en/modules/reports/reports-home.tt | 5 + .../prog/en/modules/reports/reserves_stats.tt | 6 +- .../prog/en/modules/reports/serials_stats.tt | 2 +- .../prog/en/modules/serials/checkexpiration.tt | 8 +- .../prog/en/modules/serials/serials-collection.tt | 3 +- .../prog/en/modules/serials/serials-edit.tt | 3 +- .../prog/en/modules/serials/serials-search.tt | 38 +- .../prog/en/modules/serials/subscription-add.tt | 10 +- .../en/modules/serials/tables/members_results.tt | 2 +- .../prog/en/modules/suggestion/suggestion.tt | 20 +- .../intranet-tmpl/prog/en/modules/tags/review.tt | 6 +- .../tools/automatic_item_modification_by_age.tt | 2 +- .../prog/en/modules/tools/batchMod-del.tt | 13 +- .../prog/en/modules/tools/batchMod-edit.tt | 17 +- .../prog/en/modules/tools/cleanborrowers.tt | 29 +- .../prog/en/modules/tools/csv-profiles.tt | 2 +- .../intranet-tmpl/prog/en/modules/tools/export.tt | 12 +- .../prog/en/modules/tools/inventory.tt | 2 +- .../prog/en/modules/tools/koha-news.tt | 10 +- .../prog/en/modules/tools/tools-home.tt | 5 + .../prog/en/modules/virtualshelves/shelves.tt | 2 +- .../prog/en/xslt/MARC21slim2intranetDetail.xsl | 6 +- .../intranet-tmpl/prog/en/xslt/MARC21slimUtils.xsl | 40 +- .../bootstrap/css/bootstrap-theme-oai.css | 7106 ++++++++++++++++++++ koha-tmpl/opac-tmpl/bootstrap/css/oai.css | 22 + .../opac-tmpl/bootstrap/en/includes/masthead.inc | 2 + .../bootstrap/en/includes/opac-topissues.inc | 4 +- koha-tmpl/opac-tmpl/bootstrap/en/modules/ilsdi.tt | 2 + .../opac-tmpl/bootstrap/en/modules/opac-auth.tt | 11 + .../opac-tmpl/bootstrap/en/modules/opac-detail.tt | 99 +- .../bootstrap/en/modules/opac-sendbasket.tt | 2 +- .../opac-tmpl/bootstrap/en/modules/opac-shelves.tt | 4 +- .../bootstrap/en/modules/opac-suggestions.tt | 5 + .../opac-tmpl/bootstrap/en/modules/sco/sco-main.tt | 7 +- .../bootstrap/en/xslt/MARC21slim2OPACDetail.xsl | 11 +- .../bootstrap/en/xslt/MARC21slim2OPACResults.xsl | 9 +- .../bootstrap/en/xslt/MARC21slimUtils.xsl | 40 +- .../bootstrap/en/xslt/NORMARCslim2OPACDetail.xsl | 5 +- .../bootstrap/en/xslt/NORMARCslim2OPACResults.xsl | 5 +- koha-tmpl/opac-tmpl/bootstrap/js/google-jackets.js | 2 +- koha-tmpl/opac-tmpl/xslt/OAI.xslt | 839 +++ labels/label-edit-batch.pl | 2 +- labels/label-item-search.pl | 2 +- members/memberentry.pl | 2 +- members/moremember.pl | 7 + misc/batchRebuildBiblioTables.pl | 2 +- misc/cronjobs/MARC21_parse_test.pl | 3 - misc/cronjobs/delete_patrons.pl | 2 +- misc/cronjobs/edi_cron.pl | 196 + misc/cronjobs/overdue_notices.pl | 16 +- misc/cronjobs/remove_temporary_edifiles.pl | 41 + misc/cronjobs/runreport.pl | 3 - misc/maintenance/MARC21_utf8_flag_fix.pl | 3 - misc/plack/koha.psgi | 3 +- misc/sip_cli_emulator.pl | 17 +- misc/translator/LangInstaller.pm | 4 +- misc/translator/TmplTokenizer.pm | 3 +- misc/translator/VerboseWarnings.pm | 3 +- opac/ilsdi.pl | 2 +- opac/opac-ISBDdetail.pl | 2 +- opac/opac-MARCdetail.pl | 2 +- opac/opac-account-pay-paypal-return.pl | 11 +- opac/opac-account-pay.pl | 13 +- opac/opac-authorities-home.pl | 11 +- opac/opac-search.pl | 2 +- opac/opac-shelves.pl | 2 +- opac/opac-suggestions.pl | 7 +- opac/svc/auth/googleopenidconnect | 233 + reports/bor_issues_top.pl | 6 +- serials/serials-collection.pl | 12 +- serials/serials-edit.pl | 8 +- serials/serials-search.pl | 2 +- serials/subscription-add.pl | 2 +- serials/subscription-bib-search.pl | 2 +- suggestion/suggestion.pl | 2 +- t/Biblio.t | 2 +- t/Cache.t | 35 +- t/EdiInvoice.t | 75 + t/Edifact.t | 121 + t/Ediorder.t | 56 + t/Ediordrsp.t | 59 + t/Prices.t | 20 +- t/Ris.t | 5 +- t/db_dependent/Acquisition.t | 12 + t/db_dependent/Auth_with_ldap.t | 48 +- t/db_dependent/Barcodes.t | 61 +- t/db_dependent/Circulation_Issuingrule.t | 19 +- t/db_dependent/ColumnsSettings.t | 5 + t/db_dependent/Filter_MARC_ViewPolicy.t | 183 + t/db_dependent/ILSDI_Services.t | 111 +- .../Items/AutomaticItemModificationByAge.t | 63 +- t/db_dependent/Koha.t | 8 +- t/db_dependent/Koha/Issues.t | 60 + t/db_dependent/Members.t | 159 +- t/db_dependent/OAI/Server.t | 4 +- t/db_dependent/Reports_Guided.t | 12 +- t/db_dependent/UsageStats.t | 1 + t/db_dependent/db_structure.t | 23 +- t/db_dependent/www/search_utf8.t | 9 +- t/edi_testfiles/BLSINV337023.CEI | 1 + t/edi_testfiles/QUOTES_413514.CEQ | 1 + t/edi_testfiles/ordrsp1.CEA | 1 + t/edi_testfiles/ordrsp2.CEA | 1 + t/edi_testfiles/ordrsp3.CEA | 1 + t/edi_testfiles/ordrsp4.CEA | 1 + t/edi_testfiles/prquotes_73050_20140430.CEQ | 1 + t/lib/Mocks.pm | 7 +- tools/cleanborrowers.pl | 81 +- xt/author/icondirectories.t | 2 +- xt/author/translatable-templates.t | 2 +- xt/author/valid-templates.t | 2 +- xt/single_quotes.t | 2 +- xt/tt_valid.t | 2 +- 384 files changed, 17781 insertions(+), 1235 deletions(-) create mode 100644 Koha/EDI.pm create mode 100644 Koha/Edifact.pm create mode 100644 Koha/Edifact/Line.pm create mode 100644 Koha/Edifact/Message.pm create mode 100644 Koha/Edifact/Order.pm create mode 100644 Koha/Edifact/Segment.pm create mode 100644 Koha/Edifact/Transport.pm create mode 100644 Koha/Filter/MARC/ViewPolicy.pm create mode 100644 Koha/Issue.pm create mode 100644 Koha/Issues.pm create mode 100644 Koha/OldIssue.pm create mode 100644 Koha/OldIssues.pm create mode 100644 Koha/Schema/Result/EdifactEan.pm create mode 100644 Koha/Schema/Result/EdifactMessage.pm create mode 100644 Koha/Schema/Result/VendorEdiAccount.pm create mode 100755 acqui/edi_ean.pl create mode 100755 acqui/edifactmsgs.pl create mode 100755 acqui/edimsg.pl create mode 100755 admin/edi_accounts.pl create mode 100755 admin/edi_ean_accounts.pl create mode 100644 koha-tmpl/intranet-tmpl/prog/en/js/biblio_framework.js create mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/acqui/edi_ean.tt create mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/acqui/edifactmsgs.tt create mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/acqui/edimsg.tt create mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/admin/edi_accounts.tt create mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/admin/edi_ean_accounts.tt create mode 100644 koha-tmpl/opac-tmpl/bootstrap/css/bootstrap-theme-oai.css create mode 100644 koha-tmpl/opac-tmpl/bootstrap/css/oai.css create mode 100644 koha-tmpl/opac-tmpl/xslt/OAI.xslt create mode 100755 misc/cronjobs/edi_cron.pl create mode 100755 misc/cronjobs/remove_temporary_edifiles.pl create mode 100755 opac/svc/auth/googleopenidconnect create mode 100755 t/EdiInvoice.t create mode 100755 t/Edifact.t create mode 100755 t/Ediorder.t create mode 100755 t/Ediordrsp.t create mode 100644 t/db_dependent/Filter_MARC_ViewPolicy.t create mode 100644 t/db_dependent/Koha/Issues.t create mode 100644 t/edi_testfiles/BLSINV337023.CEI create mode 100644 t/edi_testfiles/QUOTES_413514.CEQ create mode 100644 t/edi_testfiles/ordrsp1.CEA create mode 100644 t/edi_testfiles/ordrsp2.CEA create mode 100644 t/edi_testfiles/ordrsp3.CEA create mode 100644 t/edi_testfiles/ordrsp4.CEA create mode 100644 t/edi_testfiles/prquotes_73050_20140430.CEQ hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Tue Apr 12 22:18:51 2016 From: gitmaster at git.koha-community.org (Git repo owner) Date: Tue, 12 Apr 2016 20:18:51 +0000 Subject: [koha-commits] main Koha release repository branch new_12478_elasticsearch updated. v3.22.00-1211-g594de64 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_12478_elasticsearch has been updated via 594de647a5b0e8261b9fbce63c0ea74fd9fe2d18 (commit) from 4ac570eb24006b18642173b7aca31f543a0d2eeb (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 594de647a5b0e8261b9fbce63c0ea74fd9fe2d18 Author: Tomas Cohen Arazi Date: Tue Apr 12 17:05:57 2016 -0300 Bug 12478: (QA followup) Koha::SearchEngine should fallback to Zebra Signed-off-by: Tomas Cohen Arazi Signed-off-by: Chris ----------------------------------------------------------------------- Summary of changes: Koha/SearchEngine/Search.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Tue Apr 12 22:38:33 2016 From: gitmaster at git.koha-community.org (Git repo owner) Date: Tue, 12 Apr 2016 20:38:33 +0000 Subject: [koha-commits] main Koha release repository branch new_12478_elasticsearch updated. v3.22.00-1213-gb5166e9 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_12478_elasticsearch has been updated via b5166e97dec18a541634326a124851dc7a19ba78 (commit) via d9e50181398c22dcb229296b69e4a88639186fcf (commit) from 594de647a5b0e8261b9fbce63c0ea74fd9fe2d18 (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 b5166e97dec18a541634326a124851dc7a19ba78 Author: Chris Date: Wed Apr 13 08:45:28 2016 +1200 Bug 12478 : Remove the rest of the references to the old mapping tables commit d9e50181398c22dcb229296b69e4a88639186fcf Author: Chris Date: Wed Apr 13 08:42:53 2016 +1200 Bug 12478 : Remove reference to deprecated table elasticsearch_mapping.sql ----------------------------------------------------------------------- Summary of changes: installer/data/mysql/updatedatabase.pl | 33 -------------------------------- 1 file changed, 33 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Tue Apr 12 22:49:57 2016 From: gitmaster at git.koha-community.org (Git repo owner) Date: Tue, 12 Apr 2016 20:49:57 +0000 Subject: [koha-commits] main Koha release repository branch new_12478_elasticsearch updated. v3.22.00-1214-g6b1d1c7 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_12478_elasticsearch has been updated via 6b1d1c721dbc585230121ac818e555120da657f0 (commit) from b5166e97dec18a541634326a124851dc7a19ba78 (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 6b1d1c721dbc585230121ac818e555120da657f0 Author: Chris Date: Wed Apr 13 08:57:49 2016 +1200 Bug 12478: Making sure the syspref is set to Zebra by default ----------------------------------------------------------------------- Summary of changes: installer/data/mysql/atomicupdate/elastic_search.perl | 5 +++++ 1 file changed, 5 insertions(+) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Wed Apr 13 03:44:39 2016 From: gitmaster at git.koha-community.org (Git repo owner) Date: Wed, 13 Apr 2016 01:44:39 +0000 Subject: [koha-commits] main Koha release repository branch new_12478_elasticsearch updated. v3.22.00-1214-g555fcd2 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_12478_elasticsearch has been updated discards 6b1d1c721dbc585230121ac818e555120da657f0 (commit) discards b5166e97dec18a541634326a124851dc7a19ba78 (commit) discards d9e50181398c22dcb229296b69e4a88639186fcf (commit) discards 594de647a5b0e8261b9fbce63c0ea74fd9fe2d18 (commit) discards 4ac570eb24006b18642173b7aca31f543a0d2eeb (commit) discards 250dc547df1bf4ad4e75068ce00b4149442c0d9e (commit) discards 4a285d605994c23d1459c3ca2260af6473c5ff09 (commit) discards fe8732c00ce0becc932e058e42d94fa8f6ae3978 (commit) discards ec997b167683a8aa5d13787ba0c2212d75d67a14 (commit) discards 81745baacf01dbfae583ae93b7146af6b4993236 (commit) discards 7c29a3700f8d81d1e06062af7931ab82147d5952 (commit) discards 05b4deac1d160b53a83e29ca37bbd97fa371c2be (commit) discards d860d4cec00edbf1719a3e14aa84e319005bf98e (commit) discards 6e59bb6a9c5270d3ed4c039443ea4f2e07a07ed7 (commit) discards a266bb81fa84ce0eadf8af644df5c5b4acd2933b (commit) discards 368ca9514a9e36143fb2ac050063f2bbb1772f33 (commit) discards 359f73ad4460f2cdfc05d92a683b9d08e0ba10b2 (commit) discards 2dab71e2c7c0016efc0c259c016425ea30ed6dac (commit) discards a2a99b4124c680d038ba6ec7ce1ecabc2b078aa3 (commit) discards 9f5c48f2db12aefb555e9359fe32c8eae1022815 (commit) discards 4655f320abcb25e5ea8b5031acdbfb0d6f622d30 (commit) discards 1d05f858ff358573ab2b419b19c0f010d01804c5 (commit) discards 020b3577e7d7c9bf104ef0d5614bd00455205647 (commit) discards d6fd9338c192d77ef537510c87301f6f1f12704e (commit) discards 9ea0fbeb5f5b5bcde0610c436c61dc7e4fa1e73c (commit) discards 95acf0e02dad248e62686157b29af6a3d4bca4ef (commit) discards d2d8180af17a36c85ec01088e52f108c2188c97e (commit) discards 79b5b795cfc61163576abe853851648586d47abc (commit) discards c264281013d9786c298a6cb349c647c4b56e7736 (commit) discards 56dfbaae14cff8789cf18bfaf032831adb86f61e (commit) discards 1437acb11840594847ee586e607f8027b611dde6 (commit) discards 4111b19f5d30d1aab7cafe59bdb6e65984eb4899 (commit) discards dc826c386261b0ba2ea4de8123d13c6898a86bad (commit) discards 34f996a1fbe8d059adc714a2d624ab07324b38ef (commit) discards 9f44c9bed18a5726ae20982c150708df43d45966 (commit) discards f1cfbf915e8a19ded36861b3585a214a520b3576 (commit) discards b4802e9ee1c3dfa18dc971264f5252d9573afd04 (commit) discards cf1486f3b497e6587b3fd11c171039eab8d2b530 (commit) discards 4adfe53d384b8a56e17a4440212d73b8a7abd68f (commit) discards 1ff93724531e0dcbf7f39823db712f030050f1e1 (commit) discards f964d2968dfe316f2b2c5a6d50e39dcf01074327 (commit) discards 7081f9ebdb5934e87b9ff9a0b4356a94b97658a8 (commit) discards 5311cb493bff5efab81473d23a7e893f4e5f9bb4 (commit) discards 91a9b3259e33194944922eae05481c001d3d2a98 (commit) discards 5dfe59a0b29d4762abe84e3ef0267229e07fabd1 (commit) discards f6ed0368dfd81742e46e85406d9ff72d92e43ae5 (commit) discards bb29e5eec727f281f24126c64817d89b29a0581e (commit) discards ffb9fdb71e98d50d585056f0d6442fbc391dd331 (commit) discards 7e5e555c10e27b9ab7f3363608106a01c95ca928 (commit) discards 99eab8d03d36960b06034ead101c9216931f9e7c (commit) discards 1efbf4b0ae546470f0bfe8e98bb0cb11077471c3 (commit) discards 8b603e28db3e8ad74d487c860492984aba2666d9 (commit) discards 0114c65f51c3a7aeb7fff730e5d04e37d0fd4359 (commit) discards 10cae9f9ede68d47840682caf4e0b3629cbd1001 (commit) discards d757b41918a6544328d0321185451754bfcf32e3 (commit) discards 9f08c44d6f43f9eefcc699dc6801fb7c51991e72 (commit) discards 5a427acd83181984cbaabe215b374d4e562c74ca (commit) discards f97de074fd5141f83638272ce40fb5a97c983fe6 (commit) discards 0f99e289daa87d5165b457c4b2cb687e4ca750a9 (commit) discards f5fc92dbfaa1e194cff18bb12b17e3334ecd9d06 (commit) discards ca8da11885abc5748f3d1a9aad8d39ec20e2f5c4 (commit) discards 2ccfe19e589ae19ce2ec339bb0beb54d718d131a (commit) discards 621d49dca4d6ebc29610a1f033f64869a7aa3fa0 (commit) discards 42aa7956e21b680f523a30ef4637b5c7099c6b53 (commit) discards 6f19658f3845ebcc1d062ddfb7f32056c9d11f97 (commit) discards d63ae171c963c0cecc6579f0fd9863b0ee101515 (commit) discards 1dbcd721fc332e2e5cc888ad878bda0b5913ae9a (commit) discards 9fae4b8cabc526dcee89668c2034012ec9ea7d93 (commit) discards d154d58636df582c09f490cf9330a44dc64e45c1 (commit) discards 26f091f46efe8eb5deb2a79fb846d6b866b89ce3 (commit) discards 66a84c64d5ef3e1f43b78dcc310db632e016558d (commit) discards 18f8602ccd2b038a5109b4dd6d12032d7e226117 (commit) discards 8142564fe865e79ce371f7b14f06e8a7dfce2e0e (commit) discards d77aa33e42e5bf1003fddfa30a2e57dce699909b (commit) discards c08b01d14d6be2ea81d0738056d0bdfb381bfab1 (commit) discards 892a0f50c894ddf92067df9809f414dcd5e42346 (commit) discards ed0fb72100b84852982943f51c8d071bdb28cc0c (commit) discards 3e933016f8dc604289cfd80a9025ad2e74954ca5 (commit) discards 51ec4ef201ce7eb265739a7bcabb6b36b4f0913e (commit) discards 6674e2db283a225415979e6786f8691c0c92d5e4 (commit) via 555fcd28c84670f18e828e05d5495817e3e31667 (commit) via 8a42fbc55ec50503fd3fb968215f1e576848d8ad (commit) via c30cce1c6b05b97f4de4bbe21444c67f4550ab43 (commit) via 4825061d0e0607955fe7cc9bb7b3391fb9601314 (commit) via df3bcaf542b73a82affa4139d79ed776390ac360 (commit) via ce860a6749389655bc1bcedc62874fedd748283e (commit) via d9e9916de207461e5dbf337d39546610f6fd10d5 (commit) via 21ef827ae27a4ec872cee3c1e6dbac80eb4eae87 (commit) via ea22e5820b582724846e11749486b9d0b4533904 (commit) via e782900e8647429f036d9fe705336eeced0c78f6 (commit) via 7146ecc7b0e1cd9b1ebc113b1fd6f93497ce5883 (commit) via 5fa7523dfecaf3ebcbe2d7e1c45055e07988d603 (commit) via 1ea603f25cb75ea8afed632d813a095ef7382576 (commit) via 079742025fa32055f185cd3a39d8805cb42d69ba (commit) via 0807cc730af8c2b769a8878f88070f5da48c3272 (commit) via 9f2d36e1c3e8ae933f58224decca4e91e326521c (commit) via 7cf364a2c8b3698ca8a8acddfbddd567a94dac39 (commit) via 7360b96df488eec8711b88d5296cee4f7a096765 (commit) via a9ea6ec47c63e0438c78b6185e90b8f38172e7c0 (commit) via ae3b47a312e86d56f2aea7f96753fdd8bf82d030 (commit) via af86a69b50c7f3d5ca7474390ad084375424caae (commit) via 40c9b0faaf4861c799e670e421466e677295e256 (commit) via 385f830d45c41e0ff0cb8745a38a1163cb429330 (commit) via 164ccb6548b06c40ab1a200c82b81c3e58d3a784 (commit) via 77da2bce13fa81df20572b9e1a732d3100fb2de0 (commit) via c698a5d783cd697e2fec8ff950f4ad1e1873565e (commit) via fa8ef7f16d190f302ba4263b09f09a54404a8178 (commit) via c8f2b715ff76726eb5ef25f39e1875f6c2b0c42a (commit) via 193b5be34f8735164e4536ed7851a25035730b55 (commit) via 8a95452472e0d69b72d38387f4c9d0baabefc919 (commit) via 0d56c30e4c4bd86d8d9d28298ecff3a41e0b333b (commit) via 448cad8b25736f5d0d6745a62ebb4e53646c2b66 (commit) via 20d14317eb3e88d35f94f087fa1bd3c68c42a3f8 (commit) via c0a9af7e8e1cc069757518878d6d728d0e4d50a9 (commit) via 5c80d7f95ca064b828d7c5f8bfdceaa7013b8263 (commit) via 1be7bf8c41172728989b019f10fb1bbced4a0f1d (commit) via 1e1154a750ffb9666f29ba6507b52e11fc4d22fc (commit) via 158b6a2aeae2d15702626e129489936a96b30fae (commit) via efc1a2978b3d70ce33e2e4b5344c2fd2330b41a4 (commit) via e091c8138c6d7b888285884af85957a9cca466c9 (commit) via 47453c8201eef6b96050f274953e46d34c2d2117 (commit) via b3d662f0dd92df36dfe1150eff84a10a43cd3e0a (commit) via 5fffea591afb4280bc64f4e2e6db19bdb81fd33c (commit) via 607b1b01af1ff97a291ab124b7cc7b14236913ed (commit) via 09b1e530bb39231b37eca1a3eb92a01e1f280c38 (commit) via 3e739b8488c3f2f269f61b6d9fb5e5955ea68540 (commit) via a402517404aa599b8f78a0bc8a0505a5afdfa0a5 (commit) via a109594bd065d21dae83232daa5aa15d4dd5571e (commit) via a7af8bb24b55ba1e43111294b1cc68404d83b0f9 (commit) via 9e8c6e703b862faa4a3b0496500f871c20cf006a (commit) via 618659bc3d745e645e8fbc79a474ef1d59520b77 (commit) via 6cd4a75717095a15c9eb93ece22126082ce1462a (commit) via 133945511ee9ac47ed889c34fe76ad6a12c7089f (commit) via 7136d364cee42dbbf5c0146daa25c431f484fa45 (commit) via 1848b8ba5b4376910b71584a0c56eb7f9b0e57d0 (commit) via 84b78545b6e71e1f996681e68f37475fa108d887 (commit) via 05b418d15e29aad3fc24c9d45d87e87047e6deaf (commit) via 023ab0695713c6834e3c8e95a4c5309be8086e87 (commit) via 9088c6320f6ce43fb41d178df8cfcf793ab5b188 (commit) via a90f83aa238f847f508d09c28de84d1df5956d7d (commit) via 66fb6b61021785c357bad6d065ccd477265ff004 (commit) via 6a0177dffc02a614087ec733712dc5b536cd8c53 (commit) via 4ab5330590a05f3b1a2f7cd8378b408933616331 (commit) via b4f15ad7af2916fb38c05c0c4bd3f9e201bca0c6 (commit) via 72d093c1b2027039a073036e3ae603e80900e667 (commit) via 97b73abeca4dd28d2a8e1677a4f1f3c9132f23be (commit) via 83c3a055a50206b8bb813d5389f4ae7ff38633ab (commit) via 5e8fc37bc3db1c4730cf8c7f3cbc540775ba4a8f (commit) via 17d4b52fb18124fa85dca1dfc56c8ed1cd4c7123 (commit) via 9957a488ebee34cab4292643bfc37c3dde1e9050 (commit) via 8513db66731b185f97f3a74fecde9f08aabdac8f (commit) via 5afe48a64a8f3104d234ae0077eb9379ed0102c8 (commit) via 76f209fcfacf28d472ec1eda7b75c1216481c0ca (commit) via 4b3c902004fffe4cb9c96e228d28766ac78bf742 (commit) via 0c088ec75072df60dbe0e019892421456f9993c2 (commit) via 1aa11be28416d52645ae0b9321bb792ab13f89e5 (commit) via e6cd4361dcb8f16ca06bb6aaae7cf0ca43382032 (commit) via c332217585149aad033f1db862e4def5305d9b10 (commit) via 3b82a6748633c0e8703d40c63961cf2ff3941bb5 (commit) via ad24ab4cff2eff773988c90848a175edbbdbbbb0 (commit) This update added new revisions after undoing existing revisions. That is to say, the old revision is not a strict subset of the new revision. This situation occurs when you --force push a change and generate a repository containing something like this: * -- * -- B -- O -- O -- O (6b1d1c721dbc585230121ac818e555120da657f0) \ N -- N -- N (555fcd28c84670f18e828e05d5495817e3e31667) When this happens we assume that you've already had alert emails for all of the O revisions, and so we here report only the revisions in the N branch from the common base, B. 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 555fcd28c84670f18e828e05d5495817e3e31667 Author: Chris Date: Wed Apr 13 08:57:49 2016 +1200 Bug 12478: Making sure the syspref is set to Zebra by default Signed-off-by: Nick Clemens commit 8a42fbc55ec50503fd3fb968215f1e576848d8ad Author: Chris Date: Wed Apr 13 08:45:28 2016 +1200 Bug 12478 : Remove the rest of the references to the old mapping tables Signed-off-by: Nick Clemens commit c30cce1c6b05b97f4de4bbe21444c67f4550ab43 Author: Chris Date: Wed Apr 13 08:42:53 2016 +1200 Bug 12478 : Remove reference to deprecated table elasticsearch_mapping.sql Signed-off-by: Nick Clemens commit 4825061d0e0607955fe7cc9bb7b3391fb9601314 Author: Tomas Cohen Arazi Date: Tue Apr 12 17:05:57 2016 -0300 Bug 12478: (QA followup) Koha::SearchEngine should fallback to Zebra Signed-off-by: Tomas Cohen Arazi Signed-off-by: Chris Signed-off-by: Nick Clemens commit df3bcaf542b73a82affa4139d79ed776390ac360 Author: Jonathan Druart Date: Mon Apr 11 08:11:11 2016 +0100 Bug 12478: Define simple_search_compat for Zebra When Zebra is defined as the search engine, the authority search is broken (Can't locate object method "simple_search_compat" via package "Koha::SearchEngine::Zebra::Search" at /home/koha/koha/C4/AuthoritiesMarc.pm line 357.) simple_search_compat is not defined in Koha::SearchEngine::Zebra::Search, it should be a wrapper for C4::Search::SimpleSearch Signed-off-by: Nick Clemens commit ce860a6749389655bc1bcedc62874fedd748283e Author: Jonathan Druart Date: Tue Oct 13 10:45:32 2015 +0100 Bug 12478: Display facet terms ordered by number of occurrences By default ES returns the facet terms ordered by most used, which makes sense. This patch removes resort done in the scripts (catalogue/search.pl and opac/opac-search.pl) and moves it to the module. For Zebra it's now done in C4::Search::getRecords, and there is no change to expect (still alphabetically). On the Elastic search side, we could imagine to let the library define the order of the facets. The facet terms are now sorted by most used. To test easily this change, turn on the displayFacetCount pref. Signed-off-by: Nick Clemens commit d9e9916de207461e5dbf337d39546610f6fd10d5 Author: Robin Sheat Date: Tue Oct 13 17:21:36 2015 +1300 Revert "Bug 12478: Display facet terms ordered by number of occurrences" This reverts commit cd4905c2969b067476881016d0b03271f0bcc7c8. This commit caused an error in C4::Search::GetFacets when running in zebra mode. Conflicts: Koha/SearchEngine/Elasticsearch/Search.pm Signed-off-by: Nick Clemens commit 21ef827ae27a4ec872cee3c1e6dbac80eb4eae87 Author: Jonathan Druart Date: Mon Oct 12 17:03:38 2015 +0100 Bug 12478: Remove previous mappings file (sql) Signed-off-by: Nick Clemens commit ea22e5820b582724846e11749486b9d0b4533904 Author: Jonathan Druart Date: Mon Oct 12 16:54:12 2015 +0100 Bug 12478: Manually add the many_to_many relationships This will create the add_to_* accessors for us. Signed-off-by: Nick Clemens commit e782900e8647429f036d9fe705336eeced0c78f6 Author: Jonathan Druart Date: Mon Oct 12 16:52:11 2015 +0100 Bug 12478: update the schema These files have been generated with the misc/devel/update_dbix_class_files.pl script. Signed-off-by: Nick Clemens commit 7146ecc7b0e1cd9b1ebc113b1fd6f93497ce5883 Author: Jonathan Druart Date: Mon Oct 12 16:46:16 2015 +0100 Bug 12478: Move mapping attributes to the join table To make things consistent, the attributes of the mappings (sort, suggestible, facet) should be moved to the join tables (search_marc_to_field). Indeed the search_marc_map could represent a mapping for several search fields with different attributes. Before this change it was not possible. Signed-off-by: Nick Clemens commit 5fa7523dfecaf3ebcbe2d7e1c45055e07988d603 Author: Jonathan Druart Date: Fri Sep 25 15:48:50 2015 +0100 Bug 12478: Add Koha::SearchField[s] and Koha::SearchMarcMap[s] classes This was initially submited on bug 14899, but we will need it here. Signed-off-by: Nick Clemens commit 1ea603f25cb75ea8afed632d813a095ef7382576 Author: Jonathan Druart Date: Mon Oct 12 17:11:28 2015 +0100 Bug 12478: Add the yaml mappings file This should facilitate the modification of the mappings. The yaml format is more readable than sql. Signed-off-by: Nick Clemens commit 079742025fa32055f185cd3a39d8805cb42d69ba Author: Robin Sheat Date: Thu Oct 8 17:02:21 2015 +1300 Bug 12478: "fix" notforloan Signed-off-by: Nick Clemens commit 0807cc730af8c2b769a8878f88070f5da48c3272 Author: Jonathan Druart Date: Mon Oct 5 17:15:01 2015 +0100 Bug 12478: Take the FacetMaxCount pref into account The system preference FacetMaxCount should work as expected with ES. Signed-off-by: Nick Clemens commit 9f2d36e1c3e8ae933f58224decca4e91e326521c Author: Jonathan Druart Date: Mon Oct 5 11:34:54 2015 +0100 Bug 12478: Remove empty limit parameter If no limit are passed, the url will contain '&limit=' anyway. It is not necessary and can be avoided easily Test plan: 1/ Search for a term in your catalogue 2/ Hover over a link in the facet area 3/ The link is cgi-bin/koha/opac-search.pl?idx=kw&q=your_term&limit=&limit=[...] With this patch, the empty limit parameter does not appear. Signed-off-by: Nick Clemens commit 7cf364a2c8b3698ca8a8acddfbddd567a94dac39 Author: Jonathan Druart Date: Mon Oct 5 15:29:52 2015 +0100 Bug 12478: Display facet terms ordered by number of occurrences By default ES returns the facet terms ordered by most used, which makes sense. This patch removes resort done in the scripts (catalogue/search.pl and opac/opac-search.pl) and moves it to the module. For Zebra it's now done in C4::Search::getRecords, and there is no change to expect (still alphabetically). On the Elastic search side, we could imagine to let the library define the order of the facets. The facet terms are now sorted by most used. To test easily this change, turn on the displayFacetCount pref. Signed-off-by: Nick Clemens commit 7360b96df488eec8711b88d5296cee4f7a096765 Author: Jonathan Druart Date: Mon Oct 5 12:50:52 2015 +0100 Bug 12478: facets - Display description instead of code for locations Signed-off-by: Nick Clemens commit a9ea6ec47c63e0438c78b6185e90b8f38172e7c0 Author: Jonathan Druart Date: Mon Oct 5 12:51:37 2015 +0100 Bug 12478: Add Koha::AuthorisedValue[s] class These 2 classes come from bug 10363. Signed-off-by: Nick Clemens commit ae3b47a312e86d56f2aea7f96753fdd8bf82d030 Author: Jonathan Druart Date: Mon Oct 5 12:17:09 2015 +0100 Bug 12478: Use the new Koha::ItemTypes to retrieve itypes descriptions Signed-off-by: Nick Clemens commit af86a69b50c7f3d5ca7474390ad084375424caae Author: Jonathan Druart Date: Tue Sep 15 17:02:28 2015 +0100 Bug 12478: Add Koha::ItemType[s] classes These 2 classes come from bug 14828. Tests in t/db_dependent/Koha/ItemTypes.t should be updated. Signed-off-by: Nick Clemens commit 40c9b0faaf4861c799e670e421466e677295e256 Author: Jonathan Druart Date: Mon Oct 5 10:58:50 2015 +0100 Bug 12478: (follow-up) Display the correct number of facets This patch fixes a side-effect of the previous "Display the correct number of facets (5 instead of 6)" patch. If you ask for more facets ('show more' link) and that the number of facets is > 5 but < 10, 1 facet will be missing. Signed-off-by: Nick Clemens commit 385f830d45c41e0ff0cb8745a38a1163cb429330 Author: Robin Sheat Date: Mon Oct 5 17:44:14 2015 +1300 Bug 12478: abort early if there's no elasticserch definition Signed-off-by: Nick Clemens commit 164ccb6548b06c40ab1a200c82b81c3e58d3a784 Author: Robin Sheat Date: Mon Oct 5 16:21:42 2015 +1300 Bug 14899: schema changes to make the database better Signed-off-by: Nick Clemens commit 77da2bce13fa81df20572b9e1a732d3100fb2de0 Author: Jonathan Druart Date: Fri Sep 25 16:06:07 2015 +0100 Bug 14899: DB changes This patch applies several changes to the DB structure introduced by the previous ES patch set: 1/ Add a search_field.label column => It will be easier to understand what the search_field does. Indeed, some are not user friendly: acqdate, an, pl, ff8-23, ln, etc. TODO later: Update the labels with correct values (at the moment label=name) 2/ Update the foreign key search_marc_to_field.search_marc_map_id with on delete cascase. This will permit to automatically remove the entries in search_marc_to_field when they are deleted in search_marc_map. 3/ Remove the index_name_2 unique constraint on the search_marc_map table. I don't understand how this could be useful, it was defined like (index_name, marc_type, marc_field), so it means a mapping cannot be defined twice with different values for facet, suggestible and sort. This limitation does not seem to make sense. Robin, please correct me if I am wrong :) Signed-off-by: Nick Clemens commit c698a5d783cd697e2fec8ff950f4ad1e1873565e Author: Robin Sheat Date: Fri Oct 2 15:23:07 2015 +1300 Bug 12478: add location, su-geo, se to facets Signed-off-by: Nick Clemens commit fa8ef7f16d190f302ba4263b09f09a54404a8178 Author: Robin Sheat Date: Thu Oct 1 15:53:44 2015 +1300 Bug 12478: fix errors from rebase and new upstream version Signed-off-by: Nick Clemens commit c8f2b715ff76726eb5ef25f39e1875f6c2b0c42a Author: Robin Sheat Date: Wed Sep 30 15:46:18 2015 +1300 Bug 12478: fix some issues on rebase There were rebase conflicts that it was just easier to postpone until afterwards. Signed-off-by: Nick Clemens commit 193b5be34f8735164e4536ed7851a25035730b55 Author: Jonathan Druart Date: Fri Sep 4 13:00:48 2015 +0100 Bug 12478: Fix error on indexing a specific record % perl misc/search_tools/rebuild_elastic_search.pl -bn 42 Can't locate object method "idnumber" via package "MARC::Record" at misc/search_tools/rebuild_elastic_search.pl line 171. Signed-off-by: Nick Clemens commit 8a95452472e0d69b72d38387f4c9d0baabefc919 Author: Jonathan Druart Date: Fri Aug 28 11:59:26 2015 +0100 Bug 12478: Fix encoding issue on facets Filer on "?lez, Ts." => Can't escape \x{015A}, try uri_escape_utf8() instead at /home/koha/src/Koha/SearchEngine/Elasticsearch/QueryBuilder.pm line 221. Signed-off-by: Nick Clemens commit 0d56c30e4c4bd86d8d9d28298ecff3a41e0b333b Author: Jonathan Druart Date: Fri Aug 28 11:29:23 2015 +0100 Bug 12478: Do not display the 'Show more' links if no more facet available Signed-off-by: Nick Clemens commit 448cad8b25736f5d0d6745a62ebb4e53646c2b66 Author: Jonathan Druart Date: Fri Aug 28 11:24:24 2015 +0100 Bug 12478: Display the correct number of facets (5 instead of 6) The loop on facet entries was wrong, it should stop after 5 iterations. Signed-off-by: Nick Clemens commit 20d14317eb3e88d35f94f087fa1bd3c68c42a3f8 Author: Jonathan Druart Date: Fri Aug 28 11:13:45 2015 +0100 Bug 12478: Remove Solr occurrences reintroduced by a previous patch Signed-off-by: Nick Clemens commit c0a9af7e8e1cc069757518878d6d728d0e4d50a9 Author: Jonathan Druart Date: Fri Aug 28 11:13:07 2015 +0100 Bug 12478: Fix pod in the rebuild_ES.pl script Signed-off-by: Nick Clemens commit 5c80d7f95ca064b828d7c5f8bfdceaa7013b8263 Author: Jonathan Druart Date: Fri Aug 28 11:08:27 2015 +0100 Bug 12478: Fix the verbose flag on reindexing Signed-off-by: Nick Clemens commit 1be7bf8c41172728989b019f10fb1bbced4a0f1d Author: Jonathan Druart Date: Fri Aug 28 11:07:51 2015 +0100 Bug 12478: Change the commit count to 5k It will improve the indexing time. Signed-off-by: Nick Clemens commit 1e1154a750ffb9666f29ba6507b52e11fc4d22fc Author: Jonathan Druart Date: Fri Aug 28 11:07:04 2015 +0100 Bug 12478: Fix the UNIMARC and NORMARC indexing 1/ This patch fixes a major issue on UNIMARC and NORMARC installations (Compulsive c/p on insert into insert into search_marc_to_field for unimarc and normarc) 2/ After fixing that, I got invalid marc path at /usr/share/perl5/Catmandu/Fix/marc_map.pm line 35. on reindexing. It was caused by some "" values instead of NULL. 3/ Then, a "duplicate entry" error was caused by 3 lines for Local-number. It seems to be an error, 1 is enough (I suppose 0909 was an error too). Note that the following is not fixed by this patch: MariaDB [koha_es_unimarc]> insert into search_field (name, type) select distinct mapping, type from elasticsearch_mapping; Query OK, 73 rows affected, 57 warnings (0.05 sec) Records: 73 Duplicates: 0 Warnings: 57 MariaDB [koha_es_unimarc]> show warnings; +---------+------+--------------------------------------------+ | Level | Code | Message | +---------+------+--------------------------------------------+ | Warning | 1265 | Data truncated for column 'type' at row 1 | Signed-off-by: Nick Clemens commit 158b6a2aeae2d15702626e129489936a96b30fae Author: Robin Sheat Date: Fri Sep 25 15:11:29 2015 +1200 Bug 12478: allow more granular sorting configuration This allows sorting to be configured within a field. For example, while many values are included for search on author, sorting should only be done on the main entry values. This permits that by have a sort value, which can be true, false, or null. true and null are pretty much the same, but false means that a field isn't available for sorting on. By default (null), fields can be sorted on. Signed-off-by: Nick Clemens commit efc1a2978b3d70ce33e2e4b5344c2fd2330b41a4 Author: Robin Sheat Date: Thu Aug 27 16:13:16 2015 +1200 Bug 12478: pull the SQL updates from the browse interface Hopefully will reduce the rate of conflicts down the road. We'll see. Signed-off-by: Nick Clemens commit e091c8138c6d7b888285884af85957a9cca466c9 Author: Robin Sheat Date: Wed Aug 26 17:29:17 2015 +1200 Bug 12478: pull the SQL updates from the browse interface Signed-off-by: Nick Clemens commit 47453c8201eef6b96050f274953e46d34c2d2117 Author: Robin Sheat Date: Tue Aug 25 17:03:08 2015 +1200 Bug 12478: the facet "show more" links work properly now Signed-off-by: Nick Clemens commit b3d662f0dd92df36dfe1150eff84a10a43cd3e0a Author: Robin Sheat Date: Tue Aug 25 15:13:51 2015 +1200 Bug 12478: add the lenient option to the query_string query It doesn't really help. Signed-off-by: Nick Clemens commit 5fffea591afb4280bc64f4e2e6db19bdb81fd33c Author: Robin Sheat Date: Thu Aug 20 18:12:42 2015 +1200 Bug 12478: improve error reporting a bit Signed-off-by: Nick Clemens commit 607b1b01af1ff97a291ab124b7cc7b14236913ed Author: Robin Sheat Date: Mon Aug 3 17:55:54 2015 +1200 Bug 12478: update to support new Cat::Store::ES Signed-off-by: Nick Clemens commit 09b1e530bb39231b37eca1a3eb92a01e1f280c38 Author: Robin Sheat Date: Fri Jul 17 14:38:19 2015 +1200 Bug 12478: ES is now updated when records are updated/deleted Signed-off-by: Nick Clemens commit 3e739b8488c3f2f269f61b6d9fb5e5955ea68540 Author: Robin Sheat Date: Fri Jul 10 15:19:21 2015 +1200 Bug 12478: fix capitalisation issue with index names Signed-off-by: Nick Clemens commit a402517404aa599b8f78a0bc8a0505a5afdfa0a5 Author: Robin Sheat Date: Wed Jul 8 16:34:12 2015 +1200 Bug 12478: make things using SimpleSearch use the new version Signed-off-by: Nick Clemens commit a109594bd065d21dae83232daa5aa15d4dd5571e Author: Robin Sheat Date: Fri Jun 19 15:55:46 2015 +1200 Bug 12478: a replacement to the SimpleSearch interface implemented Signed-off-by: Nick Clemens commit a7af8bb24b55ba1e43111294b1cc68404d83b0f9 Author: Robin Sheat Date: Wed Jun 17 15:37:29 2015 +1200 Bug 12478: fix issue with authority sort order being weird Signed-off-by: Nick Clemens commit 9e8c6e703b862faa4a3b0496500f871c20cf006a Author: Robin Sheat Date: Mon Jun 15 17:35:41 2015 +1200 Bug 12478: auth search works in the staff client Some issues with sort order though. Signed-off-by: Nick Clemens commit 618659bc3d745e645e8fbc79a474ef1d59520b77 Author: Robin Sheat Date: Mon Jun 15 15:12:39 2015 +1200 Bug 12478: starting authority search in staff client Signed-off-by: Nick Clemens commit 6cd4a75717095a15c9eb93ece22126082ce1462a Author: Robin Sheat Date: Fri Jun 12 15:19:39 2015 +1200 Bug 12478: fix issues with the conversion SQL Signed-off-by: Nick Clemens commit 133945511ee9ac47ed889c34fe76ad6a12c7089f Author: Robin Sheat Date: Wed Jun 10 14:35:33 2015 +1200 Bug 12478: change the schema for storing mappings This makes the mapping schema a proper many-to-many relational structure, which is a little more fiddly to work with, but will make things like editors for it easier to write. Signed-off-by: Nick Clemens commit 7136d364cee42dbbf5c0146daa25c431f484fa45 Author: Robin Sheat Date: Fri Jun 5 14:29:31 2015 +1200 Bug 12478: fix multi-choice stuff in advanced search This means that things like itype get "OR"ed together, rather than "AND"ed like other things. Signed-off-by: Nick Clemens commit 1848b8ba5b4376910b71584a0c56eb7f9b0e57d0 Author: Robin Sheat Date: Thu May 14 15:15:04 2015 +1200 Bug 12478: starting to add search to staff client Signed-off-by: Nick Clemens commit 84b78545b6e71e1f996681e68f37475fa108d887 Author: Robin Sheat Date: Tue Mar 31 17:26:49 2015 +1300 Bug 12478: fix wrong counts/results for authority searches Signed-off-by: Nick Clemens commit 05b418d15e29aad3fc24c9d45d87e87047e6deaf Author: Robin Sheat Date: Wed Mar 25 17:29:14 2015 +1300 Bug 12478: fix issues caused by rebasing Signed-off-by: Nick Clemens commit 023ab0695713c6834e3c8e95a4c5309be8086e87 Author: Robin Sheat Date: Tue Mar 17 17:23:56 2015 +1300 Bug 12478: reinstate zebra compatibility for auth search Signed-off-by: Nick Clemens commit 9088c6320f6ce43fb41d178df8cfcf793ab5b188 Author: Robin Sheat Date: Fri Mar 13 15:27:24 2015 +1300 Bug 12478: paging is fixed now too Signed-off-by: Nick Clemens commit a90f83aa238f847f508d09c28de84d1df5956d7d Author: Robin Sheat Date: Fri Mar 13 15:22:53 2015 +1300 Bug 12478: sort is sorted Signed-off-by: Nick Clemens commit 66fb6b61021785c357bad6d065ccd477265ff004 Author: Robin Sheat Date: Thu Mar 12 18:11:30 2015 +1300 Bug 12478: phrase searching for authorities is happier Signed-off-by: Nick Clemens commit 6a0177dffc02a614087ec733712dc5b536cd8c53 Author: Robin Sheat Date: Wed Mar 11 16:14:14 2015 +1300 Bug 12478: fix the way counting is done Signed-off-by: Nick Clemens commit 4ab5330590a05f3b1a2f7cd8378b408933616331 Author: Robin Sheat Date: Tue Mar 10 18:12:51 2015 +1300 Bug 12478: authority paging works Signed-off-by: Nick Clemens commit b4f15ad7af2916fb38c05c0c4bd3f9e201bca0c6 Author: Robin Sheat Date: Tue Mar 10 17:32:08 2015 +1300 Bug 12478: working on authority results Signed-off-by: Nick Clemens commit 72d093c1b2027039a073036e3ae603e80900e667 Author: Robin Sheat Date: Wed Mar 4 18:19:25 2015 +1300 Bug 12478: make authid get to the templates properly Signed-off-by: Nick Clemens commit 97b73abeca4dd28d2a8e1677a4f1f3c9132f23be Author: Robin Sheat Date: Wed Mar 4 17:38:18 2015 +1300 Bug 12478: basic auth search and display is working Signed-off-by: Nick Clemens commit 83c3a055a50206b8bb813d5389f4ae7ff38633ab Author: Robin Sheat Date: Tue Mar 3 14:02:19 2015 +1300 Bug 12478: more authorities Signed-off-by: Nick Clemens commit 5e8fc37bc3db1c4730cf8c7f3cbc540775ba4a8f Author: Robin Sheat Date: Tue Feb 24 14:43:01 2015 +1300 Bug 12478 - more authorites Signed-off-by: Nick Clemens commit 17d4b52fb18124fa85dca1dfc56c8ed1cd4c7123 Author: Robin Sheat Date: Tue Feb 17 18:38:07 2015 +1300 Bug 12478 - more authority searching Queries are being built, but they seem to be wrong as no results are returned. Signed-off-by: Nick Clemens commit 9957a488ebee34cab4292643bfc37c3dde1e9050 Author: Robin Sheat Date: Wed Feb 4 16:42:12 2015 +1300 Bug 12478 - more authority query building Signed-off-by: Nick Clemens commit 8513db66731b185f97f3a74fecde9f08aabdac8f Author: Robin Sheat Date: Tue Feb 3 14:40:50 2015 +1300 Bug 12478 - fix syntax errors so that stuff runs Signed-off-by: Nick Clemens commit 5afe48a64a8f3104d234ae0077eb9379ed0102c8 Author: Robin Sheat Date: Fri Jan 30 16:06:46 2015 +1300 Bug 12478 - authority work in progress Signed-off-by: Nick Clemens commit 76f209fcfacf28d472ec1eda7b75c1216481c0ca Author: Robin Sheat Date: Wed Nov 19 15:05:12 2014 +1300 Bug 12478 - fix issue with class loading Signed-off-by: Nick Clemens commit 4b3c902004fffe4cb9c96e228d28766ac78bf742 Author: Robin Sheat Date: Wed Nov 19 14:07:20 2014 +1300 Bug 12478 - fix error in configuration loading Signed-off-by: Nick Clemens commit 0c088ec75072df60dbe0e019892421456f9993c2 Author: Robin Sheat Date: Wed Nov 12 17:27:14 2014 +1300 Bug 12478 - fix error in SQL Signed-off-by: Nick Clemens commit 1aa11be28416d52645ae0b9321bb792ab13f89e5 Author: Robin Sheat Date: Tue Sep 23 17:32:57 2014 +1200 Bug 12478 - add test cases Signed-off-by: Nick Clemens commit e6cd4361dcb8f16ca06bb6aaae7cf0ca43382032 Author: Robin Sheat Date: Thu Sep 4 13:42:26 2014 +1200 Bug 12478 - authorities can now be stored in ES (Not fetched yet though.) Signed-off-by: Nick Clemens commit c332217585149aad033f1db862e4def5305d9b10 Author: Robin Sheat Date: Mon Aug 25 15:55:50 2014 +1200 Bug 12478 - set up database tables for elasticsearch This sets up the database changes needed to run ES. This isn't intended to be ready for upstreaming, just to make testing easier. Signed-off-by: Nick Clemens commit 3b82a6748633c0e8703d40c63961cf2ff3941bb5 Author: Robin Sheat Date: Tue Sep 16 17:38:43 2014 +1200 Bug 12478 - pile of elasticsearch code Signed-off-by: Nick Clemens commit ad24ab4cff2eff773988c90848a175edbbdbbbb0 Author: Robin Sheat Date: Tue Sep 16 17:34:25 2014 +1200 Bug 12478 - add some base objects that the ES code will depend on Signed-off-by: Nick Clemens ----------------------------------------------------------------------- Summary of changes: hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Thu Apr 14 14:33:11 2016 From: gitmaster at git.koha-community.org (Git repo owner) Date: Thu, 14 Apr 2016 12:33:11 +0000 Subject: [koha-commits] main Koha release repository branch 3.22.x updated. v3.22.05-54-gc20496a 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.22.x has been updated via c20496aea938e1faaa53daff5e2cf3d697b0eac9 (commit) from b8c5192ec70e3b87644dd84cf87144370c2410bf (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 c20496aea938e1faaa53daff5e2cf3d697b0eac9 Author: Julian Maurice Date: Thu Apr 14 14:29:38 2016 +0200 Bug 15962: Block the currency deletion if used A currency should not be deleted if used by a vendor or a basket. Test plan: 1/ Add a new currency 2/ Create a vendor using this currency 3/ Create a basket using this currency 4/ Try to delete the currency 5/ Delete the basket 6/ Try to delete the currency 7/ Delete the vendor 8/ Delete the currency Signed-off-by: Julian Maurice ----------------------------------------------------------------------- Summary of changes: admin/currency.pl | 18 ++++++++++-------- .../intranet-tmpl/prog/en/modules/admin/currency.tt | 11 +++++++++-- 2 files changed, 19 insertions(+), 10 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Thu Apr 14 15:09:41 2016 From: gitmaster at git.koha-community.org (Git repo owner) Date: Thu, 14 Apr 2016 13:09:41 +0000 Subject: [koha-commits] main Koha release repository branch 3.22.x updated. v3.22.05-55-gbebb617 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.22.x has been updated via bebb61739f4460295151a37d44cc1a2d6f956d26 (commit) from c20496aea938e1faaa53daff5e2cf3d697b0eac9 (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 bebb61739f4460295151a37d44cc1a2d6f956d26 Author: Nick Clemens Date: Fri Feb 26 21:08:55 2016 +0000 Bug 15928 - Show unlinked guarantor To test: 1 - Add guarantor data to patron account by typing it in but do not 'Set to patron' 2 - Note it is not displayed on patron details 3 - Apply patch 4 - Note the info is displayed 5 - Test that linked guarantors show as expected Signed-off-by: Julian Maurice ----------------------------------------------------------------------- Summary of changes: koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt | 2 ++ members/moremember.pl | 5 +++++ 2 files changed, 7 insertions(+) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Thu Apr 14 22:04:47 2016 From: gitmaster at git.koha-community.org (Git repo owner) Date: Thu, 14 Apr 2016 20:04:47 +0000 Subject: [koha-commits] main Koha release repository branch new_12478_elasticsearch updated. v3.22.00-1216-g1dde88a 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_12478_elasticsearch has been updated via 1dde88afb15d0c6d7044e907cae268669b4b65e9 (commit) via 0fe86e9638c6a6081a62138e02197dbabdfee1bb (commit) from 555fcd28c84670f18e828e05d5495817e3e31667 (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 1dde88afb15d0c6d7044e907cae268669b4b65e9 Author: Chris Cormack Date: Wed Apr 13 21:20:36 2016 +0000 Bug 12478 : Fixing the tests for Koha::SearchEngine::Elasticsearch::Search perl t/Koha_SearchEngine_Elasticsearch_Search.t Signed-off-by: Nick Clemens commit 0fe86e9638c6a6081a62138e02197dbabdfee1bb Author: Chris Cormack Date: Wed Apr 13 20:51:59 2016 +0000 Bug 12478 : Fixing the tests in t/Koha_ElasticSearch_Indexer.t Signed-off-by: Nick Clemens ----------------------------------------------------------------------- Summary of changes: t/Koha_ElasticSearch_Indexer.t | 6 +++--- ...arch.t => Koha_SearchEngine_Elasticsearch_Search.t} | 16 +++++++++------- 2 files changed, 12 insertions(+), 10 deletions(-) rename t/{Koha_ElasticSearch_Search.t => Koha_SearchEngine_Elasticsearch_Search.t} (59%) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Tue Apr 19 19:39:18 2016 From: gitmaster at git.koha-community.org (Git repo owner) Date: Tue, 19 Apr 2016 17:39:18 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.22.00-1135-g997ad16 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 997ad166c6ea53d47e3e15e7720d63da9f3b0a80 (commit) from 2a8c68936dd7fd5c82af339db968eb67cb93a082 (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 997ad166c6ea53d47e3e15e7720d63da9f3b0a80 Author: Tomas Cohen Arazi Date: Fri Apr 1 15:30:26 2016 -0300 [SIGNED-OFF] Bug 15113: koha-rebuild-zebra should check USE_INDEXER_DAEMON and skip if enabled This patch changes the behaviour of the koha-rebuild-zebra script in the following way: USE_INDEXER_DAEMON=no - Keeps the current behaviour USE_INDEXER_DAEMON=yes - It skips incremental indexing to avoid races. Caveats: - A --force option is introduced for useing in a specific situtation that might need it (i.e. the administrator knows what he's doing). - If --full is passed, the reindexing is not skipped. The documentation files and messages are adjusted accordingly. This patch should help users that want to use the indexing daemon, in which case they wouldn't need to change their default 5 min cronjob (it will be just skipped). Ultimately, koha-common could have USE_INDEXER_DAEMON = yes by default, but that's subject for another bug report. To test: - Play with the different option switches and USE_INDEXER_DAEMON - Things work as expected - Sign off Regards Signed-off-by: Hector Castro Works as expected Signed-off-by: Jonathan Druart Signed-off-by: Your Full Name ----------------------------------------------------------------------- Summary of changes: debian/docs/koha-rebuild-zebra.xml | 12 +++++++++--- debian/scripts/koha-rebuild-zebra | 34 +++++++++++++++++++++++++--------- 2 files changed, 34 insertions(+), 12 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Tue Apr 19 20:07:33 2016 From: gitmaster at git.koha-community.org (Git repo owner) Date: Tue, 19 Apr 2016 18:07:33 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.22.00-1136-g98f551f 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 98f551faec2627742b0b1d5b72e1791b4451b401 (commit) from 997ad166c6ea53d47e3e15e7720d63da9f3b0a80 (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 98f551faec2627742b0b1d5b72e1791b4451b401 Author: Tomas Cohen Arazi Date: Fri Apr 1 15:48:10 2016 -0300 [SIGNED-OFF] Bug 16190: Enable the indexer daemon by default This patch enables the indexer daemon by default on packages installs. It does so by setting USE_INDEXER_DAEMON=yes on the /etc/default/koha-common file. It does remove now irrelevant comments from that file. This patch is straightforward to review. If is just a matter of choosing to enable or not to enable by default. Kind regards PS: Let end users rejoice this so far hidden feature :-D Signed-off-by: Hector Castro Signed-off-by: Jonathan Druart Signed-off-by: Brendan Gallagher ----------------------------------------------------------------------- Summary of changes: debian/koha-common.default | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Wed Apr 20 17:58:02 2016 From: gitmaster at git.koha-community.org (Git repo owner) Date: Wed, 20 Apr 2016 15:58:02 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.22.00-1138-g6efa491 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 6efa491d1b2f92fa407aa49c7b678f9b642fc83f (commit) via d496d03e8aa3079e0d29837b27b31b9a55afd02e (commit) from 98f551faec2627742b0b1d5b72e1791b4451b401 (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 6efa491d1b2f92fa407aa49c7b678f9b642fc83f Author: Jonathan Druart Date: Fri Apr 8 10:04:20 2016 +0100 [SIGNED-OFF] Bug 16210: Set X-Frame-Options to SAMEORIGIN in 2 other places The login page should not be displayed if the page is displayed in a frame. Signed-off-by: Marc V?ron Signed-off-by: Katrin Fischer Signed-off-by: Brendan Gallagher commit d496d03e8aa3079e0d29837b27b31b9a55afd02e Author: Jonathan Druart Date: Fri Apr 8 10:03:24 2016 +0100 [SIGNED-OFF] Bug 16210: Revert OPAC changes from Bug 15111 This patch reverts the changes made at the OPAC from the following patches: Do not include the antiClickjack legacy browser trick for greybox" Revert "Bug 15111: Do not include the antiClickjack legacy browser trick for greybox" This reverts commit fc640d2a86f395ad392f84314bce22e8b4dab1fe. Revert "Bug 15111: Change X-Frame-Options with SAMEORIGIN" This reverts commit fb167c0e4b897bf9a93b4fd6176b15e2d4dbd4df. Revert "Bug 15111 - Koha is vulnerable to Cross-Frame Scripting (XFS) attacks" This reverts commit dc03bca76cf5b7cb48d98d1ce245fc65b98be929. Setting X-Frame-Options to SAMEORIGIN is enough for mordern browsers: https://developer.mozilla.org/en-US/docs/Web/HTTP/X-Frame-Options The antiClickjack trick should be removed at the OPAC as we want to keep the OPAC usable even if the user has disabled JS. That means the OPAC will be vulnerable to XFS if a user is navigating with a prehistoric browser: Firefox 3.6.9 September 2010 IE 8 March 2008 Opera 10.5 March 2010 Safari 4 February 2009 Chrome 4.1.? somewhen 2010 Test plan: Confirm that there are no regression of bug 15111 with modern browsers Signed-off-by: Marc V?ron Signed-off-by: Katrin Fischer Signed-off-by: Brendan Gallagher ----------------------------------------------------------------------- Summary of changes: C4/Auth.pm | 16 ++++++++++------ .../opac-tmpl/bootstrap/en/includes/doc-head-close.inc | 14 -------------- koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-idref.tt | 2 +- 3 files changed, 11 insertions(+), 21 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Wed Apr 20 18:39:37 2016 From: gitmaster at git.koha-community.org (Git repo owner) Date: Wed, 20 Apr 2016 16:39:37 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.22.00-1139-g22633b5 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 22633b5a614fc08bf72ce04d13843eafbb4552fc (commit) from 6efa491d1b2f92fa407aa49c7b678f9b642fc83f (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 22633b5a614fc08bf72ce04d13843eafbb4552fc Author: Jesse Weaver Date: Tue Apr 12 16:52:29 2016 -0600 Bug 16237: Allow entering of EDI accounts with plugins disabled Test plan: 1. Disable in koha-conf.xml (restart memcached if needed). 2. Open the EDI accounts admin page. 3. Notice incredible breakage. 4. Apply patch. 5. Reload page, should now display (and the "Plugin:" dropdown should be hidden). 6. Re-enable (and the UseKohaPlugins syspref as well). 7. Ensure that the "Plugin:" dropdown is once again displayed. Signed-off-by: Owen Leonard Signed-off-by: Katrin Fischer Signed-off-by: Brendan Gallagher ----------------------------------------------------------------------- Summary of changes: admin/edi_accounts.pl | 9 +++++++-- koha-tmpl/intranet-tmpl/prog/en/modules/admin/edi_accounts.tt | 4 ++++ 2 files changed, 11 insertions(+), 2 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Wed Apr 20 18:41:11 2016 From: gitmaster at git.koha-community.org (Git repo owner) Date: Wed, 20 Apr 2016 16:41:11 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.22.00-1140-g3156950 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 3156950e0aa01826305208f1ca4f4ff16b04ec32 (commit) from 22633b5a614fc08bf72ce04d13843eafbb4552fc (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 3156950e0aa01826305208f1ca4f4ff16b04ec32 Author: Owen Leonard Date: Tue Apr 5 11:44:22 2016 -0400 Bug 16206: Corrections to templates related new EDI feature There are some issues with the template changes introduced by the EDI feature in Bug 7736. This patch makes the following changes: - Use Font Awesome icon on the Acquisitions basket page instead of a Glyphicon. - Use Font Awesome icon on the Acquisitions basket group page instead of a Glyphicon. - For consistency's sake, use the phrase "Library EANs" instead of "EDI EANs" in menus and the Library EANs page. - On the EDI accounts page: - Correct the markup of the title tag. - Improve the breadcrumbs to eliminate redundancy. - Use Font Awesome icon instead of Glyphicon for the "New account" button. - Change or remove "maxlength" attribute of form fields to match table structure. - Move the contents of some title attributes into a visible hint. - Use 'checked="checked"' instead of 'checked'. Koha templates use XTHML-style attributes. - Correct template variable in account deletion confirmation dialog. Before this patch the vendor name was not correctly displayed. - Show a message if there are no accounts defined rather than an empty table. - Remove use of "highlight" class from table rows (Bug 15927). - Correct parameter name in link to vendor details page (should be booksellerid instead of supplierid). - Correct the markup of the deletion confirmation dialog (Bug 15785). - Use Bootstrap-style buttons for "edit" and "delete," with Font Awesome icons. - On the Library EANs page: - Correct the markup of the title tag. - Make capitalization of "EAN" consistent. - Use Font Awesome icon instead of Glyphicon for the "New EAN" button. - Show a message if there are no EANs defined rather than an empty table. - Change or remove "maxlength" attribute of form fields to match table structure. - Remove use of "highlight" class from table rows (Bug 15927). - Correct the markup of the deletion confirmation dialog (Bug 15785). - Use Bootstrap-style buttons for "edit" and "delete," with Font Awesome icons. To test, apply the patch and review the affected templates. Confirm that pages look correct and work correctly. Signed-off-by: Bernardo Gonzalez Kriegel All seems to work and looks well, add/edit/delete EDI accounts and Library EANs works Ok No errors Signed-off-by: Katrin Fischer Signed-off-by: Brendan Gallagher ----------------------------------------------------------------------- Summary of changes: .../intranet-tmpl/prog/en/includes/admin-menu.inc | 2 +- .../intranet-tmpl/prog/en/modules/acqui/basket.tt | 2 +- .../prog/en/modules/acqui/basketgroup.tt | 2 +- .../prog/en/modules/admin/admin-home.tt | 4 +- .../prog/en/modules/admin/edi_accounts.tt | 83 +++++++++++--------- .../prog/en/modules/admin/edi_ean_accounts.tt | 40 +++++----- 6 files changed, 71 insertions(+), 62 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Wed Apr 20 18:42:18 2016 From: gitmaster at git.koha-community.org (Git repo owner) Date: Wed, 20 Apr 2016 16:42:18 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.22.00-1142-ge89f7a6 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 e89f7a60806f43ca03d35ca4b9e05997a70a7978 (commit) via e1cdef939ac213eea7607209135ff8ed4e6c7166 (commit) from 3156950e0aa01826305208f1ca4f4ff16b04ec32 (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 e89f7a60806f43ca03d35ca4b9e05997a70a7978 Author: Kyle M Hall Date: Tue Apr 19 10:27:45 2016 +0000 Bug 16208 [QA Followup] - Fix incorrect form parameter names Signed-off-by: Katrin Fischer Signed-off-by: Brendan Gallagher commit e1cdef939ac213eea7607209135ff8ed4e6c7166 Author: Kyle M Hall Date: Mon Apr 18 16:10:34 2016 +0000 Bug 16208 - Can't delete a library EAN if the EAN value is empty Test Plan: 1) Create an empty EAN 2) Attempt to delete it, you should get an error 3) Apply this patch 4) Attempt to delete the EAN, you should now be able to Signed-off-by: Chris Cormack This depends on bug 16206 being pushed, or you need to apply that patch first Signed-off-by: Katrin Fischer https://bugs.koha-community.org/show_bug.cgi?id=16256 Signed-off-by: Katrin Fischer Signed-off-by: Brendan Gallagher ----------------------------------------------------------------------- Summary of changes: admin/edi_ean_accounts.pl | 25 +++++--------------- .../prog/en/modules/admin/edi_ean_accounts.tt | 5 ++-- 2 files changed, 8 insertions(+), 22 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Wed Apr 20 18:43:59 2016 From: gitmaster at git.koha-community.org (Git repo owner) Date: Wed, 20 Apr 2016 16:43:59 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.22.00-1143-g51e3e31 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 51e3e31627c38f88671f8ab399b470ec4a02aaec (commit) from e89f7a60806f43ca03d35ca4b9e05997a70a7978 (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 51e3e31627c38f88671f8ab399b470ec4a02aaec Author: Kyle M Hall Date: Mon Apr 18 16:19:47 2016 +0000 Bug 16256 - Can't edit library EAN if you leave EAN empty Test Plan: 1) Create an empty EAN 2) Edit it and save 3) Note you get a new EAN row 4) Apply this patch 5) Edit the empty EAN again 6) Note you now get an updated EAN and not a new row Signed-off-by: Chris Cormack Depends on bug 16208 (which depends on 16206) Signed-off-by: Katrin Fischer Signed-off-by: Brendan Gallagher ----------------------------------------------------------------------- Summary of changes: admin/edi_ean_accounts.pl | 11 +++-------- .../intranet-tmpl/prog/en/modules/admin/edi_ean_accounts.tt | 4 ++-- 2 files changed, 5 insertions(+), 10 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Wed Apr 20 19:00:31 2016 From: gitmaster at git.koha-community.org (Git repo owner) Date: Wed, 20 Apr 2016 17:00:31 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.22.00-1144-g8ec54c8 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 8ec54c86feb92989807837d71f4c0a5e901e07e3 (commit) from 51e3e31627c38f88671f8ab399b470ec4a02aaec (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 8ec54c86feb92989807837d71f4c0a5e901e07e3 Author: Jonathan Druart Date: Tue Apr 12 09:24:18 2016 +0100 Bug 16240: (follow-up for 16082) Do not display message if no borrowernumber passed "This patron does not exist" message should not be displayed on the "Checkouts home page". The message should only be displayed if the borrowernumber parameter is passed. Test plan: Go on circ/circulation.pl => No message Go on circ/circulation.pl?borrowernumber=424242 => You should see the message Signed-off-by: Marc V?ron Signed-off-by: Katrin Fischer Signed-off-by: Brendan Gallagher ----------------------------------------------------------------------- Summary of changes: koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Wed Apr 20 19:32:14 2016 From: gitmaster at git.koha-community.org (Git repo owner) Date: Wed, 20 Apr 2016 17:32:14 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.22.00-1148-g40ec26d 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 40ec26dc6cbc2ac2634ca0e8111476bbd6f62fc7 (commit) via 22c907230af9821d84127f9e2afbea9757aed2fa (commit) via 33ad907a820debc87bf2629cc1eed4a38b3b4905 (commit) via 956dc953b52a1fd525bc75682bbdfe6848683ace (commit) from 8ec54c86feb92989807837d71f4c0a5e901e07e3 (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 40ec26dc6cbc2ac2634ca0e8111476bbd6f62fc7 Author: Tomas Cohen Arazi Date: Thu Apr 14 10:47:31 2016 -0300 Bug 16229: (QA) POD fixes Signed-off-by: Tomas Cohen Arazi Signed-off-by: Brendan Gallagher commit 22c907230af9821d84127f9e2afbea9757aed2fa Author: Jonathan Druart Date: Fri Apr 8 12:54:44 2016 +0100 Bug 16229: Add the unsafe flag to set_in_cache Could be useful later. Signed-off-by: Jacek Ablewicz Signed-off-by: Tomas Cohen Arazi Signed-off-by: Brendan Gallagher commit 33ad907a820debc87bf2629cc1eed4a38b3b4905 Author: Jonathan Druart Date: Fri Apr 8 12:43:48 2016 +0100 Bug 16229: Deep copy on setting in cache Koha::Cache->set_in_cache should deep copy (if needed) to avoid the value which has been set in cache to be unintentionally modified later. Signed-off-by: Jacek Ablewicz Signed-off-by: Tomas Cohen Arazi Signed-off-by: Brendan Gallagher commit 956dc953b52a1fd525bc75682bbdfe6848683ace Author: Jonathan Druart Date: Fri Apr 8 13:08:55 2016 +0100 Bug 16229: Deep copy on first L2 fetch When a value exists in L2 cache but not in L1 cache, it should be deep copied if needed (i.e. not a scalar). Otherwise the calling code is able to modify the value in cache. Note that is theoretical, it's possible that no code does that. Signed-off-by: Jacek Ablewicz Signed-off-by: Tomas Cohen Arazi Signed-off-by: Brendan Gallagher ----------------------------------------------------------------------- Summary of changes: Koha/Cache.pm | 37 ++++++++++++++++++++++++++++--------- t/Cache.t | 17 ++++++++++++++++- 2 files changed, 44 insertions(+), 10 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Wed Apr 20 20:26:50 2016 From: gitmaster at git.koha-community.org (Git repo owner) Date: Wed, 20 Apr 2016 18:26:50 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.22.00-1149-gfd9f9f9 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 fd9f9f9be17207b8e4e152d3b5f25bee5260ad38 (commit) from 40ec26dc6cbc2ac2634ca0e8111476bbd6f62fc7 (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 fd9f9f9be17207b8e4e152d3b5f25bee5260ad38 Author: Jonathan Druart Date: Fri Apr 8 11:42:15 2016 +0100 Bug 16227: Fix regression from bug 15084 - select currencies correctly This patch fixes a regression introduced by bug 15084: The currency dropdown lists are not correctly built. The selected currencies are wrong. Test plan: Create a vendor, the selected currencies should be the default one Edit the vendor, the selected currencies should be the ones defined for this vendor Create an order, the selected currency should be the 'List prices' of the vendor Edit an order, the selected currency should be the one defined for this order Signed-off-by: Owen Leonard Signed-off-by: Katrin Fischer Signed-off-by: Brendan Gallagher ----------------------------------------------------------------------- Summary of changes: acqui/neworderempty.pl | 2 ++ .../prog/en/modules/acqui/neworderempty.tt | 14 +++++++------- .../prog/en/modules/acqui/supplier.tt | 20 ++++++++++---------- 3 files changed, 19 insertions(+), 17 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Wed Apr 20 20:28:02 2016 From: gitmaster at git.koha-community.org (Git repo owner) Date: Wed, 20 Apr 2016 18:28:02 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.22.00-1150-g41549bf 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 41549bf3f4aa1f87060c7e27ab27e6932359211c (commit) from fd9f9f9be17207b8e4e152d3b5f25bee5260ad38 (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 41549bf3f4aa1f87060c7e27ab27e6932359211c Author: Nick Clemens Date: Mon Apr 18 16:07:46 2016 +0000 Bug 16285 - write_age() function throws error for patron categories that don't include dateofbirth in form To test: 1 Add a patron in category Library or School 2 Note the js error in the console 3 Apply patch 4 Repeat and note the error is gone Signed-off-by: Chris Cormack Made it an explicit if, and fixed the author of the commit Signed-off-by: Katrin Fischer Signed-off-by: Brendan Gallagher ----------------------------------------------------------------------- Summary of changes: koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Wed Apr 20 21:39:57 2016 From: gitmaster at git.koha-community.org (Git repo owner) Date: Wed, 20 Apr 2016 19:39:57 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.22.00-1151-g08017f8 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 08017f89f150394b6224fafb64fe8d12fc146ff1 (commit) from 41549bf3f4aa1f87060c7e27ab27e6932359211c (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 08017f89f150394b6224fafb64fe8d12fc146ff1 Author: Julian Maurice Date: Thu Apr 7 17:03:47 2016 +0200 Bug 16224: Fix t/db_dependent/Reports_Guided.t This test: is( scalar @{ get_saved_reports( $report_ids[0] ) }, 1, "filter takes report id" ); can fail when $report_ids[0] is a substring of some saved_sql fields from other reports (reports that have a different id than $report_ids[0]). We can only be sure that get_saved_reports will return at least 1 report. Signed-off-by: Jonathan Druart Signed-off-by: Katrin Fischer Signed-off-by: Brendan Gallagher ----------------------------------------------------------------------- Summary of changes: t/db_dependent/Reports_Guided.t | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Wed Apr 20 21:41:25 2016 From: gitmaster at git.koha-community.org (Git repo owner) Date: Wed, 20 Apr 2016 19:41:25 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.22.00-1152-gb679cac 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 b679cac96409b7248f8e224e10c73dafa4c82890 (commit) from 08017f89f150394b6224fafb64fe8d12fc146ff1 (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 b679cac96409b7248f8e224e10c73dafa4c82890 Author: Jonathan Druart Date: Mon Apr 4 14:45:48 2016 +0100 Bug 16179: Do not crash if "rate me" is clicked and not rate selected If JS is disabled and a user clicks on the "Rate me" button, Koha will crashes with: DBIx::Class::ResultSet::create(): Column 'rating_value' cannot be null at /usr/share/koha/lib/C4/Ratings.pm line 208 To avoid that, opac-ratings.pl will check if a rate has been selected. Test plan: Disable JS On a record detail page, click on the "Rate me" button TESTED PLAN: 1) go to /cgi-bin/koha/opac-ratings.pl?biblionumber=1 -- kaboom as above. 2) apply patch 3) refresh -- either login screen (don't know why) -- or if already logged in, detail page. 4) koha qa test tool Signed-off-by: Mark Tompsett Signed-off-by: Owen Leonard I tested successfully by temporarily removing the modification made by Bug 16210. Signed-off-by: Katrin Fischer Signed-off-by: Brendan Gallagher ----------------------------------------------------------------------- Summary of changes: opac/opac-ratings.pl | 7 +++++++ 1 file changed, 7 insertions(+) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Wed Apr 20 22:17:01 2016 From: gitmaster at git.koha-community.org (Git repo owner) Date: Wed, 20 Apr 2016 20:17:01 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.22.00-1153-g6b319a2 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 6b319a2d487257e8a08bc26af9c6b2e7fa2ece2c (commit) from b679cac96409b7248f8e224e10c73dafa4c82890 (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 6b319a2d487257e8a08bc26af9c6b2e7fa2ece2c Author: Jonathan Druart Date: Fri Mar 18 13:31:27 2016 +0000 Bug 16104: Remove warnings "used only once: possible typo" Since bug 11998, the following warnings are raised: Name "Tie::Hash::FIELDS" used only once: possible typo at /usr/share/perl/5.22/fields.pm line 135. Name "Cache::RemovalStrategy::LRU::FIELDS" used only once: possible typo at /usr/share/perl/5.22/fields.pm line 135. Name "Cache::RemovalStrategy::FIELDS" used only once: possible typo at /usr/share/perl/5.22/fields.pm line 135. It comes from the Koha::Cache 103 if ( can_load( modules => { 'Cache::Memory' => undef } ) ) { Test plan: perl -wc C4/AuthoritiesMarc.pm should return green QA note: this may have an impact on performance but I have not found any other workarounds. NOTE: I applied 15870 to master, got the error (-v 2 -c 5), applied 16104, rebased it in front, error disappeared (still only -c 5), rebased it at the end, and signed off 16104. Signed-off-by: Mark Tompsett Signed-off-by: Katrin Fischer Signed-off-by: Brendan Gallagher ----------------------------------------------------------------------- Summary of changes: Koha/Cache.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Wed Apr 20 22:20:23 2016 From: gitmaster at git.koha-community.org (Git repo owner) Date: Wed, 20 Apr 2016 20:20:23 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.22.00-1154-gbe33e1b 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 be33e1b46537d85b3d49abc076348916dd50004b (commit) from 6b319a2d487257e8a08bc26af9c6b2e7fa2ece2c (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 be33e1b46537d85b3d49abc076348916dd50004b Author: Jonathan Druart Date: Tue Apr 5 09:13:05 2016 +0100 Bug 16055: Do not allow basketgroup deletion unless empty If a basketgroup has basket attached, it should not be deletable. This patch just removes the Delete button from the interface if it cannot be deleted. When editing a basketgroup, the "Delete basket group" button is no longer displayed. Test plan: 1/ Create a basketgroup 2/ Attach 1+ baskets to this basketgroup 3/ Confirm you are not able to delete it 4/ Remove the baskets from this basketgroup 5/ Confirm you are able to delete it Signed-off-by: Owen Leonard Signed-off-by: Katrin Fischer Signed-off-by: Brendan Gallagher ----------------------------------------------------------------------- Summary of changes: koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Wed Apr 20 22:23:14 2016 From: gitmaster at git.koha-community.org (Git repo owner) Date: Wed, 20 Apr 2016 20:23:14 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.22.00-1155-g88e8f60 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 88e8f60ebc6f1fdfb242f224081f0b97f88352f8 (commit) from be33e1b46537d85b3d49abc076348916dd50004b (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 88e8f60ebc6f1fdfb242f224081f0b97f88352f8 Author: Owen Leonard Date: Fri Apr 8 11:01:07 2016 -0400 Bug 15883 - Upgrade jQuery from v1.7.2 in the staff client This patch updates the staff client version of jQuery to 2.2.3. In order to maintain compatibility with existing scripts, the jQuery migrate plugin has also been added. Included is the development version of the jQuery migrate plugin. Developers could modify doc-head-close.inc to use this version if they wanted to take advantage of its upgrade warning log. To test, apply the patch and test JavaScript interactions everywhere in the staff client. Signed-off-by: Marc V?ron Signed-off-by: Jonathan Druart Signed-off-by: Brendan Gallagher ----------------------------------------------------------------------- Summary of changes: .../jquery/images/ui-bg_flat_0_aaaaaa_40x100.png | Bin 212 -> 0 bytes .../jquery/images/ui-bg_flat_75_ffffff_40x100.png | Bin 208 -> 0 bytes .../jquery/images/ui-bg_glass_55_fbf9ee_1x400.png | Bin 335 -> 335 bytes .../jquery/images/ui-bg_glass_65_ffffff_1x400.png | Bin 207 -> 207 bytes .../jquery/images/ui-bg_glass_75_dadada_1x400.png | Bin 262 -> 262 bytes .../jquery/images/ui-bg_glass_75_e6e6e6_1x400.png | Bin 262 -> 262 bytes .../jquery/images/ui-bg_glass_95_fef1ec_1x400.png | Bin 332 -> 332 bytes .../ui-bg_highlight-soft_75_cccccc_1x100.png | Bin 280 -> 280 bytes .../lib/jquery/images/ui-icons_222222_256x240.png | Bin 6922 -> 6922 bytes .../lib/jquery/images/ui-icons_2e83ff_256x240.png | Bin 4549 -> 4549 bytes .../lib/jquery/images/ui-icons_454545_256x240.png | Bin 6992 -> 6992 bytes .../lib/jquery/images/ui-icons_888888_256x240.png | Bin 6999 -> 6999 bytes .../lib/jquery/images/ui-icons_cd0a0a_256x240.png | Bin 4549 -> 4549 bytes koha-tmpl/intranet-tmpl/lib/jquery/jquery-2.2.3.js | 9842 ++++++++++++++++ .../intranet-tmpl/lib/jquery/jquery-2.2.3.min.js | 4 + .../lib/jquery/jquery-migrate-1.3.0.js | 702 ++ .../lib/jquery/jquery-migrate-1.3.0.min.js | 2 + .../intranet-tmpl/lib/jquery/jquery-ui-1.11.4.css | 971 ++ .../intranet-tmpl/lib/jquery/jquery-ui-1.11.4.js |11711 ++++++++++++++++++++ .../lib/jquery/jquery-ui-1.11.4.min.css | 7 + .../lib/jquery/jquery-ui-1.11.4.min.js | 11 + .../prog/en/includes/doc-head-close.inc | 7 +- .../intranet-tmpl/prog/en/includes/help-top.inc | 7 +- .../prog/en/modules/circ/offline-mf.tt | 7 +- .../prog/en/modules/labels/spinelabel-print.tt | 3 +- 25 files changed, 23264 insertions(+), 10 deletions(-) delete mode 100644 koha-tmpl/intranet-tmpl/lib/jquery/images/ui-bg_flat_0_aaaaaa_40x100.png delete mode 100644 koha-tmpl/intranet-tmpl/lib/jquery/images/ui-bg_flat_75_ffffff_40x100.png create mode 100644 koha-tmpl/intranet-tmpl/lib/jquery/jquery-2.2.3.js create mode 100644 koha-tmpl/intranet-tmpl/lib/jquery/jquery-2.2.3.min.js create mode 100644 koha-tmpl/intranet-tmpl/lib/jquery/jquery-migrate-1.3.0.js create mode 100644 koha-tmpl/intranet-tmpl/lib/jquery/jquery-migrate-1.3.0.min.js create mode 100644 koha-tmpl/intranet-tmpl/lib/jquery/jquery-ui-1.11.4.css create mode 100644 koha-tmpl/intranet-tmpl/lib/jquery/jquery-ui-1.11.4.js create mode 100644 koha-tmpl/intranet-tmpl/lib/jquery/jquery-ui-1.11.4.min.css create mode 100644 koha-tmpl/intranet-tmpl/lib/jquery/jquery-ui-1.11.4.min.js hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Wed Apr 20 22:33:58 2016 From: gitmaster at git.koha-community.org (Git repo owner) Date: Wed, 20 Apr 2016 20:33:58 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.22.00-1157-g1931ff4 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 1931ff465317aa2bf8d31c0c817ff0c4d75ea8dc (commit) via 82be93af1ccbd3544646a6345ab51183a62d05cb (commit) from 88e8f60ebc6f1fdfb242f224081f0b97f88352f8 (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 1931ff465317aa2bf8d31c0c817ff0c4d75ea8dc Author: Jonathan Druart Date: Tue Apr 5 07:40:21 2016 +0100 Bug 15832: Remove empty string from the filters On each cell, the split will generate a new empty entry. This patch removes that entry. Signed-off-by: Jonathan Druart Signed-off-by: Brendan Gallagher commit 82be93af1ccbd3544646a6345ab51183a62d05cb Author: Alex Arnaud Date: Tue Feb 16 16:33:17 2016 +0100 Bug 15832 - Fix filter and items split-up in pendingreserves.tt Test plan: - Go to circ/pendingreserves.pl (Ensure that there are biblios with many items on different branches), - Check the libraries filter at the bottom of datatable. There should be duplicates. - Apply this patch and return to circ/pendingreserves.pl, - check that libraries filter should not contain duplicate, - check that the filter works. Signed-off-by: Owen Leonard Signed-off-by: Jonathan Druart Signed-off-by: Brendan Gallagher ----------------------------------------------------------------------- Summary of changes: .../intranet-tmpl/prog/en/modules/circ/pendingreserves.tt | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Wed Apr 20 22:47:26 2016 From: gitmaster at git.koha-community.org (Git repo owner) Date: Wed, 20 Apr 2016 20:47:26 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.22.00-1159-g9550e37 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 9550e37fc66402500adf8bca7a1c90ee0104cdd0 (commit) via 8f1e5ad95fd78cbf09028e3d2dfe0b2b77d4dd21 (commit) from 1931ff465317aa2bf8d31c0c817ff0c4d75ea8dc (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 9550e37fc66402500adf8bca7a1c90ee0104cdd0 Author: Nick Clemens Date: Mon Mar 28 20:09:01 2016 +0000 Bug 15682 - Only allow merging of 2 or more records form lsits (for consistency) Test as above but on shelves.pl Signed-off-by: Chris Cormack Signed-off-by: Katrin Fischer Signed-off-by: Brendan Gallagher commit 8f1e5ad95fd78cbf09028e3d2dfe0b2b77d4dd21 Author: Nick Clemens Date: Mon Mar 28 20:01:30 2016 +0000 Bug 15682 - Merging records from cataloguing search only allows to merge 2 records To test: 1 - Perform a cataloging search 2 - Attempt to merge 0 results - should fail 3 - Attempt to merge 1 resutls - should fail 4 - Attempt to merge 2 results - should succeed 5 - Attempt to merge 3 results - should succeed 6 - Test any other amount of records and if more than 1 it should succeed **Note: On shelves.pl you can merge a single record. I think that is incorrect so made this only work for 2. Will add a followup to fix shelves.pl Signed-off-by: Chris Cormack Signed-off-by: Katrin Fischer Signed-off-by: Brendan Gallagher ----------------------------------------------------------------------- Summary of changes: .../intranet-tmpl/prog/en/modules/cataloguing/addbooks.tt | 12 ++++++++---- .../prog/en/modules/virtualshelves/shelves.tt | 6 +++--- 2 files changed, 11 insertions(+), 7 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Wed Apr 20 22:52:22 2016 From: gitmaster at git.koha-community.org (Git repo owner) Date: Wed, 20 Apr 2016 20:52:22 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.22.00-1160-g9aa8bf4 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 9aa8bf46f6b45ebcd342c09bd3a09ae55f3dd4a8 (commit) from 9550e37fc66402500adf8bca7a1c90ee0104cdd0 (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 9aa8bf46f6b45ebcd342c09bd3a09ae55f3dd4a8 Author: Julian Maurice Date: Thu Jan 7 15:38:57 2016 +0100 Bug 14816: Fix multiple selection in item search Send each selected value as a separate parameter. Otherwise DataTables (or jQuery ?) joins all values with a comma Signed-off-by: Owen Leonard I could not reproduce the bug when selecting multiple home libraries, but I could by selecting multiple item types or collection codes. The patch allowed those queries to complete correctly. Signed-off-by: Jonathan Druart Signed-off-by: Brendan Gallagher ----------------------------------------------------------------------- Summary of changes: koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/itemsearch.tt | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Wed Apr 20 23:09:54 2016 From: gitmaster at git.koha-community.org (Git repo owner) Date: Wed, 20 Apr 2016 21:09:54 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.22.00-1162-ga96adaa 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 a96adaadb2c4bbf54ad8440164b73aa74a38cc96 (commit) via c20c70c99d79c0d02a37a0e41d0e90afb5c69681 (commit) from 9aa8bf46f6b45ebcd342c09bd3a09ae55f3dd4a8 (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 a96adaadb2c4bbf54ad8440164b73aa74a38cc96 Author: Tomas Cohen Arazi Date: Wed Apr 20 15:59:58 2016 -0300 Bug 16222: (QA followup) Add /api dir for the API Signed-off-by: Tomas Cohen Arazi Signed-off-by: Brendan Gallagher commit c20c70c99d79c0d02a37a0e41d0e90afb5c69681 Author: Benjamin Rokseth Date: Thu Apr 7 09:08:52 2016 +0000 Bug 16222 - Add REST API folder to Makefile.PL Add `api` folder to INTRANET_CGI_FOLDER in Makefile.PL so that the new RESTFul API introduced in bug #13799 works also when installing with make. Test plan: - apply patch and do a `perl Makefile.PL` install - observe that INSTALL_DIR/intranet/cgi-bin now has a folder `api` containing the swagger files and the api cgi mount, app.pl. Signed-off-by: Chris Cormack Signed-off-by: Katrin Fischer Signed-off-by: Brendan Gallagher ----------------------------------------------------------------------- Summary of changes: Makefile.PL | 5 +++++ etc/koha-httpd.conf | 10 +++++----- rewrite-config.PL | 1 + 3 files changed, 11 insertions(+), 5 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Thu Apr 21 09:24:05 2016 From: gitmaster at git.koha-community.org (Git repo owner) Date: Thu, 21 Apr 2016 07:24:05 +0000 Subject: [koha-commits] main Koha release repository branch 3.22.x updated. v3.22.05-57-ga7e7d6c 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.22.x has been updated via a7e7d6cbcb948e571f32834aac178850d29d8bfa (commit) via fce5e1185a493f3028bb3a8c649a2f40a7804930 (commit) from bebb61739f4460295151a37d44cc1a2d6f956d26 (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 a7e7d6cbcb948e571f32834aac178850d29d8bfa Author: Tomas Cohen Arazi Date: Wed Apr 20 15:59:58 2016 -0300 Bug 16222: (QA followup) Add /api dir for the API Signed-off-by: Tomas Cohen Arazi Signed-off-by: Brendan Gallagher (cherry picked from commit a96adaadb2c4bbf54ad8440164b73aa74a38cc96) Signed-off-by: Julian Maurice commit fce5e1185a493f3028bb3a8c649a2f40a7804930 Author: Benjamin Rokseth Date: Thu Apr 7 09:08:52 2016 +0000 Bug 16222 - Add REST API folder to Makefile.PL Add `api` folder to INTRANET_CGI_FOLDER in Makefile.PL so that the new RESTFul API introduced in bug #13799 works also when installing with make. Test plan: - apply patch and do a `perl Makefile.PL` install - observe that INSTALL_DIR/intranet/cgi-bin now has a folder `api` containing the swagger files and the api cgi mount, app.pl. Signed-off-by: Chris Cormack Signed-off-by: Katrin Fischer Signed-off-by: Brendan Gallagher (cherry picked from commit c20c70c99d79c0d02a37a0e41d0e90afb5c69681) Signed-off-by: Julian Maurice ----------------------------------------------------------------------- Summary of changes: Makefile.PL | 5 +++++ etc/koha-httpd.conf | 10 +++++----- rewrite-config.PL | 1 + 3 files changed, 11 insertions(+), 5 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Thu Apr 21 09:31:41 2016 From: gitmaster at git.koha-community.org (Git repo owner) Date: Thu, 21 Apr 2016 07:31:41 +0000 Subject: [koha-commits] main Koha release repository branch 3.22.x updated. v3.22.05-58-g9962ad6 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.22.x has been updated via 9962ad651578eb92dd062b6e18c88027ab1cd294 (commit) from a7e7d6cbcb948e571f32834aac178850d29d8bfa (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 9962ad651578eb92dd062b6e18c88027ab1cd294 Author: Jonathan Druart Date: Tue Apr 12 09:24:18 2016 +0100 Bug 16240: (follow-up for 16082) Do not display message if no borrowernumber passed "This patron does not exist" message should not be displayed on the "Checkouts home page". The message should only be displayed if the borrowernumber parameter is passed. Test plan: Go on circ/circulation.pl => No message Go on circ/circulation.pl?borrowernumber=424242 => You should see the message Signed-off-by: Marc V?ron Signed-off-by: Katrin Fischer Signed-off-by: Brendan Gallagher (cherry picked from commit 8ec54c86feb92989807837d71f4c0a5e901e07e3) Signed-off-by: Julian Maurice ----------------------------------------------------------------------- Summary of changes: koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Thu Apr 21 09:33:12 2016 From: gitmaster at git.koha-community.org (Git repo owner) Date: Thu, 21 Apr 2016 07:33:12 +0000 Subject: [koha-commits] main Koha release repository branch 3.22.x updated. v3.22.05-59-g47ebb4f 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.22.x has been updated via 47ebb4ffb1869b52f1c011e3a6b236b85b0e51ab (commit) from 9962ad651578eb92dd062b6e18c88027ab1cd294 (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 47ebb4ffb1869b52f1c011e3a6b236b85b0e51ab Author: Julian Maurice Date: Thu Jan 7 15:38:57 2016 +0100 Bug 14816: Fix multiple selection in item search Send each selected value as a separate parameter. Otherwise DataTables (or jQuery ?) joins all values with a comma Signed-off-by: Owen Leonard I could not reproduce the bug when selecting multiple home libraries, but I could by selecting multiple item types or collection codes. The patch allowed those queries to complete correctly. Signed-off-by: Jonathan Druart Signed-off-by: Brendan Gallagher (cherry picked from commit 9aa8bf46f6b45ebcd342c09bd3a09ae55f3dd4a8) Signed-off-by: Julian Maurice ----------------------------------------------------------------------- Summary of changes: koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/itemsearch.tt | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Thu Apr 21 09:34:54 2016 From: gitmaster at git.koha-community.org (Git repo owner) Date: Thu, 21 Apr 2016 07:34:54 +0000 Subject: [koha-commits] main Koha release repository branch 3.22.x updated. v3.22.05-60-g67dd965 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.22.x has been updated via 67dd96545bf8fdabdc98428438cbd92a5ae33c9f (commit) from 47ebb4ffb1869b52f1c011e3a6b236b85b0e51ab (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 67dd96545bf8fdabdc98428438cbd92a5ae33c9f Author: Tomas Cohen Arazi Date: Fri Apr 1 15:30:26 2016 -0300 Bug 15113: koha-rebuild-zebra should check USE_INDEXER_DAEMON and skip if enabled This patch changes the behaviour of the koha-rebuild-zebra script in the following way: USE_INDEXER_DAEMON=no - Keeps the current behaviour USE_INDEXER_DAEMON=yes - It skips incremental indexing to avoid races. Caveats: - A --force option is introduced for useing in a specific situtation that might need it (i.e. the administrator knows what he's doing). - If --full is passed, the reindexing is not skipped. The documentation files and messages are adjusted accordingly. This patch should help users that want to use the indexing daemon, in which case they wouldn't need to change their default 5 min cronjob (it will be just skipped). Ultimately, koha-common could have USE_INDEXER_DAEMON = yes by default, but that's subject for another bug report. To test: - Play with the different option switches and USE_INDEXER_DAEMON - Things work as expected - Sign off Regards Signed-off-by: Hector Castro Works as expected Signed-off-by: Jonathan Druart Signed-off-by: Your Full Name (cherry picked from commit 997ad166c6ea53d47e3e15e7720d63da9f3b0a80) Signed-off-by: Julian Maurice ----------------------------------------------------------------------- Summary of changes: debian/docs/koha-rebuild-zebra.xml | 12 +++++++++--- debian/scripts/koha-rebuild-zebra | 34 +++++++++++++++++++++++++--------- 2 files changed, 34 insertions(+), 12 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Thu Apr 21 09:37:04 2016 From: gitmaster at git.koha-community.org (Git repo owner) Date: Thu, 21 Apr 2016 07:37:04 +0000 Subject: [koha-commits] main Koha release repository branch 3.22.x updated. v3.22.05-62-gbde65f1 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.22.x has been updated via bde65f116cb2f7467e10f771e6368ccdf41fc578 (commit) via 584059a9b8947aa531ad21a04e23b5ebac6ab5a1 (commit) from 67dd96545bf8fdabdc98428438cbd92a5ae33c9f (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 bde65f116cb2f7467e10f771e6368ccdf41fc578 Author: Nick Clemens Date: Mon Mar 28 20:09:01 2016 +0000 Bug 15682 - Only allow merging of 2 or more records form lsits (for consistency) Test as above but on shelves.pl Signed-off-by: Chris Cormack Signed-off-by: Katrin Fischer Signed-off-by: Brendan Gallagher (cherry picked from commit 9550e37fc66402500adf8bca7a1c90ee0104cdd0) Signed-off-by: Julian Maurice commit 584059a9b8947aa531ad21a04e23b5ebac6ab5a1 Author: Nick Clemens Date: Mon Mar 28 20:01:30 2016 +0000 Bug 15682 - Merging records from cataloguing search only allows to merge 2 records To test: 1 - Perform a cataloging search 2 - Attempt to merge 0 results - should fail 3 - Attempt to merge 1 resutls - should fail 4 - Attempt to merge 2 results - should succeed 5 - Attempt to merge 3 results - should succeed 6 - Test any other amount of records and if more than 1 it should succeed **Note: On shelves.pl you can merge a single record. I think that is incorrect so made this only work for 2. Will add a followup to fix shelves.pl Signed-off-by: Chris Cormack Signed-off-by: Katrin Fischer Signed-off-by: Brendan Gallagher (cherry picked from commit 8f1e5ad95fd78cbf09028e3d2dfe0b2b77d4dd21) Signed-off-by: Julian Maurice ----------------------------------------------------------------------- Summary of changes: .../intranet-tmpl/prog/en/modules/cataloguing/addbooks.tt | 12 ++++++++---- .../prog/en/modules/virtualshelves/shelves.tt | 6 +++--- 2 files changed, 11 insertions(+), 7 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Thu Apr 21 09:40:27 2016 From: gitmaster at git.koha-community.org (Git repo owner) Date: Thu, 21 Apr 2016 07:40:27 +0000 Subject: [koha-commits] main Koha release repository branch 3.22.x updated. v3.22.05-64-gc0dd93b 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.22.x has been updated via c0dd93b6f55fda04f6e9f0e1522e3547a0d91a48 (commit) via 0f29a07371dbfac0042e7540802facf997ccb864 (commit) from bde65f116cb2f7467e10f771e6368ccdf41fc578 (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 c0dd93b6f55fda04f6e9f0e1522e3547a0d91a48 Author: Julian Maurice Date: Thu Apr 21 09:48:44 2016 +0200 Revert "Bug 15682 - Merging records from cataloguing search only allows to merge 2 records" This reverts commit 584059a9b8947aa531ad21a04e23b5ebac6ab5a1. commit 0f29a07371dbfac0042e7540802facf997ccb864 Author: Julian Maurice Date: Thu Apr 21 09:48:40 2016 +0200 Revert "Bug 15682 - Only allow merging of 2 or more records form lsits (for consistency)" This reverts commit bde65f116cb2f7467e10f771e6368ccdf41fc578. ----------------------------------------------------------------------- Summary of changes: .../intranet-tmpl/prog/en/modules/cataloguing/addbooks.tt | 12 ++++-------- .../prog/en/modules/virtualshelves/shelves.tt | 6 +++--- 2 files changed, 7 insertions(+), 11 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Thu Apr 21 09:48:20 2016 From: gitmaster at git.koha-community.org (Git repo owner) Date: Thu, 21 Apr 2016 07:48:20 +0000 Subject: [koha-commits] main Koha release repository branch 3.22.x updated. v3.22.05-66-gef6c60d 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.22.x has been updated via ef6c60d8ccc93832f87f7b6fe1f3daa5ce48dda9 (commit) via 4f699275a76107f3a210a199dc9cadd5da2560f3 (commit) from c0dd93b6f55fda04f6e9f0e1522e3547a0d91a48 (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 ef6c60d8ccc93832f87f7b6fe1f3daa5ce48dda9 Author: Jonathan Druart Date: Tue Apr 5 07:40:21 2016 +0100 Bug 15832: Remove empty string from the filters On each cell, the split will generate a new empty entry. This patch removes that entry. Signed-off-by: Jonathan Druart Signed-off-by: Brendan Gallagher (cherry picked from commit 1931ff465317aa2bf8d31c0c817ff0c4d75ea8dc) Signed-off-by: Julian Maurice commit 4f699275a76107f3a210a199dc9cadd5da2560f3 Author: Alex Arnaud Date: Tue Feb 16 16:33:17 2016 +0100 Bug 15832 - Fix filter and items split-up in pendingreserves.tt Test plan: - Go to circ/pendingreserves.pl (Ensure that there are biblios with many items on different branches), - Check the libraries filter at the bottom of datatable. There should be duplicates. - Apply this patch and return to circ/pendingreserves.pl, - check that libraries filter should not contain duplicate, - check that the filter works. Signed-off-by: Owen Leonard Signed-off-by: Jonathan Druart Signed-off-by: Brendan Gallagher (cherry picked from commit 82be93af1ccbd3544646a6345ab51183a62d05cb) Signed-off-by: Julian Maurice ----------------------------------------------------------------------- Summary of changes: .../intranet-tmpl/prog/en/modules/circ/pendingreserves.tt | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Thu Apr 21 09:57:21 2016 From: gitmaster at git.koha-community.org (Git repo owner) Date: Thu, 21 Apr 2016 07:57:21 +0000 Subject: [koha-commits] main Koha release repository branch 3.22.x updated. v3.22.05-67-g3f1b174 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.22.x has been updated via 3f1b17441ea6037ed50aa55895184494445be16a (commit) from ef6c60d8ccc93832f87f7b6fe1f3daa5ce48dda9 (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 3f1b17441ea6037ed50aa55895184494445be16a Author: Jonathan Druart Date: Tue Apr 5 09:13:05 2016 +0100 Bug 16055: Do not allow basketgroup deletion unless empty If a basketgroup has basket attached, it should not be deletable. This patch just removes the Delete button from the interface if it cannot be deleted. When editing a basketgroup, the "Delete basket group" button is no longer displayed. Test plan: 1/ Create a basketgroup 2/ Attach 1+ baskets to this basketgroup 3/ Confirm you are not able to delete it 4/ Remove the baskets from this basketgroup 5/ Confirm you are able to delete it Signed-off-by: Owen Leonard Signed-off-by: Katrin Fischer Signed-off-by: Brendan Gallagher (cherry picked from commit be33e1b46537d85b3d49abc076348916dd50004b) Signed-off-by: Julian Maurice ----------------------------------------------------------------------- Summary of changes: koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Thu Apr 21 10:05:16 2016 From: gitmaster at git.koha-community.org (Git repo owner) Date: Thu, 21 Apr 2016 08:05:16 +0000 Subject: [koha-commits] main Koha release repository branch 3.22.x updated. v3.22.05-68-ga965702 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.22.x has been updated via a965702c08f84d8d770fb81e09f13bee8e922bba (commit) from 3f1b17441ea6037ed50aa55895184494445be16a (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 a965702c08f84d8d770fb81e09f13bee8e922bba Author: Jonathan Druart Date: Mon Apr 4 14:45:48 2016 +0100 Bug 16179: Do not crash if "rate me" is clicked and not rate selected If JS is disabled and a user clicks on the "Rate me" button, Koha will crashes with: DBIx::Class::ResultSet::create(): Column 'rating_value' cannot be null at /usr/share/koha/lib/C4/Ratings.pm line 208 To avoid that, opac-ratings.pl will check if a rate has been selected. Test plan: Disable JS On a record detail page, click on the "Rate me" button TESTED PLAN: 1) go to /cgi-bin/koha/opac-ratings.pl?biblionumber=1 -- kaboom as above. 2) apply patch 3) refresh -- either login screen (don't know why) -- or if already logged in, detail page. 4) koha qa test tool Signed-off-by: Mark Tompsett Signed-off-by: Owen Leonard I tested successfully by temporarily removing the modification made by Bug 16210. Signed-off-by: Katrin Fischer Signed-off-by: Brendan Gallagher (cherry picked from commit b679cac96409b7248f8e224e10c73dafa4c82890) Signed-off-by: Julian Maurice ----------------------------------------------------------------------- Summary of changes: opac/opac-ratings.pl | 7 +++++++ 1 file changed, 7 insertions(+) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Thu Apr 21 10:05:58 2016 From: gitmaster at git.koha-community.org (Git repo owner) Date: Thu, 21 Apr 2016 08:05:58 +0000 Subject: [koha-commits] main Koha release repository branch 3.22.x updated. v3.22.05-69-g2b5387e 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.22.x has been updated via 2b5387e9013b0e3ecc2d6135a5a81f8d26f81329 (commit) from a965702c08f84d8d770fb81e09f13bee8e922bba (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 2b5387e9013b0e3ecc2d6135a5a81f8d26f81329 Author: Julian Maurice Date: Thu Apr 7 17:03:47 2016 +0200 Bug 16224: Fix t/db_dependent/Reports_Guided.t This test: is( scalar @{ get_saved_reports( $report_ids[0] ) }, 1, "filter takes report id" ); can fail when $report_ids[0] is a substring of some saved_sql fields from other reports (reports that have a different id than $report_ids[0]). We can only be sure that get_saved_reports will return at least 1 report. Signed-off-by: Jonathan Druart Signed-off-by: Katrin Fischer Signed-off-by: Brendan Gallagher (cherry picked from commit 08017f89f150394b6224fafb64fe8d12fc146ff1) Signed-off-by: Julian Maurice ----------------------------------------------------------------------- Summary of changes: t/db_dependent/Reports_Guided.t | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Apr 22 02:15:51 2016 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 22 Apr 2016 00:15:51 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.22.00-1166-g2e7df30 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 2e7df304500d75efa3cab81635d90a2b209e668a (commit) via 769728015cea465bbb47d27f69077962a8f2429d (commit) via d46a664ef6b79f6ceee2c00629f5933b4eaedfc3 (commit) via d83aff33c603d1ba4d16de53ad926bd93a09629b (commit) from a96adaadb2c4bbf54ad8440164b73aa74a38cc96 (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 2e7df304500d75efa3cab81635d90a2b209e668a Author: Kyle M Hall Date: Wed Apr 20 22:03:11 2016 +0000 Bug 15757 [QA Followup] - Having EDI configured will make unit tests fail Signed-off-by: Kyle M Hall Signed-off-by: Brendan Gallagher commit 769728015cea465bbb47d27f69077962a8f2429d Author: Jonathan Druart Date: Thu Apr 7 09:45:58 2016 +0100 Bug 15757: Make GetLoanLength defaults to 0 instead of 21 GetLoanLength arbitrary defaulted to 21. The expected behavior seems to be to default on 0 (loan will be dued today). IMPORTANT NOTE: This patch will introduce a change in the behaviors for configuration with a 0 in issuelength. Before this patch, the rule with a issuelength==0 was skipped, now it's used! Test plan: 1/ Do not define any rule: the due date will be today (before this patch was +21 days) 2/ Define some rules which does not match the patron category, itemtype or branchcode: the due date will be today (before this patch was +21 days). 3/ Modify a rule to match the checkout and set issuelength=0: the due date will be today (before this patch, the rule was skipped) 4/ Modify this rule and set the issuelength to something > 0: the due date will be adjusted (same behavior as before this patch) Signed-off-by: Bernardo Gonzalez Kriegel Works ok, checked 1-4 All test pass No koha-qa errors Signed-off-by: Kyle M Hall commit d46a664ef6b79f6ceee2c00629f5933b4eaedfc3 Author: Jonathan Druart Date: Thu Apr 7 10:13:43 2016 +0100 Bug 15757: Make issuelength default to null instead of 0 When editing circ rules, if the Loan period "issuelength" is not defined (empty string), the default value was 0, not it's inserted in the DB as NULL. Test plan: 1/ Create or edit a circ rule 2/ Do not fill the Loan period column 3/ Save => Without this patch, the value was 0 => With this patch it's now an empty string (in the DB it's set to NULL) Signed-off-by: Bernardo Gonzalez Kriegel Works as described. No errors Signed-off-by: Kyle M Hall commit d83aff33c603d1ba4d16de53ad926bd93a09629b Author: Jonathan Druart Date: Thu Apr 7 09:44:51 2016 +0100 Bug 15757: Add one test for GetLoanLength The usual call (3 params) of this subroutine was not tested. Signed-off-by: Bernardo Gonzalez Kriegel Signed-off-by: Kyle M Hall ----------------------------------------------------------------------- Summary of changes: C4/Circulation.pm | 22 ++++++------- admin/smart-rules.pl | 1 + t/db_dependent/Circulation_Issuingrule.t | 49 +++++++++++++++-------------- t/db_dependent/Circulation_issuingrules.t | 4 +-- 4 files changed, 39 insertions(+), 37 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Apr 22 02:22:54 2016 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 22 Apr 2016 00:22:54 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.22.00-1167-ga8491dc 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 a8491dc156db9d746b0f5ddd6175b66bf1bfa4ab (commit) from 2e7df304500d75efa3cab81635d90a2b209e668a (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 a8491dc156db9d746b0f5ddd6175b66bf1bfa4ab Author: Jonathan Druart Date: Wed Apr 6 11:33:11 2016 +0100 Bug 15930: Make patron searches defaulting on 'contain' The default patron search types has changed from 'contain' to start_with. Users consider it as a bug. This patch revert the previous changes to default on 'contain'. Test plan: Search for patrons in different places (guarantor, checkout, patron module, acquisition module, etc.) and confirm that the default is always 'contain' Signed-off-by: Nick Clemens Signed-off-by: Jesse Weaver Signed-off-by: Brendan Gallagher ----------------------------------------------------------------------- Summary of changes: C4/Utils/DataTables/Members.pm | 2 +- koha-tmpl/intranet-tmpl/prog/en/includes/patron-search.inc | 8 ++++---- koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tt | 7 ++++--- members/member.pl | 2 +- 4 files changed, 10 insertions(+), 9 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Apr 22 02:45:45 2016 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 22 Apr 2016 00:45:45 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.22.00-1170-g408d556 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 408d556346f6b4a50b0d71efcb4eb30014d8c0bb (commit) via 59df79869dc68b120be56dd4ff85c30f260028b8 (commit) via e28eaae9838d272641aef71effc3eeaba9041ed3 (commit) from a8491dc156db9d746b0f5ddd6175b66bf1bfa4ab (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 408d556346f6b4a50b0d71efcb4eb30014d8c0bb Author: Kyle M Hall Date: Wed Apr 20 22:30:57 2016 +0000 Bug 12787 [QA Followup] - Retain change to Reports_Guided.t Adds change from Bug 16224: Fix t/db_dependent/Reports_Guided.t (08017f89f150394b6224fafb64fe8d12fc146ff1) to Reports/Guided.t Signed-off-by: Kyle M Hall Signed-off-by: Brendan Gallagher commit 59df79869dc68b120be56dd4ff85c30f260028b8 Author: Tomas Cohen Arazi Date: Thu Apr 7 12:56:39 2016 -0300 Bug 12787: (QA followup) small QA fixes Signed-off-by: Tomas Cohen Arazi Signed-off-by: Kyle M Hall Signed-off-by: Brendan Gallagher commit e28eaae9838d272641aef71effc3eeaba9041ed3 Author: Jonathan Druart Date: Thu Apr 7 13:29:16 2016 +0100 Bug 12787: Reorganise t/db_dependent files This patch tries to reorganise test files in the db_dependent directory: - Circulation_Branch.t has been moved to Circulation/Branch.t - Circulation_issuingrules.t has been moved to Circulation/CalcDateDue.t - Circulation_Issuingrule.t has been moved to Circulation/GetHardDueDate.t - Circulation_dateexpiry.t has been moved to Circulation/dateexpiry.t - Circulation_issue.t has been moved to Circulation/issue.t - Circulation_transfers.t has been moved to Circulation/transfers.t - Items_DelItem.t has been moved to Items/DelItem.t - BiblioObject.t has been moved to Koha/Biblio.t - Members_Attributes.t has been moved to Members/Attributes.t - Members_columns.t has been moved to Members/columns.t - Circulation_OfflineOperation.t has been moved to Circulation/OfflineOperation.t - Koha_template_plugin_KohaDates.t has been moved to Template/Plugin/KohaDates.t - Koha_template_plugin_Branches.t has been moved to Template/Plugin/Branches.t - Reports/Guided.t, ReportsGuided.t and Reports_Guided.t have been merged Test plan: Confirm that all the modified tests still pass Signed-off-by: Tomas Cohen Arazi Signed-off-by: Kyle M Hall Signed-off-by: Brendan Gallagher ----------------------------------------------------------------------- Summary of changes: .../{Circulation_Branch.t => Circulation/Branch.t} | 0 .../CalcDateDue.t} | 26 +- .../GetHardDueDate.t} | 0 .../OfflineOperation.t} | 0 .../dateexpiry.t} | 0 .../{Circulation_issue.t => Circulation/issue.t} | 0 .../transfers.t} | 2 +- .../{Items_DelItem.t => Items/DelItem.t} | 0 t/db_dependent/{BiblioObject.t => Koha/Biblio.t} | 0 t/db_dependent/Koha_template_plugin_Branches.t | 57 ---- .../{Members_Attributes.t => Members/Attributes.t} | 0 .../{Members_columns.t => Members/columns.t} | 0 t/db_dependent/Reports/Guided.t | 303 ++++++++++++++++---- t/db_dependent/ReportsGuided.t | 85 ------ t/db_dependent/Reports_Guided.t | 123 -------- t/db_dependent/Template/Plugin/Branches.t | 28 +- .../Plugin/KohaDates.t} | 0 17 files changed, 266 insertions(+), 358 deletions(-) rename t/db_dependent/{Circulation_Branch.t => Circulation/Branch.t} (100%) rename t/db_dependent/{Circulation_issuingrules.t => Circulation/CalcDateDue.t} (79%) rename t/db_dependent/{Circulation_Issuingrule.t => Circulation/GetHardDueDate.t} (100%) rename t/db_dependent/{Circulation_OfflineOperation.t => Circulation/OfflineOperation.t} (100%) rename t/db_dependent/{Circulation_dateexpiry.t => Circulation/dateexpiry.t} (100%) rename t/db_dependent/{Circulation_issue.t => Circulation/issue.t} (100%) rename t/db_dependent/{Circulation_transfers.t => Circulation/transfers.t} (98%) rename t/db_dependent/{Items_DelItem.t => Items/DelItem.t} (100%) rename t/db_dependent/{BiblioObject.t => Koha/Biblio.t} (100%) delete mode 100644 t/db_dependent/Koha_template_plugin_Branches.t rename t/db_dependent/{Members_Attributes.t => Members/Attributes.t} (100%) mode change 100755 => 100644 rename t/db_dependent/{Members_columns.t => Members/columns.t} (100%) delete mode 100755 t/db_dependent/ReportsGuided.t delete mode 100755 t/db_dependent/Reports_Guided.t rename t/db_dependent/{Koha_template_plugin_KohaDates.t => Template/Plugin/KohaDates.t} (100%) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Apr 22 02:48:56 2016 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 22 Apr 2016 00:48:56 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.22.00-1172-g6dce6f1 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 6dce6f171d475d49a905d42f7bbab348def71f7c (commit) via e476be5568d41bb06ce2fef5e8da6417cf9ed682 (commit) from 408d556346f6b4a50b0d71efcb4eb30014d8c0bb (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 6dce6f171d475d49a905d42f7bbab348def71f7c Author: Nick Clemens Date: Thu Mar 31 19:48:23 2016 +0000 Bug 12663: (QA followup) Insert SCOUserCSS/JS 'after' OPACUserCSS/JS rather than 'instead of' i.e. Remove IF/ELSE and use 2 IF Signed-off-by: Katrin Fischer Signed-off-by: Brendan Gallagher commit e476be5568d41bb06ce2fef5e8da6417cf9ed682 Author: Nick Clemens Date: Tue Mar 8 22:04:32 2016 +0000 Bug 12663 - SCOUserCSS and SCOUserJS ignored on selfcheck login page Currently if not logged in when browsing to http://YOURCATALOG/cgi-bin/koha/sco/sco-main.pl You are redirected to opac-auth.tt and SCOUserCSS and SCOUserJS are not loaded. This page passes through a parameter to the template to indicate this is an SCO login and appropriate CSS and JS should be loaded. Additionally this patch ensure that when loggin in using the form you are redirected to the sco-main.pl instead of the patron account page for the user. To test: 1 - Verify that normal login works on both staff and opac 2 - Verify that SCO link goes to login page if AutoSelfCheckAllowed is set to "Don't allow" 3 - Enter changes into SCOUserJS and SCOUserCSS and observe these are present on SCO log in page with AutoSelfCheck disabled 4 - Verify that a logged in opac user without permissions cannot access the self-checkout module 5 - Verify that AutoSelfCheckAllowed and associated system preferences function as expected 6 - Verify the AutoSelfCheck user is logged out if they attempt to visit another page Followed test plan. If I go to http://YOURCATALOG/cgi-bin/koha/sco/sco-main.pl, CSS and JS trigger already on the login form, I suppose that is intended. Signed-off-by: Marc V?ron Signed-off-by: Katrin Fischer Signed-off-by: Brendan Gallagher ----------------------------------------------------------------------- Summary of changes: C4/Auth.pm | 1 + .../opac-tmpl/bootstrap/en/includes/doc-head-close.inc | 6 ++++++ koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-bottom.inc | 11 ++++++++++- koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-auth.tt | 9 ++++++++- opac/sco/sco-main.pl | 1 + 5 files changed, 26 insertions(+), 2 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Apr 22 05:05:38 2016 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 22 Apr 2016 03:05:38 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.22.00-1178-g281a8a6 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 281a8a6dbb3d02bbfe7d98e03a33dcdbfacd26bb (commit) via 0ed37aaf77fdba9277fc20e9aa859735aff3623e (commit) via 82d83268ba3d19ead4fb020d5007781bb90b0ce4 (commit) via e6c5107abd3d727e035d2d9f2df96ee294d7eae7 (commit) via cd7e65a4b51f8b6bf72ea3272e334e52af59f8c0 (commit) via 05486da41f4627ea83263f0b90a829c9f32b0cd9 (commit) from 6dce6f171d475d49a905d42f7bbab348def71f7c (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 281a8a6dbb3d02bbfe7d98e03a33dcdbfacd26bb Author: Jonathan Druart Date: Tue Apr 5 09:53:25 2016 +0100 Bug 5979: Update INSERT IGNORE INTO statement Signed-off-by: Jonathan Druart Signed-off-by: Brendan Gallagher commit 0ed37aaf77fdba9277fc20e9aa859735aff3623e Author: Alex Arnaud Date: Mon Feb 22 14:44:14 2016 +0100 Bug 5979 - Follow up: Change ISBD syspref description and fix warning in t/Biblio/Isbd.t Signed-off-by: Owen Leonard Signed-off-by: Jonathan Druart Signed-off-by: Brendan Gallagher commit 82d83268ba3d19ead4fb020d5007781bb90b0ce4 Author: Bernardo Gonzalez Kriegel Date: Fri Oct 30 11:38:24 2015 -0300 Bug 5979: follow to fix spelling Changed Montains -> Mountains koha-qa complains!! Signed-off-by: Bernardo Gonzalez Kriegel Signed-off-by: Owen Leonard Signed-off-by: Jonathan Druart Signed-off-by: Brendan Gallagher commit e6c5107abd3d727e035d2d9f2df96ee294d7eae7 Author: Alex Arnaud Date: Wed Oct 28 15:49:28 2015 +0100 Bug 5979 - OPAC ISBD view has its own syspref Signed-off-by: Bernardo Gonzalez Kriegel Works well, empty OPACISBD removes link. Test pass. Small koha-qa error fixed in followup Signed-off-by: Jonathan Druart Signed-off-by: Brendan Gallagher commit cd7e65a4b51f8b6bf72ea3272e334e52af59f8c0 Author: Alex Arnaud Date: Sat Jun 9 16:10:50 2012 +0200 Bug 5979 - Follow up: using OPACISBD systempreference to display link Signed-off-by: Bernardo Gonzalez Kriegel Signed-off-by: Jonathan Druart Signed-off-by: Brendan Gallagher commit 05486da41f4627ea83263f0b90a829c9f32b0cd9 Author: Henri-Damien LAURENT Date: Wed Jun 30 21:55:39 2010 +0200 Bug 5979 : OPAC : using OPACISBD systempreference to display link The OPACISBD system preference is used in order to be able to have one ISBD for OPAC another one for intranet. But the link ISBD at OPAC was depending on the presence or absence of value in ISBD which is for intranet. This patch fixes the behaviour to depend on the correct system preference at OPAC Signed-off-by: Katrin Fischer Verified that new system preference is added cleanly and ISBD view can be configured independently for staff and OPAC using OPACISBD and viewISBD system preferences. Signed-off-by: Bernardo Gonzalez Kriegel Signed-off-by: Jonathan Druart Signed-off-by: Brendan Gallagher ----------------------------------------------------------------------- Summary of changes: C4/Biblio.pm | 4 +- .../atomicupdate/bug_5979-add_opacisbd_syspref.sql | 1 + installer/data/mysql/sysprefs.sql | 1 + .../en/modules/admin/preferences/cataloguing.pref | 2 +- .../prog/en/modules/admin/preferences/opac.pref | 5 ++ opac/opac-MARCdetail.pl | 4 +- opac/opac-detail.pl | 5 +- t/Biblio/Isbd.t | 50 ++++++++++++++++++++ 8 files changed, 65 insertions(+), 7 deletions(-) create mode 100644 installer/data/mysql/atomicupdate/bug_5979-add_opacisbd_syspref.sql create mode 100644 t/Biblio/Isbd.t hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Apr 22 05:11:22 2016 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 22 Apr 2016 03:11:22 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.22.00-1179-gb7d3614 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 b7d36141fbf22f7d8b225d7731e59adbe0546780 (commit) from 281a8a6dbb3d02bbfe7d98e03a33dcdbfacd26bb (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 b7d36141fbf22f7d8b225d7731e59adbe0546780 Author: Brendan Gallagher Date: Fri Apr 22 03:19:56 2016 +0000 DBRev update - Bug 5979 - Add separate OPACISBD system preference ----------------------------------------------------------------------- Summary of changes: Koha.pm | 2 +- .../mysql/atomicupdate/bug_5979-add_opacisbd_syspref.sql | 1 - installer/data/mysql/updatedatabase.pl | 12 ++++++++++++ 3 files changed, 13 insertions(+), 2 deletions(-) delete mode 100644 installer/data/mysql/atomicupdate/bug_5979-add_opacisbd_syspref.sql hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Apr 22 05:12:45 2016 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 22 Apr 2016 03:12:45 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.22.00-1180-gb859739 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 b859739c2a6dc899176276022782ac3af7a0ad0c (commit) from b7d36141fbf22f7d8b225d7731e59adbe0546780 (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 b859739c2a6dc899176276022782ac3af7a0ad0c Author: Mason James Date: Fri Apr 1 15:23:22 2016 +1300 Bug 1750 - Report bor_issues_top erroneous and truncated results. Signed-off-by: Mason James TEST PLAN --------- 1) Ensure you have some checkouts 2) Home -> Reports -> Patrons with the most checkouts 3) Click 'Submit' -- you get a list 4) Click a patron name. 5) Note the borrower number. 6) In MySQL run something like: > UPDATE borrower SET firstname=NULL WHERE borrowernumber=#### 7) Refresh the report page -- name goes totally blank 8) apply patch 9) Refresh the report page -- only first name is lost 10) run koha qa test tools Signed-off-by: Mark Tompsett Signed-off-by: Katrin Fischer Signed-off-by: Brendan Gallagher ----------------------------------------------------------------------- Summary of changes: reports/bor_issues_top.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Apr 22 10:48:43 2016 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 22 Apr 2016 08:48:43 +0000 Subject: [koha-commits] main Koha release repository branch 3.22.x updated. v3.22.05-74-g7729ace 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.22.x has been updated via 7729ace7fa6fae2aec48abe80ea36d4f81197cbe (commit) via 57fc49475db35b965ea50e5b60114fa46b2be37f (commit) via 45e39882432dd9fdae0fc1b1ef7b7b8b09a9480a (commit) via 201e1f239728f3656f5f71792a7d5ce9b5a05144 (commit) via c97a01e1330ab5b1b1df7029d2149efa0deb19a4 (commit) from 2b5387e9013b0e3ecc2d6135a5a81f8d26f81329 (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 7729ace7fa6fae2aec48abe80ea36d4f81197cbe Author: Jonathan Druart Date: Fri Apr 8 10:04:20 2016 +0100 Bug 16210: Set X-Frame-Options to SAMEORIGIN in 2 other places The login page should not be displayed if the page is displayed in a frame. Signed-off-by: Marc V?ron Signed-off-by: Katrin Fischer Signed-off-by: Brendan Gallagher (cherry picked from commit 6efa491d1b2f92fa407aa49c7b678f9b642fc83f) Signed-off-by: Julian Maurice commit 57fc49475db35b965ea50e5b60114fa46b2be37f Author: Jonathan Druart Date: Fri Apr 8 10:03:24 2016 +0100 Bug 16210: Revert OPAC changes from Bug 15111 This patch reverts the changes made at the OPAC from the following patches: Do not include the antiClickjack legacy browser trick for greybox" Revert "Bug 15111: Do not include the antiClickjack legacy browser trick for greybox" This reverts commit fc640d2a86f395ad392f84314bce22e8b4dab1fe. Revert "Bug 15111: Change X-Frame-Options with SAMEORIGIN" This reverts commit fb167c0e4b897bf9a93b4fd6176b15e2d4dbd4df. Revert "Bug 15111 - Koha is vulnerable to Cross-Frame Scripting (XFS) attacks" This reverts commit dc03bca76cf5b7cb48d98d1ce245fc65b98be929. Setting X-Frame-Options to SAMEORIGIN is enough for mordern browsers: https://developer.mozilla.org/en-US/docs/Web/HTTP/X-Frame-Options The antiClickjack trick should be removed at the OPAC as we want to keep the OPAC usable even if the user has disabled JS. That means the OPAC will be vulnerable to XFS if a user is navigating with a prehistoric browser: Firefox 3.6.9 September 2010 IE 8 March 2008 Opera 10.5 March 2010 Safari 4 February 2009 Chrome 4.1.? somewhen 2010 Test plan: Confirm that there are no regression of bug 15111 with modern browsers Signed-off-by: Marc V?ron Signed-off-by: Katrin Fischer Signed-off-by: Brendan Gallagher (cherry picked from commit d496d03e8aa3079e0d29837b27b31b9a55afd02e) Signed-off-by: Julian Maurice commit 45e39882432dd9fdae0fc1b1ef7b7b8b09a9480a Author: Jonathan Druart Date: Mon Feb 22 09:24:29 2016 +0000 Bug 15111: Do not include the antiClickjack legacy browser trick for greybox Most of the scripts called via greybox (which uses iframe) don't include doc-head-close. But some do. This patch adds a popup parameter for these templates, not to include the legacy browser trick and avoid the replacement of the location. Test plan: 1/ Export patroncard and label 2/ translate itemtypes 3/ click on a idref link at the OPAC Signed-off-by: Jonathan Druart Signed-off-by: Chris Cormack Signed-off-by: Kyle M Hall (cherry picked from commit fc640d2a86f395ad392f84314bce22e8b4dab1fe) Signed-off-by: Julian Maurice commit 201e1f239728f3656f5f71792a7d5ce9b5a05144 Author: Jonathan Druart Date: Fri Nov 13 08:19:57 2015 +0000 Bug 15111: Change X-Frame-Options with SAMEORIGIN There are some places where frames are used, the greybox JS plugin for instance. We need either to allow them from Koha or replace this plugin. The easier for now is to switch the value from DENY with SAMEORIGIN. Test plan: - modify a record in a batch (tools/batch_record_modification.pl) - click on preview marc => With only the previous patch you will get a blank page. => With this patch apply, it will work as expected. Signed-off-by: Kyle M Hall Signed-off-by: Jonathan Druart Signed-off-by: Chris Cormack Signed-off-by: Kyle M Hall (cherry picked from commit fb167c0e4b897bf9a93b4fd6176b15e2d4dbd4df) Signed-off-by: Julian Maurice commit c97a01e1330ab5b1b1df7029d2149efa0deb19a4 Author: Kyle M Hall Date: Mon Nov 2 12:11:17 2015 -0500 Bug 15111 - Koha is vulnerable to Cross-Frame Scripting (XFS) attacks Web pages that can be embedded in frames are vulnerable to cross-frame scripting attacks. Cross-frame scripting is a type of phishing attack that involves instructions to an unsuspecting user to follow a specific link to update confidential information in an online application. Because the link leads to a legitimate page from the online application that is embedded in a frame hosted by the attackers' server, the attackers can capture all the information that the user enters. https://www.owasp.org/index.php/Clickjacking_Defense_Cheat_Sheet Signed-off-by: Chris Cormack Signed-off-by: Katrin Fischer Signed-off-by: Jonathan Druart Signed-off-by: Chris Cormack Signed-off-by: Kyle M Hall (cherry picked from commit dc03bca76cf5b7cb48d98d1ce245fc65b98be929) Signed-off-by: Julian Maurice ----------------------------------------------------------------------- Summary of changes: C4/Auth.pm | 16 ++++++++++------ C4/Output.pm | 11 ++++++----- .../intranet-tmpl/prog/en/includes/doc-head-close.inc | 14 ++++++++++++++ .../prog/en/modules/admin/localization.tt | 2 +- .../prog/en/modules/labels/label-print.tt | 2 +- .../intranet-tmpl/prog/en/modules/patroncards/print.tt | 2 +- 6 files changed, 33 insertions(+), 14 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Apr 22 11:08:09 2016 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 22 Apr 2016 09:08:09 +0000 Subject: [koha-commits] main Koha release repository branch 3.22.x updated. v3.22.05-75-g8f4df78 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.22.x has been updated via 8f4df78bd46e9e9c02f2841ef6bd1bba2bb39c6c (commit) from 7729ace7fa6fae2aec48abe80ea36d4f81197cbe (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 8f4df78bd46e9e9c02f2841ef6bd1bba2bb39c6c Author: Mason James Date: Fri Apr 1 15:23:22 2016 +1300 Bug 1750 - Report bor_issues_top erroneous and truncated results. Signed-off-by: Mason James TEST PLAN --------- 1) Ensure you have some checkouts 2) Home -> Reports -> Patrons with the most checkouts 3) Click 'Submit' -- you get a list 4) Click a patron name. 5) Note the borrower number. 6) In MySQL run something like: > UPDATE borrower SET firstname=NULL WHERE borrowernumber=#### 7) Refresh the report page -- name goes totally blank 8) apply patch 9) Refresh the report page -- only first name is lost 10) run koha qa test tools Signed-off-by: Mark Tompsett Signed-off-by: Katrin Fischer Signed-off-by: Brendan Gallagher (cherry picked from commit b859739c2a6dc899176276022782ac3af7a0ad0c) Signed-off-by: Julian Maurice ----------------------------------------------------------------------- Summary of changes: reports/bor_issues_top.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Apr 22 11:54:36 2016 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 22 Apr 2016 09:54:36 +0000 Subject: [koha-commits] main Koha release repository branch 3.22.x updated. v3.22.05-76-gdce531d 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.22.x has been updated via dce531d3d63242868edc8dd9f5332d810b0cdda4 (commit) from 8f4df78bd46e9e9c02f2841ef6bd1bba2bb39c6c (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 dce531d3d63242868edc8dd9f5332d810b0cdda4 Author: Jonathan Druart Date: Fri Mar 18 13:31:27 2016 +0000 Bug 16104: Remove warnings "used only once: possible typo" Since bug 11998, the following warnings are raised: Name "Tie::Hash::FIELDS" used only once: possible typo at /usr/share/perl/5.22/fields.pm line 135. Name "Cache::RemovalStrategy::LRU::FIELDS" used only once: possible typo at /usr/share/perl/5.22/fields.pm line 135. Name "Cache::RemovalStrategy::FIELDS" used only once: possible typo at /usr/share/perl/5.22/fields.pm line 135. It comes from the Koha::Cache 103 if ( can_load( modules => { 'Cache::Memory' => undef } ) ) { Test plan: perl -wc C4/AuthoritiesMarc.pm should return green QA note: this may have an impact on performance but I have not found any other workarounds. NOTE: I applied 15870 to master, got the error (-v 2 -c 5), applied 16104, rebased it in front, error disappeared (still only -c 5), rebased it at the end, and signed off 16104. Signed-off-by: Mark Tompsett Signed-off-by: Katrin Fischer Signed-off-by: Brendan Gallagher (cherry picked from commit 6b319a2d487257e8a08bc26af9c6b2e7fa2ece2c) Signed-off-by: Julian Maurice ----------------------------------------------------------------------- Summary of changes: Koha/Cache.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Apr 22 12:12:09 2016 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 22 Apr 2016 10:12:09 +0000 Subject: [koha-commits] main Koha release repository branch 3.22.x updated. v3.22.05-77-gf2c5b7b 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.22.x has been updated via f2c5b7b036a47289a069f89bf3e63ede548058d8 (commit) from dce531d3d63242868edc8dd9f5332d810b0cdda4 (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 f2c5b7b036a47289a069f89bf3e63ede548058d8 Author: Jonathan Druart Date: Wed Apr 6 11:33:11 2016 +0100 Bug 15930: Make patron searches defaulting on 'contain' The default patron search types has changed from 'contain' to start_with. Users consider it as a bug. This patch revert the previous changes to default on 'contain'. Test plan: Search for patrons in different places (guarantor, checkout, patron module, acquisition module, etc.) and confirm that the default is always 'contain' Signed-off-by: Nick Clemens Signed-off-by: Jesse Weaver Signed-off-by: Brendan Gallagher (cherry picked from commit a8491dc156db9d746b0f5ddd6175b66bf1bfa4ab) Signed-off-by: Julian Maurice ----------------------------------------------------------------------- Summary of changes: C4/Utils/DataTables/Members.pm | 2 +- koha-tmpl/intranet-tmpl/prog/en/includes/patron-search.inc | 8 ++++---- koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tt | 7 ++++--- members/member.pl | 2 +- 4 files changed, 10 insertions(+), 9 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Apr 22 13:33:43 2016 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 22 Apr 2016 11:33:43 +0000 Subject: [koha-commits] main Koha release repository branch 3.22.x updated. v3.22.05-80-ga0dd977 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.22.x has been updated via a0dd9770448322189dde29467e54d272f7d03071 (commit) via 2471a0e3a9f222b756d01492b413232afa60c1c6 (commit) via 271cbb949ae680487598bc5d873e439ecc26c315 (commit) from f2c5b7b036a47289a069f89bf3e63ede548058d8 (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 a0dd9770448322189dde29467e54d272f7d03071 Author: Jonathan Druart Date: Thu Apr 7 09:45:58 2016 +0100 Bug 15757: Make GetLoanLength defaults to 0 instead of 21 GetLoanLength arbitrary defaulted to 21. The expected behavior seems to be to default on 0 (loan will be dued today). IMPORTANT NOTE: This patch will introduce a change in the behaviors for configuration with a 0 in issuelength. Before this patch, the rule with a issuelength==0 was skipped, now it's used! Test plan: 1/ Do not define any rule: the due date will be today (before this patch was +21 days) 2/ Define some rules which does not match the patron category, itemtype or branchcode: the due date will be today (before this patch was +21 days). 3/ Modify a rule to match the checkout and set issuelength=0: the due date will be today (before this patch, the rule was skipped) 4/ Modify this rule and set the issuelength to something > 0: the due date will be adjusted (same behavior as before this patch) Signed-off-by: Bernardo Gonzalez Kriegel Works ok, checked 1-4 All test pass No koha-qa errors Signed-off-by: Kyle M Hall (cherry picked from commit 769728015cea465bbb47d27f69077962a8f2429d) Signed-off-by: Julian Maurice commit 2471a0e3a9f222b756d01492b413232afa60c1c6 Author: Jonathan Druart Date: Thu Apr 7 10:13:43 2016 +0100 Bug 15757: Make issuelength default to null instead of 0 When editing circ rules, if the Loan period "issuelength" is not defined (empty string), the default value was 0, not it's inserted in the DB as NULL. Test plan: 1/ Create or edit a circ rule 2/ Do not fill the Loan period column 3/ Save => Without this patch, the value was 0 => With this patch it's now an empty string (in the DB it's set to NULL) Signed-off-by: Bernardo Gonzalez Kriegel Works as described. No errors Signed-off-by: Kyle M Hall (cherry picked from commit d46a664ef6b79f6ceee2c00629f5933b4eaedfc3) Signed-off-by: Julian Maurice commit 271cbb949ae680487598bc5d873e439ecc26c315 Author: Jonathan Druart Date: Thu Apr 7 09:44:51 2016 +0100 Bug 15757: Add one test for GetLoanLength The usual call (3 params) of this subroutine was not tested. Signed-off-by: Bernardo Gonzalez Kriegel Signed-off-by: Kyle M Hall (cherry picked from commit d83aff33c603d1ba4d16de53ad926bd93a09629b) Signed-off-by: Julian Maurice ----------------------------------------------------------------------- Summary of changes: C4/Circulation.pm | 22 ++++++------- admin/smart-rules.pl | 1 + t/db_dependent/Circulation_Issuingrule.t | 48 ++++++++++++++--------------- t/db_dependent/Circulation_issuingrules.t | 4 +-- 4 files changed, 38 insertions(+), 37 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Sat Apr 23 00:39:12 2016 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 22 Apr 2016 22:39:12 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.22.00-1181-gce47345 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 ce47345c21930074a4ebf79f658d4a43b8944f6c (commit) from b859739c2a6dc899176276022782ac3af7a0ad0c (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 ce47345c21930074a4ebf79f658d4a43b8944f6c Author: Kyle M Hall Date: Wed Apr 20 20:37:13 2016 +0000 Bug 16317 - Attempt to share private list results in error When sharing a private list, the the receiver of the share link will get the following error when they are logged in and try to click the link: DBIx::Class::Storage::DBI::_dbh_execute(): Unknown column 'sharedate desc' in 'order clause' at /home/koha/kohaclone/Koha/Objects.pm line 150 Test Plan: 1) Create a private list 2) Share that list to another account 3) Log in as the other account 4) Click the link in the email you recieved 5) Note the error 6) Apply this patch 7) Click the link again 8) You should see no error and be able to view the list! Signed-off-by: Owen Leonard Signed-off-by: Marcel de Rooy Signed-off-by: Brendan Gallagher ----------------------------------------------------------------------- Summary of changes: opac/opac-shareshelf.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Sat Apr 23 00:41:45 2016 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 22 Apr 2016 22:41:45 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.22.00-1182-g8c807b9 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 8c807b9466b005b2094320d7fabf07e9e91d3607 (commit) from ce47345c21930074a4ebf79f658d4a43b8944f6c (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 8c807b9466b005b2094320d7fabf07e9e91d3607 Author: Alex Arnaud Date: Tue Apr 19 17:18:41 2016 +0200 Bug 16296 - Fix records displaying in virtualshelves Test plan: - Empty OPACXSLTResultsDisplay system preference, - select a virtual shelf in the dropdown list "Lists" on navigation bar (Or create one and add records), - check that records are correctly displayed (title, author, publisher etc...). Signed-off-by: Bernardo Gonzalez Kriegel Display is now correct No errors Signed-off-by: Marcel de Rooy Signed-off-by: Brendan Gallagher ----------------------------------------------------------------------- Summary of changes: opac/opac-shelves.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Sat Apr 23 00:45:58 2016 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 22 Apr 2016 22:45:58 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.22.00-1183-ge60182c 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 e60182c2f033a2b5eac578eb7bac355e03eb6b76 (commit) from 8c807b9466b005b2094320d7fabf07e9e91d3607 (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 e60182c2f033a2b5eac578eb7bac355e03eb6b76 Author: Chris Cormack Date: Mon Apr 11 10:10:18 2016 +1200 Bug 16233 Unclosed in opac-facets.inc To test: 1/ Do a search in the OPAC 2/ Restrict to only available items 3/ Notice the authors now appear bold 4/ Apply patch 5/ Refresh the page 6/ Authors should now look normal again Signed-off-by: Mark Tompsett Signed-off-by: Katrin Fischer Signed-off-by: Brendan Gallagher ----------------------------------------------------------------------- Summary of changes: koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-facets.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Sat Apr 23 00:47:34 2016 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 22 Apr 2016 22:47:34 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.22.00-1184-ga669b3c 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 a669b3c132c7a187b3dd0d0cf2d95e990338b404 (commit) from e60182c2f033a2b5eac578eb7bac355e03eb6b76 (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 a669b3c132c7a187b3dd0d0cf2d95e990338b404 Author: Owen Leonard Date: Fri Apr 8 13:33:01 2016 -0400 Bug 16230 - Show tooltip with menu item when fund cannot be deleted This patch enables Bootstrap to generate a tooltip for the fund deletion menu item when a fund cannot be deleted because it has children. Also changed: Enable translation of the associated error message. To test you must have at least one fund which has a child fund. Apply the patch and go to Administration -> Funds. - In the list of funds, find a fund which has children. - Click the "Actions" menu. The "Delete" item should be disabled. - Hovering over the "Delete" item should display a Bootstrap-style tooltip with the explanation "This fund has children." - Clicking the "Delete" item should trigger an alert, "This fund has children. It cannot be deleted." - Clicking "Delete" on funds without children should work correctly. NOTE: Before tooltip shows in Chrome, but not bootstrap styling. After, bootstrap styled. The use of _() will add the ability to translate the alert(). Signed-off-by: Mark Tompsett Signed-off-by: Katrin Fischer Signed-off-by: Brendan Gallagher ----------------------------------------------------------------------- Summary of changes: koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Sat Apr 23 00:53:06 2016 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 22 Apr 2016 22:53:06 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.22.00-1185-g05ea36e 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 05ea36e6cb5e9958a6172f4eb711dc086a455c4e (commit) from a669b3c132c7a187b3dd0d0cf2d95e990338b404 (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 05ea36e6cb5e9958a6172f4eb711dc086a455c4e Author: Owen Leonard Date: Thu Apr 7 12:49:37 2016 -0400 Bug 16225 - Extra closing quote in circulation home page template This patch removes an extra closing quote left behind by the changes made in Bug 15640. This patch also corrects the case of the "Circulation reports" heading. (See coding guideline HTML4). To test, apply the patch and go to the circulation home page. Validate the page's HTML and confirm that there are no errors. Signed-off-by: Jonathan Druart Signed-off-by: Brendan Gallagher ----------------------------------------------------------------------- Summary of changes: koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation-home.tt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Sat Apr 23 00:53:51 2016 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 22 Apr 2016 22:53:51 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.22.00-1187-g2984242 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 29842429ee536d9c491aa19264b7ce4aa10b10ed (commit) via 0fcbf1efe10a4269e3705dce10ef632e1739dbb1 (commit) from 05ea36e6cb5e9958a6172f4eb711dc086a455c4e (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 29842429ee536d9c491aa19264b7ce4aa10b10ed Author: Owen Leonard Date: Thu Apr 7 12:18:22 2016 -0400 Bug 16220 [Compiled CSS] The view tabs on opac-detail.pl are not responsive This patch updates the compiled CSS file with changes made in the previous patch to the LESS files. To test, apply both patches and clear your browser cache if necessary. - View the bibliographic detail page for any record in the OPAC - Confirm that the style of the "Normal," "MARC," and "ISBD" links looks correct. - Resize your browser to various widths, including very narrow widths. Confirm that the links work well at all sizes. - Repeat the test for each view, normal, MARC, and ISBD. Signed-off-by: Marc V?ron Signed-off-by: Jonathan Druart Signed-off-by: Brendan Gallagher commit 0fcbf1efe10a4269e3705dce10ef632e1739dbb1 Author: Owen Leonard Date: Thu Apr 7 12:11:58 2016 -0400 Bug 16220 - The view tabs on opac-detail.pl are not responsive When looking at the detail page for a bibliographic record, there are tabs linking to the "Normal," "MARC," and "ISBD" views. These tabs need to be styled responsively so that they work well at all browser widths. This patch makes some slight markup changes to the templates and updates the LESS files to add responsive styling. This patch does not include the compiled CSS file, so the follow-up is required to test the visual changes. Signed-off-by: Marc V?ron Signed-off-by: Jonathan Druart Signed-off-by: Brendan Gallagher ----------------------------------------------------------------------- Summary of changes: koha-tmpl/opac-tmpl/bootstrap/css/opac.css | 2 +- .../bootstrap/en/modules/opac-ISBDdetail.tt | 2 +- .../bootstrap/en/modules/opac-MARCdetail.tt | 2 +- .../opac-tmpl/bootstrap/en/modules/opac-detail.tt | 2 +- koha-tmpl/opac-tmpl/bootstrap/less/opac.less | 49 +++++++++----------- koha-tmpl/opac-tmpl/bootstrap/less/responsive.less | 37 +++++++++------ 6 files changed, 47 insertions(+), 47 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Sat Apr 23 00:55:04 2016 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 22 Apr 2016 22:55:04 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.22.00-1188-g366e31f 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 366e31f8c020080b9a0319abb7d2c02e10f42a40 (commit) from 29842429ee536d9c491aa19264b7ce4aa10b10ed (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 366e31f8c020080b9a0319abb7d2c02e10f42a40 Author: Tomas Cohen Arazi Date: Wed Apr 6 12:44:25 2016 -0300 Bug 16216: Circulation_Branch.t doesn't set itemtype for test data This patch makes the tests create better data for them: - Run $ prove t/db_dependent/Circulation_Branch.t => FAIL: Warnings raised - Apply the patch - Run $ prove t/db_dependent/Circulation_Branch.t => SUCCESS: No warnings raised - Sign off Signed-off-by: Hector Castro Test pass successful Signed-off-by: Katrin Fischer Signed-off-by: Brendan Gallagher ----------------------------------------------------------------------- Summary of changes: t/db_dependent/Circulation/Branch.t | 191 ++++++++++++----------------------- 1 file changed, 62 insertions(+), 129 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Sat Apr 23 00:59:40 2016 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 22 Apr 2016 22:59:40 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.22.00-1190-g313e4c0 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 313e4c0282e7b1ecc6de4a43c764f3fd80f10cea (commit) via 38094a260e42c7937460946518a2978d2385ba14 (commit) from 366e31f8c020080b9a0319abb7d2c02e10f42a40 (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 313e4c0282e7b1ecc6de4a43c764f3fd80f10cea Author: Marcel de Rooy Date: Fri Apr 22 11:27:58 2016 +0200 Bug 12267: [QA Follow-up] Adjust installer files; tiny text edit Some installer files still refer to password_allowed. The print statement of the db revision has been slightly adjusted. Signed-off-by: Marcel de Rooy Signed-off-by: Brendan Gallagher commit 38094a260e42c7937460946518a2978d2385ba14 Author: Jonathan Druart Date: Mon Apr 11 10:05:01 2016 +0100 Bug 12267: Remove borrower_attributes.password When creating a patron attribute type, there is a "Allow password" checkbox. If checked, the librarian will be able to enter a password for this patron attribute when editing a patron. The goal was to allow a patron to log in with a secondary password. However, this feature has never been implemented. """ commit 6fc62bcd321eddb0fd3ae46903e9ab6c8b1db2cd CommitDate: Mon May 12 09:03:00 2008 -0500 extended patron attributes tables & syspref (DB rev 081) - password_allowed (if set, staff patron editor will allow a password to be associated with a value; this is mostly a hook for functionality to be implemented in the future. """ To decrease maintainability, this patch suggest to remove the 2 DB fields borrower_attributes.password and borrower_attribute_types.password_allowed If they have not used by the library. Test plan: - Edit a patron attribute type and select "allow password" - Edit a patron and defined a password for this attribute - Execute the DB entry - Note that you get a warning - Empty the password field - Execute the DB entry - You do not get the warning and the 2 DB fields have been removed Signed-off-by: Marc Veron Signed-off-by: Marcel de Rooy Signed-off-by: Brendan Gallagher ----------------------------------------------------------------------- Summary of changes: C4/Members/AttributeTypes.pm | 46 +++++++------------- C4/Members/Attributes.pm | 17 +++----- admin/patron-attr-types.pl | 8 ---- installer/data/mysql/atomicupdate/bug_12267.perl | 17 ++++++++ .../data/mysql/de-DE/optional/patron_atributes.sql | 4 +- .../data/mysql/en/optional/patron_atributes.sql | 4 +- .../data/mysql/es-ES/optional/patron_atributes.sql | 4 +- installer/data/mysql/kohastructure.sql | 2 - .../data/mysql/ru-RU/optional/patron_atributes.sql | 27 +++++------- .../data/mysql/uk-UA/optional/patron_atributes.sql | 27 +++++------- .../prog/en/modules/admin/patron-attr-types.tt | 8 ---- .../prog/en/modules/members/memberentrygen.tt | 4 -- members/memberentry.pl | 6 +-- t/Members_AttributeTypes.t | 6 +-- t/Members_Attributes.t | 6 --- 15 files changed, 71 insertions(+), 115 deletions(-) create mode 100644 installer/data/mysql/atomicupdate/bug_12267.perl hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Sat Apr 23 01:18:38 2016 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 22 Apr 2016 23:18:38 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.22.00-1191-g9e350ee 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 9e350eee19236e3a67d77f679512a970db8d7e76 (commit) from 313e4c0282e7b1ecc6de4a43c764f3fd80f10cea (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 9e350eee19236e3a67d77f679512a970db8d7e76 Author: Brendan Gallagher Date: Fri Apr 22 16:27:13 2016 -0700 DBREV Bug 12267 - Allow password option in Patron Attribute non functional ----------------------------------------------------------------------- Summary of changes: Koha.pm | 2 +- installer/data/mysql/atomicupdate/bug_12267.perl | 17 --------------- installer/data/mysql/updatedatabase.pl | 25 ++++++++++++++++++++++ 3 files changed, 26 insertions(+), 18 deletions(-) delete mode 100644 installer/data/mysql/atomicupdate/bug_12267.perl hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Sat Apr 23 01:34:05 2016 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 22 Apr 2016 23:34:05 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.22.00-1192-gc1270d5 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 c1270d5c72c2bb34460ae47cd961821add28557b (commit) from 9e350eee19236e3a67d77f679512a970db8d7e76 (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 c1270d5c72c2bb34460ae47cd961821add28557b Author: Brendan Gallagher Date: Fri Apr 22 23:42:47 2016 +0000 Missed $ in commit... Signed-off-by: Brendan Gallagher ----------------------------------------------------------------------- Summary of changes: installer/data/mysql/updatedatabase.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Sat Apr 23 04:25:40 2016 From: gitmaster at git.koha-community.org (Git repo owner) Date: Sat, 23 Apr 2016 02:25:40 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.22.00-1193-g6420401 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 64204015bc221cde763085b489073daa008f8d5f (commit) from c1270d5c72c2bb34460ae47cd961821add28557b (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 64204015bc221cde763085b489073daa008f8d5f Author: Mark Tompsett Date: Fri Apr 22 22:22:36 2016 -0400 Bug 5979: Follow up on systempreferences.sql Missing comma, extra comma, and bad placement Signed-off-by: Brendan Gallagher ----------------------------------------------------------------------- Summary of changes: installer/data/mysql/sysprefs.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Mon Apr 25 14:07:42 2016 From: gitmaster at git.koha-community.org (Git repo owner) Date: Mon, 25 Apr 2016 12:07:42 +0000 Subject: [koha-commits] main Koha release repository branch 3.22.x updated. v3.22.05-81-gd26b359 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.22.x has been updated via d26b3591b1da9f4eab2555f142b88a6f703c578e (commit) from a0dd9770448322189dde29467e54d272f7d03071 (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 d26b3591b1da9f4eab2555f142b88a6f703c578e Author: Kyle M Hall Date: Wed Apr 20 20:37:13 2016 +0000 Bug 16317 - Attempt to share private list results in error When sharing a private list, the the receiver of the share link will get the following error when they are logged in and try to click the link: DBIx::Class::Storage::DBI::_dbh_execute(): Unknown column 'sharedate desc' in 'order clause' at /home/koha/kohaclone/Koha/Objects.pm line 150 Test Plan: 1) Create a private list 2) Share that list to another account 3) Log in as the other account 4) Click the link in the email you recieved 5) Note the error 6) Apply this patch 7) Click the link again 8) You should see no error and be able to view the list! Signed-off-by: Owen Leonard Signed-off-by: Marcel de Rooy Signed-off-by: Brendan Gallagher (cherry picked from commit ce47345c21930074a4ebf79f658d4a43b8944f6c) Signed-off-by: Julian Maurice ----------------------------------------------------------------------- Summary of changes: opac/opac-shareshelf.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Mon Apr 25 14:09:06 2016 From: gitmaster at git.koha-community.org (Git repo owner) Date: Mon, 25 Apr 2016 12:09:06 +0000 Subject: [koha-commits] main Koha release repository branch 3.22.x updated. v3.22.05-82-gf96e361 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.22.x has been updated via f96e3617b590b43640663d934c1c60e7d96fa7e4 (commit) from d26b3591b1da9f4eab2555f142b88a6f703c578e (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 f96e3617b590b43640663d934c1c60e7d96fa7e4 Author: Alex Arnaud Date: Tue Apr 19 17:18:41 2016 +0200 Bug 16296 - Fix records displaying in virtualshelves Test plan: - Empty OPACXSLTResultsDisplay system preference, - select a virtual shelf in the dropdown list "Lists" on navigation bar (Or create one and add records), - check that records are correctly displayed (title, author, publisher etc...). Signed-off-by: Bernardo Gonzalez Kriegel Display is now correct No errors Signed-off-by: Marcel de Rooy Signed-off-by: Brendan Gallagher (cherry picked from commit 8c807b9466b005b2094320d7fabf07e9e91d3607) Signed-off-by: Julian Maurice ----------------------------------------------------------------------- Summary of changes: opac/opac-shelves.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Mon Apr 25 20:01:29 2016 From: gitmaster at git.koha-community.org (Git repo owner) Date: Mon, 25 Apr 2016 18:01:29 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.22.00-1194-g9648cd2 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 9648cd2917f4b530c9da9b39e4fe606e457511a2 (commit) from 64204015bc221cde763085b489073daa008f8d5f (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 9648cd2917f4b530c9da9b39e4fe606e457511a2 Author: Kyle M Hall Date: Mon Apr 25 18:10:08 2016 +0000 Bug 12267 - Update DB Schema files Signed-off-by: Kyle M Hall ----------------------------------------------------------------------- Summary of changes: Koha/Schema/Result/BorrowerAttribute.pm | 12 ++---------- Koha/Schema/Result/BorrowerAttributeType.pm | 12 ++---------- 2 files changed, 4 insertions(+), 20 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Mon Apr 25 22:07:50 2016 From: gitmaster at git.koha-community.org (Git repo owner) Date: Mon, 25 Apr 2016 20:07:50 +0000 Subject: [koha-commits] main Koha release repository branch new_12478_elasticsearch updated. v3.22.00-1218-g2c0133b 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_12478_elasticsearch has been updated via 2c0133bd8875eba6540609fdfd880ecbfca09a8c (commit) via d8731b518c9ee754aa6d5d1533029b72aa98f0e2 (commit) from 1dde88afb15d0c6d7044e907cae268669b4b65e9 (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 2c0133bd8875eba6540609fdfd880ecbfca09a8c Author: Chris Cormack Date: Thu Apr 14 21:27:10 2016 +0000 Bug 12478 Increasing test Coverage for Koha::SearchEngine::Elasticsearch::Search Before this patch it was 24.6%, after it is 64% Signed-off-by: Nick Clemens commit d8731b518c9ee754aa6d5d1533029b72aa98f0e2 Author: Chris Cormack Date: Thu Apr 14 20:23:13 2016 +0000 Bug 12478 Shifting tests and adding copyright headers Signed-off-by: Nick Clemens ----------------------------------------------------------------------- Summary of changes: Koha/SearchEngine/Elasticsearch/Search.pm | 6 +-- t/Koha_ElasticSearch.t | 23 ---------- t/Koha_SearchEngine_Elasticsearch_Search.t | 40 ---------------- .../Koha_ElasticSearch.t} | 19 +++----- t/{ => db_dependent}/Koha_ElasticSearch_Indexer.t | 25 +++++----- .../Koha_SearchEngine_Elasticsearch_Search.t | 48 ++++++++++++++++++++ 6 files changed, 71 insertions(+), 90 deletions(-) delete mode 100644 t/Koha_ElasticSearch.t delete mode 100644 t/Koha_SearchEngine_Elasticsearch_Search.t copy t/{Breeding.t => db_dependent/Koha_ElasticSearch.t} (68%) mode change 100755 => 100644 rename t/{ => db_dependent}/Koha_ElasticSearch_Indexer.t (58%) create mode 100644 t/db_dependent/Koha_SearchEngine_Elasticsearch_Search.t hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Mon Apr 25 22:23:52 2016 From: gitmaster at git.koha-community.org (Git repo owner) Date: Mon, 25 Apr 2016 20:23:52 +0000 Subject: [koha-commits] main Koha release repository branch new_12478_elasticsearch updated. v3.22.00-1279-g0382f7c 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_12478_elasticsearch has been updated discards 2c0133bd8875eba6540609fdfd880ecbfca09a8c (commit) discards d8731b518c9ee754aa6d5d1533029b72aa98f0e2 (commit) discards 1dde88afb15d0c6d7044e907cae268669b4b65e9 (commit) discards 0fe86e9638c6a6081a62138e02197dbabdfee1bb (commit) discards 555fcd28c84670f18e828e05d5495817e3e31667 (commit) discards 8a42fbc55ec50503fd3fb968215f1e576848d8ad (commit) discards c30cce1c6b05b97f4de4bbe21444c67f4550ab43 (commit) discards 4825061d0e0607955fe7cc9bb7b3391fb9601314 (commit) discards df3bcaf542b73a82affa4139d79ed776390ac360 (commit) discards ce860a6749389655bc1bcedc62874fedd748283e (commit) discards d9e9916de207461e5dbf337d39546610f6fd10d5 (commit) discards 21ef827ae27a4ec872cee3c1e6dbac80eb4eae87 (commit) discards ea22e5820b582724846e11749486b9d0b4533904 (commit) discards e782900e8647429f036d9fe705336eeced0c78f6 (commit) discards 7146ecc7b0e1cd9b1ebc113b1fd6f93497ce5883 (commit) discards 5fa7523dfecaf3ebcbe2d7e1c45055e07988d603 (commit) discards 1ea603f25cb75ea8afed632d813a095ef7382576 (commit) discards 079742025fa32055f185cd3a39d8805cb42d69ba (commit) discards 0807cc730af8c2b769a8878f88070f5da48c3272 (commit) discards 9f2d36e1c3e8ae933f58224decca4e91e326521c (commit) discards 7cf364a2c8b3698ca8a8acddfbddd567a94dac39 (commit) discards 7360b96df488eec8711b88d5296cee4f7a096765 (commit) discards a9ea6ec47c63e0438c78b6185e90b8f38172e7c0 (commit) discards ae3b47a312e86d56f2aea7f96753fdd8bf82d030 (commit) discards af86a69b50c7f3d5ca7474390ad084375424caae (commit) discards 40c9b0faaf4861c799e670e421466e677295e256 (commit) discards 385f830d45c41e0ff0cb8745a38a1163cb429330 (commit) discards 164ccb6548b06c40ab1a200c82b81c3e58d3a784 (commit) discards 77da2bce13fa81df20572b9e1a732d3100fb2de0 (commit) discards c698a5d783cd697e2fec8ff950f4ad1e1873565e (commit) discards fa8ef7f16d190f302ba4263b09f09a54404a8178 (commit) discards c8f2b715ff76726eb5ef25f39e1875f6c2b0c42a (commit) discards 193b5be34f8735164e4536ed7851a25035730b55 (commit) discards 8a95452472e0d69b72d38387f4c9d0baabefc919 (commit) discards 0d56c30e4c4bd86d8d9d28298ecff3a41e0b333b (commit) discards 448cad8b25736f5d0d6745a62ebb4e53646c2b66 (commit) discards 20d14317eb3e88d35f94f087fa1bd3c68c42a3f8 (commit) discards c0a9af7e8e1cc069757518878d6d728d0e4d50a9 (commit) discards 5c80d7f95ca064b828d7c5f8bfdceaa7013b8263 (commit) discards 1be7bf8c41172728989b019f10fb1bbced4a0f1d (commit) discards 1e1154a750ffb9666f29ba6507b52e11fc4d22fc (commit) discards 158b6a2aeae2d15702626e129489936a96b30fae (commit) discards efc1a2978b3d70ce33e2e4b5344c2fd2330b41a4 (commit) discards e091c8138c6d7b888285884af85957a9cca466c9 (commit) discards 47453c8201eef6b96050f274953e46d34c2d2117 (commit) discards b3d662f0dd92df36dfe1150eff84a10a43cd3e0a (commit) discards 5fffea591afb4280bc64f4e2e6db19bdb81fd33c (commit) discards 607b1b01af1ff97a291ab124b7cc7b14236913ed (commit) discards 09b1e530bb39231b37eca1a3eb92a01e1f280c38 (commit) discards 3e739b8488c3f2f269f61b6d9fb5e5955ea68540 (commit) discards a402517404aa599b8f78a0bc8a0505a5afdfa0a5 (commit) discards a109594bd065d21dae83232daa5aa15d4dd5571e (commit) discards a7af8bb24b55ba1e43111294b1cc68404d83b0f9 (commit) discards 9e8c6e703b862faa4a3b0496500f871c20cf006a (commit) discards 618659bc3d745e645e8fbc79a474ef1d59520b77 (commit) discards 6cd4a75717095a15c9eb93ece22126082ce1462a (commit) discards 133945511ee9ac47ed889c34fe76ad6a12c7089f (commit) discards 7136d364cee42dbbf5c0146daa25c431f484fa45 (commit) discards 1848b8ba5b4376910b71584a0c56eb7f9b0e57d0 (commit) discards 84b78545b6e71e1f996681e68f37475fa108d887 (commit) discards 05b418d15e29aad3fc24c9d45d87e87047e6deaf (commit) discards 023ab0695713c6834e3c8e95a4c5309be8086e87 (commit) discards 9088c6320f6ce43fb41d178df8cfcf793ab5b188 (commit) discards a90f83aa238f847f508d09c28de84d1df5956d7d (commit) discards 66fb6b61021785c357bad6d065ccd477265ff004 (commit) discards 6a0177dffc02a614087ec733712dc5b536cd8c53 (commit) discards 4ab5330590a05f3b1a2f7cd8378b408933616331 (commit) discards b4f15ad7af2916fb38c05c0c4bd3f9e201bca0c6 (commit) discards 72d093c1b2027039a073036e3ae603e80900e667 (commit) discards 97b73abeca4dd28d2a8e1677a4f1f3c9132f23be (commit) discards 83c3a055a50206b8bb813d5389f4ae7ff38633ab (commit) discards 5e8fc37bc3db1c4730cf8c7f3cbc540775ba4a8f (commit) discards 17d4b52fb18124fa85dca1dfc56c8ed1cd4c7123 (commit) discards 9957a488ebee34cab4292643bfc37c3dde1e9050 (commit) discards 8513db66731b185f97f3a74fecde9f08aabdac8f (commit) discards 5afe48a64a8f3104d234ae0077eb9379ed0102c8 (commit) discards 76f209fcfacf28d472ec1eda7b75c1216481c0ca (commit) discards 4b3c902004fffe4cb9c96e228d28766ac78bf742 (commit) discards 0c088ec75072df60dbe0e019892421456f9993c2 (commit) discards 1aa11be28416d52645ae0b9321bb792ab13f89e5 (commit) discards e6cd4361dcb8f16ca06bb6aaae7cf0ca43382032 (commit) discards c332217585149aad033f1db862e4def5305d9b10 (commit) discards 3b82a6748633c0e8703d40c63961cf2ff3941bb5 (commit) discards ad24ab4cff2eff773988c90848a175edbbdbbbb0 (commit) via 0382f7c3dda9b88d483be75e78d502ff5b2d9383 (commit) via 29a97f50e11f0b941b54889f32cbcd4038909b0f (commit) via 9e08d341f0a2773577be35a86bd000cf7b67ed0f (commit) via 06f099502270af11c980ed87c3d33082adc5c93a (commit) via 33ad7091b68fd17bded72415a553b13c5df874a7 (commit) via 8c13b812e1972317d1bf8d749bc2a59af289f955 (commit) via 1a541006781d46a01e989d828a3874bbcd9ec7c6 (commit) via cb4cb120cca3a0754a0ba1452db5e7c9b33fd90d (commit) via 9bd4d8498fd73b53110e7832f796680fb0751b2e (commit) via d9da2234ba067de08b60708cfad1b7c4f416cf1a (commit) via f745cf62dd6a07aaa5f14ab93d27792fb9bf4ce5 (commit) via 005f2dc31a5683c729bc8a492a18f8bd8d3c2fd8 (commit) via d01d0d686197fb2a60b4da5a50ff2bd3bd21fa8e (commit) via 24c845ff4f0c8c700ccf6b897b37340232ecd592 (commit) via b516fcccd819dede1128a6daf910905d3d482891 (commit) via 6645441d1791f6fed516d9500a92108109a01c0b (commit) via a623ff0a3b1dc684bb935c0cc8c89dd1daf81b9e (commit) via 58da32036696378dbf929e1cdd5803b6321812a7 (commit) via df7b1b868ade3dc3a16e9e2a2e216005d45c0e00 (commit) via bb3feda4cbfa8b5753e9bfa0f4e685cba1c9bd92 (commit) via 8611642106401599bd18121bc5cf95cc0ab05917 (commit) via 6e9ea1701fe295e21adc04722cf5f21e46a320d8 (commit) via 8d990a30b68e830787c191b8836a06e49fb0750a (commit) via c60fe45aef9c5fc93dc7878fc141b84faeb7e9a2 (commit) via 356887bdaddee4693e1ef57af03ab3250d73ab36 (commit) via 6b10f009082e854a305e135c43128a287020e913 (commit) via 16fb264ac44a13725ad511d965b449fe9b2bb940 (commit) via 716de62aae55592a4b7ec03d33e1adf226ac3a86 (commit) via 37441636ee412fa32679ee18846584cac4b2be9d (commit) via 519169a71c0d683d7b800c357e48a60f5f6ee48a (commit) via d96a00831e12067b8c1eb350ed5e35e187988dc3 (commit) via 2b57e010f61caec06f0ed6deef395c83338417c2 (commit) via 91302364228b94d4667c200c401b6e8df9357846 (commit) via fec05c4b61dc8dea217a0717329758240027aa67 (commit) via d3d1c9433eafe75da76178fa85da2ceeba2f972f (commit) via 8865557ea90de79d5cd966e6a81cf44645926330 (commit) via b6b678cb1a5a53c8b04d9c05a313d34dc312bc84 (commit) via 4e434b1292515addd02b357c416dd328e7bc06e4 (commit) via 7095c8d11e22a150a7609494359c7b2e16c29a3e (commit) via 8c8d8b54b4e6f43204b3057f4be93df95114f308 (commit) via 90f02e13ceb1c7e3b11d11cef7cdbab82c81ca1f (commit) via 02ad7efd5e84113443af22a53a025433d8029ab1 (commit) via c68a058f67801e7b2fa68e4a06b2f9d7bb15fe6e (commit) via b7a8875d5099321a474e57ca87aa45f17a27eb39 (commit) via 2bec972fd814d687be906071aa5cc2171c841ffe (commit) via c09c5678608db98f0a66b0e0920332588f0ef4d0 (commit) via a1a02bd734fe011cd5c3e7b8a170b5576dbb5986 (commit) via 15f086dd4580957215c76636b55307da7de7124b (commit) via 8db3ab34d063dc8af679a883c176e0e54060617c (commit) via 4317cd474e96755676fe4de7ddf3748eb0e9cdb2 (commit) via 6795ae30f5ccf1be87d3a9e5847dcb0521c9c748 (commit) via cf13a87443b47668416e39c7d30592d3e0285327 (commit) via 8246ba47a4e768d5d41c0fe28667ab6392c9c7f4 (commit) via 55ec21c2fbaa5fd3aa626fd5e730cf8ebe30e181 (commit) via 57588f91b12486f1dcc6f67d39da59eadbede3ce (commit) via db6bae57669f403ea9bc009afe565e35d268cb7b (commit) via 71dba789b04533d1e37bee883163cff37572e521 (commit) via 0018b174aa97d322293225e991a527468b2d1c63 (commit) via 9977b35ae9e75641e847ed82bc17a614d636c8a2 (commit) via f0a7eb561c5832d507d527f31d4753657ffafeb6 (commit) via cf63be132a4cc9cbfca98602cdd357bb58c83535 (commit) via 57bc1064747f93f8dd41e998c23f1528a62cd3ed (commit) via b80c119e528c6fa40e8150cf7c9cb34494a3ea74 (commit) via 6148097353944cb38828d8790ed15edba1dc0422 (commit) via 71dd31a75166f874b3d3d92674072bbb640f2250 (commit) via 738e065845164d77dac4dac1cec99ee5162007a8 (commit) via ba3fb46813b028f0b3abb7b34723bc58d11936c3 (commit) via f3b184960fa78c4704d7e6b5b1a79ee15aa18b9c (commit) via 5a4d5b920a5f3e0b64ade1b6d060ba0bf8054d36 (commit) via e2b788b38db13f44be865b523f86b42fd630b093 (commit) via 07d322836b1066ec829b15c53e1df0d49dcb4f95 (commit) via 2881a9ca3a79f1c7e452ff974a5691a2085ad10d (commit) via 2b3027180c1b4d63fd8f69cf14fcf0b9d6d8972f (commit) via f08f11d5201ebb83bd2ff4239394334f5ab7b587 (commit) via 3984d3084e8f162be02ee3d79aa6e7b8a8e187cb (commit) via a897e1c92a11aa8b941e85ac2aaf2798145144c7 (commit) via cfc0dc0ccaeaef289af14f7a0bdc5af138b3e4bb (commit) via eb743bbdf35e2dfc11a6f0463c3f6b6f8e95d33b (commit) via 7251b201127de6b072d716100d3432ff72347c76 (commit) via 49c1bfc4f6ce6c7b12548d9058eb00c2e189917a (commit) via 47581c4aa08832527242186ce645bb49969dd914 (commit) via 2069914cc2b2750619cf09bfd9ca1e9f97052313 (commit) via 84d2719cd9aeeab5014a0e240c0cbaed766ecfa4 (commit) via a7d9024dd928f62027a1b89c27eec2a9adb0bf17 (commit) via d2d82ec7d637c2998b37b1139b430d0252a0ddef (commit) via 9648cd2917f4b530c9da9b39e4fe606e457511a2 (commit) via 64204015bc221cde763085b489073daa008f8d5f (commit) via c1270d5c72c2bb34460ae47cd961821add28557b (commit) via 9e350eee19236e3a67d77f679512a970db8d7e76 (commit) via 313e4c0282e7b1ecc6de4a43c764f3fd80f10cea (commit) via 38094a260e42c7937460946518a2978d2385ba14 (commit) via 366e31f8c020080b9a0319abb7d2c02e10f42a40 (commit) via 29842429ee536d9c491aa19264b7ce4aa10b10ed (commit) via 0fcbf1efe10a4269e3705dce10ef632e1739dbb1 (commit) via 05ea36e6cb5e9958a6172f4eb711dc086a455c4e (commit) via a669b3c132c7a187b3dd0d0cf2d95e990338b404 (commit) via e60182c2f033a2b5eac578eb7bac355e03eb6b76 (commit) via 8c807b9466b005b2094320d7fabf07e9e91d3607 (commit) via ce47345c21930074a4ebf79f658d4a43b8944f6c (commit) via b859739c2a6dc899176276022782ac3af7a0ad0c (commit) via b7d36141fbf22f7d8b225d7731e59adbe0546780 (commit) via 281a8a6dbb3d02bbfe7d98e03a33dcdbfacd26bb (commit) via 0ed37aaf77fdba9277fc20e9aa859735aff3623e (commit) via 82d83268ba3d19ead4fb020d5007781bb90b0ce4 (commit) via e6c5107abd3d727e035d2d9f2df96ee294d7eae7 (commit) via cd7e65a4b51f8b6bf72ea3272e334e52af59f8c0 (commit) via 05486da41f4627ea83263f0b90a829c9f32b0cd9 (commit) via 6dce6f171d475d49a905d42f7bbab348def71f7c (commit) via e476be5568d41bb06ce2fef5e8da6417cf9ed682 (commit) via 408d556346f6b4a50b0d71efcb4eb30014d8c0bb (commit) via 59df79869dc68b120be56dd4ff85c30f260028b8 (commit) via e28eaae9838d272641aef71effc3eeaba9041ed3 (commit) via a8491dc156db9d746b0f5ddd6175b66bf1bfa4ab (commit) via 2e7df304500d75efa3cab81635d90a2b209e668a (commit) via 769728015cea465bbb47d27f69077962a8f2429d (commit) via d46a664ef6b79f6ceee2c00629f5933b4eaedfc3 (commit) via d83aff33c603d1ba4d16de53ad926bd93a09629b (commit) via a96adaadb2c4bbf54ad8440164b73aa74a38cc96 (commit) via c20c70c99d79c0d02a37a0e41d0e90afb5c69681 (commit) via 9aa8bf46f6b45ebcd342c09bd3a09ae55f3dd4a8 (commit) via 9550e37fc66402500adf8bca7a1c90ee0104cdd0 (commit) via 8f1e5ad95fd78cbf09028e3d2dfe0b2b77d4dd21 (commit) via 1931ff465317aa2bf8d31c0c817ff0c4d75ea8dc (commit) via 82be93af1ccbd3544646a6345ab51183a62d05cb (commit) via 88e8f60ebc6f1fdfb242f224081f0b97f88352f8 (commit) via be33e1b46537d85b3d49abc076348916dd50004b (commit) via 6b319a2d487257e8a08bc26af9c6b2e7fa2ece2c (commit) via b679cac96409b7248f8e224e10c73dafa4c82890 (commit) via 08017f89f150394b6224fafb64fe8d12fc146ff1 (commit) via 41549bf3f4aa1f87060c7e27ab27e6932359211c (commit) via fd9f9f9be17207b8e4e152d3b5f25bee5260ad38 (commit) via 40ec26dc6cbc2ac2634ca0e8111476bbd6f62fc7 (commit) via 22c907230af9821d84127f9e2afbea9757aed2fa (commit) via 33ad907a820debc87bf2629cc1eed4a38b3b4905 (commit) via 956dc953b52a1fd525bc75682bbdfe6848683ace (commit) via 8ec54c86feb92989807837d71f4c0a5e901e07e3 (commit) via 51e3e31627c38f88671f8ab399b470ec4a02aaec (commit) via e89f7a60806f43ca03d35ca4b9e05997a70a7978 (commit) via e1cdef939ac213eea7607209135ff8ed4e6c7166 (commit) via 3156950e0aa01826305208f1ca4f4ff16b04ec32 (commit) via 22633b5a614fc08bf72ce04d13843eafbb4552fc (commit) via 6efa491d1b2f92fa407aa49c7b678f9b642fc83f (commit) via d496d03e8aa3079e0d29837b27b31b9a55afd02e (commit) via 98f551faec2627742b0b1d5b72e1791b4451b401 (commit) via 997ad166c6ea53d47e3e15e7720d63da9f3b0a80 (commit) This update added new revisions after undoing existing revisions. That is to say, the old revision is not a strict subset of the new revision. This situation occurs when you --force push a change and generate a repository containing something like this: * -- * -- B -- O -- O -- O (2c0133bd8875eba6540609fdfd880ecbfca09a8c) \ N -- N -- N (0382f7c3dda9b88d483be75e78d502ff5b2d9383) When this happens we assume that you've already had alert emails for all of the O revisions, and so we here report only the revisions in the N branch from the common base, B. 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 0382f7c3dda9b88d483be75e78d502ff5b2d9383 Author: Tomas Cohen Arazi Date: Tue Apr 12 15:33:25 2016 -0300 Bug 16248: ModZebra doesn't update zebraqueue if ES is enabled The zebraqueue table should still be populated with updates if ES is enabled, so the Zebra indexer keeps the Z39.50/SRU indexes up to date. To test: - Set SearchEngine = Elasticsearch - Watch for zebraqueue changes $ watch -n 0.5 'echo "SELECT COUNT(*) FROM zebraqueue WHERE done=0" | sudo koha-mysql kohadev' - Call touch_all_biblios.pl to simulate record changes $ sudo koha-shell kohadev ; cd kohaclone $ perl misc/maintenance/touch_all_biblios.pl -v => FAIL: Notice the watch is not changing the number of records to be indexed. - Apply the patch - Call touch_all_biblios.pl to simulate record changes $ sudo koha-shell kohadev ; cd kohaclone $ perl misc/maintenance/touch_all_biblios.pl -v => SUCCESS: The count raises (more than 0) and the zebra indexer picks the updates. - Sign off Signed-off-by: Chris Signed-off-by: Jesse Weaver commit 29a97f50e11f0b941b54889f32cbcd4038909b0f Author: Chris Cormack Date: Thu Apr 14 21:27:10 2016 +0000 Bug 12478 Increasing test Coverage for Koha::SearchEngine::Elasticsearch::Search Before this patch it was 24.6%, after it is 64% Signed-off-by: Nick Clemens commit 9e08d341f0a2773577be35a86bd000cf7b67ed0f Author: Chris Cormack Date: Thu Apr 14 20:23:13 2016 +0000 Bug 12478 Shifting tests and adding copyright headers Signed-off-by: Nick Clemens commit 06f099502270af11c980ed87c3d33082adc5c93a Author: Chris Cormack Date: Wed Apr 13 21:20:36 2016 +0000 Bug 12478 : Fixing the tests for Koha::SearchEngine::Elasticsearch::Search perl t/Koha_SearchEngine_Elasticsearch_Search.t Signed-off-by: Nick Clemens commit 33ad7091b68fd17bded72415a553b13c5df874a7 Author: Chris Cormack Date: Wed Apr 13 20:51:59 2016 +0000 Bug 12478 : Fixing the tests in t/Koha_ElasticSearch_Indexer.t Signed-off-by: Nick Clemens commit 8c13b812e1972317d1bf8d749bc2a59af289f955 Author: Chris Date: Wed Apr 13 08:57:49 2016 +1200 Bug 12478: Making sure the syspref is set to Zebra by default Signed-off-by: Nick Clemens commit 1a541006781d46a01e989d828a3874bbcd9ec7c6 Author: Chris Date: Wed Apr 13 08:45:28 2016 +1200 Bug 12478 : Remove the rest of the references to the old mapping tables Signed-off-by: Nick Clemens commit cb4cb120cca3a0754a0ba1452db5e7c9b33fd90d Author: Chris Date: Wed Apr 13 08:42:53 2016 +1200 Bug 12478 : Remove reference to deprecated table elasticsearch_mapping.sql Signed-off-by: Nick Clemens commit 9bd4d8498fd73b53110e7832f796680fb0751b2e Author: Tomas Cohen Arazi Date: Tue Apr 12 17:05:57 2016 -0300 Bug 12478: (QA followup) Koha::SearchEngine should fallback to Zebra Signed-off-by: Tomas Cohen Arazi Signed-off-by: Chris Signed-off-by: Nick Clemens commit d9da2234ba067de08b60708cfad1b7c4f416cf1a Author: Jonathan Druart Date: Mon Apr 11 08:11:11 2016 +0100 Bug 12478: Define simple_search_compat for Zebra When Zebra is defined as the search engine, the authority search is broken (Can't locate object method "simple_search_compat" via package "Koha::SearchEngine::Zebra::Search" at /home/koha/koha/C4/AuthoritiesMarc.pm line 357.) simple_search_compat is not defined in Koha::SearchEngine::Zebra::Search, it should be a wrapper for C4::Search::SimpleSearch Signed-off-by: Nick Clemens commit f745cf62dd6a07aaa5f14ab93d27792fb9bf4ce5 Author: Jonathan Druart Date: Tue Oct 13 10:45:32 2015 +0100 Bug 12478: Display facet terms ordered by number of occurrences By default ES returns the facet terms ordered by most used, which makes sense. This patch removes resort done in the scripts (catalogue/search.pl and opac/opac-search.pl) and moves it to the module. For Zebra it's now done in C4::Search::getRecords, and there is no change to expect (still alphabetically). On the Elastic search side, we could imagine to let the library define the order of the facets. The facet terms are now sorted by most used. To test easily this change, turn on the displayFacetCount pref. Signed-off-by: Nick Clemens commit 005f2dc31a5683c729bc8a492a18f8bd8d3c2fd8 Author: Robin Sheat Date: Tue Oct 13 17:21:36 2015 +1300 Revert "Bug 12478: Display facet terms ordered by number of occurrences" This reverts commit cd4905c2969b067476881016d0b03271f0bcc7c8. This commit caused an error in C4::Search::GetFacets when running in zebra mode. Conflicts: Koha/SearchEngine/Elasticsearch/Search.pm Signed-off-by: Nick Clemens commit d01d0d686197fb2a60b4da5a50ff2bd3bd21fa8e Author: Jonathan Druart Date: Mon Oct 12 17:03:38 2015 +0100 Bug 12478: Remove previous mappings file (sql) Signed-off-by: Nick Clemens commit 24c845ff4f0c8c700ccf6b897b37340232ecd592 Author: Jonathan Druart Date: Mon Oct 12 16:54:12 2015 +0100 Bug 12478: Manually add the many_to_many relationships This will create the add_to_* accessors for us. Signed-off-by: Nick Clemens commit b516fcccd819dede1128a6daf910905d3d482891 Author: Jonathan Druart Date: Mon Oct 12 16:52:11 2015 +0100 Bug 12478: update the schema These files have been generated with the misc/devel/update_dbix_class_files.pl script. Signed-off-by: Nick Clemens commit 6645441d1791f6fed516d9500a92108109a01c0b Author: Jonathan Druart Date: Mon Oct 12 16:46:16 2015 +0100 Bug 12478: Move mapping attributes to the join table To make things consistent, the attributes of the mappings (sort, suggestible, facet) should be moved to the join tables (search_marc_to_field). Indeed the search_marc_map could represent a mapping for several search fields with different attributes. Before this change it was not possible. Signed-off-by: Nick Clemens commit a623ff0a3b1dc684bb935c0cc8c89dd1daf81b9e Author: Jonathan Druart Date: Fri Sep 25 15:48:50 2015 +0100 Bug 12478: Add Koha::SearchField[s] and Koha::SearchMarcMap[s] classes This was initially submited on bug 14899, but we will need it here. Signed-off-by: Nick Clemens commit 58da32036696378dbf929e1cdd5803b6321812a7 Author: Jonathan Druart Date: Mon Oct 12 17:11:28 2015 +0100 Bug 12478: Add the yaml mappings file This should facilitate the modification of the mappings. The yaml format is more readable than sql. Signed-off-by: Nick Clemens commit df7b1b868ade3dc3a16e9e2a2e216005d45c0e00 Author: Robin Sheat Date: Thu Oct 8 17:02:21 2015 +1300 Bug 12478: "fix" notforloan Signed-off-by: Nick Clemens commit bb3feda4cbfa8b5753e9bfa0f4e685cba1c9bd92 Author: Jonathan Druart Date: Mon Oct 5 17:15:01 2015 +0100 Bug 12478: Take the FacetMaxCount pref into account The system preference FacetMaxCount should work as expected with ES. Signed-off-by: Nick Clemens commit 8611642106401599bd18121bc5cf95cc0ab05917 Author: Jonathan Druart Date: Mon Oct 5 11:34:54 2015 +0100 Bug 12478: Remove empty limit parameter If no limit are passed, the url will contain '&limit=' anyway. It is not necessary and can be avoided easily Test plan: 1/ Search for a term in your catalogue 2/ Hover over a link in the facet area 3/ The link is cgi-bin/koha/opac-search.pl?idx=kw&q=your_term&limit=&limit=[...] With this patch, the empty limit parameter does not appear. Signed-off-by: Nick Clemens commit 6e9ea1701fe295e21adc04722cf5f21e46a320d8 Author: Jonathan Druart Date: Mon Oct 5 15:29:52 2015 +0100 Bug 12478: Display facet terms ordered by number of occurrences By default ES returns the facet terms ordered by most used, which makes sense. This patch removes resort done in the scripts (catalogue/search.pl and opac/opac-search.pl) and moves it to the module. For Zebra it's now done in C4::Search::getRecords, and there is no change to expect (still alphabetically). On the Elastic search side, we could imagine to let the library define the order of the facets. The facet terms are now sorted by most used. To test easily this change, turn on the displayFacetCount pref. Signed-off-by: Nick Clemens commit 8d990a30b68e830787c191b8836a06e49fb0750a Author: Jonathan Druart Date: Mon Oct 5 12:50:52 2015 +0100 Bug 12478: facets - Display description instead of code for locations Signed-off-by: Nick Clemens commit c60fe45aef9c5fc93dc7878fc141b84faeb7e9a2 Author: Jonathan Druart Date: Mon Oct 5 12:51:37 2015 +0100 Bug 12478: Add Koha::AuthorisedValue[s] class These 2 classes come from bug 10363. Signed-off-by: Nick Clemens commit 356887bdaddee4693e1ef57af03ab3250d73ab36 Author: Jonathan Druart Date: Mon Oct 5 12:17:09 2015 +0100 Bug 12478: Use the new Koha::ItemTypes to retrieve itypes descriptions Signed-off-by: Nick Clemens commit 6b10f009082e854a305e135c43128a287020e913 Author: Jonathan Druart Date: Tue Sep 15 17:02:28 2015 +0100 Bug 12478: Add Koha::ItemType[s] classes These 2 classes come from bug 14828. Tests in t/db_dependent/Koha/ItemTypes.t should be updated. Signed-off-by: Nick Clemens commit 16fb264ac44a13725ad511d965b449fe9b2bb940 Author: Jonathan Druart Date: Mon Oct 5 10:58:50 2015 +0100 Bug 12478: (follow-up) Display the correct number of facets This patch fixes a side-effect of the previous "Display the correct number of facets (5 instead of 6)" patch. If you ask for more facets ('show more' link) and that the number of facets is > 5 but < 10, 1 facet will be missing. Signed-off-by: Nick Clemens commit 716de62aae55592a4b7ec03d33e1adf226ac3a86 Author: Robin Sheat Date: Mon Oct 5 17:44:14 2015 +1300 Bug 12478: abort early if there's no elasticserch definition Signed-off-by: Nick Clemens commit 37441636ee412fa32679ee18846584cac4b2be9d Author: Robin Sheat Date: Mon Oct 5 16:21:42 2015 +1300 Bug 14899: schema changes to make the database better Signed-off-by: Nick Clemens commit 519169a71c0d683d7b800c357e48a60f5f6ee48a Author: Jonathan Druart Date: Fri Sep 25 16:06:07 2015 +0100 Bug 14899: DB changes This patch applies several changes to the DB structure introduced by the previous ES patch set: 1/ Add a search_field.label column => It will be easier to understand what the search_field does. Indeed, some are not user friendly: acqdate, an, pl, ff8-23, ln, etc. TODO later: Update the labels with correct values (at the moment label=name) 2/ Update the foreign key search_marc_to_field.search_marc_map_id with on delete cascase. This will permit to automatically remove the entries in search_marc_to_field when they are deleted in search_marc_map. 3/ Remove the index_name_2 unique constraint on the search_marc_map table. I don't understand how this could be useful, it was defined like (index_name, marc_type, marc_field), so it means a mapping cannot be defined twice with different values for facet, suggestible and sort. This limitation does not seem to make sense. Robin, please correct me if I am wrong :) Signed-off-by: Nick Clemens commit d96a00831e12067b8c1eb350ed5e35e187988dc3 Author: Robin Sheat Date: Fri Oct 2 15:23:07 2015 +1300 Bug 12478: add location, su-geo, se to facets Signed-off-by: Nick Clemens commit 2b57e010f61caec06f0ed6deef395c83338417c2 Author: Robin Sheat Date: Thu Oct 1 15:53:44 2015 +1300 Bug 12478: fix errors from rebase and new upstream version Signed-off-by: Nick Clemens commit 91302364228b94d4667c200c401b6e8df9357846 Author: Robin Sheat Date: Wed Sep 30 15:46:18 2015 +1300 Bug 12478: fix some issues on rebase There were rebase conflicts that it was just easier to postpone until afterwards. Signed-off-by: Nick Clemens commit fec05c4b61dc8dea217a0717329758240027aa67 Author: Jonathan Druart Date: Fri Sep 4 13:00:48 2015 +0100 Bug 12478: Fix error on indexing a specific record % perl misc/search_tools/rebuild_elastic_search.pl -bn 42 Can't locate object method "idnumber" via package "MARC::Record" at misc/search_tools/rebuild_elastic_search.pl line 171. Signed-off-by: Nick Clemens commit d3d1c9433eafe75da76178fa85da2ceeba2f972f Author: Jonathan Druart Date: Fri Aug 28 11:59:26 2015 +0100 Bug 12478: Fix encoding issue on facets Filer on "?lez, Ts." => Can't escape \x{015A}, try uri_escape_utf8() instead at /home/koha/src/Koha/SearchEngine/Elasticsearch/QueryBuilder.pm line 221. Signed-off-by: Nick Clemens commit 8865557ea90de79d5cd966e6a81cf44645926330 Author: Jonathan Druart Date: Fri Aug 28 11:29:23 2015 +0100 Bug 12478: Do not display the 'Show more' links if no more facet available Signed-off-by: Nick Clemens commit b6b678cb1a5a53c8b04d9c05a313d34dc312bc84 Author: Jonathan Druart Date: Fri Aug 28 11:24:24 2015 +0100 Bug 12478: Display the correct number of facets (5 instead of 6) The loop on facet entries was wrong, it should stop after 5 iterations. Signed-off-by: Nick Clemens commit 4e434b1292515addd02b357c416dd328e7bc06e4 Author: Jonathan Druart Date: Fri Aug 28 11:13:45 2015 +0100 Bug 12478: Remove Solr occurrences reintroduced by a previous patch Signed-off-by: Nick Clemens commit 7095c8d11e22a150a7609494359c7b2e16c29a3e Author: Jonathan Druart Date: Fri Aug 28 11:13:07 2015 +0100 Bug 12478: Fix pod in the rebuild_ES.pl script Signed-off-by: Nick Clemens commit 8c8d8b54b4e6f43204b3057f4be93df95114f308 Author: Jonathan Druart Date: Fri Aug 28 11:08:27 2015 +0100 Bug 12478: Fix the verbose flag on reindexing Signed-off-by: Nick Clemens commit 90f02e13ceb1c7e3b11d11cef7cdbab82c81ca1f Author: Jonathan Druart Date: Fri Aug 28 11:07:51 2015 +0100 Bug 12478: Change the commit count to 5k It will improve the indexing time. Signed-off-by: Nick Clemens commit 02ad7efd5e84113443af22a53a025433d8029ab1 Author: Jonathan Druart Date: Fri Aug 28 11:07:04 2015 +0100 Bug 12478: Fix the UNIMARC and NORMARC indexing 1/ This patch fixes a major issue on UNIMARC and NORMARC installations (Compulsive c/p on insert into insert into search_marc_to_field for unimarc and normarc) 2/ After fixing that, I got invalid marc path at /usr/share/perl5/Catmandu/Fix/marc_map.pm line 35. on reindexing. It was caused by some "" values instead of NULL. 3/ Then, a "duplicate entry" error was caused by 3 lines for Local-number. It seems to be an error, 1 is enough (I suppose 0909 was an error too). Note that the following is not fixed by this patch: MariaDB [koha_es_unimarc]> insert into search_field (name, type) select distinct mapping, type from elasticsearch_mapping; Query OK, 73 rows affected, 57 warnings (0.05 sec) Records: 73 Duplicates: 0 Warnings: 57 MariaDB [koha_es_unimarc]> show warnings; +---------+------+--------------------------------------------+ | Level | Code | Message | +---------+------+--------------------------------------------+ | Warning | 1265 | Data truncated for column 'type' at row 1 | Signed-off-by: Nick Clemens commit c68a058f67801e7b2fa68e4a06b2f9d7bb15fe6e Author: Robin Sheat Date: Fri Sep 25 15:11:29 2015 +1200 Bug 12478: allow more granular sorting configuration This allows sorting to be configured within a field. For example, while many values are included for search on author, sorting should only be done on the main entry values. This permits that by have a sort value, which can be true, false, or null. true and null are pretty much the same, but false means that a field isn't available for sorting on. By default (null), fields can be sorted on. Signed-off-by: Nick Clemens commit b7a8875d5099321a474e57ca87aa45f17a27eb39 Author: Robin Sheat Date: Thu Aug 27 16:13:16 2015 +1200 Bug 12478: pull the SQL updates from the browse interface Hopefully will reduce the rate of conflicts down the road. We'll see. Signed-off-by: Nick Clemens commit 2bec972fd814d687be906071aa5cc2171c841ffe Author: Robin Sheat Date: Wed Aug 26 17:29:17 2015 +1200 Bug 12478: pull the SQL updates from the browse interface Signed-off-by: Nick Clemens commit c09c5678608db98f0a66b0e0920332588f0ef4d0 Author: Robin Sheat Date: Tue Aug 25 17:03:08 2015 +1200 Bug 12478: the facet "show more" links work properly now Signed-off-by: Nick Clemens commit a1a02bd734fe011cd5c3e7b8a170b5576dbb5986 Author: Robin Sheat Date: Tue Aug 25 15:13:51 2015 +1200 Bug 12478: add the lenient option to the query_string query It doesn't really help. Signed-off-by: Nick Clemens commit 15f086dd4580957215c76636b55307da7de7124b Author: Robin Sheat Date: Thu Aug 20 18:12:42 2015 +1200 Bug 12478: improve error reporting a bit Signed-off-by: Nick Clemens commit 8db3ab34d063dc8af679a883c176e0e54060617c Author: Robin Sheat Date: Mon Aug 3 17:55:54 2015 +1200 Bug 12478: update to support new Cat::Store::ES Signed-off-by: Nick Clemens commit 4317cd474e96755676fe4de7ddf3748eb0e9cdb2 Author: Robin Sheat Date: Fri Jul 17 14:38:19 2015 +1200 Bug 12478: ES is now updated when records are updated/deleted Signed-off-by: Nick Clemens commit 6795ae30f5ccf1be87d3a9e5847dcb0521c9c748 Author: Robin Sheat Date: Fri Jul 10 15:19:21 2015 +1200 Bug 12478: fix capitalisation issue with index names Signed-off-by: Nick Clemens commit cf13a87443b47668416e39c7d30592d3e0285327 Author: Robin Sheat Date: Wed Jul 8 16:34:12 2015 +1200 Bug 12478: make things using SimpleSearch use the new version Signed-off-by: Nick Clemens commit 8246ba47a4e768d5d41c0fe28667ab6392c9c7f4 Author: Robin Sheat Date: Fri Jun 19 15:55:46 2015 +1200 Bug 12478: a replacement to the SimpleSearch interface implemented Signed-off-by: Nick Clemens commit 55ec21c2fbaa5fd3aa626fd5e730cf8ebe30e181 Author: Robin Sheat Date: Wed Jun 17 15:37:29 2015 +1200 Bug 12478: fix issue with authority sort order being weird Signed-off-by: Nick Clemens commit 57588f91b12486f1dcc6f67d39da59eadbede3ce Author: Robin Sheat Date: Mon Jun 15 17:35:41 2015 +1200 Bug 12478: auth search works in the staff client Some issues with sort order though. Signed-off-by: Nick Clemens commit db6bae57669f403ea9bc009afe565e35d268cb7b Author: Robin Sheat Date: Mon Jun 15 15:12:39 2015 +1200 Bug 12478: starting authority search in staff client Signed-off-by: Nick Clemens commit 71dba789b04533d1e37bee883163cff37572e521 Author: Robin Sheat Date: Fri Jun 12 15:19:39 2015 +1200 Bug 12478: fix issues with the conversion SQL Signed-off-by: Nick Clemens commit 0018b174aa97d322293225e991a527468b2d1c63 Author: Robin Sheat Date: Wed Jun 10 14:35:33 2015 +1200 Bug 12478: change the schema for storing mappings This makes the mapping schema a proper many-to-many relational structure, which is a little more fiddly to work with, but will make things like editors for it easier to write. Signed-off-by: Nick Clemens commit 9977b35ae9e75641e847ed82bc17a614d636c8a2 Author: Robin Sheat Date: Fri Jun 5 14:29:31 2015 +1200 Bug 12478: fix multi-choice stuff in advanced search This means that things like itype get "OR"ed together, rather than "AND"ed like other things. Signed-off-by: Nick Clemens commit f0a7eb561c5832d507d527f31d4753657ffafeb6 Author: Robin Sheat Date: Thu May 14 15:15:04 2015 +1200 Bug 12478: starting to add search to staff client Signed-off-by: Nick Clemens commit cf63be132a4cc9cbfca98602cdd357bb58c83535 Author: Robin Sheat Date: Tue Mar 31 17:26:49 2015 +1300 Bug 12478: fix wrong counts/results for authority searches Signed-off-by: Nick Clemens commit 57bc1064747f93f8dd41e998c23f1528a62cd3ed Author: Robin Sheat Date: Wed Mar 25 17:29:14 2015 +1300 Bug 12478: fix issues caused by rebasing Signed-off-by: Nick Clemens commit b80c119e528c6fa40e8150cf7c9cb34494a3ea74 Author: Robin Sheat Date: Tue Mar 17 17:23:56 2015 +1300 Bug 12478: reinstate zebra compatibility for auth search Signed-off-by: Nick Clemens commit 6148097353944cb38828d8790ed15edba1dc0422 Author: Robin Sheat Date: Fri Mar 13 15:27:24 2015 +1300 Bug 12478: paging is fixed now too Signed-off-by: Nick Clemens commit 71dd31a75166f874b3d3d92674072bbb640f2250 Author: Robin Sheat Date: Fri Mar 13 15:22:53 2015 +1300 Bug 12478: sort is sorted Signed-off-by: Nick Clemens commit 738e065845164d77dac4dac1cec99ee5162007a8 Author: Robin Sheat Date: Thu Mar 12 18:11:30 2015 +1300 Bug 12478: phrase searching for authorities is happier Signed-off-by: Nick Clemens commit ba3fb46813b028f0b3abb7b34723bc58d11936c3 Author: Robin Sheat Date: Wed Mar 11 16:14:14 2015 +1300 Bug 12478: fix the way counting is done Signed-off-by: Nick Clemens commit f3b184960fa78c4704d7e6b5b1a79ee15aa18b9c Author: Robin Sheat Date: Tue Mar 10 18:12:51 2015 +1300 Bug 12478: authority paging works Signed-off-by: Nick Clemens commit 5a4d5b920a5f3e0b64ade1b6d060ba0bf8054d36 Author: Robin Sheat Date: Tue Mar 10 17:32:08 2015 +1300 Bug 12478: working on authority results Signed-off-by: Nick Clemens commit e2b788b38db13f44be865b523f86b42fd630b093 Author: Robin Sheat Date: Wed Mar 4 18:19:25 2015 +1300 Bug 12478: make authid get to the templates properly Signed-off-by: Nick Clemens commit 07d322836b1066ec829b15c53e1df0d49dcb4f95 Author: Robin Sheat Date: Wed Mar 4 17:38:18 2015 +1300 Bug 12478: basic auth search and display is working Signed-off-by: Nick Clemens commit 2881a9ca3a79f1c7e452ff974a5691a2085ad10d Author: Robin Sheat Date: Tue Mar 3 14:02:19 2015 +1300 Bug 12478: more authorities Signed-off-by: Nick Clemens commit 2b3027180c1b4d63fd8f69cf14fcf0b9d6d8972f Author: Robin Sheat Date: Tue Feb 24 14:43:01 2015 +1300 Bug 12478 - more authorites Signed-off-by: Nick Clemens commit f08f11d5201ebb83bd2ff4239394334f5ab7b587 Author: Robin Sheat Date: Tue Feb 17 18:38:07 2015 +1300 Bug 12478 - more authority searching Queries are being built, but they seem to be wrong as no results are returned. Signed-off-by: Nick Clemens commit 3984d3084e8f162be02ee3d79aa6e7b8a8e187cb Author: Robin Sheat Date: Wed Feb 4 16:42:12 2015 +1300 Bug 12478 - more authority query building Signed-off-by: Nick Clemens commit a897e1c92a11aa8b941e85ac2aaf2798145144c7 Author: Robin Sheat Date: Tue Feb 3 14:40:50 2015 +1300 Bug 12478 - fix syntax errors so that stuff runs Signed-off-by: Nick Clemens commit cfc0dc0ccaeaef289af14f7a0bdc5af138b3e4bb Author: Robin Sheat Date: Fri Jan 30 16:06:46 2015 +1300 Bug 12478 - authority work in progress Signed-off-by: Nick Clemens commit eb743bbdf35e2dfc11a6f0463c3f6b6f8e95d33b Author: Robin Sheat Date: Wed Nov 19 15:05:12 2014 +1300 Bug 12478 - fix issue with class loading Signed-off-by: Nick Clemens commit 7251b201127de6b072d716100d3432ff72347c76 Author: Robin Sheat Date: Wed Nov 19 14:07:20 2014 +1300 Bug 12478 - fix error in configuration loading Signed-off-by: Nick Clemens commit 49c1bfc4f6ce6c7b12548d9058eb00c2e189917a Author: Robin Sheat Date: Wed Nov 12 17:27:14 2014 +1300 Bug 12478 - fix error in SQL Signed-off-by: Nick Clemens commit 47581c4aa08832527242186ce645bb49969dd914 Author: Robin Sheat Date: Tue Sep 23 17:32:57 2014 +1200 Bug 12478 - add test cases Signed-off-by: Nick Clemens commit 2069914cc2b2750619cf09bfd9ca1e9f97052313 Author: Robin Sheat Date: Thu Sep 4 13:42:26 2014 +1200 Bug 12478 - authorities can now be stored in ES (Not fetched yet though.) Signed-off-by: Nick Clemens commit 84d2719cd9aeeab5014a0e240c0cbaed766ecfa4 Author: Robin Sheat Date: Mon Aug 25 15:55:50 2014 +1200 Bug 12478 - set up database tables for elasticsearch This sets up the database changes needed to run ES. This isn't intended to be ready for upstreaming, just to make testing easier. Signed-off-by: Nick Clemens commit a7d9024dd928f62027a1b89c27eec2a9adb0bf17 Author: Robin Sheat Date: Tue Sep 16 17:38:43 2014 +1200 Bug 12478 - pile of elasticsearch code Signed-off-by: Nick Clemens commit d2d82ec7d637c2998b37b1139b430d0252a0ddef Author: Robin Sheat Date: Tue Sep 16 17:34:25 2014 +1200 Bug 12478 - add some base objects that the ES code will depend on Signed-off-by: Nick Clemens ----------------------------------------------------------------------- Summary of changes: C4/Auth.pm | 17 +- C4/Biblio.pm | 46 +- C4/Circulation.pm | 22 +- C4/Members/AttributeTypes.pm | 46 +- C4/Members/Attributes.pm | 17 +- C4/Utils/DataTables/Members.pm | 2 +- Koha.pm | 2 +- Koha/Cache.pm | 39 +- Koha/Schema/Result/BorrowerAttribute.pm | 12 +- Koha/Schema/Result/BorrowerAttributeType.pm | 12 +- Makefile.PL | 5 + acqui/neworderempty.pl | 2 + admin/edi_accounts.pl | 9 +- admin/edi_ean_accounts.pl | 36 +- admin/patron-attr-types.pl | 8 - admin/smart-rules.pl | 1 + debian/docs/koha-rebuild-zebra.xml | 12 +- debian/koha-common.default | 5 +- debian/scripts/koha-rebuild-zebra | 34 +- etc/koha-httpd.conf | 10 +- .../data/mysql/de-DE/optional/patron_atributes.sql | 4 +- .../data/mysql/en/optional/patron_atributes.sql | 4 +- .../data/mysql/es-ES/optional/patron_atributes.sql | 4 +- installer/data/mysql/kohastructure.sql | 2 - .../data/mysql/ru-RU/optional/patron_atributes.sql | 27 +- installer/data/mysql/sysprefs.sql | 1 + .../data/mysql/uk-UA/optional/patron_atributes.sql | 27 +- installer/data/mysql/updatedatabase.pl | 35 + .../jquery/images/ui-bg_flat_0_aaaaaa_40x100.png | Bin 212 -> 0 bytes .../jquery/images/ui-bg_flat_75_ffffff_40x100.png | Bin 208 -> 0 bytes .../jquery/images/ui-bg_glass_55_fbf9ee_1x400.png | Bin 335 -> 335 bytes .../jquery/images/ui-bg_glass_65_ffffff_1x400.png | Bin 207 -> 207 bytes .../jquery/images/ui-bg_glass_75_dadada_1x400.png | Bin 262 -> 262 bytes .../jquery/images/ui-bg_glass_75_e6e6e6_1x400.png | Bin 262 -> 262 bytes .../jquery/images/ui-bg_glass_95_fef1ec_1x400.png | Bin 332 -> 332 bytes .../ui-bg_highlight-soft_75_cccccc_1x100.png | Bin 280 -> 280 bytes .../lib/jquery/images/ui-icons_222222_256x240.png | Bin 6922 -> 6922 bytes .../lib/jquery/images/ui-icons_2e83ff_256x240.png | Bin 4549 -> 4549 bytes .../lib/jquery/images/ui-icons_454545_256x240.png | Bin 6992 -> 6992 bytes .../lib/jquery/images/ui-icons_888888_256x240.png | Bin 6999 -> 6999 bytes .../lib/jquery/images/ui-icons_cd0a0a_256x240.png | Bin 4549 -> 4549 bytes koha-tmpl/intranet-tmpl/lib/jquery/jquery-2.2.3.js | 9842 ++++++++++++++++ .../intranet-tmpl/lib/jquery/jquery-2.2.3.min.js | 4 + .../lib/jquery/jquery-migrate-1.3.0.js | 702 ++ .../lib/jquery/jquery-migrate-1.3.0.min.js | 2 + .../intranet-tmpl/lib/jquery/jquery-ui-1.11.4.css | 971 ++ .../intranet-tmpl/lib/jquery/jquery-ui-1.11.4.js |11711 ++++++++++++++++++++ .../lib/jquery/jquery-ui-1.11.4.min.css | 7 + .../lib/jquery/jquery-ui-1.11.4.min.js | 11 + .../intranet-tmpl/prog/en/includes/admin-menu.inc | 2 +- .../prog/en/includes/doc-head-close.inc | 7 +- .../intranet-tmpl/prog/en/includes/help-top.inc | 7 +- .../prog/en/includes/patron-search.inc | 8 +- .../intranet-tmpl/prog/en/modules/acqui/basket.tt | 2 +- .../prog/en/modules/acqui/basketgroup.tt | 8 +- .../prog/en/modules/acqui/neworderempty.tt | 14 +- .../prog/en/modules/acqui/supplier.tt | 20 +- .../prog/en/modules/admin/admin-home.tt | 4 +- .../prog/en/modules/admin/aqbudgets.tt | 4 +- .../prog/en/modules/admin/edi_accounts.tt | 87 +- .../prog/en/modules/admin/edi_ean_accounts.tt | 45 +- .../prog/en/modules/admin/patron-attr-types.tt | 8 - .../en/modules/admin/preferences/cataloguing.pref | 2 +- .../prog/en/modules/admin/preferences/opac.pref | 5 + .../prog/en/modules/catalogue/itemsearch.tt | 7 +- .../prog/en/modules/cataloguing/addbooks.tt | 12 +- .../prog/en/modules/circ/circulation-home.tt | 4 +- .../prog/en/modules/circ/circulation.tt | 2 +- .../prog/en/modules/circ/offline-mf.tt | 7 +- .../prog/en/modules/circ/pendingreserves.tt | 9 +- .../prog/en/modules/labels/spinelabel-print.tt | 3 +- .../prog/en/modules/members/member.tt | 7 +- .../prog/en/modules/members/memberentrygen.tt | 8 +- .../prog/en/modules/virtualshelves/shelves.tt | 6 +- koha-tmpl/opac-tmpl/bootstrap/css/opac.css | 2 +- .../bootstrap/en/includes/doc-head-close.inc | 20 +- .../bootstrap/en/includes/opac-bottom.inc | 11 +- .../bootstrap/en/includes/opac-facets.inc | 2 +- .../bootstrap/en/modules/opac-ISBDdetail.tt | 2 +- .../bootstrap/en/modules/opac-MARCdetail.tt | 2 +- .../opac-tmpl/bootstrap/en/modules/opac-auth.tt | 9 +- .../opac-tmpl/bootstrap/en/modules/opac-detail.tt | 2 +- .../opac-tmpl/bootstrap/en/modules/opac-idref.tt | 2 +- koha-tmpl/opac-tmpl/bootstrap/less/opac.less | 49 +- koha-tmpl/opac-tmpl/bootstrap/less/responsive.less | 37 +- members/member.pl | 2 +- members/memberentry.pl | 6 +- opac/opac-MARCdetail.pl | 4 +- opac/opac-detail.pl | 5 +- opac/opac-ratings.pl | 7 + opac/opac-shareshelf.pl | 2 +- opac/opac-shelves.pl | 2 +- opac/sco/sco-main.pl | 1 + reports/bor_issues_top.pl | 2 +- rewrite-config.PL | 1 + t/Biblio/Isbd.t | 50 + t/Cache.t | 17 +- t/Members_AttributeTypes.t | 6 +- t/Members_Attributes.t | 6 - t/db_dependent/BiblioObject.t | 58 - .../{Circulation_Branch.t => Circulation/Branch.t} | 191 +- .../CalcDateDue.t} | 26 +- .../GetHardDueDate.t} | 49 +- .../OfflineOperation.t} | 0 .../dateexpiry.t} | 0 .../{Circulation_issue.t => Circulation/issue.t} | 0 .../transfers.t} | 2 +- .../{Items_DelItem.t => Items/DelItem.t} | 0 t/db_dependent/Koha/BiblioUtils.t | 70 +- t/db_dependent/Koha_template_plugin_Branches.t | 57 - .../{Members_Attributes.t => Members/Attributes.t} | 0 .../{Members_columns.t => Members/columns.t} | 0 t/db_dependent/Reports/Guided.t | 303 +- t/db_dependent/ReportsGuided.t | 85 - t/db_dependent/Reports_Guided.t | 124 - t/db_dependent/Template/Plugin/Branches.t | 28 +- .../Plugin/KohaDates.t} | 0 117 files changed, 24185 insertions(+), 1036 deletions(-) delete mode 100644 koha-tmpl/intranet-tmpl/lib/jquery/images/ui-bg_flat_0_aaaaaa_40x100.png delete mode 100644 koha-tmpl/intranet-tmpl/lib/jquery/images/ui-bg_flat_75_ffffff_40x100.png create mode 100644 koha-tmpl/intranet-tmpl/lib/jquery/jquery-2.2.3.js create mode 100644 koha-tmpl/intranet-tmpl/lib/jquery/jquery-2.2.3.min.js create mode 100644 koha-tmpl/intranet-tmpl/lib/jquery/jquery-migrate-1.3.0.js create mode 100644 koha-tmpl/intranet-tmpl/lib/jquery/jquery-migrate-1.3.0.min.js create mode 100644 koha-tmpl/intranet-tmpl/lib/jquery/jquery-ui-1.11.4.css create mode 100644 koha-tmpl/intranet-tmpl/lib/jquery/jquery-ui-1.11.4.js create mode 100644 koha-tmpl/intranet-tmpl/lib/jquery/jquery-ui-1.11.4.min.css create mode 100644 koha-tmpl/intranet-tmpl/lib/jquery/jquery-ui-1.11.4.min.js create mode 100644 t/Biblio/Isbd.t delete mode 100755 t/db_dependent/BiblioObject.t rename t/db_dependent/{Circulation_Branch.t => Circulation/Branch.t} (61%) rename t/db_dependent/{Circulation_issuingrules.t => Circulation/CalcDateDue.t} (79%) rename t/db_dependent/{Circulation_Issuingrule.t => Circulation/GetHardDueDate.t} (94%) rename t/db_dependent/{Circulation_OfflineOperation.t => Circulation/OfflineOperation.t} (100%) rename t/db_dependent/{Circulation_dateexpiry.t => Circulation/dateexpiry.t} (100%) rename t/db_dependent/{Circulation_issue.t => Circulation/issue.t} (100%) rename t/db_dependent/{Circulation_transfers.t => Circulation/transfers.t} (98%) rename t/db_dependent/{Items_DelItem.t => Items/DelItem.t} (100%) delete mode 100644 t/db_dependent/Koha_template_plugin_Branches.t rename t/db_dependent/{Members_Attributes.t => Members/Attributes.t} (100%) mode change 100755 => 100644 rename t/db_dependent/{Members_columns.t => Members/columns.t} (100%) delete mode 100755 t/db_dependent/ReportsGuided.t delete mode 100755 t/db_dependent/Reports_Guided.t rename t/db_dependent/{Koha_template_plugin_KohaDates.t => Template/Plugin/KohaDates.t} (100%) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Tue Apr 26 00:49:52 2016 From: gitmaster at git.koha-community.org (Git repo owner) Date: Mon, 25 Apr 2016 22:49:52 +0000 Subject: [koha-commits] main Koha release repository branch new_12478_elasticsearch updated. v3.22.00-1281-g0b6880b 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_12478_elasticsearch has been updated discards 0382f7c3dda9b88d483be75e78d502ff5b2d9383 (commit) discards 29a97f50e11f0b941b54889f32cbcd4038909b0f (commit) discards 9e08d341f0a2773577be35a86bd000cf7b67ed0f (commit) discards 06f099502270af11c980ed87c3d33082adc5c93a (commit) discards 33ad7091b68fd17bded72415a553b13c5df874a7 (commit) discards 8c13b812e1972317d1bf8d749bc2a59af289f955 (commit) discards 1a541006781d46a01e989d828a3874bbcd9ec7c6 (commit) discards cb4cb120cca3a0754a0ba1452db5e7c9b33fd90d (commit) discards 9bd4d8498fd73b53110e7832f796680fb0751b2e (commit) discards d9da2234ba067de08b60708cfad1b7c4f416cf1a (commit) discards f745cf62dd6a07aaa5f14ab93d27792fb9bf4ce5 (commit) discards 005f2dc31a5683c729bc8a492a18f8bd8d3c2fd8 (commit) discards d01d0d686197fb2a60b4da5a50ff2bd3bd21fa8e (commit) discards 24c845ff4f0c8c700ccf6b897b37340232ecd592 (commit) discards b516fcccd819dede1128a6daf910905d3d482891 (commit) discards 6645441d1791f6fed516d9500a92108109a01c0b (commit) discards a623ff0a3b1dc684bb935c0cc8c89dd1daf81b9e (commit) discards 58da32036696378dbf929e1cdd5803b6321812a7 (commit) discards df7b1b868ade3dc3a16e9e2a2e216005d45c0e00 (commit) discards bb3feda4cbfa8b5753e9bfa0f4e685cba1c9bd92 (commit) discards 8611642106401599bd18121bc5cf95cc0ab05917 (commit) discards 6e9ea1701fe295e21adc04722cf5f21e46a320d8 (commit) discards 8d990a30b68e830787c191b8836a06e49fb0750a (commit) discards c60fe45aef9c5fc93dc7878fc141b84faeb7e9a2 (commit) discards 356887bdaddee4693e1ef57af03ab3250d73ab36 (commit) discards 6b10f009082e854a305e135c43128a287020e913 (commit) discards 16fb264ac44a13725ad511d965b449fe9b2bb940 (commit) discards 716de62aae55592a4b7ec03d33e1adf226ac3a86 (commit) discards 37441636ee412fa32679ee18846584cac4b2be9d (commit) discards 519169a71c0d683d7b800c357e48a60f5f6ee48a (commit) discards d96a00831e12067b8c1eb350ed5e35e187988dc3 (commit) discards 2b57e010f61caec06f0ed6deef395c83338417c2 (commit) discards 91302364228b94d4667c200c401b6e8df9357846 (commit) discards fec05c4b61dc8dea217a0717329758240027aa67 (commit) discards d3d1c9433eafe75da76178fa85da2ceeba2f972f (commit) discards 8865557ea90de79d5cd966e6a81cf44645926330 (commit) discards b6b678cb1a5a53c8b04d9c05a313d34dc312bc84 (commit) discards 4e434b1292515addd02b357c416dd328e7bc06e4 (commit) discards 7095c8d11e22a150a7609494359c7b2e16c29a3e (commit) discards 8c8d8b54b4e6f43204b3057f4be93df95114f308 (commit) discards 90f02e13ceb1c7e3b11d11cef7cdbab82c81ca1f (commit) discards 02ad7efd5e84113443af22a53a025433d8029ab1 (commit) discards c68a058f67801e7b2fa68e4a06b2f9d7bb15fe6e (commit) discards b7a8875d5099321a474e57ca87aa45f17a27eb39 (commit) discards 2bec972fd814d687be906071aa5cc2171c841ffe (commit) discards c09c5678608db98f0a66b0e0920332588f0ef4d0 (commit) discards a1a02bd734fe011cd5c3e7b8a170b5576dbb5986 (commit) discards 15f086dd4580957215c76636b55307da7de7124b (commit) discards 8db3ab34d063dc8af679a883c176e0e54060617c (commit) discards 4317cd474e96755676fe4de7ddf3748eb0e9cdb2 (commit) discards 6795ae30f5ccf1be87d3a9e5847dcb0521c9c748 (commit) discards cf13a87443b47668416e39c7d30592d3e0285327 (commit) discards 8246ba47a4e768d5d41c0fe28667ab6392c9c7f4 (commit) discards 55ec21c2fbaa5fd3aa626fd5e730cf8ebe30e181 (commit) discards 57588f91b12486f1dcc6f67d39da59eadbede3ce (commit) discards db6bae57669f403ea9bc009afe565e35d268cb7b (commit) discards 71dba789b04533d1e37bee883163cff37572e521 (commit) discards 0018b174aa97d322293225e991a527468b2d1c63 (commit) discards 9977b35ae9e75641e847ed82bc17a614d636c8a2 (commit) discards f0a7eb561c5832d507d527f31d4753657ffafeb6 (commit) discards cf63be132a4cc9cbfca98602cdd357bb58c83535 (commit) discards 57bc1064747f93f8dd41e998c23f1528a62cd3ed (commit) discards b80c119e528c6fa40e8150cf7c9cb34494a3ea74 (commit) discards 6148097353944cb38828d8790ed15edba1dc0422 (commit) discards 71dd31a75166f874b3d3d92674072bbb640f2250 (commit) discards 738e065845164d77dac4dac1cec99ee5162007a8 (commit) discards ba3fb46813b028f0b3abb7b34723bc58d11936c3 (commit) discards f3b184960fa78c4704d7e6b5b1a79ee15aa18b9c (commit) discards 5a4d5b920a5f3e0b64ade1b6d060ba0bf8054d36 (commit) discards e2b788b38db13f44be865b523f86b42fd630b093 (commit) discards 07d322836b1066ec829b15c53e1df0d49dcb4f95 (commit) discards 2881a9ca3a79f1c7e452ff974a5691a2085ad10d (commit) discards 2b3027180c1b4d63fd8f69cf14fcf0b9d6d8972f (commit) discards f08f11d5201ebb83bd2ff4239394334f5ab7b587 (commit) discards 3984d3084e8f162be02ee3d79aa6e7b8a8e187cb (commit) discards a897e1c92a11aa8b941e85ac2aaf2798145144c7 (commit) discards cfc0dc0ccaeaef289af14f7a0bdc5af138b3e4bb (commit) discards eb743bbdf35e2dfc11a6f0463c3f6b6f8e95d33b (commit) discards 7251b201127de6b072d716100d3432ff72347c76 (commit) discards 49c1bfc4f6ce6c7b12548d9058eb00c2e189917a (commit) discards 47581c4aa08832527242186ce645bb49969dd914 (commit) discards 2069914cc2b2750619cf09bfd9ca1e9f97052313 (commit) discards 84d2719cd9aeeab5014a0e240c0cbaed766ecfa4 (commit) discards a7d9024dd928f62027a1b89c27eec2a9adb0bf17 (commit) discards d2d82ec7d637c2998b37b1139b430d0252a0ddef (commit) via 0b6880b5ab8ef3122b12f0b81b0f69191cc48c9b (commit) via 548142a69231e042813a95191069fbc65072e133 (commit) via 4198f70d11707510a90222e2e9dcbba7d81eff2c (commit) via f75b319782086d1a33272cf2733008732ff50832 (commit) via 69b084d9fb831a502929eb56c424c16ef73d5674 (commit) via bea5373f3f5e41a03314ae44d55ef397f6675873 (commit) via 23255c4c9d86bb50dfe0144fbf53c108d63c2674 (commit) via 82477df7bdb5ba09644e1dc0effef6f954d111ea (commit) via a27b5d48254614044f5ce62d8e5d353e246a1906 (commit) via 4dc62f129b47bf82ef351d280aa6a7f843464dab (commit) via e06fcced86d1403c1a20766dce0f9b3de889df0a (commit) via 10c496f0b983d73d64cec205e4c85ac6aa68299c (commit) via b2dbcd70971cf56833aae992773f72dda06152ee (commit) via 3d433b552530eae953c43b217357c9c2ff1740e4 (commit) via dab21a9305548fda4cd990f84f087d382b0fec3a (commit) via 0ec5e8fd3621c692a1dcbfef1b5ac1f6ad70e6c9 (commit) via 375d62de1a0436277ef2ae6ef5b5b3373ada1b93 (commit) via 05101adad3c9cabbba99c9e9c05bf96f08b92a35 (commit) via bdf50c099658f6e810f3c9e02658d91a4ccace25 (commit) via fdd6257ddc57ad649b4b40bbd417a47614fbff68 (commit) via e407d21e0c34ca76099ad303b05c3cee075832fd (commit) via 32ed22f94ceb46ebd267e246f530b47c21a25b8b (commit) via 5bfb76e26aeb59229940649e810f66495378d49a (commit) via f13450eb5d14992c434302199b2772bd36cf87b2 (commit) via 6b9aa08f32aff43116526952f86cc391f7e6b372 (commit) via 01e53b0c2465356511c412837c3c3497a0f17b41 (commit) via 2c143c3a264982a4ca8250f23cd4e65fefc04324 (commit) via 86a334bc331011be7b2d3d9d9545acec3ccfc527 (commit) via a9f37301148cd9f7b63e8279c188cf4b12bfa585 (commit) via 26191188aad419bf00e095767aed3717d309ee78 (commit) via 38b024c8d07f21c76a7c9db845b1ab44f080e901 (commit) via 7359fe52282ba13f56fae721b5edcf60f0e668e5 (commit) via 7c6b9b05130d4b3614274de5119237934ae964b1 (commit) via 120035899c226304a7df58d9fd7b9a37fbf9884f (commit) via 02351a8e55c235b3f93185c58b8faa9e009d56af (commit) via 49bca2ff35c0d42dd9fae5775aa432a0090d70df (commit) via 7c17558866f15225bf8b3d73dec347c672def6c9 (commit) via 2927b724b7fafea18f0054385b7df8997a824cc9 (commit) via 10fc426f1449ac058eeb9c382ae2285cd919a9f2 (commit) via 8384d618a94974ee4b36b3f0da60a21335920b65 (commit) via 5593fea16a1c7a0e9ab1bde9c06f924e15135cd4 (commit) via ff910a96f3441ed32752a610455844a707174641 (commit) via 864d2561b475d9c7751e2955dcae45dd301123da (commit) via 2795fe7e31095e559e5f4f63d311e9b8ab810a6f (commit) via a289c6eb293d78678f413c210b915ebbe60d5ac5 (commit) via 50e962379e835f2df17c725642de7591a5a282b7 (commit) via 4e96a611c37d4a0cc8084b10dbf34cfdbd0c1402 (commit) via 666085a622769122162e824bfe947bb49ae80a89 (commit) via f39faecd120d5a43f30d08bc8728b59dd2c96440 (commit) via 2cc6590fc3f1c0b50bd636f9ef3dcd885b8dea85 (commit) via e6dadf25e2acff2d35c443ed0572d58e202f46ba (commit) via 270e7b9780f22ddba87d8b68c37085de30c8393b (commit) via d60f74e0b27a7da1a8dd0d4bf346c14a40af2c77 (commit) via 3137a3d60ce10ed2cae59a9c493641a4f0709141 (commit) via 5f0227b03780746ac52d718e620d84829aafe6e4 (commit) via 10bba9ed42a607f91ad4772ef808ca6c38ea5666 (commit) via 79992975db9af472234194a588612f64522f35f2 (commit) via 4b89199e2fe54a94e389f209d66e81d64764aca5 (commit) via 3c809a5301c9fa6866f664981af5e6678726287f (commit) via 9278b24a10407a914755f317540707aadd99d5ed (commit) via 91cdf26622b03bb49edd8b7b8ad88219a7c003b1 (commit) via eb6607a15aa76fff7b0ccd3700356eabbb6447a6 (commit) via a6ea9a748efc93602a44d4ec0c2e4ba3d7182eab (commit) via ed02565d9566ae3c1e98450626659be66b2636b0 (commit) via 464995970a67d916b35c760d93d6be626cee1247 (commit) via fed0d53d94ab464020c4a6656c3f8c09eb3180e7 (commit) via 12cb192e5948558d244e996e1d41676ea50ceca7 (commit) via 6f725830bdf8fe11d9dd651c66b482a1304e48a3 (commit) via c651e95f7d59fa7a0c7a63f0b75d8f889dd84f59 (commit) via 9a592f173915f09adcc1213d94a15e5c67b8802a (commit) via 2150552f87abd4b63ed6e85d964bc2770859a65d (commit) via ebe374fe834bbbb14c0f1751dd6c907b11f82f12 (commit) via 5a87fda0a3602467d23a92dc59c91ed25df14420 (commit) via 66bb675936fa49a809dabc29d1c8896ac46586e0 (commit) via 41e73e4d461650cd6faa2241c88fc0d5fb7ffe34 (commit) via c75d648da47177be491cd5359d114c7d5d491f1b (commit) via b5b33c2bd018e1504da4d6bf4788f56d8442e3ec (commit) via d462e4a61f41768917517c177decd8e34765ec88 (commit) via d8c6bddb84c95d08e655af9c910da7926bfb0f29 (commit) via a8cf77018401159cb965227a8f11b688d92582a4 (commit) via 7e6276457caaa9cb1dc800fb7dcfd82c52ec0655 (commit) via 40593c7d58716551d7ee9167a7996669b800a638 (commit) via d211eb57e4d58df7edddead351a85a23ed5e6bb5 (commit) via d75b5e2f5dff11c23cecba987773539f5e4fbec7 (commit) via 76b6b9fd6e40d5bfe7e97f70ad6ca61fdbaf7344 (commit) via ecbc99ee0884154b761c1549e5af2f93873e5f25 (commit) via 9140d1285f74fb9ec55cbb01572725da5991b6e6 (commit) This update added new revisions after undoing existing revisions. That is to say, the old revision is not a strict subset of the new revision. This situation occurs when you --force push a change and generate a repository containing something like this: * -- * -- B -- O -- O -- O (0382f7c3dda9b88d483be75e78d502ff5b2d9383) \ N -- N -- N (0b6880b5ab8ef3122b12f0b81b0f69191cc48c9b) When this happens we assume that you've already had alert emails for all of the O revisions, and so we here report only the revisions in the N branch from the common base, B. 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 0b6880b5ab8ef3122b12f0b81b0f69191cc48c9b Author: Jesse Weaver Date: Mon Apr 25 12:00:13 2016 -0600 Bug 12748: (QA followup) make new tests pass * t/Koha/ItemType.pm: * Rename to .t * Fix method names * t/db_dependent/Koha/ItemTypes.t: Fix method names and Koha::Database usage Signed-off-by: Jesse Weaver commit 548142a69231e042813a95191069fbc65072e133 Author: Jesse Weaver Date: Mon Apr 25 12:00:13 2016 -0600 Bug 12748: (QA followup) fix several tiny QA tools warnings * admin/searchengine/elasticsearch/mappings.yaml: * Fix indentation so QA tools believe it's valid YAML * C4::AuthoritiesMarc: Remove tab character * C4::Search: Fix POD * Koha::BiblioUtils: remove "return undef" * Koha::Schema::Result::Search*: rename type to _type * Koha::SE::ES::Search: * Fix spelling/@_[0] * Add my to loop variable * Remove unused var $error * Add use Modern::Perl * Fix undefined variables * Koha::ES::Indexer: fix POD * Koha::SE::ES::QueryBuilder: * Don't define variables in conditionals * Fix POD * Koha::SE::Zebra::Search: * Fix debug warns/POD/barewords * Koha::SE::Zebra::Search: add use Modern::Perl * kohastructure.sql: remove old, unused elasticsearch_mappings table, add new tables * labels/label-item-search.pl: remove C4::Dates * opac/elasticsearch.pl: remove old file Signed-off-by: Jesse Weaver commit 4198f70d11707510a90222e2e9dcbba7d81eff2c Author: Tomas Cohen Arazi Date: Tue Apr 12 15:33:25 2016 -0300 Bug 16248: ModZebra doesn't update zebraqueue if ES is enabled The zebraqueue table should still be populated with updates if ES is enabled, so the Zebra indexer keeps the Z39.50/SRU indexes up to date. To test: - Set SearchEngine = Elasticsearch - Watch for zebraqueue changes $ watch -n 0.5 'echo "SELECT COUNT(*) FROM zebraqueue WHERE done=0" | sudo koha-mysql kohadev' - Call touch_all_biblios.pl to simulate record changes $ sudo koha-shell kohadev ; cd kohaclone $ perl misc/maintenance/touch_all_biblios.pl -v => FAIL: Notice the watch is not changing the number of records to be indexed. - Apply the patch - Call touch_all_biblios.pl to simulate record changes $ sudo koha-shell kohadev ; cd kohaclone $ perl misc/maintenance/touch_all_biblios.pl -v => SUCCESS: The count raises (more than 0) and the zebra indexer picks the updates. - Sign off Signed-off-by: Chris Signed-off-by: Jesse Weaver commit f75b319782086d1a33272cf2733008732ff50832 Author: Chris Cormack Date: Thu Apr 14 21:27:10 2016 +0000 Bug 12478 Increasing test Coverage for Koha::SearchEngine::Elasticsearch::Search Before this patch it was 24.6%, after it is 64% Signed-off-by: Nick Clemens Signed-off-by: Jesse Weaver commit 69b084d9fb831a502929eb56c424c16ef73d5674 Author: Chris Cormack Date: Thu Apr 14 20:23:13 2016 +0000 Bug 12478 Shifting tests and adding copyright headers Signed-off-by: Nick Clemens Signed-off-by: Jesse Weaver commit bea5373f3f5e41a03314ae44d55ef397f6675873 Author: Chris Cormack Date: Wed Apr 13 21:20:36 2016 +0000 Bug 12478 : Fixing the tests for Koha::SearchEngine::Elasticsearch::Search perl t/Koha_SearchEngine_Elasticsearch_Search.t Signed-off-by: Nick Clemens Signed-off-by: Jesse Weaver commit 23255c4c9d86bb50dfe0144fbf53c108d63c2674 Author: Chris Cormack Date: Wed Apr 13 20:51:59 2016 +0000 Bug 12478 : Fixing the tests in t/Koha_ElasticSearch_Indexer.t Signed-off-by: Nick Clemens Signed-off-by: Jesse Weaver commit 82477df7bdb5ba09644e1dc0effef6f954d111ea Author: Chris Date: Wed Apr 13 08:57:49 2016 +1200 Bug 12478: Making sure the syspref is set to Zebra by default Signed-off-by: Nick Clemens Signed-off-by: Jesse Weaver commit a27b5d48254614044f5ce62d8e5d353e246a1906 Author: Chris Date: Wed Apr 13 08:45:28 2016 +1200 Bug 12478 : Remove the rest of the references to the old mapping tables Signed-off-by: Nick Clemens Signed-off-by: Jesse Weaver commit 4dc62f129b47bf82ef351d280aa6a7f843464dab Author: Chris Date: Wed Apr 13 08:42:53 2016 +1200 Bug 12478 : Remove reference to deprecated table elasticsearch_mapping.sql Signed-off-by: Nick Clemens Signed-off-by: Jesse Weaver commit e06fcced86d1403c1a20766dce0f9b3de889df0a Author: Tomas Cohen Arazi Date: Tue Apr 12 17:05:57 2016 -0300 Bug 12478: (QA followup) Koha::SearchEngine should fallback to Zebra Signed-off-by: Tomas Cohen Arazi Signed-off-by: Chris Signed-off-by: Nick Clemens Signed-off-by: Jesse Weaver commit 10c496f0b983d73d64cec205e4c85ac6aa68299c Author: Jonathan Druart Date: Mon Apr 11 08:11:11 2016 +0100 Bug 12478: Define simple_search_compat for Zebra When Zebra is defined as the search engine, the authority search is broken (Can't locate object method "simple_search_compat" via package "Koha::SearchEngine::Zebra::Search" at /home/koha/koha/C4/AuthoritiesMarc.pm line 357.) simple_search_compat is not defined in Koha::SearchEngine::Zebra::Search, it should be a wrapper for C4::Search::SimpleSearch Signed-off-by: Nick Clemens Signed-off-by: Jesse Weaver commit b2dbcd70971cf56833aae992773f72dda06152ee Author: Jonathan Druart Date: Tue Oct 13 10:45:32 2015 +0100 Bug 12478: Display facet terms ordered by number of occurrences By default ES returns the facet terms ordered by most used, which makes sense. This patch removes resort done in the scripts (catalogue/search.pl and opac/opac-search.pl) and moves it to the module. For Zebra it's now done in C4::Search::getRecords, and there is no change to expect (still alphabetically). On the Elastic search side, we could imagine to let the library define the order of the facets. The facet terms are now sorted by most used. To test easily this change, turn on the displayFacetCount pref. Signed-off-by: Nick Clemens Signed-off-by: Jesse Weaver commit 3d433b552530eae953c43b217357c9c2ff1740e4 Author: Robin Sheat Date: Tue Oct 13 17:21:36 2015 +1300 Revert "Bug 12478: Display facet terms ordered by number of occurrences" This reverts commit cd4905c2969b067476881016d0b03271f0bcc7c8. This commit caused an error in C4::Search::GetFacets when running in zebra mode. Conflicts: Koha/SearchEngine/Elasticsearch/Search.pm Signed-off-by: Nick Clemens Signed-off-by: Jesse Weaver commit dab21a9305548fda4cd990f84f087d382b0fec3a Author: Jonathan Druart Date: Mon Oct 12 17:03:38 2015 +0100 Bug 12478: Remove previous mappings file (sql) Signed-off-by: Nick Clemens Signed-off-by: Jesse Weaver commit 0ec5e8fd3621c692a1dcbfef1b5ac1f6ad70e6c9 Author: Jonathan Druart Date: Mon Oct 12 16:54:12 2015 +0100 Bug 12478: Manually add the many_to_many relationships This will create the add_to_* accessors for us. Signed-off-by: Nick Clemens Signed-off-by: Jesse Weaver commit 375d62de1a0436277ef2ae6ef5b5b3373ada1b93 Author: Jonathan Druart Date: Mon Oct 12 16:52:11 2015 +0100 Bug 12478: update the schema These files have been generated with the misc/devel/update_dbix_class_files.pl script. Signed-off-by: Nick Clemens Signed-off-by: Jesse Weaver commit 05101adad3c9cabbba99c9e9c05bf96f08b92a35 Author: Jonathan Druart Date: Mon Oct 12 16:46:16 2015 +0100 Bug 12478: Move mapping attributes to the join table To make things consistent, the attributes of the mappings (sort, suggestible, facet) should be moved to the join tables (search_marc_to_field). Indeed the search_marc_map could represent a mapping for several search fields with different attributes. Before this change it was not possible. Signed-off-by: Nick Clemens Signed-off-by: Jesse Weaver commit bdf50c099658f6e810f3c9e02658d91a4ccace25 Author: Jonathan Druart Date: Fri Sep 25 15:48:50 2015 +0100 Bug 12478: Add Koha::SearchField[s] and Koha::SearchMarcMap[s] classes This was initially submited on bug 14899, but we will need it here. Signed-off-by: Nick Clemens Signed-off-by: Jesse Weaver commit fdd6257ddc57ad649b4b40bbd417a47614fbff68 Author: Jonathan Druart Date: Mon Oct 12 17:11:28 2015 +0100 Bug 12478: Add the yaml mappings file This should facilitate the modification of the mappings. The yaml format is more readable than sql. Signed-off-by: Nick Clemens Signed-off-by: Jesse Weaver commit e407d21e0c34ca76099ad303b05c3cee075832fd Author: Robin Sheat Date: Thu Oct 8 17:02:21 2015 +1300 Bug 12478: "fix" notforloan Signed-off-by: Nick Clemens Signed-off-by: Jesse Weaver commit 32ed22f94ceb46ebd267e246f530b47c21a25b8b Author: Jonathan Druart Date: Mon Oct 5 17:15:01 2015 +0100 Bug 12478: Take the FacetMaxCount pref into account The system preference FacetMaxCount should work as expected with ES. Signed-off-by: Nick Clemens Signed-off-by: Jesse Weaver commit 5bfb76e26aeb59229940649e810f66495378d49a Author: Jonathan Druart Date: Mon Oct 5 11:34:54 2015 +0100 Bug 12478: Remove empty limit parameter If no limit are passed, the url will contain '&limit=' anyway. It is not necessary and can be avoided easily Test plan: 1/ Search for a term in your catalogue 2/ Hover over a link in the facet area 3/ The link is cgi-bin/koha/opac-search.pl?idx=kw&q=your_term&limit=&limit=[...] With this patch, the empty limit parameter does not appear. Signed-off-by: Nick Clemens Signed-off-by: Jesse Weaver commit f13450eb5d14992c434302199b2772bd36cf87b2 Author: Jonathan Druart Date: Mon Oct 5 15:29:52 2015 +0100 Bug 12478: Display facet terms ordered by number of occurrences By default ES returns the facet terms ordered by most used, which makes sense. This patch removes resort done in the scripts (catalogue/search.pl and opac/opac-search.pl) and moves it to the module. For Zebra it's now done in C4::Search::getRecords, and there is no change to expect (still alphabetically). On the Elastic search side, we could imagine to let the library define the order of the facets. The facet terms are now sorted by most used. To test easily this change, turn on the displayFacetCount pref. Signed-off-by: Nick Clemens Signed-off-by: Jesse Weaver commit 6b9aa08f32aff43116526952f86cc391f7e6b372 Author: Jonathan Druart Date: Mon Oct 5 12:50:52 2015 +0100 Bug 12478: facets - Display description instead of code for locations Signed-off-by: Nick Clemens Signed-off-by: Jesse Weaver commit 01e53b0c2465356511c412837c3c3497a0f17b41 Author: Jonathan Druart Date: Mon Oct 5 12:51:37 2015 +0100 Bug 12478: Add Koha::AuthorisedValue[s] class These 2 classes come from bug 10363. Signed-off-by: Nick Clemens Signed-off-by: Jesse Weaver commit 2c143c3a264982a4ca8250f23cd4e65fefc04324 Author: Jonathan Druart Date: Mon Oct 5 12:17:09 2015 +0100 Bug 12478: Use the new Koha::ItemTypes to retrieve itypes descriptions Signed-off-by: Nick Clemens Signed-off-by: Jesse Weaver commit 86a334bc331011be7b2d3d9d9545acec3ccfc527 Author: Jonathan Druart Date: Tue Sep 15 17:02:28 2015 +0100 Bug 12478: Add Koha::ItemType[s] classes These 2 classes come from bug 14828. Tests in t/db_dependent/Koha/ItemTypes.t should be updated. Signed-off-by: Nick Clemens Signed-off-by: Jesse Weaver commit a9f37301148cd9f7b63e8279c188cf4b12bfa585 Author: Jonathan Druart Date: Mon Oct 5 10:58:50 2015 +0100 Bug 12478: (follow-up) Display the correct number of facets This patch fixes a side-effect of the previous "Display the correct number of facets (5 instead of 6)" patch. If you ask for more facets ('show more' link) and that the number of facets is > 5 but < 10, 1 facet will be missing. Signed-off-by: Nick Clemens Signed-off-by: Jesse Weaver commit 26191188aad419bf00e095767aed3717d309ee78 Author: Robin Sheat Date: Mon Oct 5 17:44:14 2015 +1300 Bug 12478: abort early if there's no elasticserch definition Signed-off-by: Nick Clemens Signed-off-by: Jesse Weaver commit 38b024c8d07f21c76a7c9db845b1ab44f080e901 Author: Robin Sheat Date: Mon Oct 5 16:21:42 2015 +1300 Bug 14899: schema changes to make the database better Signed-off-by: Nick Clemens Signed-off-by: Jesse Weaver commit 7359fe52282ba13f56fae721b5edcf60f0e668e5 Author: Jonathan Druart Date: Fri Sep 25 16:06:07 2015 +0100 Bug 14899: DB changes This patch applies several changes to the DB structure introduced by the previous ES patch set: 1/ Add a search_field.label column => It will be easier to understand what the search_field does. Indeed, some are not user friendly: acqdate, an, pl, ff8-23, ln, etc. TODO later: Update the labels with correct values (at the moment label=name) 2/ Update the foreign key search_marc_to_field.search_marc_map_id with on delete cascase. This will permit to automatically remove the entries in search_marc_to_field when they are deleted in search_marc_map. 3/ Remove the index_name_2 unique constraint on the search_marc_map table. I don't understand how this could be useful, it was defined like (index_name, marc_type, marc_field), so it means a mapping cannot be defined twice with different values for facet, suggestible and sort. This limitation does not seem to make sense. Robin, please correct me if I am wrong :) Signed-off-by: Nick Clemens Signed-off-by: Jesse Weaver commit 7c6b9b05130d4b3614274de5119237934ae964b1 Author: Robin Sheat Date: Fri Oct 2 15:23:07 2015 +1300 Bug 12478: add location, su-geo, se to facets Signed-off-by: Nick Clemens Signed-off-by: Jesse Weaver commit 120035899c226304a7df58d9fd7b9a37fbf9884f Author: Robin Sheat Date: Thu Oct 1 15:53:44 2015 +1300 Bug 12478: fix errors from rebase and new upstream version Signed-off-by: Nick Clemens Signed-off-by: Jesse Weaver commit 02351a8e55c235b3f93185c58b8faa9e009d56af Author: Robin Sheat Date: Wed Sep 30 15:46:18 2015 +1300 Bug 12478: fix some issues on rebase There were rebase conflicts that it was just easier to postpone until afterwards. Signed-off-by: Nick Clemens Signed-off-by: Jesse Weaver commit 49bca2ff35c0d42dd9fae5775aa432a0090d70df Author: Jonathan Druart Date: Fri Sep 4 13:00:48 2015 +0100 Bug 12478: Fix error on indexing a specific record % perl misc/search_tools/rebuild_elastic_search.pl -bn 42 Can't locate object method "idnumber" via package "MARC::Record" at misc/search_tools/rebuild_elastic_search.pl line 171. Signed-off-by: Nick Clemens Signed-off-by: Jesse Weaver commit 7c17558866f15225bf8b3d73dec347c672def6c9 Author: Jonathan Druart Date: Fri Aug 28 11:59:26 2015 +0100 Bug 12478: Fix encoding issue on facets Filer on "?lez, Ts." => Can't escape \x{015A}, try uri_escape_utf8() instead at /home/koha/src/Koha/SearchEngine/Elasticsearch/QueryBuilder.pm line 221. Signed-off-by: Nick Clemens Signed-off-by: Jesse Weaver commit 2927b724b7fafea18f0054385b7df8997a824cc9 Author: Jonathan Druart Date: Fri Aug 28 11:29:23 2015 +0100 Bug 12478: Do not display the 'Show more' links if no more facet available Signed-off-by: Nick Clemens Signed-off-by: Jesse Weaver commit 10fc426f1449ac058eeb9c382ae2285cd919a9f2 Author: Jonathan Druart Date: Fri Aug 28 11:24:24 2015 +0100 Bug 12478: Display the correct number of facets (5 instead of 6) The loop on facet entries was wrong, it should stop after 5 iterations. Signed-off-by: Nick Clemens Signed-off-by: Jesse Weaver commit 8384d618a94974ee4b36b3f0da60a21335920b65 Author: Jonathan Druart Date: Fri Aug 28 11:13:45 2015 +0100 Bug 12478: Remove Solr occurrences reintroduced by a previous patch Signed-off-by: Nick Clemens Signed-off-by: Jesse Weaver commit 5593fea16a1c7a0e9ab1bde9c06f924e15135cd4 Author: Jonathan Druart Date: Fri Aug 28 11:13:07 2015 +0100 Bug 12478: Fix pod in the rebuild_ES.pl script Signed-off-by: Nick Clemens Signed-off-by: Jesse Weaver commit ff910a96f3441ed32752a610455844a707174641 Author: Jonathan Druart Date: Fri Aug 28 11:08:27 2015 +0100 Bug 12478: Fix the verbose flag on reindexing Signed-off-by: Nick Clemens Signed-off-by: Jesse Weaver commit 864d2561b475d9c7751e2955dcae45dd301123da Author: Jonathan Druart Date: Fri Aug 28 11:07:51 2015 +0100 Bug 12478: Change the commit count to 5k It will improve the indexing time. Signed-off-by: Nick Clemens Signed-off-by: Jesse Weaver commit 2795fe7e31095e559e5f4f63d311e9b8ab810a6f Author: Jonathan Druart Date: Fri Aug 28 11:07:04 2015 +0100 Bug 12478: Fix the UNIMARC and NORMARC indexing 1/ This patch fixes a major issue on UNIMARC and NORMARC installations (Compulsive c/p on insert into insert into search_marc_to_field for unimarc and normarc) 2/ After fixing that, I got invalid marc path at /usr/share/perl5/Catmandu/Fix/marc_map.pm line 35. on reindexing. It was caused by some "" values instead of NULL. 3/ Then, a "duplicate entry" error was caused by 3 lines for Local-number. It seems to be an error, 1 is enough (I suppose 0909 was an error too). Note that the following is not fixed by this patch: MariaDB [koha_es_unimarc]> insert into search_field (name, type) select distinct mapping, type from elasticsearch_mapping; Query OK, 73 rows affected, 57 warnings (0.05 sec) Records: 73 Duplicates: 0 Warnings: 57 MariaDB [koha_es_unimarc]> show warnings; +---------+------+--------------------------------------------+ | Level | Code | Message | +---------+------+--------------------------------------------+ | Warning | 1265 | Data truncated for column 'type' at row 1 | Signed-off-by: Nick Clemens Signed-off-by: Jesse Weaver commit a289c6eb293d78678f413c210b915ebbe60d5ac5 Author: Robin Sheat Date: Fri Sep 25 15:11:29 2015 +1200 Bug 12478: allow more granular sorting configuration This allows sorting to be configured within a field. For example, while many values are included for search on author, sorting should only be done on the main entry values. This permits that by have a sort value, which can be true, false, or null. true and null are pretty much the same, but false means that a field isn't available for sorting on. By default (null), fields can be sorted on. Signed-off-by: Nick Clemens Signed-off-by: Jesse Weaver commit 50e962379e835f2df17c725642de7591a5a282b7 Author: Robin Sheat Date: Thu Aug 27 16:13:16 2015 +1200 Bug 12478: pull the SQL updates from the browse interface Hopefully will reduce the rate of conflicts down the road. We'll see. Signed-off-by: Nick Clemens Signed-off-by: Jesse Weaver commit 4e96a611c37d4a0cc8084b10dbf34cfdbd0c1402 Author: Robin Sheat Date: Wed Aug 26 17:29:17 2015 +1200 Bug 12478: pull the SQL updates from the browse interface Signed-off-by: Nick Clemens Signed-off-by: Jesse Weaver commit 666085a622769122162e824bfe947bb49ae80a89 Author: Robin Sheat Date: Tue Aug 25 17:03:08 2015 +1200 Bug 12478: the facet "show more" links work properly now Signed-off-by: Nick Clemens Signed-off-by: Jesse Weaver commit f39faecd120d5a43f30d08bc8728b59dd2c96440 Author: Robin Sheat Date: Tue Aug 25 15:13:51 2015 +1200 Bug 12478: add the lenient option to the query_string query It doesn't really help. Signed-off-by: Nick Clemens Signed-off-by: Jesse Weaver commit 2cc6590fc3f1c0b50bd636f9ef3dcd885b8dea85 Author: Robin Sheat Date: Thu Aug 20 18:12:42 2015 +1200 Bug 12478: improve error reporting a bit Signed-off-by: Nick Clemens Signed-off-by: Jesse Weaver commit e6dadf25e2acff2d35c443ed0572d58e202f46ba Author: Robin Sheat Date: Mon Aug 3 17:55:54 2015 +1200 Bug 12478: update to support new Cat::Store::ES Signed-off-by: Nick Clemens Signed-off-by: Jesse Weaver commit 270e7b9780f22ddba87d8b68c37085de30c8393b Author: Robin Sheat Date: Fri Jul 17 14:38:19 2015 +1200 Bug 12478: ES is now updated when records are updated/deleted Signed-off-by: Nick Clemens Signed-off-by: Jesse Weaver commit d60f74e0b27a7da1a8dd0d4bf346c14a40af2c77 Author: Robin Sheat Date: Fri Jul 10 15:19:21 2015 +1200 Bug 12478: fix capitalisation issue with index names Signed-off-by: Nick Clemens Signed-off-by: Jesse Weaver commit 3137a3d60ce10ed2cae59a9c493641a4f0709141 Author: Robin Sheat Date: Wed Jul 8 16:34:12 2015 +1200 Bug 12478: make things using SimpleSearch use the new version Signed-off-by: Nick Clemens Signed-off-by: Jesse Weaver commit 5f0227b03780746ac52d718e620d84829aafe6e4 Author: Robin Sheat Date: Fri Jun 19 15:55:46 2015 +1200 Bug 12478: a replacement to the SimpleSearch interface implemented Signed-off-by: Nick Clemens Signed-off-by: Jesse Weaver commit 10bba9ed42a607f91ad4772ef808ca6c38ea5666 Author: Robin Sheat Date: Wed Jun 17 15:37:29 2015 +1200 Bug 12478: fix issue with authority sort order being weird Signed-off-by: Nick Clemens Signed-off-by: Jesse Weaver commit 79992975db9af472234194a588612f64522f35f2 Author: Robin Sheat Date: Mon Jun 15 17:35:41 2015 +1200 Bug 12478: auth search works in the staff client Some issues with sort order though. Signed-off-by: Nick Clemens Signed-off-by: Jesse Weaver commit 4b89199e2fe54a94e389f209d66e81d64764aca5 Author: Robin Sheat Date: Mon Jun 15 15:12:39 2015 +1200 Bug 12478: starting authority search in staff client Signed-off-by: Nick Clemens Signed-off-by: Jesse Weaver commit 3c809a5301c9fa6866f664981af5e6678726287f Author: Robin Sheat Date: Fri Jun 12 15:19:39 2015 +1200 Bug 12478: fix issues with the conversion SQL Signed-off-by: Nick Clemens Signed-off-by: Jesse Weaver commit 9278b24a10407a914755f317540707aadd99d5ed Author: Robin Sheat Date: Wed Jun 10 14:35:33 2015 +1200 Bug 12478: change the schema for storing mappings This makes the mapping schema a proper many-to-many relational structure, which is a little more fiddly to work with, but will make things like editors for it easier to write. Signed-off-by: Nick Clemens Signed-off-by: Jesse Weaver commit 91cdf26622b03bb49edd8b7b8ad88219a7c003b1 Author: Robin Sheat Date: Fri Jun 5 14:29:31 2015 +1200 Bug 12478: fix multi-choice stuff in advanced search This means that things like itype get "OR"ed together, rather than "AND"ed like other things. Signed-off-by: Nick Clemens Signed-off-by: Jesse Weaver commit eb6607a15aa76fff7b0ccd3700356eabbb6447a6 Author: Robin Sheat Date: Thu May 14 15:15:04 2015 +1200 Bug 12478: starting to add search to staff client Signed-off-by: Nick Clemens Signed-off-by: Jesse Weaver commit a6ea9a748efc93602a44d4ec0c2e4ba3d7182eab Author: Robin Sheat Date: Tue Mar 31 17:26:49 2015 +1300 Bug 12478: fix wrong counts/results for authority searches Signed-off-by: Nick Clemens Signed-off-by: Jesse Weaver commit ed02565d9566ae3c1e98450626659be66b2636b0 Author: Robin Sheat Date: Wed Mar 25 17:29:14 2015 +1300 Bug 12478: fix issues caused by rebasing Signed-off-by: Nick Clemens Signed-off-by: Jesse Weaver commit 464995970a67d916b35c760d93d6be626cee1247 Author: Robin Sheat Date: Tue Mar 17 17:23:56 2015 +1300 Bug 12478: reinstate zebra compatibility for auth search Signed-off-by: Nick Clemens Signed-off-by: Jesse Weaver commit fed0d53d94ab464020c4a6656c3f8c09eb3180e7 Author: Robin Sheat Date: Fri Mar 13 15:27:24 2015 +1300 Bug 12478: paging is fixed now too Signed-off-by: Nick Clemens Signed-off-by: Jesse Weaver commit 12cb192e5948558d244e996e1d41676ea50ceca7 Author: Robin Sheat Date: Fri Mar 13 15:22:53 2015 +1300 Bug 12478: sort is sorted Signed-off-by: Nick Clemens Signed-off-by: Jesse Weaver commit 6f725830bdf8fe11d9dd651c66b482a1304e48a3 Author: Robin Sheat Date: Thu Mar 12 18:11:30 2015 +1300 Bug 12478: phrase searching for authorities is happier Signed-off-by: Nick Clemens Signed-off-by: Jesse Weaver commit c651e95f7d59fa7a0c7a63f0b75d8f889dd84f59 Author: Robin Sheat Date: Wed Mar 11 16:14:14 2015 +1300 Bug 12478: fix the way counting is done Signed-off-by: Nick Clemens Signed-off-by: Jesse Weaver commit 9a592f173915f09adcc1213d94a15e5c67b8802a Author: Robin Sheat Date: Tue Mar 10 18:12:51 2015 +1300 Bug 12478: authority paging works Signed-off-by: Nick Clemens Signed-off-by: Jesse Weaver commit 2150552f87abd4b63ed6e85d964bc2770859a65d Author: Robin Sheat Date: Tue Mar 10 17:32:08 2015 +1300 Bug 12478: working on authority results Signed-off-by: Nick Clemens Signed-off-by: Jesse Weaver commit ebe374fe834bbbb14c0f1751dd6c907b11f82f12 Author: Robin Sheat Date: Wed Mar 4 18:19:25 2015 +1300 Bug 12478: make authid get to the templates properly Signed-off-by: Nick Clemens Signed-off-by: Jesse Weaver commit 5a87fda0a3602467d23a92dc59c91ed25df14420 Author: Robin Sheat Date: Wed Mar 4 17:38:18 2015 +1300 Bug 12478: basic auth search and display is working Signed-off-by: Nick Clemens Signed-off-by: Jesse Weaver commit 66bb675936fa49a809dabc29d1c8896ac46586e0 Author: Robin Sheat Date: Tue Mar 3 14:02:19 2015 +1300 Bug 12478: more authorities Signed-off-by: Nick Clemens Signed-off-by: Jesse Weaver commit 41e73e4d461650cd6faa2241c88fc0d5fb7ffe34 Author: Robin Sheat Date: Tue Feb 24 14:43:01 2015 +1300 Bug 12478 - more authorites Signed-off-by: Nick Clemens Signed-off-by: Jesse Weaver commit c75d648da47177be491cd5359d114c7d5d491f1b Author: Robin Sheat Date: Tue Feb 17 18:38:07 2015 +1300 Bug 12478 - more authority searching Queries are being built, but they seem to be wrong as no results are returned. Signed-off-by: Nick Clemens Signed-off-by: Jesse Weaver commit b5b33c2bd018e1504da4d6bf4788f56d8442e3ec Author: Robin Sheat Date: Wed Feb 4 16:42:12 2015 +1300 Bug 12478 - more authority query building Signed-off-by: Nick Clemens Signed-off-by: Jesse Weaver commit d462e4a61f41768917517c177decd8e34765ec88 Author: Robin Sheat Date: Tue Feb 3 14:40:50 2015 +1300 Bug 12478 - fix syntax errors so that stuff runs Signed-off-by: Nick Clemens Signed-off-by: Jesse Weaver commit d8c6bddb84c95d08e655af9c910da7926bfb0f29 Author: Robin Sheat Date: Fri Jan 30 16:06:46 2015 +1300 Bug 12478 - authority work in progress Signed-off-by: Nick Clemens Signed-off-by: Jesse Weaver commit a8cf77018401159cb965227a8f11b688d92582a4 Author: Robin Sheat Date: Wed Nov 19 15:05:12 2014 +1300 Bug 12478 - fix issue with class loading Signed-off-by: Nick Clemens Signed-off-by: Jesse Weaver commit 7e6276457caaa9cb1dc800fb7dcfd82c52ec0655 Author: Robin Sheat Date: Wed Nov 19 14:07:20 2014 +1300 Bug 12478 - fix error in configuration loading Signed-off-by: Nick Clemens Signed-off-by: Jesse Weaver commit 40593c7d58716551d7ee9167a7996669b800a638 Author: Robin Sheat Date: Wed Nov 12 17:27:14 2014 +1300 Bug 12478 - fix error in SQL Signed-off-by: Nick Clemens Signed-off-by: Jesse Weaver commit d211eb57e4d58df7edddead351a85a23ed5e6bb5 Author: Robin Sheat Date: Tue Sep 23 17:32:57 2014 +1200 Bug 12478 - add test cases Signed-off-by: Nick Clemens Signed-off-by: Jesse Weaver commit d75b5e2f5dff11c23cecba987773539f5e4fbec7 Author: Robin Sheat Date: Thu Sep 4 13:42:26 2014 +1200 Bug 12478 - authorities can now be stored in ES (Not fetched yet though.) Signed-off-by: Nick Clemens Signed-off-by: Jesse Weaver commit 76b6b9fd6e40d5bfe7e97f70ad6ca61fdbaf7344 Author: Robin Sheat Date: Mon Aug 25 15:55:50 2014 +1200 Bug 12478 - set up database tables for elasticsearch This sets up the database changes needed to run ES. This isn't intended to be ready for upstreaming, just to make testing easier. Signed-off-by: Nick Clemens Signed-off-by: Jesse Weaver commit ecbc99ee0884154b761c1549e5af2f93873e5f25 Author: Robin Sheat Date: Tue Sep 16 17:38:43 2014 +1200 Bug 12478 - pile of elasticsearch code Signed-off-by: Nick Clemens Signed-off-by: Jesse Weaver commit 9140d1285f74fb9ec55cbb01572725da5991b6e6 Author: Robin Sheat Date: Tue Sep 16 17:34:25 2014 +1200 Bug 12478 - add some base objects that the ES code will depend on Signed-off-by: Nick Clemens Signed-off-by: Jesse Weaver ----------------------------------------------------------------------- Summary of changes: C4/AuthoritiesMarc.pm | 2 +- C4/Search.pm | 1 + Koha/BiblioUtils.pm | 2 +- Koha/ElasticSearch/Indexer.pm | 5 +- Koha/SearchEngine/Elasticsearch/QueryBuilder.pm | 19 +- Koha/SearchEngine/Elasticsearch/Search.pm | 18 +- Koha/SearchEngine/Zebra/Search.pm | 21 +- Koha/SearchField.pm | 2 +- Koha/SearchFields.pm | 2 +- Koha/SearchMarcMap.pm | 2 +- Koha/SearchMarcMaps.pm | 2 +- admin/searchengine/elasticsearch/mappings.yaml | 4760 +++++++++++------------ installer/data/mysql/kohastructure.sql | 58 +- labels/label-item-search.pl | 1 - opac/elasticsearch.pl | 102 - t/Koha/{ItemType.pm => ItemType.t} | 2 +- t/db_dependent/Koha/ItemTypes.t | 23 +- 17 files changed, 2480 insertions(+), 2542 deletions(-) delete mode 100755 opac/elasticsearch.pl rename t/Koha/{ItemType.pm => ItemType.t} (95%) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Tue Apr 26 09:07:11 2016 From: gitmaster at git.koha-community.org (Git repo owner) Date: Tue, 26 Apr 2016 07:07:11 +0000 Subject: [koha-commits] main Koha release repository branch 3.22.x updated. v3.22.05-85-g372868a 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.22.x has been updated via 372868a3003fff29c7e913ff104f2d0d2cb0e5ea (commit) via ffced981f63bd665783ccf57e72338d1388905ed (commit) via 3e2e21b3784f5ef0b09a4f4faf4770228b0bf845 (commit) from f96e3617b590b43640663d934c1c60e7d96fa7e4 (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 372868a3003fff29c7e913ff104f2d0d2cb0e5ea Author: Julian Maurice Date: Tue Apr 26 09:07:17 2016 +0200 Increment version for 3.22.6 release Signed-off-by: Julian Maurice commit ffced981f63bd665783ccf57e72338d1388905ed Author: Julian Maurice Date: Tue Apr 26 09:05:08 2016 +0200 Translation updates for Koha 3.22.6 Signed-off-by: Julian Maurice commit 3e2e21b3784f5ef0b09a4f4faf4770228b0bf845 Author: Julian Maurice Date: Mon Apr 25 14:44:18 2016 +0200 Update release notes for 3.22.6 release Signed-off-by: Julian Maurice ----------------------------------------------------------------------- Summary of changes: Koha.pm | 2 +- installer/data/mysql/updatedatabase.pl | 6 + misc/release_notes/release_notes_3_22_6.md | 379 + misc/translator/po/am-Ethi-marc-MARC21.po | 1004 +- misc/translator/po/am-Ethi-marc-NORMARC.po | 888 +- misc/translator/po/am-Ethi-marc-UNIMARC.po | 2 +- misc/translator/po/am-Ethi-opac-bootstrap.po | 341 +- misc/translator/po/am-Ethi-staff-help.po | 60 +- misc/translator/po/am-Ethi-staff-prog.po | 1052 ++- misc/translator/po/ar-Arab-marc-MARC21.po | 1008 +- misc/translator/po/ar-Arab-marc-NORMARC.po | 892 +- misc/translator/po/ar-Arab-marc-UNIMARC.po | 2 +- misc/translator/po/ar-Arab-opac-bootstrap.po | 352 +- misc/translator/po/ar-Arab-pref.po | 8 +- misc/translator/po/ar-Arab-staff-help.po | 79 +- misc/translator/po/ar-Arab-staff-prog.po | 1209 +-- misc/translator/po/az-AZ-marc-MARC21.po | 1004 +- misc/translator/po/az-AZ-marc-NORMARC.po | 888 +- misc/translator/po/az-AZ-marc-UNIMARC.po | 2 +- misc/translator/po/az-AZ-opac-bootstrap.po | 341 +- misc/translator/po/az-AZ-staff-help.po | 60 +- misc/translator/po/az-AZ-staff-prog.po | 1055 ++- misc/translator/po/be-BY-marc-MARC21.po | 1004 +- misc/translator/po/be-BY-marc-NORMARC.po | 888 +- misc/translator/po/be-BY-marc-UNIMARC.po | 2 +- misc/translator/po/be-BY-opac-bootstrap.po | 343 +- misc/translator/po/be-BY-staff-help.po | 64 +- misc/translator/po/be-BY-staff-prog.po | 1061 +-- misc/translator/po/bg-Cyrl-marc-MARC21.po | 1004 +- misc/translator/po/bg-Cyrl-marc-NORMARC.po | 888 +- misc/translator/po/bg-Cyrl-marc-UNIMARC.po | 2 +- misc/translator/po/bg-Cyrl-opac-bootstrap.po | 341 +- misc/translator/po/bg-Cyrl-staff-help.po | 60 +- misc/translator/po/bg-Cyrl-staff-prog.po | 1050 ++- misc/translator/po/bn-IN-marc-MARC21.po | 1004 +- misc/translator/po/bn-IN-marc-NORMARC.po | 908 +- misc/translator/po/bn-IN-marc-UNIMARC.po | 2 +- misc/translator/po/bn-IN-opac-bootstrap.po | 349 +- misc/translator/po/bn-IN-pref.po | 12 +- misc/translator/po/bn-IN-staff-help.po | 60 +- misc/translator/po/bn-IN-staff-prog.po | 1050 ++- misc/translator/po/ca-ES-marc-MARC21.po | 1733 ++-- misc/translator/po/ca-ES-marc-NORMARC.po | 902 +- misc/translator/po/ca-ES-marc-UNIMARC.po | 38 +- misc/translator/po/ca-ES-opac-bootstrap.po | 2883 +++--- misc/translator/po/ca-ES-staff-help.po | 6770 ++++++++++---- misc/translator/po/ca-ES-staff-prog.po | 3875 +++++--- misc/translator/po/cs-CZ-marc-MARC21.po | 1014 +- misc/translator/po/cs-CZ-marc-NORMARC.po | 888 +- misc/translator/po/cs-CZ-marc-UNIMARC.po | 2 +- misc/translator/po/cs-CZ-opac-bootstrap.po | 347 +- misc/translator/po/cs-CZ-pref.po | 15 +- misc/translator/po/cs-CZ-staff-help.po | 91 +- misc/translator/po/cs-CZ-staff-prog.po | 1081 +-- misc/translator/po/da-DK-marc-MARC21.po | 1107 ++- misc/translator/po/da-DK-marc-NORMARC.po | 888 +- misc/translator/po/da-DK-marc-UNIMARC.po | 2 +- misc/translator/po/da-DK-opac-bootstrap.po | 343 +- misc/translator/po/da-DK-pref.po | 32 +- misc/translator/po/da-DK-staff-help.po | 186 +- misc/translator/po/da-DK-staff-prog.po | 1140 +-- misc/translator/po/de-CH-marc-MARC21.po | 1328 +-- misc/translator/po/de-CH-marc-NORMARC.po | 894 +- misc/translator/po/de-CH-marc-UNIMARC.po | 2 +- misc/translator/po/de-CH-opac-bootstrap.po | 2753 +++--- misc/translator/po/de-CH-pref.po | 1 + misc/translator/po/de-CH-staff-help.po | 114 +- misc/translator/po/de-CH-staff-prog.po |11276 ++++++++++++----------- misc/translator/po/de-DE-marc-MARC21.po | 1008 +- misc/translator/po/de-DE-marc-NORMARC.po | 892 +- misc/translator/po/de-DE-marc-UNIMARC.po | 2 +- misc/translator/po/de-DE-opac-bootstrap.po | 349 +- misc/translator/po/de-DE-pref.po | 26 +- misc/translator/po/de-DE-staff-help.po | 101 +- misc/translator/po/de-DE-staff-prog.po | 1106 +-- misc/translator/po/el-GR-marc-MARC21.po | 1263 +-- misc/translator/po/el-GR-marc-NORMARC.po | 932 +- misc/translator/po/el-GR-marc-UNIMARC.po | 2 +- misc/translator/po/el-GR-opac-bootstrap.po | 508 +- misc/translator/po/el-GR-pref.po | 10 +- misc/translator/po/el-GR-staff-help.po | 70 +- misc/translator/po/el-GR-staff-prog.po | 1247 +-- misc/translator/po/en-GB-marc-MARC21.po | 1004 +- misc/translator/po/en-GB-marc-NORMARC.po | 888 +- misc/translator/po/en-GB-marc-UNIMARC.po | 2 +- misc/translator/po/en-GB-opac-bootstrap.po | 341 +- misc/translator/po/en-GB-staff-help.po | 66 +- misc/translator/po/en-GB-staff-prog.po | 1054 ++- misc/translator/po/en-NZ-marc-MARC21.po | 1004 +- misc/translator/po/en-NZ-marc-NORMARC.po | 888 +- misc/translator/po/en-NZ-marc-UNIMARC.po | 2 +- misc/translator/po/en-NZ-opac-bootstrap.po | 343 +- misc/translator/po/en-NZ-staff-help.po | 74 +- misc/translator/po/en-NZ-staff-prog.po | 1113 +-- misc/translator/po/eo-marc-MARC21.po | 1004 +- misc/translator/po/eo-marc-NORMARC.po | 888 +- misc/translator/po/eo-marc-UNIMARC.po | 2 +- misc/translator/po/eo-opac-bootstrap.po | 351 +- misc/translator/po/eo-staff-help.po | 60 +- misc/translator/po/eo-staff-prog.po | 1050 ++- misc/translator/po/es-ES-marc-MARC21.po | 1014 +- misc/translator/po/es-ES-marc-NORMARC.po | 898 +- misc/translator/po/es-ES-marc-UNIMARC.po | 2 +- misc/translator/po/es-ES-opac-bootstrap.po | 349 +- misc/translator/po/es-ES-pref.po | 13 +- misc/translator/po/es-ES-staff-help.po | 86 +- misc/translator/po/es-ES-staff-prog.po | 1096 +-- misc/translator/po/eu-marc-MARC21.po | 1004 +- misc/translator/po/eu-marc-NORMARC.po | 888 +- misc/translator/po/eu-marc-UNIMARC.po | 2 +- misc/translator/po/eu-opac-bootstrap.po | 343 +- misc/translator/po/eu-staff-help.po | 60 +- misc/translator/po/eu-staff-prog.po | 1054 ++- misc/translator/po/fa-Arab-marc-MARC21.po | 1004 +- misc/translator/po/fa-Arab-marc-NORMARC.po | 888 +- misc/translator/po/fa-Arab-marc-UNIMARC.po | 2 +- misc/translator/po/fa-Arab-opac-bootstrap.po | 343 +- misc/translator/po/fa-Arab-staff-help.po | 74 +- misc/translator/po/fa-Arab-staff-prog.po | 1062 +-- misc/translator/po/fi-FI-marc-MARC21.po | 1004 +- misc/translator/po/fi-FI-marc-NORMARC.po | 888 +- misc/translator/po/fi-FI-marc-UNIMARC.po | 2 +- misc/translator/po/fi-FI-opac-bootstrap.po | 343 +- misc/translator/po/fi-FI-staff-help.po | 76 +- misc/translator/po/fi-FI-staff-prog.po | 1061 +-- misc/translator/po/fo-FO-marc-MARC21.po | 1004 +- misc/translator/po/fo-FO-marc-NORMARC.po | 888 +- misc/translator/po/fo-FO-marc-UNIMARC.po | 2 +- misc/translator/po/fo-FO-opac-bootstrap.po | 341 +- misc/translator/po/fo-FO-staff-help.po | 60 +- misc/translator/po/fo-FO-staff-prog.po | 1050 ++- misc/translator/po/fr-CA-marc-MARC21.po | 1042 +-- misc/translator/po/fr-CA-marc-NORMARC.po | 906 +- misc/translator/po/fr-CA-marc-UNIMARC.po | 20 +- misc/translator/po/fr-CA-opac-bootstrap.po | 365 +- misc/translator/po/fr-CA-pref.po | 25 +- misc/translator/po/fr-CA-staff-help.po | 711 +- misc/translator/po/fr-CA-staff-prog.po | 1441 +-- misc/translator/po/fr-FR-marc-MARC21.po | 1096 +-- misc/translator/po/fr-FR-marc-NORMARC.po | 902 +- misc/translator/po/fr-FR-marc-UNIMARC.po | 2 +- misc/translator/po/fr-FR-opac-bootstrap.po | 525 +- misc/translator/po/fr-FR-pref.po | 360 +- misc/translator/po/fr-FR-staff-help.po | 464 +- misc/translator/po/fr-FR-staff-prog.po | 1503 +-- misc/translator/po/gl-marc-MARC21.po | 1004 +- misc/translator/po/gl-marc-NORMARC.po | 888 +- misc/translator/po/gl-marc-UNIMARC.po | 2 +- misc/translator/po/gl-opac-bootstrap.po | 341 +- misc/translator/po/gl-staff-help.po | 60 +- misc/translator/po/gl-staff-prog.po | 1057 ++- misc/translator/po/he-Hebr-marc-MARC21.po | 1004 +- misc/translator/po/he-Hebr-marc-NORMARC.po | 888 +- misc/translator/po/he-Hebr-marc-UNIMARC.po | 2 +- misc/translator/po/he-Hebr-opac-bootstrap.po | 341 +- misc/translator/po/he-Hebr-staff-help.po | 60 +- misc/translator/po/he-Hebr-staff-prog.po | 1057 ++- misc/translator/po/hi-marc-MARC21.po | 1004 +- misc/translator/po/hi-marc-NORMARC.po | 888 +- misc/translator/po/hi-marc-UNIMARC.po | 2 +- misc/translator/po/hi-opac-bootstrap.po | 341 +- misc/translator/po/hi-staff-help.po | 60 +- misc/translator/po/hi-staff-prog.po | 1055 ++- misc/translator/po/hr-HR-marc-MARC21.po | 1004 +- misc/translator/po/hr-HR-marc-NORMARC.po | 888 +- misc/translator/po/hr-HR-marc-UNIMARC.po | 2 +- misc/translator/po/hr-HR-opac-bootstrap.po | 343 +- misc/translator/po/hr-HR-staff-help.po | 64 +- misc/translator/po/hr-HR-staff-prog.po | 1059 ++- misc/translator/po/hu-HU-marc-MARC21.po | 1004 +- misc/translator/po/hu-HU-marc-NORMARC.po | 888 +- misc/translator/po/hu-HU-marc-UNIMARC.po | 2 +- misc/translator/po/hu-HU-opac-bootstrap.po | 341 +- misc/translator/po/hu-HU-staff-help.po | 60 +- misc/translator/po/hu-HU-staff-prog.po | 1057 ++- misc/translator/po/hy-Armn-marc-MARC21.po | 1004 +- misc/translator/po/hy-Armn-marc-NORMARC.po | 888 +- misc/translator/po/hy-Armn-marc-UNIMARC.po | 2 +- misc/translator/po/hy-Armn-opac-bootstrap.po | 343 +- misc/translator/po/hy-Armn-pref.po | 10 +- misc/translator/po/hy-Armn-staff-help.po | 82 +- misc/translator/po/hy-Armn-staff-prog.po | 1083 +-- misc/translator/po/ia-marc-MARC21.po | 1004 +- misc/translator/po/ia-marc-NORMARC.po | 888 +- misc/translator/po/ia-marc-UNIMARC.po | 2 +- misc/translator/po/ia-opac-bootstrap.po | 341 +- misc/translator/po/ia-staff-help.po | 60 +- misc/translator/po/ia-staff-prog.po | 1050 ++- misc/translator/po/id-ID-marc-MARC21.po | 1004 +- misc/translator/po/id-ID-marc-NORMARC.po | 888 +- misc/translator/po/id-ID-marc-UNIMARC.po | 2 +- misc/translator/po/id-ID-opac-bootstrap.po | 341 +- misc/translator/po/id-ID-staff-help.po | 60 +- misc/translator/po/id-ID-staff-prog.po | 1059 ++- misc/translator/po/iq-CA-marc-MARC21.po | 1004 +- misc/translator/po/iq-CA-marc-NORMARC.po | 888 +- misc/translator/po/iq-CA-marc-UNIMARC.po | 2 +- misc/translator/po/iq-CA-opac-bootstrap.po | 341 +- misc/translator/po/iq-CA-staff-help.po | 60 +- misc/translator/po/iq-CA-staff-prog.po | 1050 ++- misc/translator/po/is-IS-marc-MARC21.po | 1004 +- misc/translator/po/is-IS-marc-NORMARC.po | 888 +- misc/translator/po/is-IS-marc-UNIMARC.po | 2 +- misc/translator/po/is-IS-opac-bootstrap.po | 341 +- misc/translator/po/is-IS-staff-help.po | 60 +- misc/translator/po/is-IS-staff-prog.po | 1057 ++- misc/translator/po/it-IT-marc-MARC21.po | 1010 +- misc/translator/po/it-IT-marc-NORMARC.po | 894 +- misc/translator/po/it-IT-marc-UNIMARC.po | 8 +- misc/translator/po/it-IT-opac-bootstrap.po | 361 +- misc/translator/po/it-IT-pref.po | 17 +- misc/translator/po/it-IT-staff-help.po | 88 +- misc/translator/po/it-IT-staff-prog.po | 1304 +-- misc/translator/po/iu-CA-marc-MARC21.po | 1004 +- misc/translator/po/iu-CA-marc-NORMARC.po | 888 +- misc/translator/po/iu-CA-marc-UNIMARC.po | 2 +- misc/translator/po/iu-CA-opac-bootstrap.po | 341 +- misc/translator/po/iu-CA-staff-help.po | 60 +- misc/translator/po/iu-CA-staff-prog.po | 1050 ++- misc/translator/po/ja-Jpan-JP-marc-MARC21.po | 1004 +- misc/translator/po/ja-Jpan-JP-marc-NORMARC.po | 888 +- misc/translator/po/ja-Jpan-JP-marc-UNIMARC.po | 2 +- misc/translator/po/ja-Jpan-JP-opac-bootstrap.po | 341 +- misc/translator/po/ja-Jpan-JP-staff-help.po | 60 +- misc/translator/po/ja-Jpan-JP-staff-prog.po | 1061 ++- misc/translator/po/ka-marc-MARC21.po | 1004 +- misc/translator/po/ka-marc-NORMARC.po | 888 +- misc/translator/po/ka-marc-UNIMARC.po | 2 +- misc/translator/po/ka-opac-bootstrap.po | 341 +- misc/translator/po/ka-staff-help.po | 60 +- misc/translator/po/ka-staff-prog.po | 1050 ++- misc/translator/po/km-KH-marc-MARC21.po | 1004 +- misc/translator/po/km-KH-marc-NORMARC.po | 888 +- misc/translator/po/km-KH-marc-UNIMARC.po | 2 +- misc/translator/po/km-KH-opac-bootstrap.po | 341 +- misc/translator/po/km-KH-staff-help.po | 60 +- misc/translator/po/km-KH-staff-prog.po | 1050 ++- misc/translator/po/kn-Knda-marc-MARC21.po | 1004 +- misc/translator/po/kn-Knda-marc-NORMARC.po | 888 +- misc/translator/po/kn-Knda-marc-UNIMARC.po | 2 +- misc/translator/po/kn-Knda-opac-bootstrap.po | 341 +- misc/translator/po/kn-Knda-staff-help.po | 60 +- misc/translator/po/kn-Knda-staff-prog.po | 1057 ++- misc/translator/po/ko-Kore-KP-marc-MARC21.po | 1004 +- misc/translator/po/ko-Kore-KP-marc-NORMARC.po | 888 +- misc/translator/po/ko-Kore-KP-marc-UNIMARC.po | 2 +- misc/translator/po/ko-Kore-KP-opac-bootstrap.po | 343 +- misc/translator/po/ko-Kore-KP-staff-help.po | 66 +- misc/translator/po/ko-Kore-KP-staff-prog.po | 1077 +-- misc/translator/po/ku-Arab-marc-MARC21.po | 1004 +- misc/translator/po/ku-Arab-marc-NORMARC.po | 888 +- misc/translator/po/ku-Arab-marc-UNIMARC.po | 2 +- misc/translator/po/ku-Arab-opac-bootstrap.po | 341 +- misc/translator/po/ku-Arab-staff-help.po | 74 +- misc/translator/po/ku-Arab-staff-prog.po | 1057 ++- misc/translator/po/lo-Laoo-marc-MARC21.po | 1004 +- misc/translator/po/lo-Laoo-marc-NORMARC.po | 888 +- misc/translator/po/lo-Laoo-marc-UNIMARC.po | 2 +- misc/translator/po/lo-Laoo-opac-bootstrap.po | 341 +- misc/translator/po/lo-Laoo-staff-help.po | 60 +- misc/translator/po/lo-Laoo-staff-prog.po | 1057 ++- misc/translator/po/mi-NZ-marc-MARC21.po | 1004 +- misc/translator/po/mi-NZ-marc-NORMARC.po | 888 +- misc/translator/po/mi-NZ-marc-UNIMARC.po | 2 +- misc/translator/po/mi-NZ-opac-bootstrap.po | 341 +- misc/translator/po/mi-NZ-staff-help.po | 60 +- misc/translator/po/mi-NZ-staff-prog.po | 1057 ++- misc/translator/po/ml-marc-MARC21.po | 1004 +- misc/translator/po/ml-marc-NORMARC.po | 888 +- misc/translator/po/ml-marc-UNIMARC.po | 2 +- misc/translator/po/ml-opac-bootstrap.po | 341 +- misc/translator/po/ml-staff-help.po | 60 +- misc/translator/po/ml-staff-prog.po | 1050 ++- misc/translator/po/mon-marc-MARC21.po | 1004 +- misc/translator/po/mon-marc-NORMARC.po | 888 +- misc/translator/po/mon-marc-UNIMARC.po | 2 +- misc/translator/po/mon-opac-bootstrap.po | 341 +- misc/translator/po/mon-staff-help.po | 60 +- misc/translator/po/mon-staff-prog.po | 1053 ++- misc/translator/po/mr-marc-MARC21.po | 1004 +- misc/translator/po/mr-marc-NORMARC.po | 888 +- misc/translator/po/mr-marc-UNIMARC.po | 2 +- misc/translator/po/mr-opac-bootstrap.po | 341 +- misc/translator/po/mr-staff-help.po | 60 +- misc/translator/po/mr-staff-prog.po | 1057 ++- misc/translator/po/ms-MY-marc-MARC21.po | 1006 +- misc/translator/po/ms-MY-marc-NORMARC.po | 888 +- misc/translator/po/ms-MY-marc-UNIMARC.po | 2 +- misc/translator/po/ms-MY-opac-bootstrap.po | 341 +- misc/translator/po/ms-MY-staff-help.po | 60 +- misc/translator/po/ms-MY-staff-prog.po | 1063 ++- misc/translator/po/nb-NO-marc-MARC21.po | 1004 +- misc/translator/po/nb-NO-marc-NORMARC.po | 892 +- misc/translator/po/nb-NO-marc-UNIMARC.po | 2 +- misc/translator/po/nb-NO-opac-bootstrap.po | 349 +- misc/translator/po/nb-NO-pref.po | 9 +- misc/translator/po/nb-NO-staff-help.po | 64 +- misc/translator/po/nb-NO-staff-prog.po |10174 ++++++++++---------- misc/translator/po/ne-NE-marc-MARC21.po | 1004 +- misc/translator/po/ne-NE-marc-NORMARC.po | 888 +- misc/translator/po/ne-NE-marc-UNIMARC.po | 2 +- misc/translator/po/ne-NE-opac-bootstrap.po | 341 +- misc/translator/po/ne-NE-staff-help.po | 60 +- misc/translator/po/ne-NE-staff-prog.po | 1050 ++- misc/translator/po/nl-BE-marc-MARC21.po | 1004 +- misc/translator/po/nl-BE-marc-NORMARC.po | 888 +- misc/translator/po/nl-BE-marc-UNIMARC.po | 2 +- misc/translator/po/nl-BE-opac-bootstrap.po | 343 +- misc/translator/po/nl-BE-staff-help.po | 60 +- misc/translator/po/nl-BE-staff-prog.po | 1063 +-- misc/translator/po/nl-NL-marc-MARC21.po | 1004 +- misc/translator/po/nl-NL-marc-NORMARC.po | 888 +- misc/translator/po/nl-NL-marc-UNIMARC.po | 2 +- misc/translator/po/nl-NL-opac-bootstrap.po | 343 +- misc/translator/po/nl-NL-staff-help.po | 60 +- misc/translator/po/nl-NL-staff-prog.po | 1059 ++- misc/translator/po/nn-NO-marc-MARC21.po | 1004 +- misc/translator/po/nn-NO-marc-NORMARC.po | 888 +- misc/translator/po/nn-NO-marc-UNIMARC.po | 2 +- misc/translator/po/nn-NO-opac-bootstrap.po | 341 +- misc/translator/po/nn-NO-staff-help.po | 60 +- misc/translator/po/nn-NO-staff-prog.po | 1055 ++- misc/translator/po/oc-marc-MARC21.po | 1004 +- misc/translator/po/oc-marc-NORMARC.po | 888 +- misc/translator/po/oc-marc-UNIMARC.po | 2 +- misc/translator/po/oc-opac-bootstrap.po | 343 +- misc/translator/po/oc-staff-help.po | 60 +- misc/translator/po/oc-staff-prog.po | 1055 ++- misc/translator/po/pbr-marc-MARC21.po | 1004 +- misc/translator/po/pbr-marc-NORMARC.po | 888 +- misc/translator/po/pbr-marc-UNIMARC.po | 2 +- misc/translator/po/pbr-opac-bootstrap.po | 341 +- misc/translator/po/pbr-staff-help.po | 60 +- misc/translator/po/pbr-staff-prog.po | 1050 ++- misc/translator/po/pl-PL-marc-MARC21.po | 1014 +- misc/translator/po/pl-PL-marc-NORMARC.po | 892 +- misc/translator/po/pl-PL-marc-UNIMARC.po | 2 +- misc/translator/po/pl-PL-opac-bootstrap.po | 355 +- misc/translator/po/pl-PL-pref.po | 49 +- misc/translator/po/pl-PL-staff-help.po | 108 +- misc/translator/po/pl-PL-staff-prog.po | 3193 +++---- misc/translator/po/prs-marc-MARC21.po | 1004 +- misc/translator/po/prs-marc-NORMARC.po | 888 +- misc/translator/po/prs-marc-UNIMARC.po | 2 +- misc/translator/po/prs-opac-bootstrap.po | 341 +- misc/translator/po/prs-staff-help.po | 60 +- misc/translator/po/prs-staff-prog.po | 1057 ++- misc/translator/po/pt-BR-marc-MARC21.po | 1004 +- misc/translator/po/pt-BR-marc-NORMARC.po | 888 +- misc/translator/po/pt-BR-marc-UNIMARC.po | 2 +- misc/translator/po/pt-BR-opac-bootstrap.po | 343 +- misc/translator/po/pt-BR-staff-help.po | 76 +- misc/translator/po/pt-BR-staff-prog.po | 1062 +-- misc/translator/po/pt-PT-marc-MARC21.po | 1004 +- misc/translator/po/pt-PT-marc-NORMARC.po | 888 +- misc/translator/po/pt-PT-marc-UNIMARC.po | 2 +- misc/translator/po/pt-PT-opac-bootstrap.po | 343 +- misc/translator/po/pt-PT-staff-help.po | 76 +- misc/translator/po/pt-PT-staff-prog.po | 1063 +-- misc/translator/po/ro-RO-marc-MARC21.po | 1004 +- misc/translator/po/ro-RO-marc-NORMARC.po | 888 +- misc/translator/po/ro-RO-marc-UNIMARC.po | 2 +- misc/translator/po/ro-RO-opac-bootstrap.po | 341 +- misc/translator/po/ro-RO-staff-help.po | 60 +- misc/translator/po/ro-RO-staff-prog.po | 1057 ++- misc/translator/po/ru-RU-marc-MARC21.po | 1004 +- misc/translator/po/ru-RU-marc-NORMARC.po | 888 +- misc/translator/po/ru-RU-marc-UNIMARC.po | 2 +- misc/translator/po/ru-RU-opac-bootstrap.po | 343 +- misc/translator/po/ru-RU-staff-help.po | 64 +- misc/translator/po/ru-RU-staff-prog.po | 1063 +-- misc/translator/po/rw-RW-marc-MARC21.po | 1004 +- misc/translator/po/rw-RW-marc-NORMARC.po | 888 +- misc/translator/po/rw-RW-marc-UNIMARC.po | 2 +- misc/translator/po/rw-RW-opac-bootstrap.po | 341 +- misc/translator/po/rw-RW-staff-help.po | 60 +- misc/translator/po/rw-RW-staff-prog.po | 1050 ++- misc/translator/po/sd-PK-marc-MARC21.po | 1004 +- misc/translator/po/sd-PK-marc-NORMARC.po | 888 +- misc/translator/po/sd-PK-marc-UNIMARC.po | 2 +- misc/translator/po/sd-PK-opac-bootstrap.po | 341 +- misc/translator/po/sd-PK-staff-help.po | 60 +- misc/translator/po/sd-PK-staff-prog.po | 1050 ++- misc/translator/po/sk-SK-marc-MARC21.po | 1010 +- misc/translator/po/sk-SK-marc-NORMARC.po | 892 +- misc/translator/po/sk-SK-marc-UNIMARC.po | 2 +- misc/translator/po/sk-SK-opac-bootstrap.po | 345 +- misc/translator/po/sk-SK-pref.po | 10 +- misc/translator/po/sk-SK-staff-help.po | 92 +- misc/translator/po/sk-SK-staff-prog.po | 1077 +-- misc/translator/po/sl-SI-marc-MARC21.po | 1004 +- misc/translator/po/sl-SI-marc-NORMARC.po | 888 +- misc/translator/po/sl-SI-marc-UNIMARC.po | 2 +- misc/translator/po/sl-SI-opac-bootstrap.po | 341 +- misc/translator/po/sl-SI-staff-help.po | 60 +- misc/translator/po/sl-SI-staff-prog.po | 1050 ++- misc/translator/po/sq-AL-marc-MARC21.po | 1004 +- misc/translator/po/sq-AL-marc-NORMARC.po | 888 +- misc/translator/po/sq-AL-marc-UNIMARC.po | 2 +- misc/translator/po/sq-AL-opac-bootstrap.po | 341 +- misc/translator/po/sq-AL-staff-help.po | 60 +- misc/translator/po/sq-AL-staff-prog.po | 1054 ++- misc/translator/po/sr-Cyrl-marc-MARC21.po | 1004 +- misc/translator/po/sr-Cyrl-marc-NORMARC.po | 888 +- misc/translator/po/sr-Cyrl-marc-UNIMARC.po | 2 +- misc/translator/po/sr-Cyrl-opac-bootstrap.po | 341 +- misc/translator/po/sr-Cyrl-staff-help.po | 60 +- misc/translator/po/sr-Cyrl-staff-prog.po | 1052 ++- misc/translator/po/sv-SE-marc-MARC21.po | 1004 +- misc/translator/po/sv-SE-marc-NORMARC.po | 888 +- misc/translator/po/sv-SE-marc-UNIMARC.po | 2 +- misc/translator/po/sv-SE-opac-bootstrap.po | 343 +- misc/translator/po/sv-SE-staff-help.po | 76 +- misc/translator/po/sv-SE-staff-prog.po | 1063 +-- misc/translator/po/sw-KE-marc-MARC21.po | 1004 +- misc/translator/po/sw-KE-marc-NORMARC.po | 888 +- misc/translator/po/sw-KE-marc-UNIMARC.po | 2 +- misc/translator/po/sw-KE-opac-bootstrap.po | 341 +- misc/translator/po/sw-KE-staff-help.po | 60 +- misc/translator/po/sw-KE-staff-prog.po | 1050 ++- misc/translator/po/ta-LK-marc-MARC21.po | 1004 +- misc/translator/po/ta-LK-marc-NORMARC.po | 888 +- misc/translator/po/ta-LK-marc-UNIMARC.po | 2 +- misc/translator/po/ta-LK-opac-bootstrap.po | 341 +- misc/translator/po/ta-LK-staff-help.po | 60 +- misc/translator/po/ta-LK-staff-prog.po | 1050 ++- misc/translator/po/ta-marc-MARC21.po | 1004 +- misc/translator/po/ta-marc-NORMARC.po | 888 +- misc/translator/po/ta-marc-UNIMARC.po | 2 +- misc/translator/po/ta-opac-bootstrap.po | 341 +- misc/translator/po/ta-staff-help.po | 60 +- misc/translator/po/ta-staff-prog.po | 1050 ++- misc/translator/po/tet-marc-MARC21.po | 1898 ++-- misc/translator/po/tet-marc-NORMARC.po | 888 +- misc/translator/po/tet-marc-UNIMARC.po | 2 +- misc/translator/po/tet-opac-bootstrap.po | 366 +- misc/translator/po/tet-staff-help.po | 64 +- misc/translator/po/tet-staff-prog.po | 1184 +-- misc/translator/po/th-TH-marc-MARC21.po | 1004 +- misc/translator/po/th-TH-marc-NORMARC.po | 888 +- misc/translator/po/th-TH-marc-UNIMARC.po | 2 +- misc/translator/po/th-TH-opac-bootstrap.po | 341 +- misc/translator/po/th-TH-staff-help.po | 60 +- misc/translator/po/th-TH-staff-prog.po | 1057 ++- misc/translator/po/tl-PH-marc-MARC21.po | 1004 +- misc/translator/po/tl-PH-marc-NORMARC.po | 888 +- misc/translator/po/tl-PH-marc-UNIMARC.po | 2 +- misc/translator/po/tl-PH-opac-bootstrap.po | 341 +- misc/translator/po/tl-PH-staff-help.po | 60 +- misc/translator/po/tl-PH-staff-prog.po | 1055 ++- misc/translator/po/tr-TR-marc-MARC21.po | 1008 +- misc/translator/po/tr-TR-marc-NORMARC.po | 894 +- misc/translator/po/tr-TR-marc-UNIMARC.po | 2 +- misc/translator/po/tr-TR-opac-bootstrap.po | 349 +- misc/translator/po/tr-TR-pref.po | 13 +- misc/translator/po/tr-TR-staff-help.po | 158 +- misc/translator/po/tr-TR-staff-prog.po | 1145 +-- misc/translator/po/uk-UA-marc-MARC21.po | 1004 +- misc/translator/po/uk-UA-marc-NORMARC.po | 888 +- misc/translator/po/uk-UA-marc-UNIMARC.po | 224 +- misc/translator/po/uk-UA-opac-bootstrap.po | 343 +- misc/translator/po/uk-UA-staff-help.po | 64 +- misc/translator/po/uk-UA-staff-prog.po | 1204 +-- misc/translator/po/ur-Arab-marc-MARC21.po | 1004 +- misc/translator/po/ur-Arab-marc-NORMARC.po | 888 +- misc/translator/po/ur-Arab-marc-UNIMARC.po | 2 +- misc/translator/po/ur-Arab-opac-bootstrap.po | 341 +- misc/translator/po/ur-Arab-staff-help.po | 60 +- misc/translator/po/ur-Arab-staff-prog.po | 1050 ++- misc/translator/po/vi-VN-marc-MARC21.po | 1004 +- misc/translator/po/vi-VN-marc-NORMARC.po | 888 +- misc/translator/po/vi-VN-marc-UNIMARC.po | 2 +- misc/translator/po/vi-VN-opac-bootstrap.po | 343 +- misc/translator/po/vi-VN-staff-help.po | 74 +- misc/translator/po/vi-VN-staff-prog.po | 1065 +-- misc/translator/po/zh-Hans-CN-marc-MARC21.po | 1004 +- misc/translator/po/zh-Hans-CN-marc-NORMARC.po | 888 +- misc/translator/po/zh-Hans-CN-marc-UNIMARC.po | 2 +- misc/translator/po/zh-Hans-CN-opac-bootstrap.po | 343 +- misc/translator/po/zh-Hans-CN-staff-help.po | 68 +- misc/translator/po/zh-Hans-CN-staff-prog.po | 1058 ++- misc/translator/po/zh-Hans-TW-marc-MARC21.po | 1004 +- misc/translator/po/zh-Hans-TW-marc-NORMARC.po | 888 +- misc/translator/po/zh-Hans-TW-marc-UNIMARC.po | 2 +- misc/translator/po/zh-Hans-TW-opac-bootstrap.po | 345 +- misc/translator/po/zh-Hans-TW-pref.po | 1 + misc/translator/po/zh-Hans-TW-staff-help.po | 70 +- misc/translator/po/zh-Hans-TW-staff-prog.po | 1080 +-- 488 files changed, 157287 insertions(+), 148389 deletions(-) create mode 100644 misc/release_notes/release_notes_3_22_6.md hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Tue Apr 26 09:10:27 2016 From: gitmaster at git.koha-community.org (Git repo owner) Date: Tue, 26 Apr 2016 07:10:27 +0000 Subject: [koha-commits] main Koha release repository annotated tag v3.22.06 created. v3.22.06 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 annotated tag, v3.22.06 has been created at ceefd02169303a78f6af4f713245ae582448e58d (tag) tagging 372868a3003fff29c7e913ff104f2d0d2cb0e5ea (commit) replaces v3.22.05 tagged by Julian Maurice on Tue Apr 26 09:19:25 2016 +0200 - Log ----------------------------------------------------------------- Koha release 3.22.06 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQIcBAABAgAGBQJXHxZ9AAoJELCH1RJUPDmpCakQAKjy5RTQyvsFdEMo7aPrScrU 3u/G+1CT2rhvHlBIrhsJwE/90mhH3hlyC1r9sY9Cd8xFgLN4YZ++KemARrVsuu3L KgaIyZMQklXdy6fz5hs969w+BnsU9PMRupfiRhFCvCCmC12dTGizsDTs/Hq7fnnu aGeBPZZlg93MJ51l/cQbnlmmbH917lZl7tlNpo6oLCsGlHUehRVjiWYNUIckcRfD UecduBb/KhmT9G0efI1BvOhNjv2VmT5tY04M+hPHg8+8HWjrru2WxS0vL14YsSLD JtP42qkLRjIv6hy9DE6Ynws5LSxoz29Ch52ke5d2efgok9Q1xxxM2fBRu751yWVq jFP6/npegfwIR0/doMRKMCkh2iemWUwmIZM6Ff7rhMk9qM7NnhpfcOOwZCvaQvQY AFR99XcAFaXqHsOXQ+qXnHhCJILSFgkuLKo3B91qUDDMzwrJ7vLrwyyLK3A43kgj L07eHoMlWXZXopOzGuXwi/1ObQUZGARjeoZDLjX8FvbE6bnQm6snnyBqPShFJBhe J6TlR7YpHhfUZtr1CGELQXH//l7YneS75AwNqzN6oOrzRNnp5+09JCXNGNJY2Akz COlScUeO3XoCqU2gBG32IzZZUV2rqzkKFE/u6zxjZ38UtDhKs9NKsz3iQTj/JaYy qCXis9Mctk/15I8NDVKN =S1a1 -----END PGP SIGNATURE----- Aleisha (5): Bug 15866: Add confirm message for deleting rotating collection from toolbar Bug 15421: Show 'Duplicate' and 'Schedule' on Reports toolbar Bug 16029: Hide patron toolbar if patron does not exist Bug 16047: Making category code a required field on creating a group Bug 15861: Isolated 'The' in help files untranslatable Alex Arnaud (5): Bug 15889: LDAP authentication: Only update mapped attributes Bug 15838 - Subscription duplicating: Reset fields from SubscriptionDuplicateDroppedInput syspef by getting them using name instead of id Bug 16171 - Show many media in html5media tabs Bug 15832 - Fix filter and items split-up in pendingreserves.tt Bug 16296 - Fix records displaying in virtualshelves Benjamin Rokseth (1): Bug 16222 - Add REST API folder to Makefile.PL David Cook (1): Bug 15745: C4::Matcher gets CCL parsing error if term contains ? (question mark) John Seymour (1): Bug 14633: Patch to control.ini to add or dependency to libapache2-mpm-itk Jonathan Druart (27): Bug 16151: Restore the ability to place holds from lists at the OPAC Bug 16040: Update fnReloadAjax DT plugin to fix quotes deletion Bug 16082: Display a friendly "patron does not exist" message if that's the case - circulation.pl Bug 15967: Fix regression from bug 14133 - notify the library if patron is not Bug 15967: Use the email template if the print template does not exist Bug 16068: Do not cache overridden prefs Bug 14158: www search tests - Cleanup at the end Bug 14441: TrackClicks cuts off/breaks URLs (XSLT) Bug 15323: Use fixtures for the active currency Bug 15741: Fix rounding in total fines calculations Bug 15773: Fix and standardise checkboxes code in framework Bug 15722: Escape patron infos for JSON in patron searches Bug 15809: Redefine multi_param is CGI < 4.08 is used Bug 14076: Do not use CGI->param in list context - opac-authorities-home.pl Bug 16240: (follow-up for 16082) Do not display message if no borrowernumber passed Bug 15832: Remove empty string from the filters Bug 16055: Do not allow basketgroup deletion unless empty Bug 16179: Do not crash if "rate me" is clicked and not rate selected Bug 15111: Change X-Frame-Options with SAMEORIGIN Bug 15111: Do not include the antiClickjack legacy browser trick for greybox Bug 16210: Revert OPAC changes from Bug 15111 Bug 16210: Set X-Frame-Options to SAMEORIGIN in 2 other places Bug 16104: Remove warnings "used only once: possible typo" Bug 15930: Make patron searches defaulting on 'contain' Bug 15757: Add one test for GetLoanLength Bug 15757: Make issuelength default to null instead of 0 Bug 15757: Make GetLoanLength defaults to 0 instead of 21 Julian Maurice (11): Bug 16214: Fix typo 'To.jon' -> 'To.json' Bug 15868: Ask for confirmation when deleting a MMT action Bug 16134: t::lib::Mocks::mock_preference should be case-insensitive Bug 15962: Block the currency deletion if used Bug 14816: Fix multiple selection in item search Revert "Bug 15682 - Only allow merging of 2 or more records form lsits (for consistency)" Revert "Bug 15682 - Merging records from cataloguing search only allows to merge 2 records" Bug 16224: Fix t/db_dependent/Reports_Guided.t Update release notes for 3.22.6 release Translation updates for Koha 3.22.6 Increment version for 3.22.6 release Kyle M Hall (2): Bug 15111 - Koha is vulnerable to Cross-Frame Scripting (XFS) attacks Bug 16317 - Attempt to share private list results in error Marc V?ron (3): Bug 14614: Multiple URLs (856) in cart/list email are broken Bug 11498 - Prevent bypassing sco timeout with print dialog Bug 16133: Translatability of database administrator account warning Marcel de Rooy (6): Bug 16084: [QA Follow-up] Correct three occurrences of __KOHA_CONF_DIR__ Bug 15713: Restart zebra when rotating logfiles Bug 13871: Adjusted perl tidy on MsgType.pm Bug 13871: [QA Follow-up] Adjust Patron Status Request Bug 13871: [QA Follow-up] Adjust Patron Info Request Bug 13871: [QA Follow-up] Add $server for FID_SCREEN_MSG Mark Tompsett (2): Bug 16185: t/db_dependent/Reports_Guided.t is failing Bug 16191: t/Ris.t is noisy Mason James (5): Bug 14441 - TrackClicks cuts off/breaks URLs Bug 16184 - Report bor_issues_top shows incorrect number of rows Bug 13871: [TITLE_AMENDED] Additional changes Bug 13871 - OverDrive message when user authentication fails Bug 1750 - Report bor_issues_top erroneous and truncated results. Nick Clemens (4): Bug 15888 - Syndetics Reviews preference should not enable LibraryThing reviews Bug 15928 - Show unlinked guarantor Bug 15682 - Merging records from cataloguing search only allows to merge 2 records Bug 15682 - Only allow merging of 2 or more records form lsits (for consistency) Owen Leonard (6): Bug 16146 - ACQ: Previewed records in Z39.50 search results are wrong Bug 15984 - Correct templates which use the phrase "issuing rules" Bug 16047 [Follow-up] Software error on deleting a group with no category code Bug 16023 - Use Font Awesome icons on audio alerts page Bug 16025 [Revised] Use Font Awesome icons on item types localization page Bug 16027 - Use Font Awesome icons in the professional cataloging interface Tomas Cohen Arazi (6): Bug 16084: log4perl.conf not properly set on packages Bug 16138: Restart plack when rotating logfiles Bug 15741: (regression tests) Rounding is not calculated correctly Bug 16143: Make opac-shelves.pl generate OPAC itype images path Bug 16222: (QA followup) Add /api dir for the API Bug 15113: koha-rebuild-zebra should check USE_INDEXER_DAEMON and skip if enabled ----------------------------------------------------------------------- hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Tue Apr 26 15:19:27 2016 From: gitmaster at git.koha-community.org (Git repo owner) Date: Tue, 26 Apr 2016 13:19:27 +0000 Subject: [koha-commits] main Koha release repository branch new_12478_elasticsearch updated. v3.22.00-1281-g29c349c 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_12478_elasticsearch has been updated discards 0b6880b5ab8ef3122b12f0b81b0f69191cc48c9b (commit) discards 548142a69231e042813a95191069fbc65072e133 (commit) discards 4198f70d11707510a90222e2e9dcbba7d81eff2c (commit) discards f75b319782086d1a33272cf2733008732ff50832 (commit) discards 69b084d9fb831a502929eb56c424c16ef73d5674 (commit) discards bea5373f3f5e41a03314ae44d55ef397f6675873 (commit) discards 23255c4c9d86bb50dfe0144fbf53c108d63c2674 (commit) discards 82477df7bdb5ba09644e1dc0effef6f954d111ea (commit) discards a27b5d48254614044f5ce62d8e5d353e246a1906 (commit) discards 4dc62f129b47bf82ef351d280aa6a7f843464dab (commit) discards e06fcced86d1403c1a20766dce0f9b3de889df0a (commit) discards 10c496f0b983d73d64cec205e4c85ac6aa68299c (commit) discards b2dbcd70971cf56833aae992773f72dda06152ee (commit) discards 3d433b552530eae953c43b217357c9c2ff1740e4 (commit) discards dab21a9305548fda4cd990f84f087d382b0fec3a (commit) discards 0ec5e8fd3621c692a1dcbfef1b5ac1f6ad70e6c9 (commit) discards 375d62de1a0436277ef2ae6ef5b5b3373ada1b93 (commit) discards 05101adad3c9cabbba99c9e9c05bf96f08b92a35 (commit) discards bdf50c099658f6e810f3c9e02658d91a4ccace25 (commit) discards fdd6257ddc57ad649b4b40bbd417a47614fbff68 (commit) discards e407d21e0c34ca76099ad303b05c3cee075832fd (commit) discards 32ed22f94ceb46ebd267e246f530b47c21a25b8b (commit) discards 5bfb76e26aeb59229940649e810f66495378d49a (commit) discards f13450eb5d14992c434302199b2772bd36cf87b2 (commit) discards 6b9aa08f32aff43116526952f86cc391f7e6b372 (commit) discards 01e53b0c2465356511c412837c3c3497a0f17b41 (commit) discards 2c143c3a264982a4ca8250f23cd4e65fefc04324 (commit) discards 86a334bc331011be7b2d3d9d9545acec3ccfc527 (commit) discards a9f37301148cd9f7b63e8279c188cf4b12bfa585 (commit) discards 26191188aad419bf00e095767aed3717d309ee78 (commit) discards 38b024c8d07f21c76a7c9db845b1ab44f080e901 (commit) discards 7359fe52282ba13f56fae721b5edcf60f0e668e5 (commit) discards 7c6b9b05130d4b3614274de5119237934ae964b1 (commit) discards 120035899c226304a7df58d9fd7b9a37fbf9884f (commit) discards 02351a8e55c235b3f93185c58b8faa9e009d56af (commit) discards 49bca2ff35c0d42dd9fae5775aa432a0090d70df (commit) discards 7c17558866f15225bf8b3d73dec347c672def6c9 (commit) discards 2927b724b7fafea18f0054385b7df8997a824cc9 (commit) discards 10fc426f1449ac058eeb9c382ae2285cd919a9f2 (commit) discards 8384d618a94974ee4b36b3f0da60a21335920b65 (commit) discards 5593fea16a1c7a0e9ab1bde9c06f924e15135cd4 (commit) discards ff910a96f3441ed32752a610455844a707174641 (commit) discards 864d2561b475d9c7751e2955dcae45dd301123da (commit) discards 2795fe7e31095e559e5f4f63d311e9b8ab810a6f (commit) discards a289c6eb293d78678f413c210b915ebbe60d5ac5 (commit) discards 50e962379e835f2df17c725642de7591a5a282b7 (commit) discards 4e96a611c37d4a0cc8084b10dbf34cfdbd0c1402 (commit) discards 666085a622769122162e824bfe947bb49ae80a89 (commit) discards f39faecd120d5a43f30d08bc8728b59dd2c96440 (commit) discards 2cc6590fc3f1c0b50bd636f9ef3dcd885b8dea85 (commit) discards e6dadf25e2acff2d35c443ed0572d58e202f46ba (commit) discards 270e7b9780f22ddba87d8b68c37085de30c8393b (commit) discards d60f74e0b27a7da1a8dd0d4bf346c14a40af2c77 (commit) discards 3137a3d60ce10ed2cae59a9c493641a4f0709141 (commit) discards 5f0227b03780746ac52d718e620d84829aafe6e4 (commit) discards 10bba9ed42a607f91ad4772ef808ca6c38ea5666 (commit) discards 79992975db9af472234194a588612f64522f35f2 (commit) discards 4b89199e2fe54a94e389f209d66e81d64764aca5 (commit) discards 3c809a5301c9fa6866f664981af5e6678726287f (commit) discards 9278b24a10407a914755f317540707aadd99d5ed (commit) discards 91cdf26622b03bb49edd8b7b8ad88219a7c003b1 (commit) discards eb6607a15aa76fff7b0ccd3700356eabbb6447a6 (commit) discards a6ea9a748efc93602a44d4ec0c2e4ba3d7182eab (commit) discards ed02565d9566ae3c1e98450626659be66b2636b0 (commit) discards 464995970a67d916b35c760d93d6be626cee1247 (commit) discards fed0d53d94ab464020c4a6656c3f8c09eb3180e7 (commit) discards 12cb192e5948558d244e996e1d41676ea50ceca7 (commit) discards 6f725830bdf8fe11d9dd651c66b482a1304e48a3 (commit) discards c651e95f7d59fa7a0c7a63f0b75d8f889dd84f59 (commit) discards 9a592f173915f09adcc1213d94a15e5c67b8802a (commit) discards 2150552f87abd4b63ed6e85d964bc2770859a65d (commit) discards ebe374fe834bbbb14c0f1751dd6c907b11f82f12 (commit) discards 5a87fda0a3602467d23a92dc59c91ed25df14420 (commit) discards 66bb675936fa49a809dabc29d1c8896ac46586e0 (commit) discards 41e73e4d461650cd6faa2241c88fc0d5fb7ffe34 (commit) discards c75d648da47177be491cd5359d114c7d5d491f1b (commit) discards b5b33c2bd018e1504da4d6bf4788f56d8442e3ec (commit) discards d462e4a61f41768917517c177decd8e34765ec88 (commit) discards d8c6bddb84c95d08e655af9c910da7926bfb0f29 (commit) discards a8cf77018401159cb965227a8f11b688d92582a4 (commit) discards 7e6276457caaa9cb1dc800fb7dcfd82c52ec0655 (commit) discards 40593c7d58716551d7ee9167a7996669b800a638 (commit) discards d211eb57e4d58df7edddead351a85a23ed5e6bb5 (commit) discards d75b5e2f5dff11c23cecba987773539f5e4fbec7 (commit) discards 76b6b9fd6e40d5bfe7e97f70ad6ca61fdbaf7344 (commit) discards ecbc99ee0884154b761c1549e5af2f93873e5f25 (commit) discards 9140d1285f74fb9ec55cbb01572725da5991b6e6 (commit) via 29c349c8d5f37b08d8552e67b0eb2195936ce69f (commit) via 6eec9dc15564f0117b3d5ccfb8f4296554a2e6a5 (commit) via e16f7988c8de5c869ef7a9b5119d7f5370f8c2cd (commit) via 6920f2190b5218199f9939265524cb0aa88e5905 (commit) via e1397be4e7474edcfbadd713d51014d2bdc22c26 (commit) via 556d88512c85a47798ad6cd4d9878426ae086464 (commit) via 215a5df087b75631aecb2579f870f6ab859182c2 (commit) via e2abca7a663c979a1fd1e3ea4c1028b908aab71e (commit) via 440eddd196f3a953ce482fdf65f88be26b7ac4c2 (commit) via 9f31070b9c5c5e7e8aa7bafec6da171676b51583 (commit) via db669272e6190905bf6d2311e21775a3c757307c (commit) via c8c4cc1d5400555f4592736a9481b4daddb5ae0f (commit) via 72d338b3ee381d7944fecb095c2fc7d2767c72cf (commit) via 15a863fe1d6d7ecfe9b08230160128e0288748a1 (commit) via b4610691c71b8a98e1375cf3d8e945af58ce7d0c (commit) via 776dcbae01f5b43dfa09722c198218f667356d74 (commit) via 4f60862917949063c9918234f2145ccc72be0e30 (commit) via f242f7f186d69ace2b6912e6f6f163b4492c826a (commit) via 82539e86502fb618caf75281aed9fb4fb0f9a090 (commit) via 731559aeff1d132f06d77fe370ce93f17037f740 (commit) via bdc3831e0992b92898423a5ebfca700794c60c9f (commit) via fe94306f9b590599a70d709e42b9ee1800f1fb9b (commit) via e1d8d0180efd434929800b1d5fc0c42ad99740ee (commit) via 4c7cde08fea912ce0a239d8e575ca2f44cf14845 (commit) via f5747ddc450e03eeb8ed1086d4551cc83c7901fb (commit) via 8af5057e19f8e5dc35261c2437ff369fbd5414bb (commit) via dca617891fdbda286483ec6a61292d1b50984116 (commit) via 2d6b64ae6a40afbf08e5b80b9f0073ccc27e21c1 (commit) via bcf38792e3efa17993858c0b14491928ecf632dc (commit) via f61f3391679f310e1a606de95b2c2878a2517e62 (commit) via 412fad80cc9f0a1e1da15f8e6809e11de3f000dc (commit) via a1ae514e4329a4fb8373d32b0b41ac619ae1ea92 (commit) via fa6f77cc71fc6069d5c0dc527e7a8e0d2e06635d (commit) via 3949b628f4bbc05f6214d1cf547d3cc54d6cf32f (commit) via c6d59cb75675ada496d7126c92e3073e13c3acab (commit) via d1621fee0bbd17d09113fc9228fa63e448a45e7b (commit) via 0b392ab179ee210921bb551e116c8c8a1b739cf7 (commit) via df1c222537bd73d9582eea02aa21882556f40cef (commit) via 9f3c45d62c1f3de66edc7d7a25f3c2d7f6afca54 (commit) via fa447bdc804e7213e0247412b78a7a91c2e7c19f (commit) via 24d3482fee68464d3d26f3a55c35f0fd0934fc7c (commit) via c6b997e1d860d7977eda1b2071a13c948a71122b (commit) via 9f45e2ee951550817d25989227d865a916aa59a7 (commit) via 03e000bf305301ffb5d5d0ebb27ef8edf87b5fa0 (commit) via b5b036e6e99a74193350f8bb1ed9cc8709570e07 (commit) via 7a09c1f48442ee295cf9eaab73e30679a58dd340 (commit) via e293faa0ee0e961ac2ac4f75a79469931bfb59ef (commit) via 9f3703e58b9d0f098b780c98a69e05c01205964b (commit) via 0d0c8cd2c8547d1e0fbb3537217eca4eedf0fa97 (commit) via 5fbdfd48c01bd132cd3e773251b035aa4b5d1ab2 (commit) via 6e4aa91568c9f39ed9f31229d45f8fb9bb3339a1 (commit) via 3009c4afc766d3ae51fff7a4b535fe7d80bc909f (commit) via 6bd544eadb9cae9dceeb3883244ce0c02f95f8c8 (commit) via 66cdeac96c77cca0d5e2ecb4e4cb267914ade45d (commit) via 951e1dc3ae9632f9bbb42a98cb2b8971b26c2eac (commit) via b35840613024c5bd6ad59cbe9c531ef5699c30c0 (commit) via 9fd04957ed2410e061e041fea0bd3ad8b0d290b5 (commit) via eaa3bdb7ffce4ccde83d72e11dbe75327985f220 (commit) via 7366a4c0abac1f84bd25ea52ee3492805b139b7c (commit) via 4393c233d6104f5aff78bca6d24c8ee7478f764a (commit) via f0d4afac61d162ab819f36c9e95c3d60aa8b40f2 (commit) via 45b67a9d2dbdf9e4983624d5482c06e6b5b5ef3d (commit) via eee91ee4997193fed444cd2d0325f45cfc2d4990 (commit) via bcb9bf36b6fd739985ce09413235099acf2e946f (commit) via dc63f75605576ec3cd07ad3d4d7c49698414aff4 (commit) via 19a82bb7c247ae9458025f776a81511a7ad9ceaa (commit) via b08b8aa5c01becee3e023689b78f04106118e86b (commit) via befd95ca7bae4cb57c6d5cdb8f00fe21cfe131d7 (commit) via a141979553a617d4b3106f0115f237b7f9de1926 (commit) via 51f4f02fad579018d724137c1774eb6e6c5fcc59 (commit) via 19e2b47e6b28009ec14d6194b36659014c2246ac (commit) via 712bbb08dd5c175e2a03a8e35c644e0211f5993f (commit) via fe1e13085e0c5ee6f104976d5c7ec1dd5194c132 (commit) via 010a9b2b7271f1a6dfc3ff261552e10a3972722b (commit) via a690af7ef92a4b5eb58645e21cf9632959a200fc (commit) via 8be6a50fa890c5e2fe0ece601112ba92341a3e42 (commit) via 8bddbdcb97d01ccfb9fe43239caff5712d2f63cf (commit) via 53309570b01d79aad6b58e646767b7ba5fbabe4b (commit) via 233e843ef4f734d6236a0b633d209e2641ca9acb (commit) via 9d9b7bc38b2356e4ab18e53d418bb33fae60f16f (commit) via 49c976a6c1ed724972801a554e208459ab6c3257 (commit) via 4d34d4a92970f2ade4644d04316fa2b2f24665b2 (commit) via de084f7087c83dfa1f55caea628a3af3bca3d88e (commit) via d9cdde9d270c64ecae6bb88fadfb43242798456a (commit) via 45103d374598edc84b801de0e23fbfd30ff10c9f (commit) via 036f273d79dadc81878587e9228aef478980ba6e (commit) via ed70f11e84e146797eae311ec324b144838df4f6 (commit) This update added new revisions after undoing existing revisions. That is to say, the old revision is not a strict subset of the new revision. This situation occurs when you --force push a change and generate a repository containing something like this: * -- * -- B -- O -- O -- O (0b6880b5ab8ef3122b12f0b81b0f69191cc48c9b) \ N -- N -- N (29c349c8d5f37b08d8552e67b0eb2195936ce69f) When this happens we assume that you've already had alert emails for all of the O revisions, and so we here report only the revisions in the N branch from the common base, B. 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 29c349c8d5f37b08d8552e67b0eb2195936ce69f Author: Jesse Weaver Date: Mon Apr 25 12:00:13 2016 -0600 Bug 12748: (QA followup) make new tests pass * t/Koha/ItemType.pm: * Rename to .t * Fix method names * t/db_dependent/Koha/ItemTypes.t: Fix method names and Koha::Database usage Signed-off-by: Jesse Weaver Signed-off-by: Tomas Cohen Arazi Signed-off-by: Kyle M Hall commit 6eec9dc15564f0117b3d5ccfb8f4296554a2e6a5 Author: Jesse Weaver Date: Mon Apr 25 12:00:13 2016 -0600 Bug 12748: (QA followup) fix several tiny QA tools warnings * admin/searchengine/elasticsearch/mappings.yaml: * Fix indentation so QA tools believe it's valid YAML * C4::AuthoritiesMarc: Remove tab character * C4::Search: Fix POD * Koha::BiblioUtils: remove "return undef" * Koha::Schema::Result::Search*: rename type to _type * Koha::SE::ES::Search: * Fix spelling/@_[0] * Add my to loop variable * Remove unused var $error * Add use Modern::Perl * Fix undefined variables * Koha::ES::Indexer: fix POD * Koha::SE::ES::QueryBuilder: * Don't define variables in conditionals * Fix POD * Koha::SE::Zebra::Search: * Fix debug warns/POD/barewords * Koha::SE::Zebra::Search: add use Modern::Perl * kohastructure.sql: remove old, unused elasticsearch_mappings table, add new tables * labels/label-item-search.pl: remove C4::Dates * opac/elasticsearch.pl: remove old file Signed-off-by: Jesse Weaver Signed-off-by: Tomas Cohen Arazi Signed-off-by: Kyle M Hall commit e16f7988c8de5c869ef7a9b5119d7f5370f8c2cd Author: Tomas Cohen Arazi Date: Tue Apr 12 15:33:25 2016 -0300 Bug 16248: ModZebra doesn't update zebraqueue if ES is enabled The zebraqueue table should still be populated with updates if ES is enabled, so the Zebra indexer keeps the Z39.50/SRU indexes up to date. To test: - Set SearchEngine = Elasticsearch - Watch for zebraqueue changes $ watch -n 0.5 'echo "SELECT COUNT(*) FROM zebraqueue WHERE done=0" | sudo koha-mysql kohadev' - Call touch_all_biblios.pl to simulate record changes $ sudo koha-shell kohadev ; cd kohaclone $ perl misc/maintenance/touch_all_biblios.pl -v => FAIL: Notice the watch is not changing the number of records to be indexed. - Apply the patch - Call touch_all_biblios.pl to simulate record changes $ sudo koha-shell kohadev ; cd kohaclone $ perl misc/maintenance/touch_all_biblios.pl -v => SUCCESS: The count raises (more than 0) and the zebra indexer picks the updates. - Sign off Signed-off-by: Chris Signed-off-by: Jesse Weaver Signed-off-by: Tomas Cohen Arazi Signed-off-by: Kyle M Hall commit 6920f2190b5218199f9939265524cb0aa88e5905 Author: Chris Cormack Date: Thu Apr 14 21:27:10 2016 +0000 Bug 12478 Increasing test Coverage for Koha::SearchEngine::Elasticsearch::Search Before this patch it was 24.6%, after it is 64% Signed-off-by: Nick Clemens Signed-off-by: Jesse Weaver Signed-off-by: Tomas Cohen Arazi Signed-off-by: Kyle M Hall commit e1397be4e7474edcfbadd713d51014d2bdc22c26 Author: Chris Cormack Date: Thu Apr 14 20:23:13 2016 +0000 Bug 12478 Shifting tests and adding copyright headers Signed-off-by: Nick Clemens Signed-off-by: Jesse Weaver Signed-off-by: Tomas Cohen Arazi Signed-off-by: Kyle M Hall commit 556d88512c85a47798ad6cd4d9878426ae086464 Author: Chris Cormack Date: Wed Apr 13 21:20:36 2016 +0000 Bug 12478 : Fixing the tests for Koha::SearchEngine::Elasticsearch::Search perl t/Koha_SearchEngine_Elasticsearch_Search.t Signed-off-by: Nick Clemens Signed-off-by: Jesse Weaver Signed-off-by: Tomas Cohen Arazi Signed-off-by: Kyle M Hall commit 215a5df087b75631aecb2579f870f6ab859182c2 Author: Chris Cormack Date: Wed Apr 13 20:51:59 2016 +0000 Bug 12478 : Fixing the tests in t/Koha_ElasticSearch_Indexer.t Signed-off-by: Nick Clemens Signed-off-by: Jesse Weaver Signed-off-by: Tomas Cohen Arazi Signed-off-by: Kyle M Hall commit e2abca7a663c979a1fd1e3ea4c1028b908aab71e Author: Chris Date: Wed Apr 13 08:57:49 2016 +1200 Bug 12478: Making sure the syspref is set to Zebra by default Signed-off-by: Nick Clemens Signed-off-by: Jesse Weaver Signed-off-by: Tomas Cohen Arazi Signed-off-by: Kyle M Hall commit 440eddd196f3a953ce482fdf65f88be26b7ac4c2 Author: Chris Date: Wed Apr 13 08:45:28 2016 +1200 Bug 12478 : Remove the rest of the references to the old mapping tables Signed-off-by: Nick Clemens Signed-off-by: Jesse Weaver Signed-off-by: Tomas Cohen Arazi Signed-off-by: Kyle M Hall commit 9f31070b9c5c5e7e8aa7bafec6da171676b51583 Author: Chris Date: Wed Apr 13 08:42:53 2016 +1200 Bug 12478 : Remove reference to deprecated table elasticsearch_mapping.sql Signed-off-by: Nick Clemens Signed-off-by: Jesse Weaver Signed-off-by: Tomas Cohen Arazi Signed-off-by: Kyle M Hall commit db669272e6190905bf6d2311e21775a3c757307c Author: Tomas Cohen Arazi Date: Tue Apr 12 17:05:57 2016 -0300 Bug 12478: (QA followup) Koha::SearchEngine should fallback to Zebra Signed-off-by: Tomas Cohen Arazi Signed-off-by: Chris Signed-off-by: Nick Clemens Signed-off-by: Jesse Weaver Signed-off-by: Tomas Cohen Arazi Signed-off-by: Kyle M Hall commit c8c4cc1d5400555f4592736a9481b4daddb5ae0f Author: Jonathan Druart Date: Mon Apr 11 08:11:11 2016 +0100 Bug 12478: Define simple_search_compat for Zebra When Zebra is defined as the search engine, the authority search is broken (Can't locate object method "simple_search_compat" via package "Koha::SearchEngine::Zebra::Search" at /home/koha/koha/C4/AuthoritiesMarc.pm line 357.) simple_search_compat is not defined in Koha::SearchEngine::Zebra::Search, it should be a wrapper for C4::Search::SimpleSearch Signed-off-by: Nick Clemens Signed-off-by: Jesse Weaver Signed-off-by: Tomas Cohen Arazi Signed-off-by: Kyle M Hall commit 72d338b3ee381d7944fecb095c2fc7d2767c72cf Author: Jonathan Druart Date: Tue Oct 13 10:45:32 2015 +0100 Bug 12478: Display facet terms ordered by number of occurrences By default ES returns the facet terms ordered by most used, which makes sense. This patch removes resort done in the scripts (catalogue/search.pl and opac/opac-search.pl) and moves it to the module. For Zebra it's now done in C4::Search::getRecords, and there is no change to expect (still alphabetically). On the Elastic search side, we could imagine to let the library define the order of the facets. The facet terms are now sorted by most used. To test easily this change, turn on the displayFacetCount pref. Signed-off-by: Nick Clemens Signed-off-by: Jesse Weaver Signed-off-by: Tomas Cohen Arazi Signed-off-by: Kyle M Hall commit 15a863fe1d6d7ecfe9b08230160128e0288748a1 Author: Robin Sheat Date: Tue Oct 13 17:21:36 2015 +1300 Revert "Bug 12478: Display facet terms ordered by number of occurrences" This reverts commit cd4905c2969b067476881016d0b03271f0bcc7c8. This commit caused an error in C4::Search::GetFacets when running in zebra mode. Conflicts: Koha/SearchEngine/Elasticsearch/Search.pm Signed-off-by: Nick Clemens Signed-off-by: Jesse Weaver Signed-off-by: Tomas Cohen Arazi Signed-off-by: Kyle M Hall commit b4610691c71b8a98e1375cf3d8e945af58ce7d0c Author: Jonathan Druart Date: Mon Oct 12 17:03:38 2015 +0100 Bug 12478: Remove previous mappings file (sql) Signed-off-by: Nick Clemens Signed-off-by: Jesse Weaver Signed-off-by: Tomas Cohen Arazi Signed-off-by: Kyle M Hall commit 776dcbae01f5b43dfa09722c198218f667356d74 Author: Jonathan Druart Date: Mon Oct 12 16:54:12 2015 +0100 Bug 12478: Manually add the many_to_many relationships This will create the add_to_* accessors for us. Signed-off-by: Nick Clemens Signed-off-by: Jesse Weaver Signed-off-by: Tomas Cohen Arazi Signed-off-by: Kyle M Hall commit 4f60862917949063c9918234f2145ccc72be0e30 Author: Jonathan Druart Date: Mon Oct 12 16:52:11 2015 +0100 Bug 12478: update the schema These files have been generated with the misc/devel/update_dbix_class_files.pl script. Signed-off-by: Nick Clemens Signed-off-by: Jesse Weaver Signed-off-by: Tomas Cohen Arazi Signed-off-by: Kyle M Hall commit f242f7f186d69ace2b6912e6f6f163b4492c826a Author: Jonathan Druart Date: Mon Oct 12 16:46:16 2015 +0100 Bug 12478: Move mapping attributes to the join table To make things consistent, the attributes of the mappings (sort, suggestible, facet) should be moved to the join tables (search_marc_to_field). Indeed the search_marc_map could represent a mapping for several search fields with different attributes. Before this change it was not possible. Signed-off-by: Nick Clemens Signed-off-by: Jesse Weaver Signed-off-by: Tomas Cohen Arazi Signed-off-by: Kyle M Hall commit 82539e86502fb618caf75281aed9fb4fb0f9a090 Author: Jonathan Druart Date: Fri Sep 25 15:48:50 2015 +0100 Bug 12478: Add Koha::SearchField[s] and Koha::SearchMarcMap[s] classes This was initially submited on bug 14899, but we will need it here. Signed-off-by: Nick Clemens Signed-off-by: Jesse Weaver Signed-off-by: Tomas Cohen Arazi Signed-off-by: Kyle M Hall commit 731559aeff1d132f06d77fe370ce93f17037f740 Author: Jonathan Druart Date: Mon Oct 12 17:11:28 2015 +0100 Bug 12478: Add the yaml mappings file This should facilitate the modification of the mappings. The yaml format is more readable than sql. Signed-off-by: Nick Clemens Signed-off-by: Jesse Weaver Signed-off-by: Tomas Cohen Arazi Signed-off-by: Kyle M Hall commit bdc3831e0992b92898423a5ebfca700794c60c9f Author: Robin Sheat Date: Thu Oct 8 17:02:21 2015 +1300 Bug 12478: "fix" notforloan Signed-off-by: Nick Clemens Signed-off-by: Jesse Weaver Signed-off-by: Tomas Cohen Arazi Signed-off-by: Kyle M Hall commit fe94306f9b590599a70d709e42b9ee1800f1fb9b Author: Jonathan Druart Date: Mon Oct 5 17:15:01 2015 +0100 Bug 12478: Take the FacetMaxCount pref into account The system preference FacetMaxCount should work as expected with ES. Signed-off-by: Nick Clemens Signed-off-by: Jesse Weaver Signed-off-by: Tomas Cohen Arazi Signed-off-by: Kyle M Hall commit e1d8d0180efd434929800b1d5fc0c42ad99740ee Author: Jonathan Druart Date: Mon Oct 5 11:34:54 2015 +0100 Bug 12478: Remove empty limit parameter If no limit are passed, the url will contain '&limit=' anyway. It is not necessary and can be avoided easily Test plan: 1/ Search for a term in your catalogue 2/ Hover over a link in the facet area 3/ The link is cgi-bin/koha/opac-search.pl?idx=kw&q=your_term&limit=&limit=[...] With this patch, the empty limit parameter does not appear. Signed-off-by: Nick Clemens Signed-off-by: Jesse Weaver Signed-off-by: Tomas Cohen Arazi Signed-off-by: Kyle M Hall commit 4c7cde08fea912ce0a239d8e575ca2f44cf14845 Author: Jonathan Druart Date: Mon Oct 5 15:29:52 2015 +0100 Bug 12478: Display facet terms ordered by number of occurrences By default ES returns the facet terms ordered by most used, which makes sense. This patch removes resort done in the scripts (catalogue/search.pl and opac/opac-search.pl) and moves it to the module. For Zebra it's now done in C4::Search::getRecords, and there is no change to expect (still alphabetically). On the Elastic search side, we could imagine to let the library define the order of the facets. The facet terms are now sorted by most used. To test easily this change, turn on the displayFacetCount pref. Signed-off-by: Nick Clemens Signed-off-by: Jesse Weaver Signed-off-by: Tomas Cohen Arazi Signed-off-by: Kyle M Hall commit f5747ddc450e03eeb8ed1086d4551cc83c7901fb Author: Jonathan Druart Date: Mon Oct 5 12:50:52 2015 +0100 Bug 12478: facets - Display description instead of code for locations Signed-off-by: Nick Clemens Signed-off-by: Jesse Weaver Signed-off-by: Tomas Cohen Arazi Signed-off-by: Kyle M Hall commit 8af5057e19f8e5dc35261c2437ff369fbd5414bb Author: Jonathan Druart Date: Mon Oct 5 12:51:37 2015 +0100 Bug 12478: Add Koha::AuthorisedValue[s] class These 2 classes come from bug 10363. Signed-off-by: Nick Clemens Signed-off-by: Jesse Weaver Signed-off-by: Tomas Cohen Arazi Signed-off-by: Kyle M Hall commit dca617891fdbda286483ec6a61292d1b50984116 Author: Jonathan Druart Date: Mon Oct 5 12:17:09 2015 +0100 Bug 12478: Use the new Koha::ItemTypes to retrieve itypes descriptions Signed-off-by: Nick Clemens Signed-off-by: Jesse Weaver Signed-off-by: Tomas Cohen Arazi Signed-off-by: Kyle M Hall commit 2d6b64ae6a40afbf08e5b80b9f0073ccc27e21c1 Author: Jonathan Druart Date: Tue Sep 15 17:02:28 2015 +0100 Bug 12478: Add Koha::ItemType[s] classes These 2 classes come from bug 14828. Tests in t/db_dependent/Koha/ItemTypes.t should be updated. Signed-off-by: Nick Clemens Signed-off-by: Jesse Weaver Signed-off-by: Tomas Cohen Arazi Signed-off-by: Kyle M Hall commit bcf38792e3efa17993858c0b14491928ecf632dc Author: Jonathan Druart Date: Mon Oct 5 10:58:50 2015 +0100 Bug 12478: (follow-up) Display the correct number of facets This patch fixes a side-effect of the previous "Display the correct number of facets (5 instead of 6)" patch. If you ask for more facets ('show more' link) and that the number of facets is > 5 but < 10, 1 facet will be missing. Signed-off-by: Nick Clemens Signed-off-by: Jesse Weaver Signed-off-by: Tomas Cohen Arazi Signed-off-by: Kyle M Hall commit f61f3391679f310e1a606de95b2c2878a2517e62 Author: Robin Sheat Date: Mon Oct 5 17:44:14 2015 +1300 Bug 12478: abort early if there's no elasticserch definition Signed-off-by: Nick Clemens Signed-off-by: Jesse Weaver Signed-off-by: Tomas Cohen Arazi Signed-off-by: Kyle M Hall commit 412fad80cc9f0a1e1da15f8e6809e11de3f000dc Author: Robin Sheat Date: Mon Oct 5 16:21:42 2015 +1300 Bug 14899: schema changes to make the database better Signed-off-by: Nick Clemens Signed-off-by: Jesse Weaver Signed-off-by: Tomas Cohen Arazi Signed-off-by: Kyle M Hall commit a1ae514e4329a4fb8373d32b0b41ac619ae1ea92 Author: Jonathan Druart Date: Fri Sep 25 16:06:07 2015 +0100 Bug 14899: DB changes This patch applies several changes to the DB structure introduced by the previous ES patch set: 1/ Add a search_field.label column => It will be easier to understand what the search_field does. Indeed, some are not user friendly: acqdate, an, pl, ff8-23, ln, etc. TODO later: Update the labels with correct values (at the moment label=name) 2/ Update the foreign key search_marc_to_field.search_marc_map_id with on delete cascase. This will permit to automatically remove the entries in search_marc_to_field when they are deleted in search_marc_map. 3/ Remove the index_name_2 unique constraint on the search_marc_map table. I don't understand how this could be useful, it was defined like (index_name, marc_type, marc_field), so it means a mapping cannot be defined twice with different values for facet, suggestible and sort. This limitation does not seem to make sense. Robin, please correct me if I am wrong :) Signed-off-by: Nick Clemens Signed-off-by: Jesse Weaver Signed-off-by: Tomas Cohen Arazi Signed-off-by: Kyle M Hall commit fa6f77cc71fc6069d5c0dc527e7a8e0d2e06635d Author: Robin Sheat Date: Fri Oct 2 15:23:07 2015 +1300 Bug 12478: add location, su-geo, se to facets Signed-off-by: Nick Clemens Signed-off-by: Jesse Weaver Signed-off-by: Tomas Cohen Arazi Signed-off-by: Kyle M Hall commit 3949b628f4bbc05f6214d1cf547d3cc54d6cf32f Author: Robin Sheat Date: Thu Oct 1 15:53:44 2015 +1300 Bug 12478: fix errors from rebase and new upstream version Signed-off-by: Nick Clemens Signed-off-by: Jesse Weaver Signed-off-by: Tomas Cohen Arazi Signed-off-by: Kyle M Hall commit c6d59cb75675ada496d7126c92e3073e13c3acab Author: Robin Sheat Date: Wed Sep 30 15:46:18 2015 +1300 Bug 12478: fix some issues on rebase There were rebase conflicts that it was just easier to postpone until afterwards. Signed-off-by: Nick Clemens Signed-off-by: Jesse Weaver Signed-off-by: Tomas Cohen Arazi Signed-off-by: Kyle M Hall commit d1621fee0bbd17d09113fc9228fa63e448a45e7b Author: Jonathan Druart Date: Fri Sep 4 13:00:48 2015 +0100 Bug 12478: Fix error on indexing a specific record % perl misc/search_tools/rebuild_elastic_search.pl -bn 42 Can't locate object method "idnumber" via package "MARC::Record" at misc/search_tools/rebuild_elastic_search.pl line 171. Signed-off-by: Nick Clemens Signed-off-by: Jesse Weaver Signed-off-by: Tomas Cohen Arazi Signed-off-by: Kyle M Hall commit 0b392ab179ee210921bb551e116c8c8a1b739cf7 Author: Jonathan Druart Date: Fri Aug 28 11:59:26 2015 +0100 Bug 12478: Fix encoding issue on facets Filer on "?lez, Ts." => Can't escape \x{015A}, try uri_escape_utf8() instead at /home/koha/src/Koha/SearchEngine/Elasticsearch/QueryBuilder.pm line 221. Signed-off-by: Nick Clemens Signed-off-by: Jesse Weaver Signed-off-by: Tomas Cohen Arazi Signed-off-by: Kyle M Hall commit df1c222537bd73d9582eea02aa21882556f40cef Author: Jonathan Druart Date: Fri Aug 28 11:29:23 2015 +0100 Bug 12478: Do not display the 'Show more' links if no more facet available Signed-off-by: Nick Clemens Signed-off-by: Jesse Weaver Signed-off-by: Tomas Cohen Arazi Signed-off-by: Kyle M Hall commit 9f3c45d62c1f3de66edc7d7a25f3c2d7f6afca54 Author: Jonathan Druart Date: Fri Aug 28 11:24:24 2015 +0100 Bug 12478: Display the correct number of facets (5 instead of 6) The loop on facet entries was wrong, it should stop after 5 iterations. Signed-off-by: Nick Clemens Signed-off-by: Jesse Weaver Signed-off-by: Tomas Cohen Arazi Signed-off-by: Kyle M Hall commit fa447bdc804e7213e0247412b78a7a91c2e7c19f Author: Jonathan Druart Date: Fri Aug 28 11:13:45 2015 +0100 Bug 12478: Remove Solr occurrences reintroduced by a previous patch Signed-off-by: Nick Clemens Signed-off-by: Jesse Weaver Signed-off-by: Tomas Cohen Arazi Signed-off-by: Kyle M Hall commit 24d3482fee68464d3d26f3a55c35f0fd0934fc7c Author: Jonathan Druart Date: Fri Aug 28 11:13:07 2015 +0100 Bug 12478: Fix pod in the rebuild_ES.pl script Signed-off-by: Nick Clemens Signed-off-by: Jesse Weaver Signed-off-by: Tomas Cohen Arazi Signed-off-by: Kyle M Hall commit c6b997e1d860d7977eda1b2071a13c948a71122b Author: Jonathan Druart Date: Fri Aug 28 11:08:27 2015 +0100 Bug 12478: Fix the verbose flag on reindexing Signed-off-by: Nick Clemens Signed-off-by: Jesse Weaver Signed-off-by: Tomas Cohen Arazi Signed-off-by: Kyle M Hall commit 9f45e2ee951550817d25989227d865a916aa59a7 Author: Jonathan Druart Date: Fri Aug 28 11:07:51 2015 +0100 Bug 12478: Change the commit count to 5k It will improve the indexing time. Signed-off-by: Nick Clemens Signed-off-by: Jesse Weaver Signed-off-by: Tomas Cohen Arazi Signed-off-by: Kyle M Hall commit 03e000bf305301ffb5d5d0ebb27ef8edf87b5fa0 Author: Jonathan Druart Date: Fri Aug 28 11:07:04 2015 +0100 Bug 12478: Fix the UNIMARC and NORMARC indexing 1/ This patch fixes a major issue on UNIMARC and NORMARC installations (Compulsive c/p on insert into insert into search_marc_to_field for unimarc and normarc) 2/ After fixing that, I got invalid marc path at /usr/share/perl5/Catmandu/Fix/marc_map.pm line 35. on reindexing. It was caused by some "" values instead of NULL. 3/ Then, a "duplicate entry" error was caused by 3 lines for Local-number. It seems to be an error, 1 is enough (I suppose 0909 was an error too). Note that the following is not fixed by this patch: MariaDB [koha_es_unimarc]> insert into search_field (name, type) select distinct mapping, type from elasticsearch_mapping; Query OK, 73 rows affected, 57 warnings (0.05 sec) Records: 73 Duplicates: 0 Warnings: 57 MariaDB [koha_es_unimarc]> show warnings; +---------+------+--------------------------------------------+ | Level | Code | Message | +---------+------+--------------------------------------------+ | Warning | 1265 | Data truncated for column 'type' at row 1 | Signed-off-by: Nick Clemens Signed-off-by: Jesse Weaver Signed-off-by: Tomas Cohen Arazi Signed-off-by: Kyle M Hall commit b5b036e6e99a74193350f8bb1ed9cc8709570e07 Author: Robin Sheat Date: Fri Sep 25 15:11:29 2015 +1200 Bug 12478: allow more granular sorting configuration This allows sorting to be configured within a field. For example, while many values are included for search on author, sorting should only be done on the main entry values. This permits that by have a sort value, which can be true, false, or null. true and null are pretty much the same, but false means that a field isn't available for sorting on. By default (null), fields can be sorted on. Signed-off-by: Nick Clemens Signed-off-by: Jesse Weaver Signed-off-by: Tomas Cohen Arazi Signed-off-by: Kyle M Hall commit 7a09c1f48442ee295cf9eaab73e30679a58dd340 Author: Robin Sheat Date: Thu Aug 27 16:13:16 2015 +1200 Bug 12478: pull the SQL updates from the browse interface Hopefully will reduce the rate of conflicts down the road. We'll see. Signed-off-by: Nick Clemens Signed-off-by: Jesse Weaver Signed-off-by: Tomas Cohen Arazi Signed-off-by: Kyle M Hall commit e293faa0ee0e961ac2ac4f75a79469931bfb59ef Author: Robin Sheat Date: Wed Aug 26 17:29:17 2015 +1200 Bug 12478: pull the SQL updates from the browse interface Signed-off-by: Nick Clemens Signed-off-by: Jesse Weaver Signed-off-by: Tomas Cohen Arazi Signed-off-by: Kyle M Hall commit 9f3703e58b9d0f098b780c98a69e05c01205964b Author: Robin Sheat Date: Tue Aug 25 17:03:08 2015 +1200 Bug 12478: the facet "show more" links work properly now Signed-off-by: Nick Clemens Signed-off-by: Jesse Weaver Signed-off-by: Tomas Cohen Arazi Signed-off-by: Kyle M Hall commit 0d0c8cd2c8547d1e0fbb3537217eca4eedf0fa97 Author: Robin Sheat Date: Tue Aug 25 15:13:51 2015 +1200 Bug 12478: add the lenient option to the query_string query It doesn't really help. Signed-off-by: Nick Clemens Signed-off-by: Jesse Weaver Signed-off-by: Tomas Cohen Arazi Signed-off-by: Kyle M Hall commit 5fbdfd48c01bd132cd3e773251b035aa4b5d1ab2 Author: Robin Sheat Date: Thu Aug 20 18:12:42 2015 +1200 Bug 12478: improve error reporting a bit Signed-off-by: Nick Clemens Signed-off-by: Jesse Weaver Signed-off-by: Tomas Cohen Arazi Signed-off-by: Kyle M Hall commit 6e4aa91568c9f39ed9f31229d45f8fb9bb3339a1 Author: Robin Sheat Date: Mon Aug 3 17:55:54 2015 +1200 Bug 12478: update to support new Cat::Store::ES Signed-off-by: Nick Clemens Signed-off-by: Jesse Weaver Signed-off-by: Tomas Cohen Arazi Signed-off-by: Kyle M Hall commit 3009c4afc766d3ae51fff7a4b535fe7d80bc909f Author: Robin Sheat Date: Fri Jul 17 14:38:19 2015 +1200 Bug 12478: ES is now updated when records are updated/deleted Signed-off-by: Nick Clemens Signed-off-by: Jesse Weaver Signed-off-by: Tomas Cohen Arazi Signed-off-by: Kyle M Hall commit 6bd544eadb9cae9dceeb3883244ce0c02f95f8c8 Author: Robin Sheat Date: Fri Jul 10 15:19:21 2015 +1200 Bug 12478: fix capitalisation issue with index names Signed-off-by: Nick Clemens Signed-off-by: Jesse Weaver Signed-off-by: Tomas Cohen Arazi Signed-off-by: Kyle M Hall commit 66cdeac96c77cca0d5e2ecb4e4cb267914ade45d Author: Robin Sheat Date: Wed Jul 8 16:34:12 2015 +1200 Bug 12478: make things using SimpleSearch use the new version Signed-off-by: Nick Clemens Signed-off-by: Jesse Weaver Signed-off-by: Tomas Cohen Arazi Signed-off-by: Kyle M Hall commit 951e1dc3ae9632f9bbb42a98cb2b8971b26c2eac Author: Robin Sheat Date: Fri Jun 19 15:55:46 2015 +1200 Bug 12478: a replacement to the SimpleSearch interface implemented Signed-off-by: Nick Clemens Signed-off-by: Jesse Weaver Signed-off-by: Tomas Cohen Arazi Signed-off-by: Kyle M Hall commit b35840613024c5bd6ad59cbe9c531ef5699c30c0 Author: Robin Sheat Date: Wed Jun 17 15:37:29 2015 +1200 Bug 12478: fix issue with authority sort order being weird Signed-off-by: Nick Clemens Signed-off-by: Jesse Weaver Signed-off-by: Tomas Cohen Arazi Signed-off-by: Kyle M Hall commit 9fd04957ed2410e061e041fea0bd3ad8b0d290b5 Author: Robin Sheat Date: Mon Jun 15 17:35:41 2015 +1200 Bug 12478: auth search works in the staff client Some issues with sort order though. Signed-off-by: Nick Clemens Signed-off-by: Jesse Weaver Signed-off-by: Tomas Cohen Arazi Signed-off-by: Kyle M Hall commit eaa3bdb7ffce4ccde83d72e11dbe75327985f220 Author: Robin Sheat Date: Mon Jun 15 15:12:39 2015 +1200 Bug 12478: starting authority search in staff client Signed-off-by: Nick Clemens Signed-off-by: Jesse Weaver Signed-off-by: Tomas Cohen Arazi Signed-off-by: Kyle M Hall commit 7366a4c0abac1f84bd25ea52ee3492805b139b7c Author: Robin Sheat Date: Fri Jun 12 15:19:39 2015 +1200 Bug 12478: fix issues with the conversion SQL Signed-off-by: Nick Clemens Signed-off-by: Jesse Weaver Signed-off-by: Tomas Cohen Arazi Signed-off-by: Kyle M Hall commit 4393c233d6104f5aff78bca6d24c8ee7478f764a Author: Robin Sheat Date: Wed Jun 10 14:35:33 2015 +1200 Bug 12478: change the schema for storing mappings This makes the mapping schema a proper many-to-many relational structure, which is a little more fiddly to work with, but will make things like editors for it easier to write. Signed-off-by: Nick Clemens Signed-off-by: Jesse Weaver Signed-off-by: Tomas Cohen Arazi Signed-off-by: Kyle M Hall commit f0d4afac61d162ab819f36c9e95c3d60aa8b40f2 Author: Robin Sheat Date: Fri Jun 5 14:29:31 2015 +1200 Bug 12478: fix multi-choice stuff in advanced search This means that things like itype get "OR"ed together, rather than "AND"ed like other things. Signed-off-by: Nick Clemens Signed-off-by: Jesse Weaver Signed-off-by: Tomas Cohen Arazi Signed-off-by: Kyle M Hall commit 45b67a9d2dbdf9e4983624d5482c06e6b5b5ef3d Author: Robin Sheat Date: Thu May 14 15:15:04 2015 +1200 Bug 12478: starting to add search to staff client Signed-off-by: Nick Clemens Signed-off-by: Jesse Weaver Signed-off-by: Tomas Cohen Arazi Signed-off-by: Kyle M Hall commit eee91ee4997193fed444cd2d0325f45cfc2d4990 Author: Robin Sheat Date: Tue Mar 31 17:26:49 2015 +1300 Bug 12478: fix wrong counts/results for authority searches Signed-off-by: Nick Clemens Signed-off-by: Jesse Weaver Signed-off-by: Tomas Cohen Arazi Signed-off-by: Kyle M Hall commit bcb9bf36b6fd739985ce09413235099acf2e946f Author: Robin Sheat Date: Wed Mar 25 17:29:14 2015 +1300 Bug 12478: fix issues caused by rebasing Signed-off-by: Nick Clemens Signed-off-by: Jesse Weaver Signed-off-by: Tomas Cohen Arazi Signed-off-by: Kyle M Hall commit dc63f75605576ec3cd07ad3d4d7c49698414aff4 Author: Robin Sheat Date: Tue Mar 17 17:23:56 2015 +1300 Bug 12478: reinstate zebra compatibility for auth search Signed-off-by: Nick Clemens Signed-off-by: Jesse Weaver Signed-off-by: Tomas Cohen Arazi Signed-off-by: Kyle M Hall commit 19a82bb7c247ae9458025f776a81511a7ad9ceaa Author: Robin Sheat Date: Fri Mar 13 15:27:24 2015 +1300 Bug 12478: paging is fixed now too Signed-off-by: Nick Clemens Signed-off-by: Jesse Weaver Signed-off-by: Tomas Cohen Arazi Signed-off-by: Kyle M Hall commit b08b8aa5c01becee3e023689b78f04106118e86b Author: Robin Sheat Date: Fri Mar 13 15:22:53 2015 +1300 Bug 12478: sort is sorted Signed-off-by: Nick Clemens Signed-off-by: Jesse Weaver Signed-off-by: Tomas Cohen Arazi Signed-off-by: Kyle M Hall commit befd95ca7bae4cb57c6d5cdb8f00fe21cfe131d7 Author: Robin Sheat Date: Thu Mar 12 18:11:30 2015 +1300 Bug 12478: phrase searching for authorities is happier Signed-off-by: Nick Clemens Signed-off-by: Jesse Weaver Signed-off-by: Tomas Cohen Arazi Signed-off-by: Kyle M Hall commit a141979553a617d4b3106f0115f237b7f9de1926 Author: Robin Sheat Date: Wed Mar 11 16:14:14 2015 +1300 Bug 12478: fix the way counting is done Signed-off-by: Nick Clemens Signed-off-by: Jesse Weaver Signed-off-by: Tomas Cohen Arazi Signed-off-by: Kyle M Hall commit 51f4f02fad579018d724137c1774eb6e6c5fcc59 Author: Robin Sheat Date: Tue Mar 10 18:12:51 2015 +1300 Bug 12478: authority paging works Signed-off-by: Nick Clemens Signed-off-by: Jesse Weaver Signed-off-by: Tomas Cohen Arazi Signed-off-by: Kyle M Hall commit 19e2b47e6b28009ec14d6194b36659014c2246ac Author: Robin Sheat Date: Tue Mar 10 17:32:08 2015 +1300 Bug 12478: working on authority results Signed-off-by: Nick Clemens Signed-off-by: Jesse Weaver Signed-off-by: Tomas Cohen Arazi Signed-off-by: Kyle M Hall commit 712bbb08dd5c175e2a03a8e35c644e0211f5993f Author: Robin Sheat Date: Wed Mar 4 18:19:25 2015 +1300 Bug 12478: make authid get to the templates properly Signed-off-by: Nick Clemens Signed-off-by: Jesse Weaver Signed-off-by: Tomas Cohen Arazi Signed-off-by: Kyle M Hall commit fe1e13085e0c5ee6f104976d5c7ec1dd5194c132 Author: Robin Sheat Date: Wed Mar 4 17:38:18 2015 +1300 Bug 12478: basic auth search and display is working Signed-off-by: Nick Clemens Signed-off-by: Jesse Weaver Signed-off-by: Tomas Cohen Arazi Signed-off-by: Kyle M Hall commit 010a9b2b7271f1a6dfc3ff261552e10a3972722b Author: Robin Sheat Date: Tue Mar 3 14:02:19 2015 +1300 Bug 12478: more authorities Signed-off-by: Nick Clemens Signed-off-by: Jesse Weaver Signed-off-by: Tomas Cohen Arazi Signed-off-by: Kyle M Hall commit a690af7ef92a4b5eb58645e21cf9632959a200fc Author: Robin Sheat Date: Tue Feb 24 14:43:01 2015 +1300 Bug 12478 - more authorites Signed-off-by: Nick Clemens Signed-off-by: Jesse Weaver Signed-off-by: Tomas Cohen Arazi Signed-off-by: Kyle M Hall commit 8be6a50fa890c5e2fe0ece601112ba92341a3e42 Author: Robin Sheat Date: Tue Feb 17 18:38:07 2015 +1300 Bug 12478 - more authority searching Queries are being built, but they seem to be wrong as no results are returned. Signed-off-by: Nick Clemens Signed-off-by: Jesse Weaver Signed-off-by: Tomas Cohen Arazi Signed-off-by: Kyle M Hall commit 8bddbdcb97d01ccfb9fe43239caff5712d2f63cf Author: Robin Sheat Date: Wed Feb 4 16:42:12 2015 +1300 Bug 12478 - more authority query building Signed-off-by: Nick Clemens Signed-off-by: Jesse Weaver Signed-off-by: Tomas Cohen Arazi Signed-off-by: Kyle M Hall commit 53309570b01d79aad6b58e646767b7ba5fbabe4b Author: Robin Sheat Date: Tue Feb 3 14:40:50 2015 +1300 Bug 12478 - fix syntax errors so that stuff runs Signed-off-by: Nick Clemens Signed-off-by: Jesse Weaver Signed-off-by: Tomas Cohen Arazi Signed-off-by: Kyle M Hall commit 233e843ef4f734d6236a0b633d209e2641ca9acb Author: Robin Sheat Date: Fri Jan 30 16:06:46 2015 +1300 Bug 12478 - authority work in progress Signed-off-by: Nick Clemens Signed-off-by: Jesse Weaver Signed-off-by: Tomas Cohen Arazi Signed-off-by: Kyle M Hall commit 9d9b7bc38b2356e4ab18e53d418bb33fae60f16f Author: Robin Sheat Date: Wed Nov 19 15:05:12 2014 +1300 Bug 12478 - fix issue with class loading Signed-off-by: Nick Clemens Signed-off-by: Jesse Weaver Signed-off-by: Tomas Cohen Arazi Signed-off-by: Kyle M Hall commit 49c976a6c1ed724972801a554e208459ab6c3257 Author: Robin Sheat Date: Wed Nov 19 14:07:20 2014 +1300 Bug 12478 - fix error in configuration loading Signed-off-by: Nick Clemens Signed-off-by: Jesse Weaver Signed-off-by: Tomas Cohen Arazi Signed-off-by: Kyle M Hall commit 4d34d4a92970f2ade4644d04316fa2b2f24665b2 Author: Robin Sheat Date: Wed Nov 12 17:27:14 2014 +1300 Bug 12478 - fix error in SQL Signed-off-by: Nick Clemens Signed-off-by: Jesse Weaver Signed-off-by: Tomas Cohen Arazi Signed-off-by: Kyle M Hall commit de084f7087c83dfa1f55caea628a3af3bca3d88e Author: Robin Sheat Date: Tue Sep 23 17:32:57 2014 +1200 Bug 12478 - add test cases Signed-off-by: Nick Clemens Signed-off-by: Jesse Weaver Signed-off-by: Tomas Cohen Arazi Signed-off-by: Kyle M Hall commit d9cdde9d270c64ecae6bb88fadfb43242798456a Author: Robin Sheat Date: Thu Sep 4 13:42:26 2014 +1200 Bug 12478 - authorities can now be stored in ES (Not fetched yet though.) Signed-off-by: Nick Clemens Signed-off-by: Jesse Weaver Signed-off-by: Tomas Cohen Arazi Signed-off-by: Kyle M Hall commit 45103d374598edc84b801de0e23fbfd30ff10c9f Author: Robin Sheat Date: Mon Aug 25 15:55:50 2014 +1200 Bug 12478 - set up database tables for elasticsearch This sets up the database changes needed to run ES. This isn't intended to be ready for upstreaming, just to make testing easier. Signed-off-by: Nick Clemens Signed-off-by: Jesse Weaver Signed-off-by: Tomas Cohen Arazi Signed-off-by: Kyle M Hall commit 036f273d79dadc81878587e9228aef478980ba6e Author: Robin Sheat Date: Tue Sep 16 17:38:43 2014 +1200 Bug 12478 - pile of elasticsearch code Signed-off-by: Nick Clemens Signed-off-by: Jesse Weaver Signed-off-by: Tomas Cohen Arazi Signed-off-by: Kyle M Hall commit ed70f11e84e146797eae311ec324b144838df4f6 Author: Robin Sheat Date: Tue Sep 16 17:34:25 2014 +1200 Bug 12478 - add some base objects that the ES code will depend on Signed-off-by: Nick Clemens Signed-off-by: Jesse Weaver Signed-off-by: Tomas Cohen Arazi Signed-off-by: Kyle M Hall ----------------------------------------------------------------------- Summary of changes: hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Tue Apr 26 18:37:23 2016 From: gitmaster at git.koha-community.org (Git repo owner) Date: Tue, 26 Apr 2016 16:37:23 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.22.00-1195-g7354547 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 7354547ce323cf88ed40f4d2b65b06b98ce61c34 (commit) from 9648cd2917f4b530c9da9b39e4fe606e457511a2 (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 7354547ce323cf88ed40f4d2b65b06b98ce61c34 Author: Jonathan Druart Date: Sat Apr 23 07:21:54 2016 +0100 Bug 16328: follow-up for bug 15044 - Fix datatable error Bug 15044 added a new column to the suggestion table at the OPAC but forgot to modify the DT params. Test plan: The suggestion table at the OPAC should not be broken with this patch. NOTE: Sorting was broken prior to patch. Sorting was fixed after patch. The added null causes the field count to match up properly. Signed-off-by: Mark Tompsett Signed-off-by: Katrin Fischer Signed-off-by: Brendan Gallagher ----------------------------------------------------------------------- Summary of changes: koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-suggestions.tt | 1 + 1 file changed, 1 insertion(+) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Tue Apr 26 22:47:01 2016 From: gitmaster at git.koha-community.org (Git repo owner) Date: Tue, 26 Apr 2016 20:47:01 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.22.00-1283-gf24dd95 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 f24dd95e5d4b3c1b7b9adf5618790f516b5889c5 (commit) via ceaec34d314b147ac06373487cc27ae59c53bcf9 (commit) via 37ea74669c77efee888630fdcab73889f3d21367 (commit) via ae8765f20e54c9c3eec5f1d5082c24e5be373ca2 (commit) via 7b7b47ca6853cf5bfe438ff1c18b4987c2602f8a (commit) via e09834f3aa9d0776acbce2673341f63228bc2a8e (commit) via 39ff330c8dd7f8126567c3004d13ed9b11926d94 (commit) via fbb5094caee6d96a5c9282e46f934f1e44781449 (commit) via 253f8bac3f45dfa668c5d54bdc68038b7f9bc5fa (commit) via bc21573db4122c64212f40553f4b510918e14dd8 (commit) via 2e18cca19f6d75427162b9d23923985248b45b88 (commit) via 24493a0d732246407e9a52c69f2deeab3f3fbda5 (commit) via 4b3d5ef68621fe32475fda790ae116f2f19b7f5f (commit) via 8d042911532c19e8a74b42cb0f57f3099fc2e126 (commit) via a792e847199b26368fa34ada8b76bc3dfbee7f9a (commit) via adccfdb9f9a325e9b3794c61db67e915beb515c3 (commit) via 98db1a3984c1f04b90c41cf3c7af639645dc24a2 (commit) via 0ed2c3dc922dfd0737582a6519fb7fc094d8dd8f (commit) via 24f72bd12afd31ae37fa69c611fcf60a28ca655b (commit) via 3e95923a8a6e09a3c21a86035475cf851cc62d5d (commit) via 1cc42acb9113304a27934a535a935f11f9d42189 (commit) via 9cddc7ab165447e14b617c99e7acbd5ea4aa9812 (commit) via 2de8fd9e33942f96fa026fd1feb49aea7007dacd (commit) via ce5bc33ef3c1055373d7d047d44f10fa42eb2584 (commit) via 246f2dddaf6bc23f0b574113166171d4e2786e9e (commit) via 7a9d8d6b29c3ab215a0e5493752bfa282d9fff8a (commit) via 446cf8381db28ecdcd5fe0442b07920cb5a54492 (commit) via e8950b6b00fe52a8bfed12bc3b6fbf193343e853 (commit) via 7c0cbc3fe8a9f900045f4bb1ec31c79afded2d1d (commit) via c5f351360f2f5d3848f152c73685463808441574 (commit) via 282ea1cdb4052f2de97a18a279cffc06ca3181ae (commit) via 8365f9e9fdbb65146cf794a0d63a8e2a11f00543 (commit) via 7d1046015680dbcbf7fd5ae838c5efe62cf09b2c (commit) via 8c76e99fcadbb42074368cfed7698b35d67d9f78 (commit) via 52c4b55a48f463a727da132b654a59ebd0e29813 (commit) via 0b9483a691af2dc6322f240daee5b754ba214e82 (commit) via 2aa72529c0b411bf1b8367293ac885f836759a49 (commit) via 7f04ac955d2c202ad7ce2ecf29ae9e6577db9f4f (commit) via a866ab9439cd89ea02dbf7b92ed9b079b45450d5 (commit) via c9cc12b79c28af77855cd3a74f5865cfe21c5e5c (commit) via c369095f802134d75b3b44a13613d3295154734c (commit) via c6ef16a50f487abf1117224b5d162776f2d12f93 (commit) via 8dd390108046ccf601eec11d4d913df81ddcb894 (commit) via 2ee681c630fe1e860e6846b0abbfe64f75c1c6b2 (commit) via 4493493da0a67534b238fd5a131e6acf944bacad (commit) via 2e79ea0f749af1e0bc08d4818fe0da46c5831b94 (commit) via e0be1ee6dc77a275c26e09ebdee5c141f5a93204 (commit) via 364b5870ed12c0f78caf2b002e5602d48de52109 (commit) via 589d7376bb1c3c63e119b27db90e0fcbd28fa742 (commit) via 349ecc34007ccb820ed4913230793ebbe59a36b7 (commit) via e0f6c4dc6edb4a143dc5e106a750c262ee05c4fc (commit) via bded6d50c744fe830168e7ecb96880cf326053c2 (commit) via 374f1e6384437c8f7e8dd8d9a6ed8889ad3dd800 (commit) via fdef405cdddcf7456247e7706941aabeb11895ea (commit) via b4392018bc1f9bf6a2f7dfe70b488856ad3a3897 (commit) via 1c737eaaf8847ac01eb281c37840584e18f4a03b (commit) via 4cd2729ddfba1c57cdf0754fbb5c4e8fd0cd386a (commit) via cd9946f0d4cc76df12883c4a0fec9f4e38fa623c (commit) via 2a73cf100b3c40a3c4cd650f95c9481bd7cc4945 (commit) via 8349e6955e306caabdb46a7c2c1ddd11496eadcd (commit) via bc3b0daaa42122045775c94b6fae59af63009465 (commit) via d241e217952febd0e68d24b92eb0a13fc0859191 (commit) via 417553a9e47bf31f4cb785162e3dced856a2ac2a (commit) via efe300993c8ff5efd08dac0cbbfad492aad6a214 (commit) via 7e87829166342d20d0828b157ac138a6b0220c87 (commit) via 2f0fb1b8449251736ffedefe9e865830786f12a3 (commit) via 841cb937017ad46a4f43509c4479d0cee37d523c (commit) via 1d0edd61bdb3229a75064dd025a54c6c3b4aab15 (commit) via 8b6451c49028967e81835fec73d860ee4901b42b (commit) via 45834b214c6889f6748608768c60d10311d1ae64 (commit) via b76d61a24b40f063126aedee60fc65e361cdf802 (commit) via e00fadad67cfe2ca607b90cb1848e3c3233156a1 (commit) via e74e5a504c958b06dc1e55e76ed8c2f4a42a643e (commit) via 45ffdbf226bbc1a678cf6a3d712144529109b00e (commit) via f5eb93a55ce47c237bf7afe216302b13b0c276bd (commit) via dfbe20e4dc64a200d4223b004b9220cdf582c606 (commit) via 0002bbc72a42b4c4223e20c66ef032c20f48ba19 (commit) via 8c85389558848b3159aa1ed2bbc10a6d1613bfa5 (commit) via 05fa9bccb0f2e82f52efba01b2435c723184643b (commit) via faa4e1f6ecd9e918749f568a5cc7a1ad795bdfa2 (commit) via 205260bd638310a88a64c045e5831167e6d08231 (commit) via 90c49a01fee1bddac41a6563ae1ef4c5db657545 (commit) via 90efe994c91fcbae771485bb87b1de0241310be7 (commit) via c7eee93d2f7540dedc3badc00af48d4905f605db (commit) via 0536ef37ccaeeab48a2b6298a5317d161c1a8e05 (commit) via 1d22202fb192734dca3bb3ff48ae3128e00ddb2a (commit) via 7dbd13e66f0ada4f0a4fa116f08def230a7858bf (commit) via 95dabf4bfd15f6aed149c17546c00083063a01c1 (commit) from 7354547ce323cf88ed40f4d2b65b06b98ce61c34 (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 f24dd95e5d4b3c1b7b9adf5618790f516b5889c5 Author: Brendan Gallagher Date: Tue Apr 26 20:55:25 2016 +0000 DBRev for Bug 12478 - Elasticsearch support for Koha Signed-off-by: Brendan Gallagher commit ceaec34d314b147ac06373487cc27ae59c53bcf9 Author: Jesse Weaver Date: Mon Apr 25 12:00:13 2016 -0600 Bug 12748: (QA followup) make new tests pass * t/Koha/ItemType.pm: * Rename to .t * Fix method names * t/db_dependent/Koha/ItemTypes.t: Fix method names and Koha::Database usage Signed-off-by: Jesse Weaver Signed-off-by: Tomas Cohen Arazi Signed-off-by: Kyle M Hall Signed-off-by: Brendan Gallagher commit 37ea74669c77efee888630fdcab73889f3d21367 Author: Jesse Weaver Date: Mon Apr 25 12:00:13 2016 -0600 Bug 12748: (QA followup) fix several tiny QA tools warnings * admin/searchengine/elasticsearch/mappings.yaml: * Fix indentation so QA tools believe it's valid YAML * C4::AuthoritiesMarc: Remove tab character * C4::Search: Fix POD * Koha::BiblioUtils: remove "return undef" * Koha::Schema::Result::Search*: rename type to _type * Koha::SE::ES::Search: * Fix spelling/@_[0] * Add my to loop variable * Remove unused var $error * Add use Modern::Perl * Fix undefined variables * Koha::ES::Indexer: fix POD * Koha::SE::ES::QueryBuilder: * Don't define variables in conditionals * Fix POD * Koha::SE::Zebra::Search: * Fix debug warns/POD/barewords * Koha::SE::Zebra::Search: add use Modern::Perl * kohastructure.sql: remove old, unused elasticsearch_mappings table, add new tables * labels/label-item-search.pl: remove C4::Dates * opac/elasticsearch.pl: remove old file Signed-off-by: Jesse Weaver Signed-off-by: Tomas Cohen Arazi Signed-off-by: Kyle M Hall Signed-off-by: Brendan Gallagher commit ae8765f20e54c9c3eec5f1d5082c24e5be373ca2 Author: Tomas Cohen Arazi Date: Tue Apr 12 15:33:25 2016 -0300 Bug 16248: ModZebra doesn't update zebraqueue if ES is enabled The zebraqueue table should still be populated with updates if ES is enabled, so the Zebra indexer keeps the Z39.50/SRU indexes up to date. To test: - Set SearchEngine = Elasticsearch - Watch for zebraqueue changes $ watch -n 0.5 'echo "SELECT COUNT(*) FROM zebraqueue WHERE done=0" | sudo koha-mysql kohadev' - Call touch_all_biblios.pl to simulate record changes $ sudo koha-shell kohadev ; cd kohaclone $ perl misc/maintenance/touch_all_biblios.pl -v => FAIL: Notice the watch is not changing the number of records to be indexed. - Apply the patch - Call touch_all_biblios.pl to simulate record changes $ sudo koha-shell kohadev ; cd kohaclone $ perl misc/maintenance/touch_all_biblios.pl -v => SUCCESS: The count raises (more than 0) and the zebra indexer picks the updates. - Sign off Signed-off-by: Chris Signed-off-by: Jesse Weaver Signed-off-by: Tomas Cohen Arazi Signed-off-by: Kyle M Hall Signed-off-by: Brendan Gallagher commit 7b7b47ca6853cf5bfe438ff1c18b4987c2602f8a Author: Chris Cormack Date: Thu Apr 14 21:27:10 2016 +0000 Bug 12478 Increasing test Coverage for Koha::SearchEngine::Elasticsearch::Search Before this patch it was 24.6%, after it is 64% Signed-off-by: Nick Clemens Signed-off-by: Jesse Weaver Signed-off-by: Tomas Cohen Arazi Signed-off-by: Kyle M Hall Signed-off-by: Brendan Gallagher commit e09834f3aa9d0776acbce2673341f63228bc2a8e Author: Chris Cormack Date: Thu Apr 14 20:23:13 2016 +0000 Bug 12478 Shifting tests and adding copyright headers Signed-off-by: Nick Clemens Signed-off-by: Jesse Weaver Signed-off-by: Tomas Cohen Arazi Signed-off-by: Kyle M Hall Signed-off-by: Brendan Gallagher commit 39ff330c8dd7f8126567c3004d13ed9b11926d94 Author: Chris Cormack Date: Wed Apr 13 21:20:36 2016 +0000 Bug 12478 : Fixing the tests for Koha::SearchEngine::Elasticsearch::Search perl t/Koha_SearchEngine_Elasticsearch_Search.t Signed-off-by: Nick Clemens Signed-off-by: Jesse Weaver Signed-off-by: Tomas Cohen Arazi Signed-off-by: Kyle M Hall Signed-off-by: Brendan Gallagher commit fbb5094caee6d96a5c9282e46f934f1e44781449 Author: Chris Cormack Date: Wed Apr 13 20:51:59 2016 +0000 Bug 12478 : Fixing the tests in t/Koha_ElasticSearch_Indexer.t Signed-off-by: Nick Clemens Signed-off-by: Jesse Weaver Signed-off-by: Tomas Cohen Arazi Signed-off-by: Kyle M Hall Signed-off-by: Brendan Gallagher commit 253f8bac3f45dfa668c5d54bdc68038b7f9bc5fa Author: Chris Date: Wed Apr 13 08:57:49 2016 +1200 Bug 12478: Making sure the syspref is set to Zebra by default Signed-off-by: Nick Clemens Signed-off-by: Jesse Weaver Signed-off-by: Tomas Cohen Arazi Signed-off-by: Kyle M Hall Signed-off-by: Brendan Gallagher commit bc21573db4122c64212f40553f4b510918e14dd8 Author: Chris Date: Wed Apr 13 08:45:28 2016 +1200 Bug 12478 : Remove the rest of the references to the old mapping tables Signed-off-by: Nick Clemens Signed-off-by: Jesse Weaver Signed-off-by: Tomas Cohen Arazi Signed-off-by: Kyle M Hall Signed-off-by: Brendan Gallagher commit 2e18cca19f6d75427162b9d23923985248b45b88 Author: Chris Date: Wed Apr 13 08:42:53 2016 +1200 Bug 12478 : Remove reference to deprecated table elasticsearch_mapping.sql Signed-off-by: Nick Clemens Signed-off-by: Jesse Weaver Signed-off-by: Tomas Cohen Arazi Signed-off-by: Kyle M Hall Signed-off-by: Brendan Gallagher commit 24493a0d732246407e9a52c69f2deeab3f3fbda5 Author: Tomas Cohen Arazi Date: Tue Apr 12 17:05:57 2016 -0300 Bug 12478: (QA followup) Koha::SearchEngine should fallback to Zebra Signed-off-by: Tomas Cohen Arazi Signed-off-by: Chris Signed-off-by: Nick Clemens Signed-off-by: Jesse Weaver Signed-off-by: Tomas Cohen Arazi Signed-off-by: Kyle M Hall Signed-off-by: Brendan Gallagher commit 4b3d5ef68621fe32475fda790ae116f2f19b7f5f Author: Jonathan Druart Date: Mon Apr 11 08:11:11 2016 +0100 Bug 12478: Define simple_search_compat for Zebra When Zebra is defined as the search engine, the authority search is broken (Can't locate object method "simple_search_compat" via package "Koha::SearchEngine::Zebra::Search" at /home/koha/koha/C4/AuthoritiesMarc.pm line 357.) simple_search_compat is not defined in Koha::SearchEngine::Zebra::Search, it should be a wrapper for C4::Search::SimpleSearch Signed-off-by: Nick Clemens Signed-off-by: Jesse Weaver Signed-off-by: Tomas Cohen Arazi Signed-off-by: Kyle M Hall Signed-off-by: Brendan Gallagher commit 8d042911532c19e8a74b42cb0f57f3099fc2e126 Author: Jonathan Druart Date: Tue Oct 13 10:45:32 2015 +0100 Bug 12478: Display facet terms ordered by number of occurrences By default ES returns the facet terms ordered by most used, which makes sense. This patch removes resort done in the scripts (catalogue/search.pl and opac/opac-search.pl) and moves it to the module. For Zebra it's now done in C4::Search::getRecords, and there is no change to expect (still alphabetically). On the Elastic search side, we could imagine to let the library define the order of the facets. The facet terms are now sorted by most used. To test easily this change, turn on the displayFacetCount pref. Signed-off-by: Nick Clemens Signed-off-by: Jesse Weaver Signed-off-by: Tomas Cohen Arazi Signed-off-by: Kyle M Hall Signed-off-by: Brendan Gallagher commit a792e847199b26368fa34ada8b76bc3dfbee7f9a Author: Robin Sheat Date: Tue Oct 13 17:21:36 2015 +1300 Revert "Bug 12478: Display facet terms ordered by number of occurrences" This reverts commit cd4905c2969b067476881016d0b03271f0bcc7c8. This commit caused an error in C4::Search::GetFacets when running in zebra mode. Conflicts: Koha/SearchEngine/Elasticsearch/Search.pm Signed-off-by: Nick Clemens Signed-off-by: Jesse Weaver Signed-off-by: Tomas Cohen Arazi Signed-off-by: Kyle M Hall Signed-off-by: Brendan Gallagher commit adccfdb9f9a325e9b3794c61db67e915beb515c3 Author: Jonathan Druart Date: Mon Oct 12 17:03:38 2015 +0100 Bug 12478: Remove previous mappings file (sql) Signed-off-by: Nick Clemens Signed-off-by: Jesse Weaver Signed-off-by: Tomas Cohen Arazi Signed-off-by: Kyle M Hall Signed-off-by: Brendan Gallagher commit 98db1a3984c1f04b90c41cf3c7af639645dc24a2 Author: Jonathan Druart Date: Mon Oct 12 16:54:12 2015 +0100 Bug 12478: Manually add the many_to_many relationships This will create the add_to_* accessors for us. Signed-off-by: Nick Clemens Signed-off-by: Jesse Weaver Signed-off-by: Tomas Cohen Arazi Signed-off-by: Kyle M Hall Signed-off-by: Brendan Gallagher commit 0ed2c3dc922dfd0737582a6519fb7fc094d8dd8f Author: Jonathan Druart Date: Mon Oct 12 16:52:11 2015 +0100 Bug 12478: update the schema These files have been generated with the misc/devel/update_dbix_class_files.pl script. Signed-off-by: Nick Clemens Signed-off-by: Jesse Weaver Signed-off-by: Tomas Cohen Arazi Signed-off-by: Kyle M Hall Signed-off-by: Brendan Gallagher commit 24f72bd12afd31ae37fa69c611fcf60a28ca655b Author: Jonathan Druart Date: Mon Oct 12 16:46:16 2015 +0100 Bug 12478: Move mapping attributes to the join table To make things consistent, the attributes of the mappings (sort, suggestible, facet) should be moved to the join tables (search_marc_to_field). Indeed the search_marc_map could represent a mapping for several search fields with different attributes. Before this change it was not possible. Signed-off-by: Nick Clemens Signed-off-by: Jesse Weaver Signed-off-by: Tomas Cohen Arazi Signed-off-by: Kyle M Hall Signed-off-by: Brendan Gallagher commit 3e95923a8a6e09a3c21a86035475cf851cc62d5d Author: Jonathan Druart Date: Fri Sep 25 15:48:50 2015 +0100 Bug 12478: Add Koha::SearchField[s] and Koha::SearchMarcMap[s] classes This was initially submited on bug 14899, but we will need it here. Signed-off-by: Nick Clemens Signed-off-by: Jesse Weaver Signed-off-by: Tomas Cohen Arazi Signed-off-by: Kyle M Hall Signed-off-by: Brendan Gallagher commit 1cc42acb9113304a27934a535a935f11f9d42189 Author: Jonathan Druart Date: Mon Oct 12 17:11:28 2015 +0100 Bug 12478: Add the yaml mappings file This should facilitate the modification of the mappings. The yaml format is more readable than sql. Signed-off-by: Nick Clemens Signed-off-by: Jesse Weaver Signed-off-by: Tomas Cohen Arazi Signed-off-by: Kyle M Hall Signed-off-by: Brendan Gallagher commit 9cddc7ab165447e14b617c99e7acbd5ea4aa9812 Author: Robin Sheat Date: Thu Oct 8 17:02:21 2015 +1300 Bug 12478: "fix" notforloan Signed-off-by: Nick Clemens Signed-off-by: Jesse Weaver Signed-off-by: Tomas Cohen Arazi Signed-off-by: Kyle M Hall Signed-off-by: Brendan Gallagher commit 2de8fd9e33942f96fa026fd1feb49aea7007dacd Author: Jonathan Druart Date: Mon Oct 5 17:15:01 2015 +0100 Bug 12478: Take the FacetMaxCount pref into account The system preference FacetMaxCount should work as expected with ES. Signed-off-by: Nick Clemens Signed-off-by: Jesse Weaver Signed-off-by: Tomas Cohen Arazi Signed-off-by: Kyle M Hall Signed-off-by: Brendan Gallagher commit ce5bc33ef3c1055373d7d047d44f10fa42eb2584 Author: Jonathan Druart Date: Mon Oct 5 11:34:54 2015 +0100 Bug 12478: Remove empty limit parameter If no limit are passed, the url will contain '&limit=' anyway. It is not necessary and can be avoided easily Test plan: 1/ Search for a term in your catalogue 2/ Hover over a link in the facet area 3/ The link is cgi-bin/koha/opac-search.pl?idx=kw&q=your_term&limit=&limit=[...] With this patch, the empty limit parameter does not appear. Signed-off-by: Nick Clemens Signed-off-by: Jesse Weaver Signed-off-by: Tomas Cohen Arazi Signed-off-by: Kyle M Hall Signed-off-by: Brendan Gallagher commit 246f2dddaf6bc23f0b574113166171d4e2786e9e Author: Jonathan Druart Date: Mon Oct 5 15:29:52 2015 +0100 Bug 12478: Display facet terms ordered by number of occurrences By default ES returns the facet terms ordered by most used, which makes sense. This patch removes resort done in the scripts (catalogue/search.pl and opac/opac-search.pl) and moves it to the module. For Zebra it's now done in C4::Search::getRecords, and there is no change to expect (still alphabetically). On the Elastic search side, we could imagine to let the library define the order of the facets. The facet terms are now sorted by most used. To test easily this change, turn on the displayFacetCount pref. Signed-off-by: Nick Clemens Signed-off-by: Jesse Weaver Signed-off-by: Tomas Cohen Arazi Signed-off-by: Kyle M Hall Signed-off-by: Brendan Gallagher commit 7a9d8d6b29c3ab215a0e5493752bfa282d9fff8a Author: Jonathan Druart Date: Mon Oct 5 12:50:52 2015 +0100 Bug 12478: facets - Display description instead of code for locations Signed-off-by: Nick Clemens Signed-off-by: Jesse Weaver Signed-off-by: Tomas Cohen Arazi Signed-off-by: Kyle M Hall Signed-off-by: Brendan Gallagher commit 446cf8381db28ecdcd5fe0442b07920cb5a54492 Author: Jonathan Druart Date: Mon Oct 5 12:51:37 2015 +0100 Bug 12478: Add Koha::AuthorisedValue[s] class These 2 classes come from bug 10363. Signed-off-by: Nick Clemens Signed-off-by: Jesse Weaver Signed-off-by: Tomas Cohen Arazi Signed-off-by: Kyle M Hall Signed-off-by: Brendan Gallagher commit e8950b6b00fe52a8bfed12bc3b6fbf193343e853 Author: Jonathan Druart Date: Mon Oct 5 12:17:09 2015 +0100 Bug 12478: Use the new Koha::ItemTypes to retrieve itypes descriptions Signed-off-by: Nick Clemens Signed-off-by: Jesse Weaver Signed-off-by: Tomas Cohen Arazi Signed-off-by: Kyle M Hall Signed-off-by: Brendan Gallagher commit 7c0cbc3fe8a9f900045f4bb1ec31c79afded2d1d Author: Jonathan Druart Date: Tue Sep 15 17:02:28 2015 +0100 Bug 12478: Add Koha::ItemType[s] classes These 2 classes come from bug 14828. Tests in t/db_dependent/Koha/ItemTypes.t should be updated. Signed-off-by: Nick Clemens Signed-off-by: Jesse Weaver Signed-off-by: Tomas Cohen Arazi Signed-off-by: Kyle M Hall Signed-off-by: Brendan Gallagher commit c5f351360f2f5d3848f152c73685463808441574 Author: Jonathan Druart Date: Mon Oct 5 10:58:50 2015 +0100 Bug 12478: (follow-up) Display the correct number of facets This patch fixes a side-effect of the previous "Display the correct number of facets (5 instead of 6)" patch. If you ask for more facets ('show more' link) and that the number of facets is > 5 but < 10, 1 facet will be missing. Signed-off-by: Nick Clemens Signed-off-by: Jesse Weaver Signed-off-by: Tomas Cohen Arazi Signed-off-by: Kyle M Hall Signed-off-by: Brendan Gallagher commit 282ea1cdb4052f2de97a18a279cffc06ca3181ae Author: Robin Sheat Date: Mon Oct 5 17:44:14 2015 +1300 Bug 12478: abort early if there's no elasticserch definition Signed-off-by: Nick Clemens Signed-off-by: Jesse Weaver Signed-off-by: Tomas Cohen Arazi Signed-off-by: Kyle M Hall Signed-off-by: Brendan Gallagher commit 8365f9e9fdbb65146cf794a0d63a8e2a11f00543 Author: Robin Sheat Date: Mon Oct 5 16:21:42 2015 +1300 Bug 14899: schema changes to make the database better Signed-off-by: Nick Clemens Signed-off-by: Jesse Weaver Signed-off-by: Tomas Cohen Arazi Signed-off-by: Kyle M Hall Signed-off-by: Brendan Gallagher commit 7d1046015680dbcbf7fd5ae838c5efe62cf09b2c Author: Jonathan Druart Date: Fri Sep 25 16:06:07 2015 +0100 Bug 14899: DB changes This patch applies several changes to the DB structure introduced by the previous ES patch set: 1/ Add a search_field.label column => It will be easier to understand what the search_field does. Indeed, some are not user friendly: acqdate, an, pl, ff8-23, ln, etc. TODO later: Update the labels with correct values (at the moment label=name) 2/ Update the foreign key search_marc_to_field.search_marc_map_id with on delete cascase. This will permit to automatically remove the entries in search_marc_to_field when they are deleted in search_marc_map. 3/ Remove the index_name_2 unique constraint on the search_marc_map table. I don't understand how this could be useful, it was defined like (index_name, marc_type, marc_field), so it means a mapping cannot be defined twice with different values for facet, suggestible and sort. This limitation does not seem to make sense. Robin, please correct me if I am wrong :) Signed-off-by: Nick Clemens Signed-off-by: Jesse Weaver Signed-off-by: Tomas Cohen Arazi Signed-off-by: Kyle M Hall Signed-off-by: Brendan Gallagher commit 8c76e99fcadbb42074368cfed7698b35d67d9f78 Author: Robin Sheat Date: Fri Oct 2 15:23:07 2015 +1300 Bug 12478: add location, su-geo, se to facets Signed-off-by: Nick Clemens Signed-off-by: Jesse Weaver Signed-off-by: Tomas Cohen Arazi Signed-off-by: Kyle M Hall Signed-off-by: Brendan Gallagher commit 52c4b55a48f463a727da132b654a59ebd0e29813 Author: Robin Sheat Date: Thu Oct 1 15:53:44 2015 +1300 Bug 12478: fix errors from rebase and new upstream version Signed-off-by: Nick Clemens Signed-off-by: Jesse Weaver Signed-off-by: Tomas Cohen Arazi Signed-off-by: Kyle M Hall Signed-off-by: Brendan Gallagher commit 0b9483a691af2dc6322f240daee5b754ba214e82 Author: Robin Sheat Date: Wed Sep 30 15:46:18 2015 +1300 Bug 12478: fix some issues on rebase There were rebase conflicts that it was just easier to postpone until afterwards. Signed-off-by: Nick Clemens Signed-off-by: Jesse Weaver Signed-off-by: Tomas Cohen Arazi Signed-off-by: Kyle M Hall Signed-off-by: Brendan Gallagher commit 2aa72529c0b411bf1b8367293ac885f836759a49 Author: Jonathan Druart Date: Fri Sep 4 13:00:48 2015 +0100 Bug 12478: Fix error on indexing a specific record % perl misc/search_tools/rebuild_elastic_search.pl -bn 42 Can't locate object method "idnumber" via package "MARC::Record" at misc/search_tools/rebuild_elastic_search.pl line 171. Signed-off-by: Nick Clemens Signed-off-by: Jesse Weaver Signed-off-by: Tomas Cohen Arazi Signed-off-by: Kyle M Hall Signed-off-by: Brendan Gallagher commit 7f04ac955d2c202ad7ce2ecf29ae9e6577db9f4f Author: Jonathan Druart Date: Fri Aug 28 11:59:26 2015 +0100 Bug 12478: Fix encoding issue on facets Filer on "?lez, Ts." => Can't escape \x{015A}, try uri_escape_utf8() instead at /home/koha/src/Koha/SearchEngine/Elasticsearch/QueryBuilder.pm line 221. Signed-off-by: Nick Clemens Signed-off-by: Jesse Weaver Signed-off-by: Tomas Cohen Arazi Signed-off-by: Kyle M Hall Signed-off-by: Brendan Gallagher commit a866ab9439cd89ea02dbf7b92ed9b079b45450d5 Author: Jonathan Druart Date: Fri Aug 28 11:29:23 2015 +0100 Bug 12478: Do not display the 'Show more' links if no more facet available Signed-off-by: Nick Clemens Signed-off-by: Jesse Weaver Signed-off-by: Tomas Cohen Arazi Signed-off-by: Kyle M Hall Signed-off-by: Brendan Gallagher commit c9cc12b79c28af77855cd3a74f5865cfe21c5e5c Author: Jonathan Druart Date: Fri Aug 28 11:24:24 2015 +0100 Bug 12478: Display the correct number of facets (5 instead of 6) The loop on facet entries was wrong, it should stop after 5 iterations. Signed-off-by: Nick Clemens Signed-off-by: Jesse Weaver Signed-off-by: Tomas Cohen Arazi Signed-off-by: Kyle M Hall Signed-off-by: Brendan Gallagher commit c369095f802134d75b3b44a13613d3295154734c Author: Jonathan Druart Date: Fri Aug 28 11:13:45 2015 +0100 Bug 12478: Remove Solr occurrences reintroduced by a previous patch Signed-off-by: Nick Clemens Signed-off-by: Jesse Weaver Signed-off-by: Tomas Cohen Arazi Signed-off-by: Kyle M Hall Signed-off-by: Brendan Gallagher commit c6ef16a50f487abf1117224b5d162776f2d12f93 Author: Jonathan Druart Date: Fri Aug 28 11:13:07 2015 +0100 Bug 12478: Fix pod in the rebuild_ES.pl script Signed-off-by: Nick Clemens Signed-off-by: Jesse Weaver Signed-off-by: Tomas Cohen Arazi Signed-off-by: Kyle M Hall Signed-off-by: Brendan Gallagher commit 8dd390108046ccf601eec11d4d913df81ddcb894 Author: Jonathan Druart Date: Fri Aug 28 11:08:27 2015 +0100 Bug 12478: Fix the verbose flag on reindexing Signed-off-by: Nick Clemens Signed-off-by: Jesse Weaver Signed-off-by: Tomas Cohen Arazi Signed-off-by: Kyle M Hall Signed-off-by: Brendan Gallagher commit 2ee681c630fe1e860e6846b0abbfe64f75c1c6b2 Author: Jonathan Druart Date: Fri Aug 28 11:07:51 2015 +0100 Bug 12478: Change the commit count to 5k It will improve the indexing time. Signed-off-by: Nick Clemens Signed-off-by: Jesse Weaver Signed-off-by: Tomas Cohen Arazi Signed-off-by: Kyle M Hall Signed-off-by: Brendan Gallagher commit 4493493da0a67534b238fd5a131e6acf944bacad Author: Jonathan Druart Date: Fri Aug 28 11:07:04 2015 +0100 Bug 12478: Fix the UNIMARC and NORMARC indexing 1/ This patch fixes a major issue on UNIMARC and NORMARC installations (Compulsive c/p on insert into insert into search_marc_to_field for unimarc and normarc) 2/ After fixing that, I got invalid marc path at /usr/share/perl5/Catmandu/Fix/marc_map.pm line 35. on reindexing. It was caused by some "" values instead of NULL. 3/ Then, a "duplicate entry" error was caused by 3 lines for Local-number. It seems to be an error, 1 is enough (I suppose 0909 was an error too). Note that the following is not fixed by this patch: MariaDB [koha_es_unimarc]> insert into search_field (name, type) select distinct mapping, type from elasticsearch_mapping; Query OK, 73 rows affected, 57 warnings (0.05 sec) Records: 73 Duplicates: 0 Warnings: 57 MariaDB [koha_es_unimarc]> show warnings; +---------+------+--------------------------------------------+ | Level | Code | Message | +---------+------+--------------------------------------------+ | Warning | 1265 | Data truncated for column 'type' at row 1 | Signed-off-by: Nick Clemens Signed-off-by: Jesse Weaver Signed-off-by: Tomas Cohen Arazi Signed-off-by: Kyle M Hall Signed-off-by: Brendan Gallagher commit 2e79ea0f749af1e0bc08d4818fe0da46c5831b94 Author: Robin Sheat Date: Fri Sep 25 15:11:29 2015 +1200 Bug 12478: allow more granular sorting configuration This allows sorting to be configured within a field. For example, while many values are included for search on author, sorting should only be done on the main entry values. This permits that by have a sort value, which can be true, false, or null. true and null are pretty much the same, but false means that a field isn't available for sorting on. By default (null), fields can be sorted on. Signed-off-by: Nick Clemens Signed-off-by: Jesse Weaver Signed-off-by: Tomas Cohen Arazi Signed-off-by: Kyle M Hall Signed-off-by: Brendan Gallagher commit e0be1ee6dc77a275c26e09ebdee5c141f5a93204 Author: Robin Sheat Date: Thu Aug 27 16:13:16 2015 +1200 Bug 12478: pull the SQL updates from the browse interface Hopefully will reduce the rate of conflicts down the road. We'll see. Signed-off-by: Nick Clemens Signed-off-by: Jesse Weaver Signed-off-by: Tomas Cohen Arazi Signed-off-by: Kyle M Hall Signed-off-by: Brendan Gallagher commit 364b5870ed12c0f78caf2b002e5602d48de52109 Author: Robin Sheat Date: Wed Aug 26 17:29:17 2015 +1200 Bug 12478: pull the SQL updates from the browse interface Signed-off-by: Nick Clemens Signed-off-by: Jesse Weaver Signed-off-by: Tomas Cohen Arazi Signed-off-by: Kyle M Hall Signed-off-by: Brendan Gallagher commit 589d7376bb1c3c63e119b27db90e0fcbd28fa742 Author: Robin Sheat Date: Tue Aug 25 17:03:08 2015 +1200 Bug 12478: the facet "show more" links work properly now Signed-off-by: Nick Clemens Signed-off-by: Jesse Weaver Signed-off-by: Tomas Cohen Arazi Signed-off-by: Kyle M Hall Signed-off-by: Brendan Gallagher commit 349ecc34007ccb820ed4913230793ebbe59a36b7 Author: Robin Sheat Date: Tue Aug 25 15:13:51 2015 +1200 Bug 12478: add the lenient option to the query_string query It doesn't really help. Signed-off-by: Nick Clemens Signed-off-by: Jesse Weaver Signed-off-by: Tomas Cohen Arazi Signed-off-by: Kyle M Hall Signed-off-by: Brendan Gallagher commit e0f6c4dc6edb4a143dc5e106a750c262ee05c4fc Author: Robin Sheat Date: Thu Aug 20 18:12:42 2015 +1200 Bug 12478: improve error reporting a bit Signed-off-by: Nick Clemens Signed-off-by: Jesse Weaver Signed-off-by: Tomas Cohen Arazi Signed-off-by: Kyle M Hall Signed-off-by: Brendan Gallagher commit bded6d50c744fe830168e7ecb96880cf326053c2 Author: Robin Sheat Date: Mon Aug 3 17:55:54 2015 +1200 Bug 12478: update to support new Cat::Store::ES Signed-off-by: Nick Clemens Signed-off-by: Jesse Weaver Signed-off-by: Tomas Cohen Arazi Signed-off-by: Kyle M Hall Signed-off-by: Brendan Gallagher commit 374f1e6384437c8f7e8dd8d9a6ed8889ad3dd800 Author: Robin Sheat Date: Fri Jul 17 14:38:19 2015 +1200 Bug 12478: ES is now updated when records are updated/deleted Signed-off-by: Nick Clemens Signed-off-by: Jesse Weaver Signed-off-by: Tomas Cohen Arazi Signed-off-by: Kyle M Hall Signed-off-by: Brendan Gallagher commit fdef405cdddcf7456247e7706941aabeb11895ea Author: Robin Sheat Date: Fri Jul 10 15:19:21 2015 +1200 Bug 12478: fix capitalisation issue with index names Signed-off-by: Nick Clemens Signed-off-by: Jesse Weaver Signed-off-by: Tomas Cohen Arazi Signed-off-by: Kyle M Hall Signed-off-by: Brendan Gallagher commit b4392018bc1f9bf6a2f7dfe70b488856ad3a3897 Author: Robin Sheat Date: Wed Jul 8 16:34:12 2015 +1200 Bug 12478: make things using SimpleSearch use the new version Signed-off-by: Nick Clemens Signed-off-by: Jesse Weaver Signed-off-by: Tomas Cohen Arazi Signed-off-by: Kyle M Hall Signed-off-by: Brendan Gallagher commit 1c737eaaf8847ac01eb281c37840584e18f4a03b Author: Robin Sheat Date: Fri Jun 19 15:55:46 2015 +1200 Bug 12478: a replacement to the SimpleSearch interface implemented Signed-off-by: Nick Clemens Signed-off-by: Jesse Weaver Signed-off-by: Tomas Cohen Arazi Signed-off-by: Kyle M Hall Signed-off-by: Brendan Gallagher commit 4cd2729ddfba1c57cdf0754fbb5c4e8fd0cd386a Author: Robin Sheat Date: Wed Jun 17 15:37:29 2015 +1200 Bug 12478: fix issue with authority sort order being weird Signed-off-by: Nick Clemens Signed-off-by: Jesse Weaver Signed-off-by: Tomas Cohen Arazi Signed-off-by: Kyle M Hall Signed-off-by: Brendan Gallagher commit cd9946f0d4cc76df12883c4a0fec9f4e38fa623c Author: Robin Sheat Date: Mon Jun 15 17:35:41 2015 +1200 Bug 12478: auth search works in the staff client Some issues with sort order though. Signed-off-by: Nick Clemens Signed-off-by: Jesse Weaver Signed-off-by: Tomas Cohen Arazi Signed-off-by: Kyle M Hall Signed-off-by: Brendan Gallagher commit 2a73cf100b3c40a3c4cd650f95c9481bd7cc4945 Author: Robin Sheat Date: Mon Jun 15 15:12:39 2015 +1200 Bug 12478: starting authority search in staff client Signed-off-by: Nick Clemens Signed-off-by: Jesse Weaver Signed-off-by: Tomas Cohen Arazi Signed-off-by: Kyle M Hall Signed-off-by: Brendan Gallagher commit 8349e6955e306caabdb46a7c2c1ddd11496eadcd Author: Robin Sheat Date: Fri Jun 12 15:19:39 2015 +1200 Bug 12478: fix issues with the conversion SQL Signed-off-by: Nick Clemens Signed-off-by: Jesse Weaver Signed-off-by: Tomas Cohen Arazi Signed-off-by: Kyle M Hall Signed-off-by: Brendan Gallagher commit bc3b0daaa42122045775c94b6fae59af63009465 Author: Robin Sheat Date: Wed Jun 10 14:35:33 2015 +1200 Bug 12478: change the schema for storing mappings This makes the mapping schema a proper many-to-many relational structure, which is a little more fiddly to work with, but will make things like editors for it easier to write. Signed-off-by: Nick Clemens Signed-off-by: Jesse Weaver Signed-off-by: Tomas Cohen Arazi Signed-off-by: Kyle M Hall Signed-off-by: Brendan Gallagher commit d241e217952febd0e68d24b92eb0a13fc0859191 Author: Robin Sheat Date: Fri Jun 5 14:29:31 2015 +1200 Bug 12478: fix multi-choice stuff in advanced search This means that things like itype get "OR"ed together, rather than "AND"ed like other things. Signed-off-by: Nick Clemens Signed-off-by: Jesse Weaver Signed-off-by: Tomas Cohen Arazi Signed-off-by: Kyle M Hall Signed-off-by: Brendan Gallagher commit 417553a9e47bf31f4cb785162e3dced856a2ac2a Author: Robin Sheat Date: Thu May 14 15:15:04 2015 +1200 Bug 12478: starting to add search to staff client Signed-off-by: Nick Clemens Signed-off-by: Jesse Weaver Signed-off-by: Tomas Cohen Arazi Signed-off-by: Kyle M Hall Signed-off-by: Brendan Gallagher commit efe300993c8ff5efd08dac0cbbfad492aad6a214 Author: Robin Sheat Date: Tue Mar 31 17:26:49 2015 +1300 Bug 12478: fix wrong counts/results for authority searches Signed-off-by: Nick Clemens Signed-off-by: Jesse Weaver Signed-off-by: Tomas Cohen Arazi Signed-off-by: Kyle M Hall Signed-off-by: Brendan Gallagher commit 7e87829166342d20d0828b157ac138a6b0220c87 Author: Robin Sheat Date: Wed Mar 25 17:29:14 2015 +1300 Bug 12478: fix issues caused by rebasing Signed-off-by: Nick Clemens Signed-off-by: Jesse Weaver Signed-off-by: Tomas Cohen Arazi Signed-off-by: Kyle M Hall Signed-off-by: Brendan Gallagher commit 2f0fb1b8449251736ffedefe9e865830786f12a3 Author: Robin Sheat Date: Tue Mar 17 17:23:56 2015 +1300 Bug 12478: reinstate zebra compatibility for auth search Signed-off-by: Nick Clemens Signed-off-by: Jesse Weaver Signed-off-by: Tomas Cohen Arazi Signed-off-by: Kyle M Hall Signed-off-by: Brendan Gallagher commit 841cb937017ad46a4f43509c4479d0cee37d523c Author: Robin Sheat Date: Fri Mar 13 15:27:24 2015 +1300 Bug 12478: paging is fixed now too Signed-off-by: Nick Clemens Signed-off-by: Jesse Weaver Signed-off-by: Tomas Cohen Arazi Signed-off-by: Kyle M Hall Signed-off-by: Brendan Gallagher commit 1d0edd61bdb3229a75064dd025a54c6c3b4aab15 Author: Robin Sheat Date: Fri Mar 13 15:22:53 2015 +1300 Bug 12478: sort is sorted Signed-off-by: Nick Clemens Signed-off-by: Jesse Weaver Signed-off-by: Tomas Cohen Arazi Signed-off-by: Kyle M Hall Signed-off-by: Brendan Gallagher commit 8b6451c49028967e81835fec73d860ee4901b42b Author: Robin Sheat Date: Thu Mar 12 18:11:30 2015 +1300 Bug 12478: phrase searching for authorities is happier Signed-off-by: Nick Clemens Signed-off-by: Jesse Weaver Signed-off-by: Tomas Cohen Arazi Signed-off-by: Kyle M Hall Signed-off-by: Brendan Gallagher commit 45834b214c6889f6748608768c60d10311d1ae64 Author: Robin Sheat Date: Wed Mar 11 16:14:14 2015 +1300 Bug 12478: fix the way counting is done Signed-off-by: Nick Clemens Signed-off-by: Jesse Weaver Signed-off-by: Tomas Cohen Arazi Signed-off-by: Kyle M Hall Signed-off-by: Brendan Gallagher commit b76d61a24b40f063126aedee60fc65e361cdf802 Author: Robin Sheat Date: Tue Mar 10 18:12:51 2015 +1300 Bug 12478: authority paging works Signed-off-by: Nick Clemens Signed-off-by: Jesse Weaver Signed-off-by: Tomas Cohen Arazi Signed-off-by: Kyle M Hall Signed-off-by: Brendan Gallagher commit e00fadad67cfe2ca607b90cb1848e3c3233156a1 Author: Robin Sheat Date: Tue Mar 10 17:32:08 2015 +1300 Bug 12478: working on authority results Signed-off-by: Nick Clemens Signed-off-by: Jesse Weaver Signed-off-by: Tomas Cohen Arazi Signed-off-by: Kyle M Hall Signed-off-by: Brendan Gallagher commit e74e5a504c958b06dc1e55e76ed8c2f4a42a643e Author: Robin Sheat Date: Wed Mar 4 18:19:25 2015 +1300 Bug 12478: make authid get to the templates properly Signed-off-by: Nick Clemens Signed-off-by: Jesse Weaver Signed-off-by: Tomas Cohen Arazi Signed-off-by: Kyle M Hall Signed-off-by: Brendan Gallagher commit 45ffdbf226bbc1a678cf6a3d712144529109b00e Author: Robin Sheat Date: Wed Mar 4 17:38:18 2015 +1300 Bug 12478: basic auth search and display is working Signed-off-by: Nick Clemens Signed-off-by: Jesse Weaver Signed-off-by: Tomas Cohen Arazi Signed-off-by: Kyle M Hall Signed-off-by: Brendan Gallagher commit f5eb93a55ce47c237bf7afe216302b13b0c276bd Author: Robin Sheat Date: Tue Mar 3 14:02:19 2015 +1300 Bug 12478: more authorities Signed-off-by: Nick Clemens Signed-off-by: Jesse Weaver Signed-off-by: Tomas Cohen Arazi Signed-off-by: Kyle M Hall Signed-off-by: Brendan Gallagher commit dfbe20e4dc64a200d4223b004b9220cdf582c606 Author: Robin Sheat Date: Tue Feb 24 14:43:01 2015 +1300 Bug 12478 - more authorites Signed-off-by: Nick Clemens Signed-off-by: Jesse Weaver Signed-off-by: Tomas Cohen Arazi Signed-off-by: Kyle M Hall Signed-off-by: Brendan Gallagher commit 0002bbc72a42b4c4223e20c66ef032c20f48ba19 Author: Robin Sheat Date: Tue Feb 17 18:38:07 2015 +1300 Bug 12478 - more authority searching Queries are being built, but they seem to be wrong as no results are returned. Signed-off-by: Nick Clemens Signed-off-by: Jesse Weaver Signed-off-by: Tomas Cohen Arazi Signed-off-by: Kyle M Hall Signed-off-by: Brendan Gallagher commit 8c85389558848b3159aa1ed2bbc10a6d1613bfa5 Author: Robin Sheat Date: Wed Feb 4 16:42:12 2015 +1300 Bug 12478 - more authority query building Signed-off-by: Nick Clemens Signed-off-by: Jesse Weaver Signed-off-by: Tomas Cohen Arazi Signed-off-by: Kyle M Hall Signed-off-by: Brendan Gallagher commit 05fa9bccb0f2e82f52efba01b2435c723184643b Author: Robin Sheat Date: Tue Feb 3 14:40:50 2015 +1300 Bug 12478 - fix syntax errors so that stuff runs Signed-off-by: Nick Clemens Signed-off-by: Jesse Weaver Signed-off-by: Tomas Cohen Arazi Signed-off-by: Kyle M Hall Signed-off-by: Brendan Gallagher commit faa4e1f6ecd9e918749f568a5cc7a1ad795bdfa2 Author: Robin Sheat Date: Fri Jan 30 16:06:46 2015 +1300 Bug 12478 - authority work in progress Signed-off-by: Nick Clemens Signed-off-by: Jesse Weaver Signed-off-by: Tomas Cohen Arazi Signed-off-by: Kyle M Hall Signed-off-by: Brendan Gallagher commit 205260bd638310a88a64c045e5831167e6d08231 Author: Robin Sheat Date: Wed Nov 19 15:05:12 2014 +1300 Bug 12478 - fix issue with class loading Signed-off-by: Nick Clemens Signed-off-by: Jesse Weaver Signed-off-by: Tomas Cohen Arazi Signed-off-by: Kyle M Hall Signed-off-by: Brendan Gallagher commit 90c49a01fee1bddac41a6563ae1ef4c5db657545 Author: Robin Sheat Date: Wed Nov 19 14:07:20 2014 +1300 Bug 12478 - fix error in configuration loading Signed-off-by: Nick Clemens Signed-off-by: Jesse Weaver Signed-off-by: Tomas Cohen Arazi Signed-off-by: Kyle M Hall Signed-off-by: Brendan Gallagher commit 90efe994c91fcbae771485bb87b1de0241310be7 Author: Robin Sheat Date: Wed Nov 12 17:27:14 2014 +1300 Bug 12478 - fix error in SQL Signed-off-by: Nick Clemens Signed-off-by: Jesse Weaver Signed-off-by: Tomas Cohen Arazi Signed-off-by: Kyle M Hall Signed-off-by: Brendan Gallagher commit c7eee93d2f7540dedc3badc00af48d4905f605db Author: Robin Sheat Date: Tue Sep 23 17:32:57 2014 +1200 Bug 12478 - add test cases Signed-off-by: Nick Clemens Signed-off-by: Jesse Weaver Signed-off-by: Tomas Cohen Arazi Signed-off-by: Kyle M Hall Signed-off-by: Brendan Gallagher commit 0536ef37ccaeeab48a2b6298a5317d161c1a8e05 Author: Robin Sheat Date: Thu Sep 4 13:42:26 2014 +1200 Bug 12478 - authorities can now be stored in ES (Not fetched yet though.) Signed-off-by: Nick Clemens Signed-off-by: Jesse Weaver Signed-off-by: Tomas Cohen Arazi Signed-off-by: Kyle M Hall Signed-off-by: Brendan Gallagher commit 1d22202fb192734dca3bb3ff48ae3128e00ddb2a Author: Robin Sheat Date: Mon Aug 25 15:55:50 2014 +1200 Bug 12478 - set up database tables for elasticsearch This sets up the database changes needed to run ES. This isn't intended to be ready for upstreaming, just to make testing easier. Signed-off-by: Nick Clemens Signed-off-by: Jesse Weaver Signed-off-by: Tomas Cohen Arazi Signed-off-by: Kyle M Hall Signed-off-by: Brendan Gallagher commit 7dbd13e66f0ada4f0a4fa116f08def230a7858bf Author: Robin Sheat Date: Tue Sep 16 17:38:43 2014 +1200 Bug 12478 - pile of elasticsearch code Signed-off-by: Nick Clemens Signed-off-by: Jesse Weaver Signed-off-by: Tomas Cohen Arazi Signed-off-by: Kyle M Hall Signed-off-by: Brendan Gallagher commit 95dabf4bfd15f6aed149c17546c00083063a01c1 Author: Robin Sheat Date: Tue Sep 16 17:34:25 2014 +1200 Bug 12478 - add some base objects that the ES code will depend on Signed-off-by: Nick Clemens Signed-off-by: Jesse Weaver Signed-off-by: Tomas Cohen Arazi Signed-off-by: Kyle M Hall Signed-off-by: Brendan Gallagher ----------------------------------------------------------------------- Summary of changes: C4/AuthoritiesMarc.pm | 11 +- C4/Biblio.pm | 50 +- C4/Items.pm | 6 +- C4/Matcher.pm | 8 +- C4/Search.pm | 19 +- C4/XISBN.pm | 6 +- Koha.pm | 2 +- Koha/AuthorisedValue.pm | 2 +- Koha/AuthorisedValues.pm | 2 +- Koha/Authority.pm | 52 + Koha/BiblioUtils.pm | 164 ++ Koha/BiblioUtils/Iterator.pm | 126 + Koha/Database.pm | 5 +- Koha/ElasticSearch.pm | 450 ++++ Koha/ElasticSearch/Indexer.pm | 207 ++ Koha/ItemType.pm | 4 + Koha/ItemTypes.pm | 4 + Koha/MetadataIterator.pm | 74 + Koha/Objects.pm | 18 + Koha/Schema/Result/SearchField.pm | 122 + Koha/Schema/Result/SearchMarcMap.pm | 130 + Koha/Schema/Result/SearchMarcToField.pm | 128 + Koha/SearchEngine.pm | 46 + Koha/SearchEngine/Elasticsearch/QueryBuilder.pm | 771 ++++++ Koha/SearchEngine/Elasticsearch/Search.pm | 458 ++++ Koha/SearchEngine/QueryBuilder.pm | 60 + Koha/SearchEngine/Search.pm | 58 + Koha/SearchEngine/Zebra/QueryBuilder.pm | 56 + Koha/SearchEngine/Zebra/Search.pm | 100 + Koha/{Authority.pm => SearchField.pm} | 13 +- Koha/{ItemTypes.pm => SearchFields.pm} | 10 +- Koha/{Authority.pm => SearchMarcMap.pm} | 14 +- Koha/{ItemTypes.pm => SearchMarcMaps.pm} | 10 +- acqui/neworderbiblio.pl | 10 +- admin/searchengine/elasticsearch/mappings.yaml | 2695 ++++++++++++++++++++ authorities/authorities-home.pl | 26 +- authorities/authorities-list.pl | 5 +- catalogue/search.pl | 140 +- cataloguing/addbooks.pl | 13 +- .../value_builder/marc21_linking_section.pl | 10 +- cataloguing/value_builder/unimarc_field_4XX.pl | 11 +- circ/circulation.pl | 5 +- installer/data/mysql/kohastructure.sql | 43 + installer/data/mysql/sysprefs.sql | 1 + installer/data/mysql/updatedatabase.pl | 86 + .../prog/en/modules/admin/preferences/admin.pref | 8 + labels/label-item-search.pl | 8 +- misc/migration_tools/bulkmarcimport.pl | 16 +- misc/migration_tools/checkNonIndexedBiblios.pl | 10 +- misc/migration_tools/remove_unused_authorities.pl | 5 +- misc/search_tools/rebuild_elastic_search.pl | 212 ++ opac/opac-authorities-home.pl | 25 +- opac/opac-search.pl | 24 +- serials/subscription-bib-search.pl | 6 +- t/Koha/ItemType.t | 46 + t/db_dependent/Koha/{Biblio.t => BiblioUtils.t} | 4 +- t/db_dependent/Koha/ItemTypes.t | 79 + t/db_dependent/Koha_ElasticSearch.t | 23 + t/db_dependent/Koha_ElasticSearch_Indexer.t | 52 + .../Koha_SearchEngine_Elasticsearch_Search.t | 48 + 60 files changed, 6676 insertions(+), 121 deletions(-) create mode 100644 Koha/BiblioUtils.pm create mode 100644 Koha/BiblioUtils/Iterator.pm create mode 100644 Koha/ElasticSearch.pm create mode 100644 Koha/ElasticSearch/Indexer.pm create mode 100644 Koha/MetadataIterator.pm create mode 100644 Koha/Schema/Result/SearchField.pm create mode 100644 Koha/Schema/Result/SearchMarcMap.pm create mode 100644 Koha/Schema/Result/SearchMarcToField.pm create mode 100644 Koha/SearchEngine.pm create mode 100644 Koha/SearchEngine/Elasticsearch/QueryBuilder.pm create mode 100644 Koha/SearchEngine/Elasticsearch/Search.pm create mode 100644 Koha/SearchEngine/QueryBuilder.pm create mode 100644 Koha/SearchEngine/Search.pm create mode 100644 Koha/SearchEngine/Zebra/QueryBuilder.pm create mode 100644 Koha/SearchEngine/Zebra/Search.pm copy Koha/{Authority.pm => SearchField.pm} (76%) copy Koha/{ItemTypes.pm => SearchFields.pm} (84%) copy Koha/{Authority.pm => SearchMarcMap.pm} (79%) copy Koha/{ItemTypes.pm => SearchMarcMaps.pm} (83%) create mode 100644 admin/searchengine/elasticsearch/mappings.yaml create mode 100755 misc/search_tools/rebuild_elastic_search.pl create mode 100755 t/Koha/ItemType.t rename t/db_dependent/Koha/{Biblio.t => BiblioUtils.t} (98%) create mode 100755 t/db_dependent/Koha/ItemTypes.t create mode 100644 t/db_dependent/Koha_ElasticSearch.t create mode 100644 t/db_dependent/Koha_ElasticSearch_Indexer.t create mode 100644 t/db_dependent/Koha_SearchEngine_Elasticsearch_Search.t hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Tue Apr 26 22:55:17 2016 From: gitmaster at git.koha-community.org (Git repo owner) Date: Tue, 26 Apr 2016 20:55:17 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.22.00-1284-gca405ec 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 ca405ec114d13c68bb0ea770916afd4e1e16cc8c (commit) from f24dd95e5d4b3c1b7b9adf5618790f516b5889c5 (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 ca405ec114d13c68bb0ea770916afd4e1e16cc8c Author: Brendan Gallagher Date: Tue Apr 26 20:55:25 2016 +0000 Bug 12478: (RM followup) fix syntax error in updatedatabase.pl Signed-off-by: Jesse Weaver ----------------------------------------------------------------------- Summary of changes: installer/data/mysql/updatedatabase.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Tue Apr 26 23:11:08 2016 From: gitmaster at git.koha-community.org (Git repo owner) Date: Tue, 26 Apr 2016 21:11:08 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.22.00-1285-gbc59823 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 bc5982374a08c150d1a95bf582ff0ca21f7f51e5 (commit) from ca405ec114d13c68bb0ea770916afd4e1e16cc8c (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 bc5982374a08c150d1a95bf582ff0ca21f7f51e5 Author: Tomas Cohen Arazi Date: Tue Apr 12 15:26:44 2016 -0300 Bug 16249: Zebra-specific tests should pass with ES disabled This patch makes the t/db_dependent/Search.t tests correctly set 'Zebra' for the 'SearchEngine' syspref. To test: - On top of bug 12478 branch, run $ prove t/db_dependent/Search.t => FAIL: Tests fail - Apply the patch - Run: $ prove t/db_dependent/Search.t => SUCCESS: Tests now pass. Signed-off-by: Chris Signed-off-by: Katrin Fischer Signed-off-by: Brendan Gallagher ----------------------------------------------------------------------- Summary of changes: t/db_dependent/Search.t | 3 +++ 1 file changed, 3 insertions(+) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Wed Apr 27 00:56:06 2016 From: gitmaster at git.koha-community.org (Git repo owner) Date: Tue, 26 Apr 2016 22:56:06 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.22.00-1286-g9b866b9 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 9b866b91affb4e96cf2bc0a3b66bb638ddc54986 (commit) from bc5982374a08c150d1a95bf582ff0ca21f7f51e5 (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 9b866b91affb4e96cf2bc0a3b66bb638ddc54986 Author: Kyle M Hall Date: Tue Apr 26 15:45:38 2016 +0000 Bug 16354 - TestBuilder.t fails due to key constraints Test Plan: 1) prove t/db_dependent/TestBuilder.t 2) Note failure 3) Apply this patch 4) prove t/db_dependent/TestBuilder.t 5) Tests should now pass! Signed-off-by: Bernardo Gonzalez Kriegel Failure noted and corrected. No errors Signed-off-by: Katrin Fischer Signed-off-by: Brendan Gallagher ----------------------------------------------------------------------- Summary of changes: installer/data/mysql/atomicupdate/bug_16354.sql | 9 +++++++++ installer/data/mysql/kohastructure.sql | 6 +++--- 2 files changed, 12 insertions(+), 3 deletions(-) create mode 100644 installer/data/mysql/atomicupdate/bug_16354.sql hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Wed Apr 27 01:04:58 2016 From: gitmaster at git.koha-community.org (Git repo owner) Date: Tue, 26 Apr 2016 23:04:58 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.22.00-1287-gee652b0 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 ee652b07cabe58ae10fb77f69488dbd1a74bf962 (commit) from 9b866b91affb4e96cf2bc0a3b66bb638ddc54986 (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 ee652b07cabe58ae10fb77f69488dbd1a74bf962 Author: Brendan Gallagher Date: Tue Apr 26 23:14:02 2016 +0000 DBREv Bug 16354 - Fix FK constraints for edifact_messages table Signed-off-by: Brendan Gallagher ----------------------------------------------------------------------- Summary of changes: Koha.pm | 2 +- installer/data/mysql/atomicupdate/bug_16354.sql | 9 --------- installer/data/mysql/updatedatabase.pl | 20 ++++++++++++++++++++ 3 files changed, 21 insertions(+), 10 deletions(-) delete mode 100644 installer/data/mysql/atomicupdate/bug_16354.sql hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Wed Apr 27 01:06:32 2016 From: gitmaster at git.koha-community.org (Git repo owner) Date: Tue, 26 Apr 2016 23:06:32 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.22.00-1288-g080ae7a 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 080ae7a8b9587aaa31b0adfb8925981dc574aa65 (commit) from ee652b07cabe58ae10fb77f69488dbd1a74bf962 (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 080ae7a8b9587aaa31b0adfb8925981dc574aa65 Author: Owen Leonard Date: Thu Apr 21 12:39:53 2016 -0400 Bug 16321 - 'Show all details' checkbox triggers JS error after jQuery upgrade This patch fixes problems with show/hide actions on a few pages caused by some problematic jQuery syntax. To test, apply the patch and go to Acquisitions. Testing basket.tt: - Locate a vendor which has an open basket with multiple orders. - View the details of that basket. - Click the 'Show all details' checkbox above the table of orders. - Checking the box should trigger the display of additional columns in the table. - Unchecking the box should hide them again. Testing invoice.tt: - Go to Acquisitions -> Invoices and perform an invoice search. - Click to view an invoice which includes one or more received records. - Click the 'Show all details' checkbox above the table of titles and confirm that it fuctions as described above. Testing newordersubscription.tt: - Go to Acquisitions and locate a vendor which is linked to a subscription - Create or add to a basket for that vendor. - Add an order using the 'From a subscription' option. - Perform a search for subscriptions. - In the table of subscriptions search results, checking or unchecking the "Show only renewed" checkbox should work correctly. Signed-off-by: Chris Cormack Signed-off-by: Jonathan Druart Signed-off-by: Brendan Gallagher ----------------------------------------------------------------------- Summary of changes: koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt | 2 +- .../intranet-tmpl/prog/en/modules/acqui/newordersubscription.tt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Wed Apr 27 01:07:58 2016 From: gitmaster at git.koha-community.org (Git repo owner) Date: Tue, 26 Apr 2016 23:07:58 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.22.00-1293-gc133bed 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 c133bedf54d34b5f7f4deec6bfe2f375ccc9b713 (commit) via a159d2b067c62bbfd524709813071951bc600ae4 (commit) via f3e4b5bbb6b02d7bb6e89d84c0379666eb1e704f (commit) via ac5a1bfececb5400a77f0ebad90181f5215d5a85 (commit) via 66aacace086f16d2eca860cc6c2aa164866d0488 (commit) from 080ae7a8b9587aaa31b0adfb8925981dc574aa65 (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 c133bedf54d34b5f7f4deec6bfe2f375ccc9b713 Author: Jonathan Druart Date: Wed Apr 13 17:22:18 2016 +0100 Bug 16154: Fix some other occurrences Signed-off-by: Owen Leonard Signed-off-by: Katrin Fischer Signed-off-by: Brendan Gallagher commit a159d2b067c62bbfd524709813071951bc600ae4 Author: Jonathan Druart Date: Tue Mar 29 09:52:25 2016 +0100 Bug 16154: CGI->multi_param - Assign a list This patch replaces the occurrences of @foo = $cgi->param('foo'); with @foo = $cgi->multi_param('foo'); perl -p -i -e 's/^(\s*@\w+\s*=\s*)\$(cgi|input|query)\->param\(/$1\$$2\->multi_param\(/xms' **/*.pl Signed-off-by: Owen Leonard Signed-off-by: Katrin Fischer Signed-off-by: Brendan Gallagher commit f3e4b5bbb6b02d7bb6e89d84c0379666eb1e704f Author: Jonathan Druart Date: Tue Mar 29 09:51:07 2016 +0100 Bug 16154: CGI->multi_param - Force scalar context This patch replaces the occurrences of $template->param( foo => $cgi->param('foo') ); with $template->param( foo => scalar $cgi->param('foo') ); perl -p -i -e 's/(\s*=>\s*)\$(cgi|input|query)\->param\(/$1scalar \$$2\->param\(/xms' **/*.pl Signed-off-by: Owen Leonard Signed-off-by: Katrin Fischer Signed-off-by: Brendan Gallagher commit ac5a1bfececb5400a77f0ebad90181f5215d5a85 Author: Jonathan Druart Date: Tue Mar 29 09:41:58 2016 +0100 Bug 16154: CGI->multi_param - Manual changes This patch does the same as the previous one, but affects lines which have not been caught by the regex. Signed-off-by: Owen Leonard Signed-off-by: Katrin Fischer Signed-off-by: Brendan Gallagher commit 66aacace086f16d2eca860cc6c2aa164866d0488 Author: Jonathan Druart Date: Tue Mar 29 09:15:43 2016 +0100 Bug 16154: CGI->multi_param - Declare a list This patch replaces the occurrences of my @foo = $cgi->param('foo'); with my @foo = $cgi->multi_param('foo'); perl -p -i -e 's/^(\s*my\s*@\w+\s*=\s*)\$(cgi|input|query)\->param\(/$1\$$2\->multi_param\(/xms' **/*.pl Signed-off-by: Owen Leonard Signed-off-by: Katrin Fischer Signed-off-by: Brendan Gallagher ----------------------------------------------------------------------- Summary of changes: C4/Biblio.pm | 2 +- acqui/addorder.pl | 14 ++--- acqui/addorderiso2709.pl | 26 +++++----- acqui/basketgroup.pl | 2 +- acqui/check_duplicate_barcode_ajax.pl | 2 +- acqui/check_uniqueness.pl | 4 +- acqui/finishreceive.pl | 16 +++--- acqui/histsearch.pl | 6 +-- acqui/invoice-files.pl | 4 +- acqui/invoice.pl | 6 +-- acqui/lateorders-export.pl | 2 +- acqui/lateorders.pl | 2 +- acqui/z3950_search.pl | 2 +- admin/aqbudgetperiods.pl | 10 ++-- admin/aqbudgets.pl | 2 +- admin/aqcontract.pl | 22 ++++---- admin/aqplan.pl | 4 +- admin/audio_alerts.pl | 2 +- admin/auth_subfields_structure.pl | 20 ++++---- admin/authorised_values.pl | 6 +-- admin/branches.pl | 4 +- admin/categories.pl | 4 +- admin/columns_settings.pl | 2 +- admin/marc_subfields_structure.pl | 26 +++++----- admin/matching-rules.pl | 28 +++++----- admin/oai_set_mappings.pl | 8 +-- admin/oai_sets.pl | 4 +- admin/patron-attr-types.pl | 8 +-- admin/z3950servers.pl | 2 +- authorities/auth_finder.pl | 26 +++++----- authorities/authorities.pl | 10 ++-- authorities/merge.pl | 2 +- authorities/ysearch.pl | 8 +-- catalogue/ISBDdetail.pl | 2 +- catalogue/MARCdetail.pl | 2 +- catalogue/detail.pl | 2 +- catalogue/itemsearch.pl | 28 +++++----- catalogue/labeledMARCdetail.pl | 2 +- catalogue/search.pl | 16 +++--- cataloguing/addbiblio.pl | 4 +- cataloguing/addbooks.pl | 2 +- cataloguing/additem.pl | 22 ++++---- cataloguing/merge.pl | 4 +- cataloguing/plugin_launcher.pl | 2 +- cataloguing/value_builder/EXAMPLE.pl | 4 +- .../value_builder/marc21_linking_section.pl | 6 +-- cataloguing/value_builder/unimarc_field_210c.pl | 12 ++--- cataloguing/value_builder/unimarc_field_4XX.pl | 6 +-- cataloguing/z3950_auth_search.pl | 4 +- cataloguing/z3950_search.pl | 2 +- circ/circulation.pl | 8 +-- circ/overdue.pl | 4 +- circ/returns.pl | 4 +- circ/selectbranchprinter.pl | 2 +- course_reserves/add_items.pl | 14 ++--- course_reserves/course-details.pl | 2 +- course_reserves/mod_course.pl | 2 +- labels/label-create-csv.pl | 4 +- labels/label-create-pdf.pl | 4 +- labels/label-create-xml.pl | 4 +- labels/label-edit-batch.pl | 4 +- labels/label-edit-layout.pl | 14 ++--- labels/label-edit-profile.pl | 14 ++--- labels/label-edit-template.pl | 36 ++++++------- labels/label-print.pl | 6 +-- members/files.pl | 4 +- members/member-flags.pl | 2 +- members/member.pl | 6 +-- members/memberentry.pl | 6 +-- members/mod_debarment.pl | 2 +- members/moremember.pl | 2 +- members/nl-search.pl | 42 +++++++-------- members/paycollect.pl | 2 +- opac/ilsdi.pl | 4 +- opac/opac-account-pay-paypal-return.pl | 2 +- opac/opac-account-pay.pl | 2 +- opac/opac-account.pl | 8 +-- opac/opac-image.pl | 2 +- opac/opac-renew.pl | 2 +- opac/opac-review.pl | 2 +- opac/opac-search-history.pl | 4 +- opac/opac-search.pl | 22 ++++---- opac/opac-serial-issues.pl | 4 +- opac/opac-shelves.pl | 4 +- opac/opac-suggestions.pl | 2 +- opac/opac-topissues.pl | 2 +- opac/opac-user.pl | 2 +- patron_lists/list.pl | 6 +-- patroncards/create-pdf.pl | 4 +- patroncards/edit-batch.pl | 6 +-- patroncards/edit-profile.pl | 14 ++--- patroncards/edit-template.pl | 32 ++++++------ patroncards/image-manage.pl | 2 +- patroncards/print.pl | 6 +-- reports/acquisitions_stats.pl | 2 +- reports/bor_issues_top.pl | 2 +- reports/borrowers_out.pl | 2 +- reports/borrowers_stats.pl | 2 +- reports/cat_issues_top.pl | 2 +- reports/catalogue_out.pl | 2 +- reports/catalogue_stats.pl | 2 +- reports/dictionary.pl | 4 +- reports/guided_reports.pl | 54 ++++++++++---------- reports/issues_avg_stats.pl | 2 +- reports/issues_stats.pl | 2 +- reports/manager.pl | 2 +- reserve/modrequest.pl | 14 ++--- reserve/placerequest.pl | 6 +-- reserve/renewscript.pl | 10 ++-- reserve/request.pl | 2 +- serials/checkexpiration.pl | 2 +- serials/claims.pl | 2 +- serials/lateissues-export.pl | 2 +- serials/serial-issues.pl | 2 +- serials/serials-collection.pl | 4 +- serials/serials-edit.pl | 34 ++++++------ serials/serials-search.pl | 2 +- serials/showpredictionpattern.pl | 46 ++++++++--------- serials/subscription-add.pl | 20 ++++---- serials/subscription-renew.pl | 2 +- suggestion/suggestion.pl | 2 +- svc/checkouts | 2 +- svc/import_bib | 2 +- svc/renew | 2 +- tags/review.pl | 2 +- tools/automatic_item_modification_by_age.pl | 10 ++-- tools/batchMod.pl | 14 ++--- tools/batch_delete_records.pl | 2 +- tools/batch_record_modification.pl | 2 +- tools/exceptionHolidays.pl | 2 +- tools/export.pl | 12 ++--- tools/holidays.pl | 2 +- tools/inventory.pl | 2 +- tools/koha-news.pl | 6 +-- tools/letter.pl | 6 +-- tools/modborrowers.pl | 8 +-- tools/overduerules.pl | 4 +- tools/scheduler.pl | 2 +- tools/viewlog.pl | 4 +- virtualshelves/addbybiblionumber.pl | 2 +- virtualshelves/shelves.pl | 16 +++--- 141 files changed, 528 insertions(+), 528 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Wed Apr 27 04:29:38 2016 From: gitmaster at git.koha-community.org (Git repo owner) Date: Wed, 27 Apr 2016 02:29:38 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.22.00-1294-g4e6baf6 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 4e6baf61858bd22d91d50ad5f176f04242a23370 (commit) from c133bedf54d34b5f7f4deec6bfe2f375ccc9b713 (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 4e6baf61858bd22d91d50ad5f176f04242a23370 Author: Brendan Gallagher Date: Wed Apr 27 02:38:35 2016 +0000 Forgot extra $dbh Signed-off-by: Brendan Gallagher ----------------------------------------------------------------------- Summary of changes: installer/data/mysql/updatedatabase.pl | 2 ++ 1 file changed, 2 insertions(+) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Wed Apr 27 14:47:31 2016 From: gitmaster at git.koha-community.org (Git repo owner) Date: Wed, 27 Apr 2016 12:47:31 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.22.00-1295-ga25bfbf 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 a25bfbfc574ac41a8a570a9a9b01716291d5a0dc (commit) from 4e6baf61858bd22d91d50ad5f176f04242a23370 (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 a25bfbfc574ac41a8a570a9a9b01716291d5a0dc Author: Bernardo Gonzalez Kriegel Date: Tue Apr 26 23:08:07 2016 -0300 Bug 16361: Installer syntax error Bug 16354 introduces a syntax error on updatedatabase.pl see comment #5 there To test 1) Check error on update 3.23.00.051 2) Apply the patch 3) run updatedabase again (perhaps changing 051 to XXX) Signed-off-by: Liz Rea happy again! Signed-off-by: Katrin Fischer Signed-off-by: Kyle M Hall ----------------------------------------------------------------------- Summary of changes: installer/data/mysql/updatedatabase.pl | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Wed Apr 27 17:07:28 2016 From: gitmaster at git.koha-community.org (Git repo owner) Date: Wed, 27 Apr 2016 15:07:28 +0000 Subject: [koha-commits] main Koha release repository branch 3.20.x updated. v3.20.10-46-ga33d75c 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.20.x has been updated via a33d75c5b6090c6f42b5ef08baf435d44ae26a08 (commit) via d1f8301ff8ab371f36cf75a07004dac159bc5961 (commit) via 0bceb0af8111060fba607a6f15c3de707a879679 (commit) via 62b3d204b2fa0e719ba6d9ecad1371d670aa5a1e (commit) via 4a47224136df62b528f73d0e38c4febde903808a (commit) via 68f551c37a96c8332cd47813a90e6cfb41202efc (commit) via c5a4a4ad642153542b5168a5f4ede1c6d5c96b39 (commit) via 029ccc0d512a767255807f21842262f8efcfcf17 (commit) via 49e43878efa818fcf06b9f866102aa18c9a96e30 (commit) via 551effddfb70f2785c694da978b65054feb86b1d (commit) via fa07817592e7d00c40fb87cd6cb7c9b490273972 (commit) via 06b7d7fa19726c0150c6544d8cd9bf7dee43fb46 (commit) via 3c76bf5a76b55b362211839fa8c19f59fcc23049 (commit) via d3faa9cc532630f7f2b0b2022579834d117ce5ed (commit) via 2f59171ca92a21d0025701c5d8851fd6bcc08a6c (commit) via 52f8818ac357b7172d382803b5015e0c36e35a05 (commit) via 7eb3fc2738dcc02e48ed07305acd0a882a0699bd (commit) via 67acc63bd139b5deae120f6536c0b3e3fa16f941 (commit) via 37740c696e9161639d68752c61620f53c8c0fcbc (commit) via c5fe537db93f71911a202ecbb9ec30436a8c1732 (commit) via e7b1d92f41fb181e4e47c898c51f62c30af4f8f3 (commit) via 9f1c5dc552095099632e140d9d50c995e9bf2505 (commit) via 850f66a214c045af675dbd8887554ae78a2941f1 (commit) via 551973022632d46f08687f281bffa340f2306b53 (commit) via 19e2a1b343042f8d4438cec6b0485a913020df3a (commit) via fbf7fb5da17ea0fd1f50892b51e6246d938223d9 (commit) via 882e002165a10a24e83de4a9746d06a2ac74fa23 (commit) via 8a77af1215516165fb44d5c0f04ae80d570c2216 (commit) via b4846b121011f2d749cf645cdc631d651003022e (commit) via fac50f8c1a5c1815e0bf5361486423fc95410d0d (commit) via 9bf48192b74f3e5260d1422487551e3a32921898 (commit) via 8fd14b9b6b6e41cd3242948ba3fa7b8d165af446 (commit) via 430dc045033ea3f70684068da3d37f0b769b60f9 (commit) via 0f5ef2cc8a31b7d520390e52d6b5a250071cde3c (commit) via 90b4c1fe665fa251dd060a62dcc62af9f96da64a (commit) via 2318d6175b27003866bdc412fca878806cc5c363 (commit) via f74e6488f659374aa30553f1e0be6be6973f5143 (commit) via ffab14e5f5297000465885cb9d7c5214c1d0891b (commit) via 61b64efe02da4604f77f4703b9f00faac9497dcd (commit) via 431a141b946412ebe13c0347660546106aad11c7 (commit) via 9082762551429199eb911697ceb7d620436ef865 (commit) via 79f813467c4b02106420951eafc692674745eea9 (commit) via 90d46d133750d8b29afe8dbd91f30cc402b8cb7d (commit) via 57b94630d1eb917f527ea09cf28ac8d880dcd9be (commit) from 0ed4d365fa7bc235a4d5546ec77a578a5e20cc7a (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 a33d75c5b6090c6f42b5ef08baf435d44ae26a08 Author: Jonathan Druart Date: Wed Apr 6 11:33:11 2016 +0100 Bug 15930: Make patron searches defaulting on 'contain' The default patron search types has changed from 'contain' to start_with. Users consider it as a bug. This patch revert the previous changes to default on 'contain'. Test plan: Search for patrons in different places (guarantor, checkout, patron module, acquisition module, etc.) and confirm that the default is always 'contain' Signed-off-by: Nick Clemens Signed-off-by: Jesse Weaver Signed-off-by: Brendan Gallagher (cherry picked from commit a8491dc156db9d746b0f5ddd6175b66bf1bfa4ab) Signed-off-by: Julian Maurice (cherry picked from commit f2c5b7b036a47289a069f89bf3e63ede548058d8) Signed-off-by: Fr?d?ric Demians commit d1f8301ff8ab371f36cf75a07004dac159bc5961 Author: Mason James Date: Fri Apr 1 15:23:22 2016 +1300 Bug 1750 - Report bor_issues_top erroneous and truncated results. Signed-off-by: Mason James TEST PLAN --------- 1) Ensure you have some checkouts 2) Home -> Reports -> Patrons with the most checkouts 3) Click 'Submit' -- you get a list 4) Click a patron name. 5) Note the borrower number. 6) In MySQL run something like: > UPDATE borrower SET firstname=NULL WHERE borrowernumber=#### 7) Refresh the report page -- name goes totally blank 8) apply patch 9) Refresh the report page -- only first name is lost 10) run koha qa test tools Signed-off-by: Mark Tompsett Signed-off-by: Katrin Fischer Signed-off-by: Brendan Gallagher (cherry picked from commit b859739c2a6dc899176276022782ac3af7a0ad0c) Signed-off-by: Julian Maurice (cherry picked from commit 8f4df78bd46e9e9c02f2841ef6bd1bba2bb39c6c) Signed-off-by: Fr?d?ric Demians commit 0bceb0af8111060fba607a6f15c3de707a879679 Author: Jonathan Druart Date: Fri Apr 8 10:04:20 2016 +0100 Bug 16210: Set X-Frame-Options to SAMEORIGIN in 2 other places The login page should not be displayed if the page is displayed in a frame. Signed-off-by: Marc V?ron Signed-off-by: Katrin Fischer Signed-off-by: Brendan Gallagher (cherry picked from commit 6efa491d1b2f92fa407aa49c7b678f9b642fc83f) Signed-off-by: Julian Maurice (cherry picked from commit 7729ace7fa6fae2aec48abe80ea36d4f81197cbe) Signed-off-by: Fr?d?ric Demians commit 62b3d204b2fa0e719ba6d9ecad1371d670aa5a1e Author: Jonathan Druart Date: Fri Apr 8 10:03:24 2016 +0100 Bug 16210: Revert OPAC changes from Bug 15111 This patch reverts the changes made at the OPAC from the following patches: Do not include the antiClickjack legacy browser trick for greybox" Revert "Bug 15111: Do not include the antiClickjack legacy browser trick for greybox" This reverts commit fc640d2a86f395ad392f84314bce22e8b4dab1fe. Revert "Bug 15111: Change X-Frame-Options with SAMEORIGIN" This reverts commit fb167c0e4b897bf9a93b4fd6176b15e2d4dbd4df. Revert "Bug 15111 - Koha is vulnerable to Cross-Frame Scripting (XFS) attacks" This reverts commit dc03bca76cf5b7cb48d98d1ce245fc65b98be929. Setting X-Frame-Options to SAMEORIGIN is enough for mordern browsers: https://developer.mozilla.org/en-US/docs/Web/HTTP/X-Frame-Options The antiClickjack trick should be removed at the OPAC as we want to keep the OPAC usable even if the user has disabled JS. That means the OPAC will be vulnerable to XFS if a user is navigating with a prehistoric browser: Firefox 3.6.9 September 2010 IE 8 March 2008 Opera 10.5 March 2010 Safari 4 February 2009 Chrome 4.1.? somewhen 2010 Test plan: Confirm that there are no regression of bug 15111 with modern browsers Signed-off-by: Marc V?ron Signed-off-by: Katrin Fischer Signed-off-by: Brendan Gallagher (cherry picked from commit d496d03e8aa3079e0d29837b27b31b9a55afd02e) Signed-off-by: Julian Maurice (cherry picked from commit 57fc49475db35b965ea50e5b60114fa46b2be37f) Signed-off-by: Fr?d?ric Demians commit 4a47224136df62b528f73d0e38c4febde903808a Author: Jonathan Druart Date: Mon Feb 22 09:24:29 2016 +0000 Bug 15111: Do not include the antiClickjack legacy browser trick for greybox Most of the scripts called via greybox (which uses iframe) don't include doc-head-close. But some do. This patch adds a popup parameter for these templates, not to include the legacy browser trick and avoid the replacement of the location. Test plan: 1/ Export patroncard and label 2/ translate itemtypes 3/ click on a idref link at the OPAC Signed-off-by: Jonathan Druart Signed-off-by: Chris Cormack Signed-off-by: Kyle M Hall (cherry picked from commit fc640d2a86f395ad392f84314bce22e8b4dab1fe) Signed-off-by: Julian Maurice (cherry picked from commit 45e39882432dd9fdae0fc1b1ef7b7b8b09a9480a) Signed-off-by: Fr?d?ric Demians commit 68f551c37a96c8332cd47813a90e6cfb41202efc Author: Jonathan Druart Date: Fri Nov 13 08:19:57 2015 +0000 Bug 15111: Change X-Frame-Options with SAMEORIGIN There are some places where frames are used, the greybox JS plugin for instance. We need either to allow them from Koha or replace this plugin. The easier for now is to switch the value from DENY with SAMEORIGIN. Test plan: - modify a record in a batch (tools/batch_record_modification.pl) - click on preview marc => With only the previous patch you will get a blank page. => With this patch apply, it will work as expected. Signed-off-by: Kyle M Hall Signed-off-by: Jonathan Druart Signed-off-by: Chris Cormack Signed-off-by: Kyle M Hall (cherry picked from commit fb167c0e4b897bf9a93b4fd6176b15e2d4dbd4df) Signed-off-by: Julian Maurice (cherry picked from commit 201e1f239728f3656f5f71792a7d5ce9b5a05144) Signed-off-by: Fr?d?ric Demians commit c5a4a4ad642153542b5168a5f4ede1c6d5c96b39 Author: Kyle M Hall Date: Mon Nov 2 12:11:17 2015 -0500 Bug 15111 - Koha is vulnerable to Cross-Frame Scripting (XFS) attacks Web pages that can be embedded in frames are vulnerable to cross-frame scripting attacks. Cross-frame scripting is a type of phishing attack that involves instructions to an unsuspecting user to follow a specific link to update confidential information in an online application. Because the link leads to a legitimate page from the online application that is embedded in a frame hosted by the attackers' server, the attackers can capture all the information that the user enters. https://www.owasp.org/index.php/Clickjacking_Defense_Cheat_Sheet Signed-off-by: Chris Cormack Signed-off-by: Katrin Fischer Signed-off-by: Jonathan Druart Signed-off-by: Chris Cormack Signed-off-by: Kyle M Hall (cherry picked from commit dc03bca76cf5b7cb48d98d1ce245fc65b98be929) Signed-off-by: Julian Maurice (cherry picked from commit c97a01e1330ab5b1b1df7029d2149efa0deb19a4) Signed-off-by: Fr?d?ric Demians commit 029ccc0d512a767255807f21842262f8efcfcf17 Author: Jonathan Druart Date: Mon Apr 4 14:45:48 2016 +0100 Bug 16179: Do not crash if "rate me" is clicked and not rate selected If JS is disabled and a user clicks on the "Rate me" button, Koha will crashes with: DBIx::Class::ResultSet::create(): Column 'rating_value' cannot be null at /usr/share/koha/lib/C4/Ratings.pm line 208 To avoid that, opac-ratings.pl will check if a rate has been selected. Test plan: Disable JS On a record detail page, click on the "Rate me" button TESTED PLAN: 1) go to /cgi-bin/koha/opac-ratings.pl?biblionumber=1 -- kaboom as above. 2) apply patch 3) refresh -- either login screen (don't know why) -- or if already logged in, detail page. 4) koha qa test tool Signed-off-by: Mark Tompsett Signed-off-by: Owen Leonard I tested successfully by temporarily removing the modification made by Bug 16210. Signed-off-by: Katrin Fischer Signed-off-by: Brendan Gallagher (cherry picked from commit b679cac96409b7248f8e224e10c73dafa4c82890) Signed-off-by: Julian Maurice (cherry picked from commit a965702c08f84d8d770fb81e09f13bee8e922bba) Signed-off-by: Fr?d?ric Demians commit 49e43878efa818fcf06b9f866102aa18c9a96e30 Author: Jonathan Druart Date: Tue Apr 5 07:40:21 2016 +0100 Bug 15832: Remove empty string from the filters On each cell, the split will generate a new empty entry. This patch removes that entry. Signed-off-by: Jonathan Druart Signed-off-by: Brendan Gallagher (cherry picked from commit 1931ff465317aa2bf8d31c0c817ff0c4d75ea8dc) Signed-off-by: Julian Maurice (cherry picked from commit ef6c60d8ccc93832f87f7b6fe1f3daa5ce48dda9) Signed-off-by: Fr?d?ric Demians commit 551effddfb70f2785c694da978b65054feb86b1d Author: Alex Arnaud Date: Tue Feb 16 16:33:17 2016 +0100 Bug 15832 - Fix filter and items split-up in pendingreserves.tt Test plan: - Go to circ/pendingreserves.pl (Ensure that there are biblios with many items on different branches), - Check the libraries filter at the bottom of datatable. There should be duplicates. - Apply this patch and return to circ/pendingreserves.pl, - check that libraries filter should not contain duplicate, - check that the filter works. Signed-off-by: Owen Leonard Signed-off-by: Jonathan Druart Signed-off-by: Brendan Gallagher (cherry picked from commit 82be93af1ccbd3544646a6345ab51183a62d05cb) Signed-off-by: Julian Maurice (cherry picked from commit 4f699275a76107f3a210a199dc9cadd5da2560f3) Signed-off-by: Fr?d?ric Demians commit fa07817592e7d00c40fb87cd6cb7c9b490273972 Author: Tomas Cohen Arazi Date: Fri Apr 1 15:30:26 2016 -0300 Bug 15113: koha-rebuild-zebra should check USE_INDEXER_DAEMON and skip if enabled This patch changes the behaviour of the koha-rebuild-zebra script in the following way: USE_INDEXER_DAEMON=no - Keeps the current behaviour USE_INDEXER_DAEMON=yes - It skips incremental indexing to avoid races. Caveats: - A --force option is introduced for useing in a specific situtation that might need it (i.e. the administrator knows what he's doing). - If --full is passed, the reindexing is not skipped. The documentation files and messages are adjusted accordingly. This patch should help users that want to use the indexing daemon, in which case they wouldn't need to change their default 5 min cronjob (it will be just skipped). Ultimately, koha-common could have USE_INDEXER_DAEMON = yes by default, but that's subject for another bug report. To test: - Play with the different option switches and USE_INDEXER_DAEMON - Things work as expected - Sign off Regards Signed-off-by: Hector Castro Works as expected Signed-off-by: Jonathan Druart Signed-off-by: Your Full Name (cherry picked from commit 997ad166c6ea53d47e3e15e7720d63da9f3b0a80) Signed-off-by: Julian Maurice (cherry picked from commit 67dd96545bf8fdabdc98428438cbd92a5ae33c9f) Signed-off-by: Fr?d?ric Demians commit 06b7d7fa19726c0150c6544d8cd9bf7dee43fb46 Author: Julian Maurice Date: Thu Jan 7 15:38:57 2016 +0100 Bug 14816: Fix multiple selection in item search Send each selected value as a separate parameter. Otherwise DataTables (or jQuery ?) joins all values with a comma Signed-off-by: Owen Leonard I could not reproduce the bug when selecting multiple home libraries, but I could by selecting multiple item types or collection codes. The patch allowed those queries to complete correctly. Signed-off-by: Jonathan Druart Signed-off-by: Brendan Gallagher (cherry picked from commit 9aa8bf46f6b45ebcd342c09bd3a09ae55f3dd4a8) Signed-off-by: Julian Maurice (cherry picked from commit 47ebb4ffb1869b52f1c011e3a6b236b85b0e51ab) Signed-off-by: Fr?d?ric Demians commit 3c76bf5a76b55b362211839fa8c19f59fcc23049 Author: Nick Clemens Date: Fri Feb 26 21:08:55 2016 +0000 Bug 15928 - Show unlinked guarantor To test: 1 - Add guarantor data to patron account by typing it in but do not 'Set to patron' 2 - Note it is not displayed on patron details 3 - Apply patch 4 - Note the info is displayed 5 - Test that linked guarantors show as expected Signed-off-by: Julian Maurice (cherry picked from commit bebb61739f4460295151a37d44cc1a2d6f956d26) Signed-off-by: Fr?d?ric Demians commit d3faa9cc532630f7f2b0b2022579834d117ce5ed Author: Julian Maurice Date: Thu Apr 14 14:29:38 2016 +0200 Bug 15962: Block the currency deletion if used A currency should not be deleted if used by a vendor or a basket. Test plan: 1/ Add a new currency 2/ Create a vendor using this currency 3/ Create a basket using this currency 4/ Try to delete the currency 5/ Delete the basket 6/ Try to delete the currency 7/ Delete the vendor 8/ Delete the currency Signed-off-by: Julian Maurice (cherry picked from commit c20496aea938e1faaa53daff5e2cf3d697b0eac9) Signed-off-by: Fr?d?ric Demians commit 2f59171ca92a21d0025701c5d8851fd6bcc08a6c Author: Marc V?ron Date: Wed Mar 23 08:11:49 2016 +0100 Bug 16133: Translatability of database administrator account warning This patch removes sentence splitting of the database administrator warning with a button styled link. Additionally, it uses the same wording as in the warning on the 'About' page. To test: - Apply patch - Log in to Staff client as database administration user - Verify that the wording of the warning is the same as on the About page (Tab 'System information') - Verify that the link to the patron administration page is styled as a button and behaves correctly NOTE: Actually, the category is irrelevant. But I like the improved message. Categories may or may not be set up at the initial log in. Signed-off-by: Mark Tompsett Signed-off-by: Katrin Fischer Signed-off-by: Brendan A Gallagher (cherry picked from commit e53b80dedf91617f9eecb9defd2d6f5222f03d65) Signed-off-by: Julian Maurice (cherry picked from commit c6a049167f9f1b4d4df81520900b23d2b9e0ea46) commit 52f8818ac357b7172d382803b5015e0c36e35a05 Author: Mark Tompsett Date: Fri Apr 1 17:59:29 2016 -0400 Bug 16191: t/Ris.t is noisy TEST PLAN --------- 1) prove t/Ris.t -- very noisy 2) apply patch 3) prove t/Ris.t -- just one confusing noise. 4) run koha qa test tools Signed-off-by: Marc V?ron Signed-off-by: Jonathan Druart Signed-off-by: Brendan Gallagher brendan at bywatersolutions.com (cherry picked from commit 5b909a82693d452d233e95d7598092aa5ee14c17) Signed-off-by: Julian Maurice (cherry picked from commit af42fd5e81c7ce2764dc9796293e9815f9809b54) Signed-off-by: Fr?d?ric Demians commit 7eb3fc2738dcc02e48ed07305acd0a882a0699bd Author: Owen Leonard Date: Thu Mar 17 09:08:39 2016 -0400 Bug 16047 [Follow-up] Software error on deleting a group with no category code This follow-up take the original patch a little further, making category name required on the entry form as well. Without a category name there is no label in the interface when selecting a category. That doens't make any sense. Also changed on the group entry form: - Added "required" attribute to labels on required fields. - Changed "Update" submit button label to "Submit." - Added a "Cancel" link. - Added the "validated" class to the form so that our built-in validation script will process it (not strictly necessary but makes the validation appearance more consistent). Followed test plan, form displays and behaves as expected. Signed-off-by: Marc V?ron Signed-off-by: Katrin Fischer Signed-off-by: Brendan Gallagher brendan at bywatersolutions.com (cherry picked from commit df127ebad814ad1710b161b85a69d408de95de85) Signed-off-by: Julian Maurice (cherry picked from commit c514e1fee2890660caa36c1dae62bcfbc6f72fc3) Signed-off-by: Fr?d?ric Demians commit 67acc63bd139b5deae120f6536c0b3e3fa16f941 Author: Aleisha Date: Thu Mar 10 21:49:57 2016 +0000 Bug 16047: Making category code a required field on creating a group This will prevent users from creating a group without a category code, which causes a software error when you try to delete it To test: 1) Go to Admin -> Libraries and groups 2) Create new group without category code 3) Attempt to delete the group you just created and notice software error 4) Apply patch 5) Create new group without category code 6) Notice you now cannot save the group without putting in a category code Sponsored-by: Catalyst IT Signed-off-by: Owen Leonard Signed-off-by: Katrin Fischer Signed-off-by: Brendan Gallagher brendan at bywatersolutions.com (cherry picked from commit 577aa86eb96160088c70008bfe85ae2c0820f547) Signed-off-by: Julian Maurice (cherry picked from commit 730cfb59258841572d19ffd9eedf36571edc100a) Signed-off-by: Fr?d?ric Demians commit 37740c696e9161639d68752c61620f53c8c0fcbc Author: Aleisha Date: Sun Mar 13 23:40:53 2016 +0000 Bug 16029: Hide patron toolbar if patron does not exist To test: 1) Create a patron, take note of the borrower number 2) Delete the patron 3) Navigate to the page of the patron you just deleted by typing the url (ie /cgi-bin/koha/members/moremember.pl?borrowernumber=X) 4) Confirm that the patron toolbar is not showing on the page 5) The message now has a link that says 'Find another patron?'. Click this link and confirm you are taken to the member home pgae. Sponsored-by: Catalyst IT Followed test plan, works as expected. Signed-off-by: Marc V?ron Signed-off-by: Jonathan Druart Signed-off-by: Brendan Gallagher brendan at bywatersolutions.com (cherry picked from commit 1870141874667d854f9b5508c563169baefb2328) Signed-off-by: Julian Maurice (cherry picked from commit e0ad205512af9dba2a9d5cad70bf6fdffecc6e17) Signed-off-by: Fr?d?ric Demians commit c5fe537db93f71911a202ecbb9ec30436a8c1732 Author: Owen Leonard Date: Fri Mar 18 09:41:15 2016 -0400 Bug 15984 - Correct templates which use the phrase "issuing rules" This patch corrects two places in the templates where the phrase "issuing rules" is used instead of "circulation and fine rules." To test, apply the patch and view the help pages for Administration -> Circulation and fine rules; and Tools -> Automatic item modification by age. Confirm that the term "circulation and fine rules" is used instead of "issuing rules." Signed-off-by: Marc V?ron Signed-off-by: Jonathan Druart Signed-off-by: Brendan Gallagher brendan at bywatersolutions.com (cherry picked from commit 98a9e30f040661e0a67a594f72abd8ab02cf9ad6) Signed-off-by: Julian Maurice (cherry picked from commit 1c1d9558eb6df6f44e96d204e8e6683e3ae04491) Signed-off-by: Fr?d?ric Demians commit e7b1d92f41fb181e4e47c898c51f62c30af4f8f3 Author: Jonathan Druart Date: Fri Feb 12 11:49:28 2016 +0000 Bug 14076: Do not use CGI->param in list context - opac-authorities-home.pl See bug 15809 for more info on why we should not use CGI->param in list context. Note: I have not found any places where several values for the same params are passed to this script but, just in case, this patch won't change this ability. Test plan: Do an authority search at the OPAC Test with several values of the form. Confirm that the results are always the same before and after this patch. Signed-off-by: Mark Tompsett Signed-off-by: Marcel de Rooy Signed-off-by: Brendan Gallagher brendan at bywatersolutions.com (cherry picked from commit 3fa2b10150a9ea2db2897be1246cba3785c55e55) Signed-off-by: Julian Maurice (cherry picked from commit 182838a54498b4a00a4077779458cf005f5ec444) Signed-off-by: Fr?d?ric Demians commit 9f1c5dc552095099632e140d9d50c995e9bf2505 Author: Jonathan Druart Date: Fri Feb 12 11:32:02 2016 +0000 Bug 15809: Redefine multi_param is CGI < 4.08 is used On debian Jessie, the CGI version is >= 4.08 Since this version, the param method raise a warning "CGI::param called in list context". Indeed, it can cause vulnerability if called in list context https://metacpan.org/pod/CGI#Fetching-the-value-or-values-of-a-single-named-parameter http://blog.gerv.net/2014/10/new-class-of-vulnerability-in-perl-web-applications/ There is a long journey to get rid of these warnings. First I suggest to redefine the multi_param method when the CGI version installed is < 4.08, it will allow us to move the wrong ->param calls to ->multi_param without waiting for everybody to upgrade. The different ways to call these 2 methods are: my $foo = $cgi->param('foo'); # OK my @foo = $cgi->param('foo'); # NOK, will raise the warning my @foo = $cgi->multi_param('foo'); #OK $template->param( foo => $cgi->param('foo') ); # NOK, will raise the warning # and vulnerable $template->param( foo => scalar $cgi->param('foo') ); # OK Signed-off-by: Mark Tompsett Signed-off-by: Marcel de Rooy Tested a call to multi_param with CGI < 4.08. With reference to the comments on Bugzilla, this workaround is arguable, but provides a base to move to multi_param. If we come up with a better solution, it should be easy to adjust. Signed-off-by: Brendan Gallagher brendan at bywatersolutions.com (cherry picked from commit 94dde6b48d6e20a5260ea49f9b98ec884c2c25b5) Signed-off-by: Julian Maurice (cherry picked from commit 279732365eb07bf9f9929402aadd837c16f131b6) Signed-off-by: Fr?d?ric Demians commit 850f66a214c045af675dbd8887554ae78a2941f1 Author: Mason James Date: Fri Apr 1 15:56:34 2016 +1300 Bug 16184 - Report bor_issues_top shows incorrect number of rows TEST PLAN --------- 1) Have at least 6 patrons with checkouts and some checkins. 2) Reports -> Patrons with the most checkouts 3) Click 'Submit' (default is 5) -- more than 5 entries listed. 4) Apply patch 5) Refresh page -- only 5 entries listed. 6) Run koha qa test tools NOTE: While this works, I'd be much happier with a refactor as it would also speed up the report. See comment #5. Signed-off-by: Mark Tompsett Signed-off-by: Katrin Fischer Signed-off-by: Brendan A Gallagher (cherry picked from commit 2c68980467009a9d19116440d4f28356707e9e7c) Signed-off-by: Julian Maurice (cherry picked from commit bd4659d09f92135a7956496c44af555b5938c8c3) Signed-off-by: Fr?d?ric Demians commit 551973022632d46f08687f281bffa340f2306b53 Author: Alex Arnaud Date: Wed Mar 30 16:49:10 2016 +0200 Bug 16171 - Show many media in html5media tabs Signed-off-by: Mirko Tietgen Signed-off-by: Katrin Fischer Signed-off-by: Brendan A Gallagher (cherry picked from commit c2f92f68d84753d62880e17e9d1bd19c8b9bff47) Signed-off-by: Julian Maurice (cherry picked from commit 0c37ebee17b81f31838c28f0690cea07b314a893) Signed-off-by: Fr?d?ric Demians commit 19e2a1b343042f8d4438cec6b0485a913020df3a Author: Nick Clemens Date: Tue Feb 23 20:41:57 2016 +0000 Bug 15888 - Syndetics Reviews preference should not enable LibraryThing reviews To test: 1 - Enable Syndetics Reviews without a LibraryThing ID 2 - Check page source and note you have a stanza for LTFL tabbed reveiws 3 - Apply patch 4 - Reload page and note LTFL tabbed reviews are not present 5 - Enter a LibraryThing ID and not the tab is restored. Signed-off-by: Chris Cormack Signed-off-by: Katrin Fischer Signed-off-by: Brendan A Gallagher (cherry picked from commit 541a03cf6daace451f78e614b8019382dcd52acc) Signed-off-by: Julian Maurice (cherry picked from commit 9a7c37473042cbc0c533ea12e95273b7471d22a3) Signed-off-by: Fr?d?ric Demians commit fbf7fb5da17ea0fd1f50892b51e6246d938223d9 Author: Julian Maurice Date: Thu Apr 7 07:43:21 2016 +0200 Bug 15868: Ask for confirmation when deleting a MMT action Test plan: Create marc modification template Add an action Delete it With this patch you must get a confirmation mesg Signed-off-by: Julian Maurice (cherry picked from commit 9fddbc045da2dc25389e924262bd8f6e2bc99bfd) Signed-off-by: Fr?d?ric Demians commit 882e002165a10a24e83de4a9746d06a2ac74fa23 Author: Aleisha Date: Sun Mar 20 23:24:18 2016 +0000 Bug 15866: Add confirm message for deleting rotating collection from toolbar To test: 1) Go to Tools -> Rotating Collections 2) Click on any rotating collection ('Add or remove items' from drop down menu) 3) Click 'Delete' from toolbar. Validate you are now asked to confirm your deletion. Check that cancel works, then check that confirm works. Sponsored-by: Catalyst IT Signed-off-by: Marc V?ron Signed-off-by: Katrin Fischer I've added the word 'rotating' before collection, to make it clear for translators what is meant here. Signed-off-by: Brendan A Gallagher (cherry picked from commit a48d166bbf506287355c9fceea2633159308c530) Signed-off-by: Julian Maurice (cherry picked from commit 887bb8c92fbda53713dd0862124b533ce64ece1f) Signed-off-by: Fr?d?ric Demians commit 8a77af1215516165fb44d5c0f04ae80d570c2216 Author: Alex Arnaud Date: Wed Feb 17 12:27:14 2016 +0100 Bug 15838 - Subscription duplicating: Reset fields from SubscriptionDuplicateDroppedInput syspef by getting them using name instead of id How I tested: Verified bug with start and end date (were not cleared without patch). After applying the patch all fields defined in SubscriptionDuplicateDroppedInput were cleared as expected. Signed-off-by: Marc V?ron Signed-off-by: Jonathan Druart Signed-off-by: Brendan Gallagher brendan at bywatersolutions.com (cherry picked from commit 873a49f13b79bf1f5f7163f217cfc3a317ce602f) Signed-off-by: Julian Maurice (cherry picked from commit 702002129787ceb2cdae61f6dc2352dff1afa84d) Signed-off-by: Fr?d?ric Demians commit b4846b121011f2d749cf645cdc631d651003022e Author: Julian Maurice Date: Wed Apr 6 16:12:16 2016 +0200 Bug 16214: Fix typo 'To.jon' -> 'To.json' Bug 15722 introduces a regression in serials patron search results, causing the surname to not be displayed To reproduce: 1. Create a routing list for a subscription 2. Click on "Add recipients" button 3. Run a search 4. Check that surname is not displayed Signed-off-by: Jonathan Druart Signed-off-by: Brendan A Gallagher (cherry picked from commit e916ded09756ba4902a25e9e68fe536614419c87) Signed-off-by: Julian Maurice (cherry picked from commit 11ba21369dc99ba2b1ae4d4fbe4af572e6af40e4) Signed-off-by: Fr?d?ric Demians commit fac50f8c1a5c1815e0bf5361486423fc95410d0d Author: Jonathan Druart Date: Tue Mar 8 14:09:09 2016 +0000 Bug 15722: Escape patron infos for JSON in patron searches If patron infos contain invalid JSON chars (\t for instance), the results won't appear. The solution is to escape these info. Test plan: Edit patron infos in DB (update borrowers set surname="foobar\t" where borrowernumber=42) Search for foobar (you should have more than 1 result) Without this patch, DT retrieves a bad formatted JSON and the results won't appear. With this patch, the table result appears Signed-off-by: Kyle M Hall Signed-off-by: Katrin Fischer Signed-off-by: Brendan A Gallagher (cherry picked from commit cd20b61a7c845110e518e6dedc12ac50efebe4aa) Signed-off-by: Julian Maurice (cherry picked from commit eba74c8e51a52432362150c38d674f661a6228e8) Signed-off-by: Fr?d?ric Demians commit 9bf48192b74f3e5260d1422487551e3a32921898 Author: Jonathan Druart Date: Tue Feb 9 17:02:05 2016 +0000 Bug 15773: Fix and standardise checkboxes code in framework When creating a new subfield for an authority framework, the checkboxes don't behave as they should. If you click on the 'repeatable', 'mandatory' or 'is url' checkbox's label, the checkbox from the second tab will be checked/unchecked. This is caused by a non-unique id of the input element. I have found this bug when working on the removal of CGI::checkbox in both admin/auth_subfields_structure.pl and admin/marc_subfields_structure.pl scripts. This patch remove the use of CGI::checkbox as well as the generation of html code from these 2 pl scripts (which should be avoided). The code these scripts are now pretty similar. Test plan: Add/modify/remove subfield for a MARC framework and an Authority framework. Use as many field as possible and confirm that the values are correctly inserted/displayed. Signed-off-by: Hector Castro Works as advertised Signed-off-by: Katrin Fischer Signed-off-by: Brendan Gallagher brendan at bywatersolutions.com (cherry picked from commit 39597b86ae299a9b4c0c1e8221f51f9e8dd300ed) Signed-off-by: Julian Maurice (cherry picked from commit 60e601bf5f485a46b36bf14d2145adf9c25fe098) Signed-off-by: Fr?d?ric Demians commit 8fd14b9b6b6e41cd3242948ba3fa7b8d165af446 Author: David Cook Date: Fri Feb 5 16:09:45 2016 +1100 Bug 15745: C4::Matcher gets CCL parsing error if term contains ? (question mark) Signed-off-by: Olli-Antti Kivilahti Also fixes ! and + Rebased to master Signed-off-by: Tomas Cohen Arazi It makes perfect sense and works as expected. This part of the code is too under-tested so no point requiring a regression test for such a simple change. Signed-off-by: Brendan A Gallagher (cherry picked from commit fcbd81049f590e5fc0c31030bcdb1311951c1444) Signed-off-by: Julian Maurice (cherry picked from commit 7212c9f41e635a3be54dc2356696b1e9ce6a370f) Signed-off-by: Fr?d?ric Demians commit 430dc045033ea3f70684068da3d37f0b769b60f9 Author: Jonathan Druart Date: Tue Mar 8 11:58:24 2016 +0000 Bug 15741: Fix rounding in total fines calculations C4::Members::GetMemberAccountRecords wrongly casts float to integer It's common to use sprintf in Perl to do this job. % perl -e 'print int(1000*64.60)."\n"'; 64599 % perl -e 'print sprintf("%.0f", 1000*64.60)."\n"'; 64600 Test plan: 1) Create manual invoice for 64.60 (or 1.14, 1.36, ...) 2) Try to pay it using "Pay amount" or "Pay selected" buttons Signed-off-by: Sally Healey Signed-off-by: Katrin Fischer Signed-off-by: Tomas Cohen Arazi Signed-off-by: Brendan A Gallagher (cherry picked from commit 92fbb1f3d0f2bdb070a1b647c96edbce5b28a377) Signed-off-by: Julian Maurice (cherry picked from commit 40507ce1529a237ec5c51837805100e89e96db9c) Signed-off-by: Fr?d?ric Demians commit 0f5ef2cc8a31b7d520390e52d6b5a250071cde3c Author: Jonathan Druart Date: Wed Mar 30 11:30:01 2016 +0100 Bug 15323: Use fixtures for the active currency prove t/Prices.t fails after bug 15084 has been pushed It's caused by commit 1538e9ecf47642c4974693ff499c3e95e4d71977 Bug 15084: Replace C4::Budgets::GetCurrencies with Koha::Acquisition::Currencies->search Koha::Number::Price->_format_params calls Koha::Acquisition::Currencies->get_active, which requests the DB. The currency data should be mocked. Test plan: sudo service mysql stop prove t/Prices.t should return green Signed-off-by: Tomas Cohen Arazi Patch works as expected and passes the qa-tools tests. Signed-off-by: Katrin Fischer Signed-off-by: Brendan A Gallagher (cherry picked from commit 0a14e22d59343475ed6970b82b474a80e43d8e29) Signed-off-by: Julian Maurice (cherry picked from commit c4c7ea475b813d97595a6114ef2e31028ec6efe5) Signed-off-by: Fr?d?ric Demians commit 90b4c1fe665fa251dd060a62dcc62af9f96da64a Author: Jonathan Druart Date: Tue Mar 1 12:13:22 2016 +0000 Bug 14441: TrackClicks cuts off/breaks URLs (XSLT) Same test plan as previous patch, but for opac defail and result using the XSLT views. Signed-off-by: Katrin Fischer I am amazed! Signed-off-by: Brendan A Gallagher (cherry picked from commit ee0abde76e78713233a9fcd31fbb6f80b5a9610c) Signed-off-by: Julian Maurice (cherry picked from commit 97de8be7046833a3a1e6ced3e3d512c89ca8cb85) Signed-off-by: Fr?d?ric Demians commit 2318d6175b27003866bdc412fca878806cc5c363 Author: Mason James Date: Tue Mar 1 16:26:06 2016 +1300 Bug 14441 - TrackClicks cuts off/breaks URLs to test... 1/ set TrackClicks syspref to 'track' 2/ add a problematic multipart url to an item's 'url' field example url: http://foo.corg?key1=val1&key2=val2 3/ test url in opac-detail.pl - url is corrupt 4/ apply patch - url is corrct Signed-off-by: Katrin Fischer Only fixes the item URLs - a follow-up for the URLs in the bibliographic record (856 for MARC21) is still needed. Signed-off-by: Brendan A Gallagher (cherry picked from commit de2a298a0623408c064ed0edbe47795740c814f4) Signed-off-by: Julian Maurice (cherry picked from commit 7e7b170febb55dfdc01d1864eaa48a1646210cc0) Signed-off-by: Fr?d?ric Demians commit f74e6488f659374aa30553f1e0be6be6973f5143 Author: Jonathan Druart Date: Wed Mar 30 10:55:02 2016 +0100 Bug 14158: www search tests - Cleanup at the end When something wrong happen, the parent process is waiting for the children to finish, but they have been zombified and the test hangs. To fix that, we should ensure that the cleanup is correctly done and that the processes are correctly killed. Test plan: export KOHA_USER=koha export KOHA_PASS=koha export KOHA_INTRANET_URL=http://do_not_exist_but_its_expected export KOHA_OPAC_URL=http://another_url prove t/db_dependent/www/search_utf8.t Without this patch, the tests will hang With the patch applied, they won't! Signed-off-by: Tomas Cohen Arazi Signed-off-by: Brendan A Gallagher (cherry picked from commit 8255a18edc9c2eee52b01bfa20114b088b9bf555) Signed-off-by: Julian Maurice (cherry picked from commit 5808b3de5b40bf964813b0c3509f7f7cd0429422) Signed-off-by: Fr?d?ric Demians commit ffab14e5f5297000465885cb9d7c5214c1d0891b Author: Marc V?ron Date: Wed Feb 10 17:21:40 2016 +0100 Bug 11498 - Prevent bypassing sco timeout with print dialog This patch prevents bypassing the self check timeout with the print dialog. To test: - Set syspref 'WebVasedSelfCheck' to 'Enable' - Set syspref 'SelfCheckoutReceivePrompt' to 'Show' - Set syspref 'SelfCheckTimeout' to 20 seconds - Apply patch - Go to SCO page (/cgi-bin/koha/sco/sco-main.pl) - Enter card number - Click 'Finish'. Dialog "Would you like to pritn a receipt?' appears. - Confirm printing without waiting 20 seconds => Result: Print slip, SCO page shows 'Please enter your card number' - Enter card number again - Click 'Finish'. Dialog "Would you like to pritn a receipt?' appears. - Wait > 20 seconds (value of SelfCheckTimeout) and then confirm. => Result: Message appears "Timeout while waiting for print confirmation" - Click on OK. => Result: Self checkout page refreshes (shows 'Please enter your card number') Signed-off-by: Mirko Tietgen Signed-off-by: Katrin Fischer https://bugs.koha-community.org/show_bug.cgi?id=11497 Signed-off-by: Brendan A Gallagher (cherry picked from commit 7f8037f642913d94ebec70413c6fd8cadfdf938d) Signed-off-by: Julian Maurice (cherry picked from commit 80737996ec728d0cb6264f35a2a98a6f33ee445f) Signed-off-by: Fr?d?ric Demians commit 61b64efe02da4604f77f4703b9f00faac9497dcd Author: Jonathan Druart Date: Thu Mar 3 08:58:06 2016 +0000 Bug 15967: Fix regression from bug 14133 - notify the library if patron is not Regression introduced by bug 14133, see but 14133 comment 13. Test plan: Without this patch applied, if a patron cannot be notified (no email address or sms number), the print notice generated for the library was not. With this patch applied, the print notice should be generated using the print template Signed-off-by: Nick Clemens Signed-off-by: Katrin Fischer Signed-off-by: Brendan A Gallagher (cherry picked from commit faaa2cbcdb1970866be4f8a7001bf2de305823a9) Signed-off-by: Julian Maurice (cherry picked from commit 8664af5e20716d1a849b1deb26e48927b4921c5a) Signed-off-by: Fr?d?ric Demians commit 431a141b946412ebe13c0347660546106aad11c7 Author: John Seymour Date: Wed Feb 10 22:38:15 2016 -0500 Bug 14633: Patch to control.ini to add or dependency to libapache2-mpm-itk The other attachment was not a patch which could be applied by 'git bz'. This corrects that. Signed-off-by: Chris Cormack debian/update-control will need to be run after this is applied, but it works well Signed-off-by: Tomas Cohen Arazi Signed-off-by: Brendan A Gallagher (cherry picked from commit aa66debec6fcdbdadd643386749a61229167aa62) Signed-off-by: Julian Maurice (cherry picked from commit 50c84aa4ce4614655a0fdc5c75a0e98694b4fa9c) Signed-off-by: Fr?d?ric Demians commit 9082762551429199eb911697ceb7d620436ef865 Author: Jonathan Druart Date: Mon Mar 21 15:49:25 2016 +0000 Bug 16040: Update fnReloadAjax DT plugin to fix quotes deletion When deleting quotes, the table is not regenerated and a JS error is raised. That is because we are not using an up-to-date plugin Test plan: Delete a quote and confirm you do not get a JS error Works as expected. Signed-off-by: Marc V?ron Signed-off-by: Katrin Fischer Signed-off-by: Brendan A Gallagher (cherry picked from commit 908a751e2cadcda0ceafa2efdd2cf0104a323467) Signed-off-by: Julian Maurice (cherry picked from commit 9478a0bf1eb43e0b82fb7c8ea84a4b503b9f81ce) Signed-off-by: Fr?d?ric Demians commit 79f813467c4b02106420951eafc692674745eea9 Author: Marcel de Rooy Date: Mon Feb 1 13:48:06 2016 +0100 Bug 15713: Restart zebra when rotating logfiles Somehow, it may happen that Zebra keeps writing to the old rotated logfile with extension .log.1. I must add that although I saw that happen (a new log was created and was empty, while Zebra kept writing to log.1 for weeks), I cannot reproduce it every time. By stopping the zebra server in prerotate and starting it again in postrotate, this should not happen at all. In practice, this implies that your Zebra server is restarted once a week. Note: The existing sharedscripts directive makes sure that these actions are not executed for all individual logfiles but once for all matching logfiles (even when running multiple instances). Test plan: [1] Apply the change in koha-common.logrotate to the file /etc/logrotate.d/koha-common. [2] Run logrotate -f /etc/logrotate.conf (forcing a logrotate). [3] Check in zebra-error.log that your zebra server was stopped ('killed by signal 15'). [4] Verify that your Zebra server runs (read: has been restarted). (Do a search..) Signed-off-by: Marcel de Rooy Signed-off-by: Marc V?ron Signed-off-by: Jonathan Druart Signed-off-by: Brendan Gallagher brendan at bywatersolutions.com (cherry picked from commit af47f00636848e1115b08652abcaec6b789bf672) Signed-off-by: Julian Maurice (cherry picked from commit ddd1bbebeadc3bed0fd592bc04621a0dc3fb08c6) Signed-off-by: Fr?d?ric Demians commit 90d46d133750d8b29afe8dbd91f30cc402b8cb7d Author: Marc V?ron Date: Thu Mar 24 11:59:27 2016 +0100 Bug 14614: Multiple URLs (856) in cart/list email are broken To reproduce: - Add multiple subfields 856 u to a bilbio - Add this biblio to a cart and send it as mail (from Staff client and from OPAC) Result: Links in mail body are broken To test - Apply patch - Send carts again (from Staff client and from OPAC) - Result: In mail body, links display separated with blank-pipe-blank like http://bla.com | http://blabla.com | http://blablabla.com - Change one of the 856 u to not to be a link, e.g. ??? - Send carts again - Verify that in mail body ??? correctly display as text. (Amended to make it work for OPAC as well, MV) Signed-off-by: Owen Leonard Signed-off-by: Tomas Cohen Arazi Signed-off-by: Brendan A Gallagher (cherry picked from commit d135499d2893fe1000c627f433395989d7d9e022) Signed-off-by: Julian Maurice (cherry picked from commit bd6e5a4c32496c94b0f90010fdc6b8dc047ea64f) Signed-off-by: Fr?d?ric Demians commit 57b94630d1eb917f527ea09cf28ac8d880dcd9be Author: Julian Maurice Date: Wed Mar 23 14:16:18 2016 +0100 Change syspref case to make tests pass Regression due to bug 11998 Signed-off-by: Julian Maurice (cherry picked from commit f89c350f7216619bbf327bc700b0c4cd8be0486f) Signed-off-by: Fr?d?ric Demians ----------------------------------------------------------------------- Summary of changes: C4/Auth.pm | 16 +- C4/Context.pm | 9 + C4/Matcher.pm | 5 +- C4/Members.pm | 2 +- C4/Output.pm | 11 +- C4/Ris.pm | 11 +- C4/Utils/DataTables/Members.pm | 2 +- admin/auth_subfields_structure.pl | 180 ++++----------- admin/currency.pl | 18 +- admin/marc_subfields_structure.pl | 183 +++++---------- debian/control.in | 4 +- debian/docs/koha-rebuild-zebra.xml | 12 +- debian/koha-common.logrotate | 4 + debian/scripts/koha-rebuild-zebra | 34 ++- .../lib/jquery/plugins/dataTables.fnReloadAjax.js | 150 +++++++++---- .../prog/en/includes/doc-head-close.inc | 14 ++ .../prog/en/includes/patron-search.inc | 8 +- .../en/includes/rotating-collections-toolbar.inc | 18 +- .../en/modules/acqui/tables/members_results.tt | 2 +- .../en/modules/admin/auth_subfields_structure.tt | 99 +++++--- .../prog/en/modules/admin/branches.tt | 17 +- .../prog/en/modules/admin/currency.tt | 11 +- .../prog/en/modules/admin/localization.tt | 237 ++++++++++++++++++++ .../en/modules/admin/marc_subfields_structure.tt | 74 +++--- .../prog/en/modules/basket/sendbasket.tt | 2 +- .../prog/en/modules/catalogue/detail.tt | 12 +- .../prog/en/modules/catalogue/itemsearch.tt | 7 +- .../prog/en/modules/circ/pendingreserves.tt | 9 +- .../prog/en/modules/help/admin/smart-rules.tt | 2 +- .../intranet-tmpl/prog/en/modules/intranet-main.tt | 5 +- .../prog/en/modules/labels/label-print.tt | 4 +- .../prog/en/modules/members/member.tt | 7 +- .../prog/en/modules/members/moremember.tt | 7 +- .../en/modules/members/tables/members_results.tt | 2 +- .../prog/en/modules/patroncards/print.tt | 2 +- .../modules/patroncards/tables/members_results.tt | 2 +- .../prog/en/modules/serials/subscription-add.tt | 2 +- .../en/modules/serials/tables/members_results.tt | 2 +- .../modules/tools/marc_modification_templates.tt | 9 +- .../opac-tmpl/bootstrap/en/modules/opac-detail.tt | 42 ++-- .../bootstrap/en/modules/opac-sendbasket.tt | 2 +- .../opac-tmpl/bootstrap/en/modules/sco/sco-main.tt | 7 +- .../bootstrap/en/xslt/MARC21slim2OPACDetail.xsl | 5 +- .../bootstrap/en/xslt/MARC21slim2OPACResults.xsl | 9 +- .../bootstrap/en/xslt/NORMARCslim2OPACDetail.xsl | 5 +- .../bootstrap/en/xslt/NORMARCslim2OPACResults.xsl | 5 +- members/member.pl | 2 +- members/moremember.pl | 5 + misc/cronjobs/overdue_notices.pl | 12 +- opac/opac-authorities-home.pl | 11 +- opac/opac-ratings.pl | 7 + reports/bor_issues_top.pl | 8 +- t/Prices.t | 20 +- t/db_dependent/Auth_with_cas.t | 2 +- t/db_dependent/www/search_utf8.t | 5 + 55 files changed, 831 insertions(+), 511 deletions(-) create mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/admin/localization.tt hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Wed Apr 27 18:15:30 2016 From: gitmaster at git.koha-community.org (Git repo owner) Date: Wed, 27 Apr 2016 16:15:30 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.22.00-1301-g19d2dfb 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 19d2dfb733b0ec6b66228462678d016891334138 (commit) via 2c385d0d7dfe0398e8f5ebb90a600f1d8925e420 (commit) via 220a517c8ed79b68312c1dc94a3a893e21c590aa (commit) via 9eb80092e3aeae8292dee9a3cb3e7345c9adefc2 (commit) via 49a3b581b7d68251a0bf76aaf84b0565a6226fce (commit) via b69402d14cd83ebedfd1272f9a42c4ceacfa60db (commit) from a25bfbfc574ac41a8a570a9a9b01716291d5a0dc (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 19d2dfb733b0ec6b66228462678d016891334138 Author: Brendan Gallagher Date: Wed Apr 27 16:24:18 2016 +0000 DBRev for Bug 14686 - New menu option and permission for file uploading Signed-off-by: Brendan Gallagher commit 2c385d0d7dfe0398e8f5ebb90a600f1d8925e420 Author: Jonathan Druart Date: Mon Apr 4 14:21:08 2016 +0100 Bug 14686: Remove unused use Signed-off-by: Jonathan Druart Signed-off-by: Brendan Gallagher commit 220a517c8ed79b68312c1dc94a3a893e21c590aa Author: Marcel de Rooy Date: Fri Apr 1 11:14:15 2016 +0200 Bug 14686: [QA Follow-up] Move allows_add_by to Upload.pm As requested by QA, the sub should be moved. Test plan: See previous patches. Signed-off-by: Marcel de Rooy Signed-off-by: Jonathan Druart Signed-off-by: Brendan Gallagher commit 9eb80092e3aeae8292dee9a3cb3e7345c9adefc2 Author: Marcel de Rooy Date: Mon Feb 8 10:26:58 2016 +0100 Bug 14686: Add Upload to Tools menu This patch makes sure that the added granular permissions work as advertised. Note: The field owner was not included in the Koha::Upload->get response. The code to verify if a user is allowed to delete an upload, is concentrated in the template now. When get returns a Koha::Object, this check could be relocated. Test plan: [1] Verify that the current user has permission for tools, or has at least upload_general_files. [2] Do you see Upload in the Tools menu? Follow the link. [3] Upload a permanent file (with a category). [4] Do you see the Delete button in the results form? [5] Make sure that another user has no permission to upload. [6] Login as that user and check the Tools menu. Try the URL [yourserver]/cgi-bin/koha/tools/upload.pl You should have no access to the upload form. [7] Enable upload_general_files for this user. Go to upload and search for the upload from step 3. You should not see a Delete button. [8] Enable upload_manage for this user. Search for the upload again. Delete the upload. [9] Go to upload via the Cataloguing editor (856$u plugin) or add parameter "plugin=1" to the URL. You should not see the Tools menu. Signed-off-by: Marcel de Rooy Signed-off-by: Mirko Tietgen Signed-off-by: Jonathan Druart Signed-off-by: Brendan Gallagher commit 49a3b581b7d68251a0bf76aaf84b0565a6226fce Author: Marcel de Rooy Date: Mon Mar 14 13:42:10 2016 +0100 Bug 14686: Add two granular permission for upload under tools [1] Upload_general_files This will allow you to access the tools/upload form via the Tools menu. And it will also allow you to add permanent uploads. [2] Upload_manage It will allow you to delete uploads from other users. Note that anyone may delete his own uploads. It is not meant to include upload_general_files. In order to not disturb existing users that now have edit_catalogue and are using the plugin (read: added at least one record to uploaded_files), we will add the first permission for them. New users will need to be authorized in the usual way thereafter. Note: If you only have one of the other permissions checked in allows_add_by, e.g. stage_marc_import, you can add temporary uploads, but not permanent uploads. Test plan: We are only testing the dbrev here, not if the perm works as advertised. [1] Run the dbrev and check that you see the perms with a description on the Patron/Set permissions page. [2] If you had records in uploaded_files and a user with edit_catalogue *only*, verify that this user now also has upload_general_files. Signed-off-by: Mirko Tietgen Signed-off-by: Jonathan Druart Signed-off-by: Brendan Gallagher commit b69402d14cd83ebedfd1272f9a42c4ceacfa60db Author: Marcel de Rooy Date: Mon Mar 14 13:22:14 2016 +0100 Bug 14686: Add allows_add_by to check permissions for uploading The three permissions in tools/upload-file.pl are moved to a custom routine in DBIx's UploadedFile.pm. An additional granular permission upload_general_files is added. (The dbrev patch will contain it too.) At some point in time this could be moved to a Koha::Object class. The routine is tested in Upload.t. Test plan: [1] Run t/db_dependent/Upload.t [2] If you only apply this patch, you can also test uploading with a user that has edit_catalogue but does not have tools or circulate. Upload status should say: Denied. Signed-off-by: Mirko Tietgen Signed-off-by: Jonathan Druart Signed-off-by: Brendan Gallagher ----------------------------------------------------------------------- Summary of changes: Koha.pm | 2 +- Koha/Upload.pm | 25 +++++++++- installer/data/mysql/updatedatabase.pl | 29 +++++++++++ .../intranet-tmpl/prog/en/includes/permissions.inc | 2 + .../intranet-tmpl/prog/en/includes/tools-menu.inc | 3 ++ .../prog/en/modules/tools/tools-home.tt | 5 ++ .../intranet-tmpl/prog/en/modules/tools/upload.tt | 13 +++-- t/db_dependent/Upload.t | 51 ++++++++++++++++++-- tools/upload-file.pl | 16 +----- tools/upload.pl | 11 +++-- 10 files changed, 129 insertions(+), 28 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Wed Apr 27 18:17:06 2016 From: gitmaster at git.koha-community.org (Git repo owner) Date: Wed, 27 Apr 2016 16:17:06 +0000 Subject: [koha-commits] main Koha release repository annotated tag v3.20.11 created. v3.20.11 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 annotated tag, v3.20.11 has been created at da5520c7d034e08507f1518f3574c6a18de31112 (tag) tagging 66a7d1aec6b0b51023f6eeee3a14240b57d406ce (commit) replaces v3.20.10 tagged by Fr?d?ric Demians on Wed Apr 27 18:31:13 2016 +0200 - Log ----------------------------------------------------------------- Koha release 3.20.11 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.12 (GNU/Linux) iQEcBAABAgAGBQJXIOlRAAoJEGOGo5WRV8bu28oH/0PKE3ZtnLcMFJpXOImS+VdM JJFYqQmwSgUK2ixeSjvhUid9Q0vOuYZeIXvBn3WPTnwutrP5pJH9ncRpnmev/ACI 1k30vtQsndYICce1dbKLBI4SmtR6xcLmzEtXkHuS4h271bAxRufDvIWclh77yIRB 8B1KMpEE9Pj+cVi4y/jRYs2FwRiB22dO2xFKuDjnFGFJv+kRTKKN2LPUTaCBa/9O bweUccX9upSIWje+4oI1xlVrrtSOjId6HaRx414zpdcqYXQkWeKFiscvwyyIO/E+ RmQFVJnSLpfEBvXoEZvd7nYVUcUoAK9kaFnaFMUTdsHCQeZh2s89zz78iArI1sI= =LWWF -----END PGP SIGNATURE----- Aleisha (3): Bug 15866: Add confirm message for deleting rotating collection from toolbar Bug 16029: Hide patron toolbar if patron does not exist Bug 16047: Making category code a required field on creating a group Alex Arnaud (3): Bug 15838 - Subscription duplicating: Reset fields from SubscriptionDuplicateDroppedInput syspef by getting them using name instead of id Bug 16171 - Show many media in html5media tabs Bug 15832 - Fix filter and items split-up in pendingreserves.tt David Cook (1): Bug 15745: C4::Matcher gets CCL parsing error if term contains ? (question mark) Fr?d?ric Demians (2): Version 3.20.11 Translation for 3.20.11 John Seymour (1): Bug 14633: Patch to control.ini to add or dependency to libapache2-mpm-itk Jonathan Druart (19): Bug 14841: Columns settings are not taken into account for checkout table / moremember Bug 14841: Fine column is not manage by columns settings Bug 16040: Update fnReloadAjax DT plugin to fix quotes deletion Bug 15967: Fix regression from bug 14133 - notify the library if patron is not Bug 14158: www search tests - Cleanup at the end Bug 14441: TrackClicks cuts off/breaks URLs (XSLT) Bug 15323: Use fixtures for the active currency Bug 15741: Fix rounding in total fines calculations Bug 15773: Fix and standardise checkboxes code in framework Bug 15722: Escape patron infos for JSON in patron searches Bug 15809: Redefine multi_param is CGI < 4.08 is used Bug 14076: Do not use CGI->param in list context - opac-authorities-home.pl Bug 15832: Remove empty string from the filters Bug 16179: Do not crash if "rate me" is clicked and not rate selected Bug 15111: Change X-Frame-Options with SAMEORIGIN Bug 15111: Do not include the antiClickjack legacy browser trick for greybox Bug 16210: Revert OPAC changes from Bug 15111 Bug 16210: Set X-Frame-Options to SAMEORIGIN in 2 other places Bug 15930: Make patron searches defaulting on 'contain' Julian Maurice (5): Change syspref case to make tests pass Bug 16214: Fix typo 'To.jon' -> 'To.json' Bug 15868: Ask for confirmation when deleting a MMT action Bug 15962: Block the currency deletion if used Bug 14816: Fix multiple selection in item search Kyle M Hall (1): Bug 15111 - Koha is vulnerable to Cross-Frame Scripting (XFS) attacks Marc V?ron (3): Bug 14614: Multiple URLs (856) in cart/list email are broken Bug 11498 - Prevent bypassing sco timeout with print dialog Bug 16133: Translatability of database administrator account warning Marcel de Rooy (1): Bug 15713: Restart zebra when rotating logfiles Mark Tompsett (1): Bug 16191: t/Ris.t is noisy Mason James (3): Bug 14441 - TrackClicks cuts off/breaks URLs Bug 16184 - Report bor_issues_top shows incorrect number of rows Bug 1750 - Report bor_issues_top erroneous and truncated results. Nick Clemens (2): Bug 15888 - Syndetics Reviews preference should not enable LibraryThing reviews Bug 15928 - Show unlinked guarantor Owen Leonard (2): Bug 15984 - Correct templates which use the phrase "issuing rules" Bug 16047 [Follow-up] Software error on deleting a group with no category code Tomas Cohen Arazi (1): Bug 15113: koha-rebuild-zebra should check USE_INDEXER_DAEMON and skip if enabled ----------------------------------------------------------------------- hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Wed Apr 27 18:17:20 2016 From: gitmaster at git.koha-community.org (Git repo owner) Date: Wed, 27 Apr 2016 16:17:20 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.22.00-1303-g0124a62 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 0124a6269d344e3e93f1c892f74629fba501a61f (commit) via 6424a3c27753cc4e81393ebde24d645cfc627768 (commit) from 19d2dfb733b0ec6b66228462678d016891334138 (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 0124a6269d344e3e93f1c892f74629fba501a61f Author: Jonathan Druart Date: Fri Aug 16 12:25:58 2013 +0200 Bug 10347 [Follow-up] Scroll down clicking on the "Add multiple copies" button Signed-off-by: Owen Leonard Signed-off-by: Bernardo Gonzalez Kriegel Signed-off-by: Katrin Fischer Signed-off-by: Brendan Gallagher commit 6424a3c27753cc4e81393ebde24d645cfc627768 Author: Owen Leonard Date: Thu Aug 15 14:53:26 2013 -0400 Bug 10347 - Deactivate "Add item" button when "Add multiple copies" was activated When the "Add multiple items" button is pressed the other submit buttons should be hidden in order to eliminate confusion about which button submits the form at that stage in the process. This patch alters the form so that clicking the "add multiple" button hides the other two buttons and displays form for submitting the number of copies to add. This patch also makes changes to accompanying text in order to make things (hopefully) clearer. The button text has been changed (again, see Bug 10346) to "Add multiple copies of this item." Explanatory text has been added "The barcode you enter will be incremented for each additional item," because that seemed non-obvious about the process. Unrelated change: a section of obsolete JavaScript has been removed. To test, go to the add/edit items page for a new or existing record. Test adding a single item, adding & duplicating, and adding multiple. The add multiple form should be shown upon clicking 'add multiple,' and hidden when 'cancel' is clicked. Signed-off-by: Bernardo Gonzalez Kriegel Work as described, tried adding one, one & dup, multiple and cancel multiple No errors Signed-off-by: Katrin Fischer Signed-off-by: Brendan Gallagher ----------------------------------------------------------------------- Summary of changes: .../prog/en/modules/cataloguing/additem.tt | 37 ++++++++++++++++---- 1 file changed, 30 insertions(+), 7 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Wed Apr 27 18:19:01 2016 From: gitmaster at git.koha-community.org (Git repo owner) Date: Wed, 27 Apr 2016 16:19:01 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.22.00-1304-g16b939c 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 16b939c3bc8ab1102c007d759e6a23929939e9fd (commit) from 0124a6269d344e3e93f1c892f74629fba501a61f (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 16b939c3bc8ab1102c007d759e6a23929939e9fd Author: Aleisha Date: Tue Mar 29 01:40:35 2016 +0000 Bug 2324: Adding confirm dialog when undoing import EDIT: Comment 3 To test: 1) Go to Tools -> Staged MARC Management 2) Click on a batch to see details 3) If not already imported, then import, otherwise you should already see the button to undo import into catalog. 4) Click this button. Confirm you are asked to confirm. Confirm clicking Cancel will cancel the undo. Confirm clicking OK will continue with the undo. Sponsored-by: Catalyst IT Signed-off-by: Mark Tompsett Signed-off-by: Jonathan Druart Signed-off-by: Brendan Gallagher ----------------------------------------------------------------------- Summary of changes: koha-tmpl/intranet-tmpl/prog/en/modules/tools/manage-marc-import.tt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Wed Apr 27 18:20:50 2016 From: gitmaster at git.koha-community.org (Git repo owner) Date: Wed, 27 Apr 2016 16:20:50 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.22.00-1305-g4867744 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 486774412796c43f1627c5a2efdfbf2dbb47ac32 (commit) from 16b939c3bc8ab1102c007d759e6a23929939e9fd (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 486774412796c43f1627c5a2efdfbf2dbb47ac32 Author: Jonathan Druart Date: Tue Mar 29 16:38:18 2016 +0100 Bug 16158: Move GetAuthorisedValues outside the loop In catalogue/detail.pl and catalogue/moredetail.pl, the GetAuthorisedValues subroutine is called once per item. It's not needed, only 1 call is enough. Test plan: Edit item and view a catalogue record. The withdrawn, lost and damaged values should be correctly displayed/saved. Signed-off-by: Mark Tompsett Signed-off-by: Marcel de Rooy Signed-off-by: Brendan Gallagher ----------------------------------------------------------------------- Summary of changes: catalogue/detail.pl | 15 ++++++++------- catalogue/moredetail.pl | 14 +++++++++++--- .../prog/en/modules/catalogue/detail.tt | 8 ++++---- .../prog/en/modules/catalogue/moredetail.tt | 18 +++++++++--------- 4 files changed, 32 insertions(+), 23 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Wed Apr 27 18:51:17 2016 From: gitmaster at git.koha-community.org (Git repo owner) Date: Wed, 27 Apr 2016 16:51:17 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.22.00-1306-ga63a513 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 a63a51381b837343eb13a2f719d797fec4937cfa (commit) from 486774412796c43f1627c5a2efdfbf2dbb47ac32 (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 a63a51381b837343eb13a2f719d797fec4937cfa Author: Kyle M Hall Date: Wed Apr 27 17:00:22 2016 +0000 Bug 14686 - DBRev fix - add missing call to SetVersion Signed-off-by: Kyle M Hall ----------------------------------------------------------------------- Summary of changes: installer/data/mysql/updatedatabase.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Thu Apr 28 12:41:51 2016 From: gitmaster at git.koha-community.org (Git repo owner) Date: Thu, 28 Apr 2016 10:41:51 +0000 Subject: [koha-commits] main Koha release repository branch 3.22.x updated. v3.22.06-1-g4c20eff 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.22.x has been updated via 4c20effa88c91f4b0c38b93c87a427fb9264912c (commit) from 372868a3003fff29c7e913ff104f2d0d2cb0e5ea (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 4c20effa88c91f4b0c38b93c87a427fb9264912c Author: Sophie Meynieux Date: Tue Apr 26 18:04:45 2016 +0200 Bug 16356: Fix Error 500 when returning an item which itemtype is not in itemtypes table Test plan : * Find an item with itemtype (itype or bilbioitems.itemtype depending on syspref) does not exist in itemtypes table * If necessary, change itemtype of one of your item * Check out this item * Try to check it in, you've got a 500 Error and item is not returned With the patch * Try to check your item in. Item is correctly returned Signed-off-by: Owen Leonard Signed-off-by: Kyle M Hall Signed-off-by: Julian Maurice ----------------------------------------------------------------------- Summary of changes: C4/ItemType.pm | 1 + 1 file changed, 1 insertion(+) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Apr 29 01:14:08 2016 From: gitmaster at git.koha-community.org (Git repo owner) Date: Thu, 28 Apr 2016 23:14:08 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.22.00-1307-g4fb754d 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 4fb754d3378adac7b9a1e40a0d83df2a7e5c2006 (commit) from a63a51381b837343eb13a2f719d797fec4937cfa (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 4fb754d3378adac7b9a1e40a0d83df2a7e5c2006 Author: Marc V?ron Date: Thu Apr 28 11:47:57 2016 +0200 Bug 16378: Overdues.pm: Can't call method "store" without a package or object reference Overdues.pm line 588 tries to do an $accountline->set with column outstanding instead of amountoutstanding. This patch fixes it. To test: - Verify that code change is correct. - Try to trigger a situation where an existing fine is updated (see comment in line 574 in C4/Overdues.pm) Signed-off-by: Jacek Ablewicz Signed-off-by: Kyle M Hall Signed-off-by: Brendan Gallagher ----------------------------------------------------------------------- Summary of changes: C4/Overdues.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Apr 29 01:15:20 2016 From: gitmaster at git.koha-community.org (Git repo owner) Date: Thu, 28 Apr 2016 23:15:20 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.22.00-1308-g404d900 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 404d9001febc47f53a89be349abd8628d75dd8f6 (commit) from 4fb754d3378adac7b9a1e40a0d83df2a7e5c2006 (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 404d9001febc47f53a89be349abd8628d75dd8f6 Author: Jacek Ablewicz Date: Thu Apr 28 09:35:51 2016 +0200 Bug 16373: merge.pl reports success but files are not merged To recreate: 1) Select two biblios to merge 2) Merge them 3) Sucess reported but list of bibs contains only the reference record. 4) View the 'new' record, it won't have any additional items 5) View the 'merged' record, it is still there with its items This happens because record IDs (biblionumbers) are not correctly set up in the template on the 2nd merge stage, since Bug 15358. To test: 1) apply patch 2) try to recreate this issue once again, confirm that a problem is resolved Signed-off-by: Chris Cormack Signed-off-by: Katrin Fischer Signed-off-by: Brendan Gallagher ----------------------------------------------------------------------- Summary of changes: koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/merge.tt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Apr 29 01:18:20 2016 From: gitmaster at git.koha-community.org (Git repo owner) Date: Thu, 28 Apr 2016 23:18:20 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.22.00-1309-g6d52cd6 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 6d52cd63f351cd56f36492b80c10c0d8568ef03d (commit) from 404d9001febc47f53a89be349abd8628d75dd8f6 (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 6d52cd63f351cd56f36492b80c10c0d8568ef03d Author: Jonathan Druart Date: Wed Apr 6 15:59:02 2016 +0100 Bug 12752: FIX letter names in 3.15.00.041 3.15.00.041 was wrong, the name of the letter should not always been the name of the first HOLD notice. PREDUE_PHONE should be updated with the first name of the PREDUE notice, same for OVERDUE_PHONE and OVERDUE Signed-off-by: Chris Cormack Signed-off-by: Marcel de Rooy Signed-off-by: Brendan Gallagher ----------------------------------------------------------------------- Summary of changes: installer/data/mysql/updatedatabase.pl | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Apr 29 04:04:03 2016 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 29 Apr 2016 02:04:03 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.22.00-1310-g7a2547d 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 7a2547d53e499e54a106491048fdbbf56549cda0 (commit) from 6d52cd63f351cd56f36492b80c10c0d8568ef03d (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 7a2547d53e499e54a106491048fdbbf56549cda0 Author: Marcel de Rooy Date: Thu Apr 28 08:50:47 2016 +0200 Bug 16377: Fix t/db_dependent/Members/Attributes.t This is a follow-up for bug 12267 fixing the test, still referring to password fields. Test plan: Run the test. Signed-off-by: Marcel de Rooy Signed-off-by: Bernardo Gonzalez Kriegel Test now pass No errors Signed-off-by: Kyle M Hall Signed-off-by: Brendan Gallagher ----------------------------------------------------------------------- Summary of changes: t/db_dependent/Members/Attributes.t | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Apr 29 04:06:45 2016 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 29 Apr 2016 02:06:45 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.22.00-1311-gf04e991 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 f04e9919755c85b03c7016f838d747523c0effb5 (commit) from 7a2547d53e499e54a106491048fdbbf56549cda0 (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 f04e9919755c85b03c7016f838d747523c0effb5 Author: Jonathan Druart Date: Wed Apr 6 16:35:23 2016 +0100 Bug 16217: Resync names of notices Bug 12752 has fixed a bug for installations upgrading from 3.14, but has not fixed the problem for new installations. Because of some wrong data manipulations, the names for a given letter code may diverge. In particular OVERDUE and PREDUE names of phone notices have been wrongly modify by bug 11867: they have been set to the name of the first HOLD notice. Trying to be back on our feet, this update DB entry will try to guess and set back up the correct name. To know if your install is affected by this bug, the following SQL query can help you: SELECT code, name, message_transport_type FROM letter WHERE code="PREDUE" OR code="OVERDUE"; If the names are different for the same code, something went wrong. Executing this update DB entry should fix the divergence. Signed-off-by: Bernardo Gonzalez Kriegel Fix the problem, see comment #6 for test. No koha-qa errors Signed-off-by: Marcel de Rooy Signed-off-by: Brendan Gallagher ----------------------------------------------------------------------- Summary of changes: installer/data/mysql/atomicupdate/bug_16217.perl | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 installer/data/mysql/atomicupdate/bug_16217.perl hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Apr 29 04:17:47 2016 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 29 Apr 2016 02:17:47 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.22.00-1312-g6823552 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 68235527aae8f5a6b3b2a49e70b7d2ea87a1816b (commit) from f04e9919755c85b03c7016f838d747523c0effb5 (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 68235527aae8f5a6b3b2a49e70b7d2ea87a1816b Author: Brendan Gallagher Date: Fri Apr 29 02:26:46 2016 +0000 DBRev Bug 16217 - Notice' names may have diverged Signed-off-by: Brendan Gallagher ----------------------------------------------------------------------- Summary of changes: Koha.pm | 2 +- installer/data/mysql/atomicupdate/bug_16217.perl | 14 -------------- installer/data/mysql/updatedatabase.pl | 21 +++++++++++++++++++++ 3 files changed, 22 insertions(+), 15 deletions(-) delete mode 100644 installer/data/mysql/atomicupdate/bug_16217.perl hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Apr 29 04:35:30 2016 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 29 Apr 2016 02:35:30 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.22.00-1314-gb84aa17 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 b84aa1779e0aa09c1a307e195908a205ea82aa88 (commit) via adb8d41053357eeb68fa148a04c2202df6e54974 (commit) from 68235527aae8f5a6b3b2a49e70b7d2ea87a1816b (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 b84aa1779e0aa09c1a307e195908a205ea82aa88 Author: Alex Arnaud Date: Fri Apr 22 11:03:50 2016 +0200 Bug 13877 - Fix QA issues Signed-off-by: Bernardo Gonzalez Kriegel No koha-qa errors Signed-off-by: Katrin Fischer Signed-off-by: Brendan Gallagher commit adb8d41053357eeb68fa148a04c2202df6e54974 Author: Alex Arnaud Date: Tue Mar 15 16:36:28 2016 +0100 Bug 13877 - Make serialseq season name translatable regardless its position in a string Signed-off-by: Chris Cormack Signed-off-by: Katrin Fischer Signed-off-by: Brendan Gallagher ----------------------------------------------------------------------- Summary of changes: .../prog/en/modules/serials/serials-collection.tt | 16 ++++++++-------- .../prog/en/modules/serials/showpredictionpattern.tt | 16 ++++++++-------- 2 files changed, 16 insertions(+), 16 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Apr 29 04:39:10 2016 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 29 Apr 2016 02:39:10 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.22.00-1317-gef97b6b 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 ef97b6b301a5c1a9ef5c63cc93933bf7442513fc (commit) via 5fc93bce9b786797724539bea1a1689e959078e6 (commit) via 95f492b4d2505103269b295a34bab74804df9746 (commit) from b84aa1779e0aa09c1a307e195908a205ea82aa88 (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 ef97b6b301a5c1a9ef5c63cc93933bf7442513fc Author: Marc V?ron Date: Wed Apr 27 12:38:58 2016 +0200 Bug 12721: (followup) Replace mysqlism by DBIx::Class This patch removes the mysqlism (see comment #18) Signed-off-by: Chris Cormack Signed-off-by: Katrin Fischer Fixed QA tools complaints about missing lines before and after =cut in POD. Signed-off-by: Brendan Gallagher commit 5fc93bce9b786797724539bea1a1689e959078e6 Author: Marc V?ron Date: Sun Oct 18 16:28:52 2015 +0200 Bug 12721 - Prevent software error if incorrect fieldnames given in sypref StatisticsFields To reproduce issue: See comment #1 To test: - Apply patch - Leave syspref StatisticsFields empty - Display statistics for an author => Result: Table displays Shelving location, Collection code, Item type (as before) - Change syspref to any combination of location|itype|ccode => Result: Table displays columns as appropriate - Change syspref to some garbage => Result: Same as with empty syspref (was crashing without patch) - Change syspref to valid combination with trailing | => Result: Table displays columns as appropriate (was crashing without patch) - Change syspref to a combination of valid and invalid fields (location|blah|ccode) => Result: Table displays column of valid fields only (was crashing without patch) Signed-off-by: Aleisha Signed-off-by: Katrin Fischer Signed-off-by: Brendan Gallagher commit 95f492b4d2505103269b295a34bab74804df9746 Author: Marc V?ron Date: Sun Oct 18 18:27:58 2015 +0200 Bug 12721 - Syspref StatisticsFields: Warning on About page and text change in System preferences This patch adds a warning to the about page if the syspref 'StatisticsFields' is misconfigured. Additionally, the text on Home > Administration > SystemPreferences for 'Statistics Fields' is changed. To test: - Apply patch - Edit syspref 'StatisticsFields'. Verify that the explanation makes sense. - Leave field empty => verify that no message appears on About page, tab System information - Insert valid field names, e.g. location|itype => verify that no message appears on the About page - Add trailing char => verify that the warning message appears on the About page - Fill in some garbage or misspell a field name => verify that the warning message appears on the About page Signed-off-by: Aleisha Signed-off-by: Katrin Fischer Signed-off-by: Brendan Gallagher ----------------------------------------------------------------------- Summary of changes: C4/Members/Statistics.pm | 36 +++++++++++++++++--- about.pl | 10 ++++++ koha-tmpl/intranet-tmpl/prog/en/modules/about.tt | 7 ++-- .../prog/en/modules/admin/preferences/patrons.pref | 2 +- 4 files changed, 47 insertions(+), 8 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Apr 29 04:41:23 2016 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 29 Apr 2016 02:41:23 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.22.00-1318-g2026be4 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 2026be47fd79fb15f1e9fb83be34403e8eb18079 (commit) from ef97b6b301a5c1a9ef5c63cc93933bf7442513fc (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 2026be47fd79fb15f1e9fb83be34403e8eb18079 Author: Jonathan Druart Date: Fri Mar 18 13:39:27 2016 +0000 Bug 16105: Do not initialize the memory cache if not needed Cache::Memory is loaded and Koha::Cache::_initialize_memory is called even if a memcached cache has been correctly initialize, it does not make sense. It should only be initialize if needed. Test plan: Correctly configure a memcache server and confirm that the memory cache is not initialize. Do not configure correctly a memcache server and confirm that the cache system default on Cache::Memory Signed-off-by: Chris Cormack Signed-off-by: Kyle M Hall Signed-off-by: Brendan Gallagher ----------------------------------------------------------------------- Summary of changes: Koha/Cache.pm | 46 ++++++++++++++++------------------------------ 1 file changed, 16 insertions(+), 30 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Apr 29 12:14:51 2016 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 29 Apr 2016 10:14:51 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.22.00-1322-ge27bca7 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 e27bca77c77617f807304ca9775897a0b7a11dda (commit) via f3b42788cd874ee8cc9cf21a6b8fee564e59e4ec (commit) via 2aa93c5fda64ee87c0c84508a0c7740dceb94c17 (commit) via 456348aba9a13413b0409f11d21d5f0133f498fe (commit) from 2026be47fd79fb15f1e9fb83be34403e8eb18079 (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 e27bca77c77617f807304ca9775897a0b7a11dda Author: Kyle M Hall Date: Fri Apr 29 10:23:47 2016 +0000 Bug 15532 - DBRev 3.23.00.054 commit f3b42788cd874ee8cc9cf21a6b8fee564e59e4ec Author: Kyle M Hall Date: Wed Apr 27 17:18:49 2016 +0000 Bug 15532 [QA Followup] - Remove unused variable Signed-off-by: Marcel de Rooy commit 2aa93c5fda64ee87c0c84508a0c7740dceb94c17 Author: Kyle M Hall Date: Mon Apr 18 16:46:57 2016 +0000 Bug 15532 [QA Followup] - Remove unecessary lines from unit test Signed-off-by: Marcel de Rooy commit 456348aba9a13413b0409f11d21d5f0133f498fe Author: Kyle M Hall Date: Sat Dec 19 11:34:03 2015 +0000 Bug 15532: Add ability to allow only items whose home/holding branch matches the hold's pickup branch to fill a given hold Some libraries would like to be able to limit hold filling to items that match the pickup library for a hold based on the item's home or holding library. The patron's home library should not affect whether a patron can place the hold, instead the hold will only be fillable when an item matching the pickup location becomes available. Test Plan: 1) Apply this patch 2) Run updatedatabase.pl 3) Note the new "Hold pickup library match" rules for "checkout, hold, and return policy" and for "holds policy by item type" 4) Set the policy to "item's holding library" 5) Place a hold where the item's holding branch does not match the pickup branch 6) Check in the item 7) Note it is not trapped for the hold 8) Update the item's holding branch to match the pickup branch 8) Check in the item 9) Note the item is trapped for the hold 10) Repeat steps 4-9 but for home branch instead Signed-off-by: Hector Castro Works as described Signed-off-by: Marcel de Rooy ----------------------------------------------------------------------- Summary of changes: C4/Circulation.pm | 10 +- C4/HoldsQueue.pm | 54 ++++++-- C4/Reserves.pm | 1 + Koha.pm | 2 +- admin/smart-rules.pl | 86 ++++++------ installer/data/mysql/kohastructure.sql | 4 + installer/data/mysql/updatedatabase.pl | 39 ++++-- .../prog/en/modules/admin/smart-rules.tt | 58 ++++++++ t/db_dependent/Holds/HoldFulfillmentPolicy.t | 139 ++++++++++++++++++++ t/db_dependent/HoldsQueue.t | 119 ++++++++++++++++- 10 files changed, 442 insertions(+), 70 deletions(-) create mode 100755 t/db_dependent/Holds/HoldFulfillmentPolicy.t hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Apr 29 12:22:01 2016 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 29 Apr 2016 10:22:01 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.22.00-1330-g1a0ca28 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 1a0ca2874fc60b58db0f5f55f20871377cfe77a1 (commit) via b87af43c4737cceef1855679f11ba277c0600358 (commit) via 4f91c48259b2fe3fd6f1c0f1dfee0f0d99eb10d7 (commit) via b9625bbc8ba3562602a8fe0e2375a5972f6d0cbd (commit) via aa7b14f1f2eeb6525e33e0cd3480e82a64ccb320 (commit) via cc7726969484222dba9a5d76aaca6c5661c24fdd (commit) via 43902cf42dab7b56f9215b5c51e4ac8e51fd62c8 (commit) via fc81ee50040076ba6417cd047ea72c9ced7a1414 (commit) from e27bca77c77617f807304ca9775897a0b7a11dda (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 1a0ca2874fc60b58db0f5f55f20871377cfe77a1 Author: Kyle M Hall Date: Fri Apr 29 10:30:10 2016 +0000 Bug 15533 - DBRev 3.23.00.055 Signed-off-by: Kyle M Hall commit b87af43c4737cceef1855679f11ba277c0600358 Author: Kyle M Hall Date: Thu Apr 28 18:54:59 2016 +0000 Bug 15533 [QA Followup] - All itemtypes for all items showing in OPAC multi-hold Signed-off-by: Katrin Fischer Signed-off-by: Kyle M Hall commit 4f91c48259b2fe3fd6f1c0f1dfee0f0d99eb10d7 Author: Katrin Fischer Date: Thu Apr 28 20:46:40 2016 +0200 Bug 15533: QA follow-up - Formatting and improving translatability - Makes new message in the holds tables in the patron account translatable - Unbolds the note in the holds table for the record Signed-off-by: Kyle M Hall commit b9625bbc8ba3562602a8fe0e2375a5972f6d0cbd Author: Kyle M Hall Date: Thu Apr 28 18:20:28 2016 +0000 Bug 15533 [QA Followup] - Itemtype limit missing from tables Signed-off-by: Katrin Fischer Signed-off-by: Kyle M Hall commit aa7b14f1f2eeb6525e33e0cd3480e82a64ccb320 Author: Kyle M Hall Date: Thu Apr 28 15:33:48 2016 +0000 Bug 15533 [QA Followup] - Move tags for translatability Signed-off-by: Katrin Fischer Signed-off-by: Kyle M Hall commit cc7726969484222dba9a5d76aaca6c5661c24fdd Author: Kyle M Hall Date: Thu Apr 28 15:32:09 2016 +0000 Bug 15533 [QA Followup] - Add a system preference Signed-off-by: Katrin Fischer Signed-off-by: Kyle M Hall commit 43902cf42dab7b56f9215b5c51e4ac8e51fd62c8 Author: Julian Maurice Date: Tue Apr 12 15:18:20 2016 +0200 Bug 15533: Fix 'ambiguous' SQL query in CanItemBeReserved Adding reserves.itemtype made a query to fail in CanItemBeReserved. This patch prefixes the column names with the corresponding table names to prevent that. You can trigger the error by running prove t/db_dependent/Holds.t You should see something like this: Column 'itemtype' in where clause is ambiguous Signed-off-by: Katrin Fischer Signed-off-by: Kyle M Hall commit fc81ee50040076ba6417cd047ea72c9ced7a1414 Author: Kyle M Hall Date: Fri Dec 25 12:05:57 2015 +0000 Bug 15533 - Allow patrons and librarians to select itemtype when placing hold Some libraries would like the ability to select the itemtype to request when placing holds. For example, if a record has 3 copies of BookA and 3 copies of BookA in large print, this feature would allow a person to place a hold on the record, but still be able to target only the Large Print edition so that the first Large Print copy that becomes available is targeted, rather than forcing the patron to select a particular copy to hold. Test Plan: 1) Apply this patch 2) Run updatedatabase.pl 3) Create a record with items of two or more itemtypes 4) Place a record level hold on the record while choosing one particular itemtype 5) Check in an item from the record that is not of that itemtype 6) Notee it is not trapped for the hold 7) Check in an item from the record that does match the selected itemtype 8) Note the item is trapped for the hold Signed-off-by: Andreas Hedstr?m Mace Signed-off-by: Benjamin Rokseth Signed-off-by: Katrin Fischer Signed-off-by: Kyle M Hall ----------------------------------------------------------------------- Summary of changes: C4/HoldsQueue.pm | 23 +++- C4/Reserves.pm | 31 ++++-- Koha.pm | 2 +- Koha/Schema/Result/OldReserve.pm | 33 +++++- Koha/Schema/Result/Reserve.pm | 33 +++++- installer/data/mysql/kohastructure.sql | 9 +- installer/data/mysql/sysprefs.sql | 1 + installer/data/mysql/updatedatabase.pl | 30 ++++++ .../intranet-tmpl/prog/en/includes/strings.inc | 1 + koha-tmpl/intranet-tmpl/prog/en/js/holds.js | 4 + .../en/modules/admin/preferences/circulation.pref | 6 ++ .../prog/en/modules/reserve/request.tt | 21 +++- .../opac-tmpl/bootstrap/en/modules/opac-reserve.tt | 17 +++ .../opac-tmpl/bootstrap/en/modules/opac-user.tt | 7 +- opac/opac-reserve.pl | 16 +-- reserve/placerequest.pl | 28 ++--- reserve/request.pl | 7 ++ svc/holds | 7 ++ t/db_dependent/Holds/HoldItemtypeLimit.t | 112 ++++++++++++++++++++ t/db_dependent/HoldsQueue.t | 66 +++++++++++- 20 files changed, 413 insertions(+), 41 deletions(-) create mode 100644 t/db_dependent/Holds/HoldItemtypeLimit.t hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Apr 29 12:23:57 2016 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 29 Apr 2016 10:23:57 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.22.00-1331-g07e4488 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 07e44886042cd29dd17e1f2aac1aeb6abc9df795 (commit) from 1a0ca2874fc60b58db0f5f55f20871377cfe77a1 (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 07e44886042cd29dd17e1f2aac1aeb6abc9df795 Author: Kyle M Hall Date: Fri Apr 29 10:32:38 2016 +0000 Bug 15533 - DBRev - Update Schema Files to match current DB structure Signed-off-by: Kyle M Hall ----------------------------------------------------------------------- Summary of changes: Koha/Schema/Result/BranchItemRule.pm | 18 ++++++++++++-- Koha/Schema/Result/DefaultBranchCircRule.pm | 18 ++++++++++++-- Koha/Schema/Result/DefaultBranchItemRule.pm | 18 ++++++++++++-- Koha/Schema/Result/DefaultCircRule.pm | 18 ++++++++++++-- Koha/Schema/Result/EdifactMessage.pm | 16 ++++++------- Koha/Schema/Result/Itemtype.pm | 34 +++++++++++++++++++++++++-- 6 files changed, 104 insertions(+), 18 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Apr 29 12:27:02 2016 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 29 Apr 2016 10:27:02 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.22.00-1335-gbba892f 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 bba892fde5e2a82bf7ca2ba0358c1c6bc390c94a (commit) via 586a6a89c2862eeabd86beb0f8ec28d941ef9906 (commit) via 7fd8911cbd29217adbdf0a1f1f6cb35fa1eea9f3 (commit) via 4e1d7a16896787cb4e874abce8fc051a3c12a3ae (commit) from 07e44886042cd29dd17e1f2aac1aeb6abc9df795 (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 bba892fde5e2a82bf7ca2ba0358c1c6bc390c94a Author: Kyle M Hall Date: Wed Apr 27 14:07:51 2016 +0000 Bug 15534 [QA Followup] - Fix rule labels Signed-off-by: Katrin Fischer Signed-off-by: Kyle M Hall commit 586a6a89c2862eeabd86beb0f8ec28d941ef9906 Author: Kyle M Hall Date: Wed Apr 27 13:31:13 2016 +0000 Bug 15534 [QA Followup] - Use IsItemOnHoldAndFound instead of GetReserveStatus Signed-off-by: Katrin Fischer Signed-off-by: Kyle M Hall commit 7fd8911cbd29217adbdf0a1f1f6cb35fa1eea9f3 Author: Kyle M Hall Date: Mon Apr 18 13:21:12 2016 +0000 Bug 15534 [QA Followup] - Remove superfluous lines from unit tests Signed-off-by: Jonathan Druart Signed-off-by: Katrin Fischer Signed-off-by: Kyle M Hall commit 4e1d7a16896787cb4e874abce8fc051a3c12a3ae Author: Kyle M Hall Date: Sat Feb 6 03:59:31 2016 +0000 Bug 15534 - Add the ability to prevent a patron from placing a hold on a record with available items Some libraries would like to prevent patrons from placing holds on items where there are other items available for the patron to check out. Test Plan: 1) Apply this patch 2) Browse to the circulation rules 3) Note the new option for "On shelf holds allowed" 4) Set the rule to "If all unavailable", set "item level holds" to allow 5) Find a patron/branch/itemtype applicable to this rule 6) Ensure at least one item on the record is available for the patron to check out 7) Attempt to place a hold for the item 8) Note you cannot place the hold 9) Check the available item out to another patron 10) Note you can now place a hold for the first patron Signed-off-by: Andreas Hedstr?m Mace Works as intended! Signed-off-by: Jonathan Druart Signed-off-by: Katrin Fischer Signed-off-by: Kyle M Hall ----------------------------------------------------------------------- Summary of changes: C4/Reserves.pm | 26 ++++- .../prog/en/modules/admin/smart-rules.tt | 12 +- .../Holds/DisallowHoldIfItemsAvailable.t | 118 ++++++++++++++++++++ 3 files changed, 153 insertions(+), 3 deletions(-) create mode 100755 t/db_dependent/Holds/DisallowHoldIfItemsAvailable.t hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Apr 29 12:31:17 2016 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 29 Apr 2016 10:31:17 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.22.00-1337-g7f52638 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 7f52638129bd48ab7f38dc809e7ece78773e8b91 (commit) via 0c6f23a6ce45183c6396925f6018ec31090ed2cb (commit) from bba892fde5e2a82bf7ca2ba0358c1c6bc390c94a (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 7f52638129bd48ab7f38dc809e7ece78773e8b91 Author: Jonathan Druart Date: Fri Apr 8 13:37:46 2016 +0100 Bug 16221: follow-up for changes made by bug 16229 Signed-off-by: Jonathan Druart Signed-off-by: Tomas Cohen Arazi Signed-off-by: Kyle M Hall commit 0c6f23a6ce45183c6396925f6018ec31090ed2cb Author: Jacek Ablewicz Date: Thu Apr 7 10:26:31 2016 +0200 Bug 16221: Use Storable::dclone() instead of Clone::clone() for L1 cache deep-copying mode Storable dclone() is over 3x faster then Clone::clone() when used for creating a deep copies of the big, complex data structures like MARC frameworks. See also Bug 16044 comments #18 & #20. This is a trivial version of Bug 16166. Performance test results (see Bug 16140 comment #23 for test setup description): master 146.29 (14.64+14.53+14.51+14.57+14.72+14.56+14.53+15.06+14.56+14.61) master + Bug 16221 96.5 (9.77+9.63+9.77+9.77+9.68+9.05+9.68+9.83+9.63+9.69) master + Bug 16166 90.7 (9.15+9.10+9.16+8.41+9.19+9.19+9.11+9.19+9.02+9.18) Bug 16166 is a bit faster and more comprehensive implementation, but also more complex and harder to test/evaluate. Test plan: 1) apply patch 2) profile GetMarcStructure() calls before / after patch, e.g. by running some script which calls it often (like catalogue search w/ XSLT processing turned on, etc.) Signed-off-by: Jonathan Druart Signed-off-by: Tomas Cohen Arazi Signed-off-by: Kyle M Hall ----------------------------------------------------------------------- Summary of changes: Koha/Cache.pm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Apr 29 12:32:49 2016 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 29 Apr 2016 10:32:49 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.22.00-1338-g6865aae 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 6865aae232da0cf18e7060cc6d9691dc3342d1de (commit) from 7f52638129bd48ab7f38dc809e7ece78773e8b91 (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 6865aae232da0cf18e7060cc6d9691dc3342d1de Author: Aleisha Date: Thu Apr 14 22:22:29 2016 +0000 Bug 16265: Making item types actions buttons To test: 1) Go to Admin -> Item types 2) Confirm Edit and Delete show as font awesome buttons and work as expected 3) Confirm the buttons do not wrap with a narrower browser Sponsored-by: Catalyst IT Signed-off-by: Marc V?ron Signed-off-by: Jonathan Druart Signed-off-by: Kyle M Hall ----------------------------------------------------------------------- Summary of changes: koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Apr 29 12:35:07 2016 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 29 Apr 2016 10:35:07 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.22.00-1339-gd4e96e7 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 d4e96e7303bf76f096cb11c9ac929840bde6a393 (commit) from 6865aae232da0cf18e7060cc6d9691dc3342d1de (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 d4e96e7303bf76f096cb11c9ac929840bde6a393 Author: Aleisha Date: Tue Apr 26 01:27:19 2016 +0000 Bug 16351: Making invoice number a required field EDIT: Added 'validated' class to form and removed 'Required' span (became unnecessary) To test: 1) Go to Acqui -> Do a vendor search 2) Receive a shipment 3) Attempt to click 'Next' without specifying invoice number. Notice error. 4) Go back to vendor search then apply patch. Click Receive shipment 5) Notice you cannot click 'Next' until you put something in invoice number. Sponsored-by: Catalyst IT Signed-off-by: Marc V?ron Signed-off-by: Katrin Fischer Signed-off-by: Kyle M Hall ----------------------------------------------------------------------- Summary of changes: koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Apr 29 12:36:44 2016 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 29 Apr 2016 10:36:44 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.22.00-1340-ge5860b8 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 e5860b8d79f03d08a3d51ab95786779cd8b26e13 (commit) from d4e96e7303bf76f096cb11c9ac929840bde6a393 (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 e5860b8d79f03d08a3d51ab95786779cd8b26e13 Author: Aleisha Date: Wed Apr 27 01:01:18 2016 +0000 Bug 16359: Changing size of text input fields so filter box doesn't cover parts of page To test: 1) Go to Reports -> Saved reports 2) Notice how Filter covers parts of page 3) Apply patch and refresh page 4) Notice how Filter does not cover anything anymore Sponsored-by: Catalyst IT Signed-off-by: Owen Leonard I couldn't see the problem in Firefox, but it is a problem in Chrome. The fix works fine for both. Signed-off-by: Katrin Fischer Signed-off-by: Kyle M Hall ----------------------------------------------------------------------- Summary of changes: .../intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Apr 29 12:39:02 2016 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 29 Apr 2016 10:39:02 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.22.00-1341-g772ad7e 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 772ad7e48316ed7297072717a5359d7975eaff6f (commit) from e5860b8d79f03d08a3d51ab95786779cd8b26e13 (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 772ad7e48316ed7297072717a5359d7975eaff6f Author: Aleisha Date: Wed Apr 27 01:34:49 2016 +0000 Bug 16360: Adding 'actions' class to column in tag review so buttons don't wrap EDIT: Comment 3 Note: the wrapping only happens when all tags have been approved (or all rejected), i.e. column has a certain width. When testing, ensure all tags have been approved or rejected and click the opposite action to see the effect of the bug and the patch. To test: 1) Go to Tools -> Tags 2) Click Reject for a tag 3) Notice buttons do not wrap Sponsored-by: Catalyst IT Signed-off-by: Owen Leonard Signed-off-by: Katrin Fischer Signed-off-by: Kyle M Hall ----------------------------------------------------------------------- Summary of changes: koha-tmpl/intranet-tmpl/prog/en/modules/tags/review.tt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Apr 29 12:41:54 2016 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 29 Apr 2016 10:41:54 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.22.00-1342-g42a4373 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 42a43733b592934601bcb5270cbc880b2ce3baee (commit) from 772ad7e48316ed7297072717a5359d7975eaff6f (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 42a43733b592934601bcb5270cbc880b2ce3baee Author: Aleisha Date: Wed Apr 27 04:08:40 2016 +0000 Bug 16363: Add floating toolbar to advanced search EDIT: Ah yes I was so sure it wasn't mini but couldn't remember what to use! Thanks for that Owen To test: 1) Go to advanced search 2) Confirm Save, More Options and Clear fields (notice change from New search to Clear fields) are in toolbar and work as expected Sponsored-by: Catalyst IT Signed-off-by: Owen Leonard Signed-off-by: Katrin Fischer Signed-off-by: Kyle M Hall ----------------------------------------------------------------------- Summary of changes: .../prog/en/modules/catalogue/advsearch.tt | 45 +++++++++++--------- 1 file changed, 24 insertions(+), 21 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Apr 29 12:45:26 2016 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 29 Apr 2016 10:45:26 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.22.00-1343-g5515b2a 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 5515b2a728437312edd33c0c2e872997c00e102d (commit) from 42a43733b592934601bcb5270cbc880b2ce3baee (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 5515b2a728437312edd33c0c2e872997c00e102d Author: Aleisha Date: Thu Apr 14 22:38:52 2016 +0000 Bug 16267: Making circ and fines rules actions buttons EDIT: Comment 3 To test: 1) Go to Admin -> Circulation and fines rules 2) Fines rules a) Confirm that buttons Edit, Delete, Save, and Clear all show as font awesome buttons and work as expected 2) Default checkout, hold and return policy a) Confirm that column heading is now Actions b) Confirm that actions Save and Unset show as font awesome buttons and work as expected 3) Checkout limit by patron category AND holds policy by item type a) Confirm that buttons Add and Delete show as font awesome buttons and work as expected (you may need to add a rule to see the Delete button) 4) Confirm that none of the buttons wrap on a narrower browser Sponsored-by: Catalyst IT Signed-off-by: Arslan Farooq Signed-off-by: Jonathan Druart Signed-off-by: Kyle M Hall ----------------------------------------------------------------------- Summary of changes: .../prog/en/modules/admin/smart-rules.tt | 35 ++++++++++---------- 1 file changed, 17 insertions(+), 18 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Apr 29 12:48:34 2016 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 29 Apr 2016 10:48:34 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.22.00-1344-g819839f 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 819839fd9c24209ee4665f599db15621c51394cc (commit) from 5515b2a728437312edd33c0c2e872997c00e102d (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 819839fd9c24209ee4665f599db15621c51394cc Author: Aleisha Date: Sun Apr 17 22:35:19 2016 +0000 Bug 16268: Add confirm message for deleting circ and fines rules EDIT: Removes unnecessary code and uses confirm message in staff-global.js To test: 1) Apply 16267 2) Go to Admin -> Circ and fines rules 3) Try clicking on Delete and Unset buttons 4) Confirm a confirm message pops up and works as expected Sponsored-by: Catalyst IT Signed-off-by: Marc V?ron Signed-off-by: Jonathan Druart Signed-off-by: Kyle M Hall ----------------------------------------------------------------------- Summary of changes: .../intranet-tmpl/prog/en/modules/admin/smart-rules.tt | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Apr 29 12:50:02 2016 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 29 Apr 2016 10:50:02 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.22.00-1346-g6e6f9c9 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 6e6f9c973d41797abf08382a6d7ad819a27d2ec8 (commit) via d06de76eab41465fc83431aa57018b094931f0f8 (commit) from 819839fd9c24209ee4665f599db15621c51394cc (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 6e6f9c973d41797abf08382a6d7ad819a27d2ec8 Author: Owen Leonard Date: Fri Apr 22 09:31:10 2016 -0400 Bug 16281: [Follow-up] Remove the use of "onclick" from Reports module This minor follow-up adds a dummy href attribute to the "Return to the previous page" link so that the link behaves like a link. A "preventDefault()" is added to the goback() function to keep the "#" link from triggering a page jump. To test, apply the patch, create a report with an SQL error and run it. Confirm that the 'Return to previous page' link works as expected. Signed-off-by: Hector Castro Works as advertised Signed-off-by: Katrin Fischer Signed-off-by: Kyle M Hall commit d06de76eab41465fc83431aa57018b094931f0f8 Author: Aleisha Date: Sun Apr 17 23:45:26 2016 +0000 Bug 16281: Remove the use of 'onclick' from Reports module EDIT: Removing unnecessary functions To test: 1) Go to Reports -> Dictionary a) Attempt to delete a definition. Confirm the Ok and cancel buttons in confirm dialog work as expected 2) Go to Reports -> Build new a) On each step of building a report, confirm the back button works as expected b) Confirm add column and delete column on step 3 works as expected 3) Confirm deleting a report from the toolbar triggers confirm dialog and it works as expected 4) Create a report with an SQL error and run it. Confirm that the 'Return to previous page' link works as expected Sponsored-by: Catalyst IT Signed-off-by: Owen Leonard Signed-off-by: Katrin Fischer Signed-off-by: Kyle M Hall ----------------------------------------------------------------------- Summary of changes: .../prog/en/includes/reports-toolbar.inc | 8 +++++- .../prog/en/modules/reports/dictionary.tt | 9 +++++- .../en/modules/reports/guided_reports_start.tt | 29 ++++++++++++++------ 3 files changed, 36 insertions(+), 10 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Apr 29 12:52:31 2016 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 29 Apr 2016 10:52:31 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.22.00-1347-g87ae493 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 87ae49399da34c5e9db954a0edb693335faea53e (commit) from 6e6f9c973d41797abf08382a6d7ad819a27d2ec8 (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 87ae49399da34c5e9db954a0edb693335faea53e Author: Aleisha Date: Thu Mar 31 21:24:21 2016 +0000 Bug 16182: Make phone number clickable to call EDIT: fixing typo, changing sms number from tel: to sms: To test: 1) Go to a patron detail page 2) Confirm that all available phone numbers can be clicked and allow you to call this number from your device a) in the top left circ-menu.inc b) primary/secondary/other/organisation/mobile phone numbers c) alternate address phone number d) alternate contact phone number e) enable the EnhancedMessagingPreferences system preference. check the SMS number under Patron messaging preferences (back on the detail page) is clickable 3) Check to see if there are any phone numbers I have missed. Sponsored-by: Catalyst IT Signed-off-by: Marc Veron Signed-off-by: Marcel de Rooy Signed-off-by: Kyle M Hall ----------------------------------------------------------------------- Summary of changes: .../intranet-tmpl/prog/en/includes/circ-menu.inc | 7 +++---- .../prog/en/modules/members/moremember.tt | 18 +++++++++--------- 2 files changed, 12 insertions(+), 13 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Apr 29 12:54:03 2016 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 29 Apr 2016 10:54:03 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.22.00-1348-ge6d3dae 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 e6d3daea9239858e63e3b167f08c03732331daaa (commit) from 87ae49399da34c5e9db954a0edb693335faea53e (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 e6d3daea9239858e63e3b167f08c03732331daaa Author: Aleisha Date: Mon Apr 11 01:45:55 2016 +0000 Bug 16234: Removing 'view link' text To test: 1) Go to the Fines account of a borrower (i.e. members/boraccount.pl) 2) Notice 'View link' text is unnecessary and clutters description column 3) Apply patch and refresh page 4) Confirm 'view link' text is gone and the record title is now a link and works as expected Sponsored-by: Catalyst IT Signed-off-by: Mark Tompsett Signed-off-by: Jonathan Druart Signed-off-by: Kyle M Hall ----------------------------------------------------------------------- Summary of changes: koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Apr 29 12:55:18 2016 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 29 Apr 2016 10:55:18 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.22.00-1349-gfb740c4 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 fb740c4d2bd0a99e468eaf01d3815558658bfd30 (commit) from e6d3daea9239858e63e3b167f08c03732331daaa (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 fb740c4d2bd0a99e468eaf01d3815558658bfd30 Author: Aleisha Date: Mon Apr 11 02:10:54 2016 +0000 Bug 16235: Making borrower account actions buttons EDIT: Fixing some indenting and adding actions class to the cells so the buttons don't wrap EDIT: Comment 6 EDIT: Moving the buttons into one column EDIT: Fixing typo and js error EDIT: removing tabs To test: 1) Go to a borrower's account page who has paid fines before a) Confirm column heading is now 'Actions' and covers both Reverse column and Print column b) Confirm Reverse and Print show as buttons and work as expected 2) Go to a borrower's account page who has never paid fines (or create a new borrower) a) Create a manual credit (just to put something in their account) b) Go back to their account page c) Confirm the Reverse column does not show as the column heading for Print is   (since there is only one action in this column and it's written on every button) d) Confirm Print shows as a button and works as expected Sponsored-by: Catalyst IT Signed-off-by: Mark Tompsett Followed test plan. White spaces OK. Signed-off-by: Marc V?ron Signed-off-by: Katrin Fischer Signed-off-by: Kyle M Hall ----------------------------------------------------------------------- Summary of changes: .../prog/en/modules/members/boraccount.tt | 40 +++++++++----------- 1 file changed, 18 insertions(+), 22 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Apr 29 12:56:56 2016 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 29 Apr 2016 10:56:56 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.22.00-1351-gf01bc2b 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 f01bc2bc4674799980bb27ef5a4a27b3f4ba1466 (commit) via e8bcb0ee79980d578e29944daa11202ee5d2e2a9 (commit) from fb740c4d2bd0a99e468eaf01d3815558658bfd30 (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 f01bc2bc4674799980bb27ef5a4a27b3f4ba1466 Author: Mark Tompsett Date: Sun Apr 10 23:22:11 2016 -0400 Bug 16236: Whitespace followup tab to 4 spaces on line 255, as per koha qa test tool failure without this patch. TEST PLAN --------- 1) Apply first patch 2) Run koha qa test tools -- fails because of a tab 3) Apply this patch 4) Run koha qa test tools -- passes Signed-off-by: Mark Tompsett Signed-off-by: Jonathan Druart Signed-off-by: Kyle M Hall commit e8bcb0ee79980d578e29944daa11202ee5d2e2a9 Author: Aleisha Date: Mon Apr 11 02:18:13 2016 +0000 Bug 16236: Making authorised values actions buttons To test: 1) Go to Admin -> Authorised values 2) Select a category 3) Confirm that Edit and Delete shows as buttons under 'Actions' column and work as expected Sponsored-by: Catalyst IT Signed-off-by: Mark Tompsett Signed-off-by: Jonathan Druart Signed-off-by: Kyle M Hall ----------------------------------------------------------------------- Summary of changes: .../intranet-tmpl/prog/en/modules/admin/authorised_values.tt | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Apr 29 13:26:53 2016 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 29 Apr 2016 11:26:53 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.22.00-1352-gd989615 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 d989615c3272b61dcc3fae2bf3397035caee499d (commit) from f01bc2bc4674799980bb27ef5a4a27b3f4ba1466 (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 d989615c3272b61dcc3fae2bf3397035caee499d Author: Aleisha Date: Mon Apr 25 23:08:49 2016 +0000 Bug 15414: Silencing warns triggered by creating a new layout in patron card creator This patch assigns $field and $image values in the for loops To test: 1) Go to Tools -> Patron Card Creator -> New layout 2) Notice warns 3) Apply patch and refresh page 4) Notice warns are gone and page still works as expected Sponsored-by: Catalyst IT NOTE: Trivial initialization in a loop issue. Signed-off-by: Mark Tompsett Signed-off-by: Kyle M Hall Signed-off-by: Kyle M Hall ----------------------------------------------------------------------- Summary of changes: patroncards/edit-layout.pl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Apr 29 13:29:15 2016 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 29 Apr 2016 11:29:15 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.22.00-1354-g76bd4b6 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 76bd4b6f2979858fdc60ff2a59e661ac84325b42 (commit) via b64df89601aecd82f63067d28d2baffb9ee8feba (commit) from d989615c3272b61dcc3fae2bf3397035caee499d (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 76bd4b6f2979858fdc60ff2a59e661ac84325b42 Author: Owen Leonard Date: Wed Apr 27 21:44:57 2016 -0400 Bug 10171 [Follow-up] Add a header in Advanced Search (staff interface) This patch re-indents the new include file because it's not often you get to help a new file come into the world, it should be indented nicely. Signed-off-by: Marc V?ron Signed-off-by: Katrin Fischer Signed-off-by: Kyle M Hall commit b64df89601aecd82f63067d28d2baffb9ee8feba Author: Aleisha Date: Wed Apr 27 03:34:07 2016 +0000 Bug 10171: Add a search box include on advanced search and item search pages This patch creates a new file: adv-search.inc. This search include has no catalog search (as it makes no sense to have the catalog search tab on the advanced search page). The item search page uses home-search.inc (with catalog search) as the catalog search is different to the item search. To test: 1) Go to Search (advanced search) 2) Confirm search header is there with no catalog search tab and works as expected 3) Go to item search 4) Confirm search header is there with catalog search tab and works as expected Sponsored-by: Catalyst IT Signed-off-by: Owen Leonard Tested together with follow up patch, works as expected. Signed-off-by: Marc V?ron Signed-off-by: Katrin Fischer Signed-off-by: Kyle M Hall ----------------------------------------------------------------------- Summary of changes: .../intranet-tmpl/prog/en/includes/adv-search.inc | 53 ++++++++++++++++++++ .../prog/en/modules/catalogue/advsearch.tt | 2 +- .../prog/en/modules/catalogue/itemsearch.tt | 1 + 3 files changed, 55 insertions(+), 1 deletion(-) create mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/adv-search.inc hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Apr 29 13:31:12 2016 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 29 Apr 2016 11:31:12 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.22.00-1355-g8caaffc 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 8caaffc6938c9c29a38e7fac394042b0062e3f0b (commit) from 76bd4b6f2979858fdc60ff2a59e661ac84325b42 (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 8caaffc6938c9c29a38e7fac394042b0062e3f0b Author: Aleisha Date: Thu Apr 14 22:02:47 2016 +0000 Bug 16263: making authority tags and subfields actions buttons EDIT: Subfields icon, 'i' to eye To test: 1) Go to Admin -> Authority types 2) Click the dropdown for one of the frameworks and click MARC structure 3) Confirm the actions subfields, edit and delete all show in the dropdown and work as expected 4) Click subfields 5) Confirm the action delete on this page shows as a font awesome button and works as expected Sponsored-by: Catalyst IT Signed-off-by: Arslan Farooq Signed-off-by: Bernardo Gonzalez Kriegel Another sign, pretty eye. No errors. Signed-off-by: Katrin Fischer Signed-off-by: Kyle M Hall ----------------------------------------------------------------------- Summary of changes: .../en/modules/admin/auth_subfields_structure.tt | 4 ++-- .../prog/en/modules/admin/auth_tag_structure.tt | 22 +++++++++++++------- 2 files changed, 16 insertions(+), 10 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Apr 29 13:36:46 2016 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 29 Apr 2016 11:36:46 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.22.00-1359-g22bc6ce 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 22bc6cefba67bebac13b4d2374385348e96436a0 (commit) via 04b81ad227691e4a6d81057a050848d4eb23692a (commit) via 7ddf9c4c9937767e73304fcd1196f6f4e1602076 (commit) via ae1f9607e6717b3ec7fb86efff8e328dc3f633b1 (commit) from 8caaffc6938c9c29a38e7fac394042b0062e3f0b (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 22bc6cefba67bebac13b4d2374385348e96436a0 Author: Kyle M Hall Date: Fri Apr 29 11:45:28 2016 +0000 Bug 11088 [QA Followup] - Add action icon for consistency Signed-off-by: Kyle M Hall commit 04b81ad227691e4a6d81057a050848d4eb23692a Author: Jesse Weaver Date: Thu Apr 28 13:29:06 2016 +0000 Bug 11088: (QA followup) don't let language chooser obscure toolbar This uses a similar JS trick to the cataloging interface to change the location of the toolbar if the language picker is shown. Signed-off-by: Katrin Fischer Signed-off-by: Kyle M Hall commit 7ddf9c4c9937767e73304fcd1196f6f4e1602076 Author: Arslan Farooq Date: Thu Apr 28 13:29:06 2016 +0000 Bug 11088 [Follow up] - Patron entry page should use floating toolbar like cataloging interface To test: 1) Go to add a new patron 2) Confirm floating 'Save' button stays fixed at bottom right corner of the page as you scroll the page up/down 3) Resize the browser window to s smaller size, and see the 'Save' button stays fixed in place 3) Go to edit an existing patron 4) Repeat Step 2 and 3 Signed-off-by: Owen Leonard Signed-off-by: Katrin Fischer Signed-off-by: Kyle M Hall commit ae1f9607e6717b3ec7fb86efff8e328dc3f633b1 Author: Aleisha Date: Thu Apr 28 08:05:03 2016 +0000 Bug 11088: Floating Save div for Patron entry page To test: 1) Go to add a new patron 2) Confirm floating save div scrolls down page with you and works as expected 3) Go to edit an existing patron 4) Repeat Step 2 Sponsored-by: Catalyst IT Signed-off-by: Owen Leonard Signed-off-by: Katrin Fischer Signed-off-by: Kyle M Hall ----------------------------------------------------------------------- Summary of changes: koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css | 8 ++++++++ .../intranet-tmpl/prog/en/modules/members/memberentrygen.tt | 7 ++++++- 2 files changed, 14 insertions(+), 1 deletion(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Apr 29 13:40:37 2016 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 29 Apr 2016 11:40:37 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.22.00-1360-gd6851d3 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 d6851d3f92955cb22f35a047e887d57e50a45c6e (commit) from 22bc6cefba67bebac13b4d2374385348e96436a0 (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 d6851d3f92955cb22f35a047e887d57e50a45c6e Author: Aleisha Date: Tue Apr 26 02:52:59 2016 +0000 Bug 12333: Acquisitions toolbar and removing Add to basket section at bottom To test: 1) Go to Acqui -> do a vendor search -> view a basket 2) Confirm that the Add Order to basket section at the bottom is gone. Confirm the add to basket button in the toolbar still works as expected 3) Confirm that when you make your browser shorter, the toolbar follows the page down as you scroll Sponsored-by: Catalyst IT Signed-off-by: Owen Leonard Signed-off-by: Katrin Fischer Signed-off-by: Kyle M Hall ----------------------------------------------------------------------- Summary of changes: koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Apr 29 13:41:48 2016 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 29 Apr 2016 11:41:48 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.22.00-1361-g8e9e56d 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 8e9e56d0d4aefef9ef7bd7bc48d9e859aadc465e (commit) from d6851d3f92955cb22f35a047e887d57e50a45c6e (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 8e9e56d0d4aefef9ef7bd7bc48d9e859aadc465e Author: Kyle M Hall Date: Tue Nov 5 11:31:20 2013 -0500 Bug 11203 - Datatables in acqusitions do not ignore "stopwords" in titles Sorting by the "summary" column does not produce the preferred results. Title beginning with 'a', 'an', or 'the' are sorted using those articles. Test plan: 1) Place an order for 2 items with the titles "Alpha" and "The Alpha", along with some other records with titles starting with something between 'a' and 't', and 't' and 'z' 2) Sort the "pending orders" table, note the incorrect sorting 3) Receive all the items 4) Sort the "already received" table, note the incorrect sorting 5) Apply the patch 6) Repeat steps 1-4, note the corrected sorting 7) Check acqui/basket.pl for correct sorting 8) Check acqui/invoice.pl for correct sorting Signed-off-by: Owen Leonard Signed-off-by: Katrin Fischer Signed-off-by: Kyle M Hall ----------------------------------------------------------------------- Summary of changes: koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt | 9 +++++---- koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt | 7 +++++-- koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt | 4 ++-- 3 files changed, 12 insertions(+), 8 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Apr 29 13:43:50 2016 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 29 Apr 2016 11:43:50 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.22.00-1363-gb46f412 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 b46f4128ea250010b644aa55b544c3c663a7fd17 (commit) via 23f45686411aa4e26dab157d69b156c896136915 (commit) from 8e9e56d0d4aefef9ef7bd7bc48d9e859aadc465e (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 b46f4128ea250010b644aa55b544c3c663a7fd17 Author: Kyle M Hall Date: Tue Apr 19 11:55:28 2016 +0000 Bug 9393 [QA Followup] - Don't display link if librarian cannot view the modification Signed-off-by: Katrin Fischer Signed-off-by: Kyle M Hall commit 23f45686411aa4e26dab157d69b156c896136915 Author: Kyle M Hall Date: Tue Dec 18 14:18:16 2012 -0500 Bug 9393 - Add note to circulation.pl if borrower has pending modifications Signed-off-by: Jonathan Druart New link "patron modifications" (if there are) on the checkout page. Signed-off-by: Katrin Fischer Signed-off-by: Katrin Fischer Signed-off-by: Kyle M Hall ----------------------------------------------------------------------- Summary of changes: circ/circulation.pl | 2 ++ koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt | 8 ++++++++ 2 files changed, 10 insertions(+) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Apr 29 13:44:58 2016 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 29 Apr 2016 11:44:58 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.22.00-1365-g28eb6db 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 28eb6db0d1718d356d9e99c77c5519774496f607 (commit) via caa753388ade8515a05ea4b70cf9c58dd14a51a7 (commit) from b46f4128ea250010b644aa55b544c3c663a7fd17 (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 28eb6db0d1718d356d9e99c77c5519774496f607 Author: Kyle M Hall Date: Wed Mar 16 18:00:20 2016 +0000 Bug 14577 [QA Followup] Signed-off-by: Jonathan Druart Signed-off-by: Kyle M Hall commit caa753388ade8515a05ea4b70cf9c58dd14a51a7 Author: Kyle M Hall Date: Thu Feb 11 01:23:09 2016 +0000 Bug 14577 - Allow restriction of checkouts based on fines of guarantor's guarantees This enhancment allows a library to prevent patrons from checking out items if his or her guarantees own too much. Test Plan: 1) Apply this patch 2) Find or create a patron with a guarantor 3) Add a fine to the patron's account 4) Set the new system preference NoIssuesChargeGuarantees to be less than the amount owed by the patron 4) Attempt to check out an item to the guarantor, you will either be warned or prevented from checking out based on your system settings. Signed-off-by: Cathi Wiggin Signed-off-by: Jonathan Druart Signed-off-by: Kyle M Hall ----------------------------------------------------------------------- Summary of changes: C4/Circulation.pm | 25 ++++++++ C4/Members.pm | 23 +++++++ Koha/Patron.pm | 3 +- circ/circulation.pl | 15 +++++ installer/data/mysql/atomicupdate/bug_14577.sql | 2 + installer/data/mysql/sysprefs.sql | 1 + .../en/modules/admin/preferences/circulation.pref | 5 ++ .../prog/en/modules/circ/circulation.tt | 45 +++++++++---- .../en/modules/circ/circulation_batch_checkouts.tt | 11 +++- .../Circulation/NoIssuesChargeGuarantees.t | 67 ++++++++++++++++++++ 10 files changed, 181 insertions(+), 16 deletions(-) create mode 100644 installer/data/mysql/atomicupdate/bug_14577.sql create mode 100644 t/db_dependent/Circulation/NoIssuesChargeGuarantees.t hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Apr 29 13:45:44 2016 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 29 Apr 2016 11:45:44 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.22.00-1367-g60b3572 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 60b3572894843df6a413d916db8defcc6c60bef6 (commit) via f0b60f712c9dfda216bfb4d204c88256afc1092b (commit) from 28eb6db0d1718d356d9e99c77c5519774496f607 (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 60b3572894843df6a413d916db8defcc6c60bef6 Author: Marcel de Rooy Date: Fri Apr 22 10:04:49 2016 +0200 Bug 16283: [QA Follow-up] Remove case sensitive message The message on opac-memberentry does no longer apply. Signed-off-by: Marcel de Rooy Signed-off-by: Kyle M Hall commit f0b60f712c9dfda216bfb4d204c88256afc1092b Author: Kyle M Hall Date: Tue Dec 18 10:55:25 2012 -0500 Bug 16283 - Make OPAC registration captcha case insensitive The OPAC registration captcha should not be case sensitive. This patch was moved here from bug 9393. Test Plan: 1) Enable patron self registration 2) Test the captcha by typing in the captcha in lower case. Registration should still succeed. Signed-off-by: Jonathan Druart Signed-off-by: Marcel de Rooy Signed-off-by: Kyle M Hall ----------------------------------------------------------------------- Summary of changes: koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-memberentry.tt | 1 - opac/opac-memberentry.pl | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Apr 29 13:49:19 2016 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 29 Apr 2016 11:49:19 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.22.00-1372-gdf5b1b7 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 df5b1b70aa9e3128e4cab7a73ebadeae0da2fa22 (commit) via 6c4415a8738b60f4fd7ad44e3b6b79ee1f3b6659 (commit) via fd4f2f88a6b7711e6f7e76b43f2fbca490190695 (commit) via 86015eefb4016a5d55c0707f2e7df6cd8207d65b (commit) via af32e3a475be4520ab8576090ce7faf032b85d50 (commit) from 60b3572894843df6a413d916db8defcc6c60bef6 (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 df5b1b70aa9e3128e4cab7a73ebadeae0da2fa22 Author: Kyle M Hall Date: Fri Apr 29 11:58:29 2016 +0000 Bug 14577 - DBRev 3.23.00.056 Signed-off-by: Kyle M Hall commit 6c4415a8738b60f4fd7ad44e3b6b79ee1f3b6659 Author: Jonathan Druart Date: Fri Apr 8 15:51:22 2016 +0100 Bug 9004: Use Koha::Calendar instead of C4::Calendar This patch tries to make the code more readable using Koha::Calendar instead of deprecated C4::Calendar and Date::Calc commit fd4f2f88a6b7711e6f7e76b43f2fbca490190695 Author: Nick Clemens Date: Fri Apr 8 13:21:37 2016 +0000 Bug 9004: (QA followup) Fix pod commit 86015eefb4016a5d55c0707f2e7df6cd8207d65b Author: Kyle M Hall Date: Fri Nov 2 08:30:46 2012 -0400 Bug 9004 - Talking Tech doesn't account for holidays when calculating a holds last pickup date - Add holidays check Signed-off-by: Chris William commit af32e3a475be4520ab8576090ce7faf032b85d50 Author: Kyle M Hall Date: Fri Nov 2 08:23:37 2012 -0400 Bug 9004 - Talking Tech doesn't account for holidays when calculating a holds last pickup date - Perltidy script. Signed-off-by: Chris William ----------------------------------------------------------------------- Summary of changes: Koha.pm | 2 +- installer/data/mysql/atomicupdate/bug_14577.sql | 2 - installer/data/mysql/updatedatabase.pl | 11 ++ .../thirdparty/TalkingTech_itiva_outbound.pl | 106 ++++++++------------ 4 files changed, 52 insertions(+), 69 deletions(-) delete mode 100644 installer/data/mysql/atomicupdate/bug_14577.sql hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Apr 29 13:55:43 2016 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 29 Apr 2016 11:55:43 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.22.00-1375-g74e28c0 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 74e28c02f9c7588fed911afaf92eac6e34d00e49 (commit) via dafbd180a0ca14640c427d56bcfff94872117b68 (commit) via 1cdc1ae3d6822e3a21c84016b84ab81f91c8093e (commit) from df5b1b70aa9e3128e4cab7a73ebadeae0da2fa22 (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 74e28c02f9c7588fed911afaf92eac6e34d00e49 Author: Jonathan Druart Date: Fri Apr 8 15:51:22 2016 +0100 Bug 9004: Use Koha::Calendar instead of C4::Calendar This patch tries to make the code more readable using Koha::Calendar instead of deprecated C4::Calendar and Date::Calc Signed-off-by: Kyle M Hall commit dafbd180a0ca14640c427d56bcfff94872117b68 Author: Kyle M Hall Date: Fri Nov 2 08:30:46 2012 -0400 Bug 9004 - Talking Tech doesn't account for holidays when calculating a holds last pickup date - Add holidays check Signed-off-by: Chris William Signed-off-by: Kyle M Hall commit 1cdc1ae3d6822e3a21c84016b84ab81f91c8093e Author: Kyle M Hall Date: Fri Nov 2 08:23:37 2012 -0400 Bug 9004 - Talking Tech doesn't account for holidays when calculating a holds last pickup date - Perltidy script. Signed-off-by: Chris William Signed-off-by: Kyle M Hall ----------------------------------------------------------------------- Summary of changes: hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Apr 29 14:04:46 2016 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 29 Apr 2016 12:04:46 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.22.00-1380-ga789184 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 a789184e01d269a1d12f88315aff2959fe16658a (commit) via afae8e583a2f020941c341be374712ab72365126 (commit) via 4be1dfd62357e9c0745673c34dd50001c99d6ee4 (commit) via 5a961c6953600df07998575fd96cf682d7ae46c2 (commit) via 0893a5075b0ae27509de12ddf11d7e005ae53c43 (commit) from 74e28c02f9c7588fed911afaf92eac6e34d00e49 (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 a789184e01d269a1d12f88315aff2959fe16658a Author: Kyle M Hall Date: Wed Apr 27 15:39:55 2016 +0000 Bug 11565 [QA Followup] - Only hide options when none are in use Signed-off-by: Katrin Fischer Signed-off-by: Kyle M Hall commit afae8e583a2f020941c341be374712ab72365126 Author: Owen Leonard Date: Tue Mar 22 09:04:25 2016 -0400 Bug 11565 [QA Followup] - Hide checkout options when not in use This follow-up reformats the checkout screen so that checkout settings like specify due date, on-site checkout, and override high holds are grouped in a panel which is hidden by default. Clicking a link shows all the available settings. Also modified in this patch: The default color for div.hint has been made a little darker for readability. To test, apply the patch and clear your browser cache if necessary. - Check out to a patron who is not blocked from checking out. - Click the "Checkout settings" link and confirm that the settings panel is displayed. - Test that the settings in the panel behave as expected. - Test with preferences on and off: decreaseLoanHighHolds, OnSiteCheckouts, SpecifyDueDate. NOTE: This patch is a work in progress. It does not address the issue of checkout setting being hidden even if they are active. Signed-off-by: Katrin Fischer Signed-off-by: Kyle M Hall commit 4be1dfd62357e9c0745673c34dd50001c99d6ee4 Author: Katrin Fischer Date: Wed Apr 27 14:49:36 2016 +0200 Bug 11565: QA Follo-up: Improve translatability of 'not shortened' message Mark-up inside sentences splits them of up for translation, so it's better to only highlight full sentences for easier translation. Signed-off-by: Kyle M Hall commit 5a961c6953600df07998575fd96cf682d7ae46c2 Author: Jesse Weaver Date: Wed Sep 30 11:48:14 2015 -0400 Bug 11565: (QA followup) add class to allow feature to be easily hidden This wraps both checkboxes (in the confirmation dialog and checkout interface) in a class of "circ-override-high-holds" so they can be easily hidden. Signed-off-by: Katrin Fischer Signed-off-by: Kyle M Hall commit 0893a5075b0ae27509de12ddf11d7e005ae53c43 Author: Kyle M Hall Date: Wed Sep 30 11:48:14 2015 -0400 Bug 11565 - decreaseLoanHighHolds needs Override This patch allows the high holds loan length decrease to be overridden either by a checkbox that remembers its setting during a series of checkouts, or by a one time use override checkbox that will show in the warning popup if a checkout is affected by high holds. Test Plan: 1) Set up a checkout that will be affected by decreaseLoanHighHolds 2) Attempt to check out an item 3) Check the override checkbox 4) Note the checkout date is not reduced 5) Return the item 6) Start a new checkout for the patron 7) Check the "Don't decrease lean length based on holds" checkbox 8) Check out the item 9) Note you are not warned about the high holds decrease and that the checkout length is not reduced Signed-off-by: Kyle M Hall Signed-off-by: Christopher Brannon Signed-off-by: Katrin Fischer Signed-off-by: Kyle M Hall ----------------------------------------------------------------------- Summary of changes: C4/Circulation.pm | 30 ++++- circ/circulation.pl | 17 ++- .../intranet-tmpl/prog/en/css/staff-global.css | 37 ++--- .../intranet-tmpl/prog/en/js/pages/circulation.js | 24 ++++ .../prog/en/modules/circ/circulation.tt | 142 +++++++++++++------- t/db_dependent/DecreaseLoanHighHolds.t | 20 ++- 6 files changed, 195 insertions(+), 75 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Apr 29 14:08:07 2016 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 29 Apr 2016 12:08:07 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.22.00-1382-gb75d982 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 b75d982be00c351b2082d10dcf157917c3af70fc (commit) via cf6bd4d982f14ec0dbf01c417a78743390850a77 (commit) from a789184e01d269a1d12f88315aff2959fe16658a (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 b75d982be00c351b2082d10dcf157917c3af70fc Author: Kyle M Hall Date: Tue Apr 26 14:29:40 2016 +0000 Bug 14497 [QA Followup] - Refactor code to have a single source for message Signed-off-by: Jonathan Druart Signed-off-by: Kyle M Hall commit cf6bd4d982f14ec0dbf01c417a78743390850a77 Author: Kyle M Hall Date: Mon Jul 6 09:43:34 2015 -0400 Bug 14497 - Add warning to patron details page if patron's fines exceed noissuescharge Some librarians have requested that the same warning on the check out page be placed on the patron details page if a patron's fines exceed the system preference noissuescharge. Test Plan: 1) Apply this patch 2) Find or create a patron who's fines exceed noissuescharge 3) Browse to that patron's details ( moremember.pl ) 4) You should see a warning near the top of the page with links to the patron's account page and the pay fines page Signed-off-by: Nick Clemens Patch ammended post sign-off Signed-off-by: Sally Healey Signed-off-by: Jonathan Druart Signed-off-by: Kyle M Hall ----------------------------------------------------------------------- Summary of changes: .../prog/en/includes/blocked-fines.inc | 22 ++++++++++++++++++++ .../prog/en/modules/circ/circulation.tt | 11 +++------- .../prog/en/modules/members/moremember.tt | 4 ++++ members/moremember.pl | 2 +- 4 files changed, 30 insertions(+), 9 deletions(-) create mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/blocked-fines.inc hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Apr 29 14:09:47 2016 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 29 Apr 2016 12:09:47 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.22.00-1383-gae40e5e 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 ae40e5e4c68f50ef1c68e8901e46c73e50c31a0a (commit) from b75d982be00c351b2082d10dcf157917c3af70fc (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 ae40e5e4c68f50ef1c68e8901e46c73e50c31a0a Author: Owen Leonard Date: Wed Apr 6 10:54:48 2016 -0400 Bug 9387 - Feedback message for FAILED check out items are not obvious for visually impaired This patch adds a heading to the error dialg displayed when a barcode has been submitted for checkout which doesn't exist. This patch also modifies the markup of the error dialog in order to make error a little more clear to sighted users. To test, apply the patch and submit a barcode for checkout which does not exist. The resulting error dialog should have a heading, "Barcode not found." Signed-off-by: Marc Veron Signed-off-by: Marcel de Rooy Signed-off-by: Kyle M Hall ----------------------------------------------------------------------- Summary of changes: koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Apr 29 14:16:44 2016 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 29 Apr 2016 12:16:44 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.22.00-1384-g97e36c0 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 97e36c02648e7de5711f4542c9140e763b4a30e8 (commit) from ae40e5e4c68f50ef1c68e8901e46c73e50c31a0a (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 97e36c02648e7de5711f4542c9140e763b4a30e8 Author: Bouzid Fergani Date: Thu Mar 5 10:56:14 2015 -0500 Bug 11371 - Add a new report : Orders by fund with more options Add option show or no inactive budget and more options Use subroutine GetBudgetHierarchy for return all budgets Delete subroutine GetBudgetPeriodDescription and theire tests Use Price TT plugin Correct name of column and capitalization the first letter Add checkbox for show inactive budgets, default the drop down list containt a active budget Not use [i] for inactive budgets, i add (inactive) at the end of inactive budget Add vendor note in the list of show attribute Test case: Go to Home > Reports > Orders by fund Select one or all budgets You can show the inactive budget, default the drop down list containt a active budget Choose output to screen ou csv file Works as expected. QA tools OK with Bug 16104 applied. Signed-off-by: Marc V?ron Signed-off-by: Katrin Fischer - changed 'Fund (budget):' back to 'Fund:', as the budget no longer shows in the pull down. - Fixed number of tests in Budgets.t - Removed &GetBudgetPeriodDescription Signed-off-by: Kyle M Hall ----------------------------------------------------------------------- Summary of changes: C4/Budgets.pm | 122 ++++++++++- .../csv_headers/reports/orders_by_budget.tt | 1 + .../en/modules/reports/csv/orders_by_budget.tt | 12 ++ .../prog/en/modules/reports/orders_by_budget.tt | 161 +++++++++++++++ .../prog/en/modules/reports/reports-home.tt | 79 +++---- reports/orders_by_fund.pl | 216 ++++++++++++++++++++ t/db_dependent/Acquisition.t | 22 +- t/db_dependent/Budgets.t | 13 +- 8 files changed, 580 insertions(+), 46 deletions(-) create mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/csv_headers/reports/orders_by_budget.tt create mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/reports/csv/orders_by_budget.tt create mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/reports/orders_by_budget.tt create mode 100755 reports/orders_by_fund.pl hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Apr 29 14:19:14 2016 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 29 Apr 2016 12:19:14 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.22.00-1385-gcf705bd 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 cf705bdd0e1a982cbc386509cd7d676e6930a349 (commit) from 97e36c02648e7de5711f4542c9140e763b4a30e8 (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 cf705bdd0e1a982cbc386509cd7d676e6930a349 Author: Marc V?ron Date: Mon Apr 25 15:02:36 2016 +0200 Bug 14050: Default framework for authorities should not be deletable To test: - Apply patch - In staff client, go to Home > Administration > Authority types - Verify that the Actions for the Default type do not contain the delete action - Verify that other types have a delete action Signed-off-by: Hector Castro Delete action was eliminated Signed-off-by: Jonathan Druart Signed-off-by: Kyle M Hall ----------------------------------------------------------------------- Summary of changes: koha-tmpl/intranet-tmpl/prog/en/modules/admin/authtypes.tt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Apr 29 14:30:54 2016 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 29 Apr 2016 12:30:54 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.22.00-1387-gfdda5d7 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 fdda5d7d7cf8c724e57e5bb8b1e55533cb0e7b8b (commit) via b140c4b2fdc894c0d53eca2bf2f2bb5cb1982a91 (commit) from cf705bdd0e1a982cbc386509cd7d676e6930a349 (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 fdda5d7d7cf8c724e57e5bb8b1e55533cb0e7b8b Author: Mark Tompsett Date: Mon Apr 4 18:59:33 2016 -0400 Bug 14144: Clean ups and refactors perltidy old new calls to new call format attrType -> attr_type (perlcritic friendlier) double quotes to single quotes '' combinations to q{} (perlcritic friendlier) refactored parameters to mock_net_ldap_search into a HASH This piece is not necessary, but I think it is nicer. Signed-off-by: Hector Castro Works as expected. No koha-qa erros Signed-off-by: Kyle M Hall Signed-off-by: Kyle M Hall commit b140c4b2fdc894c0d53eca2bf2f2bb5cb1982a91 Author: Mark Tompsett Date: Mon Apr 4 18:07:26 2016 -0400 Bug 14144: Silence warnings t/db_dependent/Auth_with_ldap.t Revisiting this bug, I noticed that C4::Context->config() was mocked poorly. I expanded the mock function a little and have quieted the test which seemed to be working in a broken manner before. TEST PLAN --------- 1) prove t/db_dependend/Auth_with_ldap.t -- shibboleth noise 2) apply this patch 3) prove t/db_dependend/Auth_with_ldap.t -- no noise 4) run koha qa test tools Signed-off-by: Hector Castro Signed-off-by: Kyle M Hall Signed-off-by: Kyle M Hall ----------------------------------------------------------------------- Summary of changes: t/db_dependent/Auth_with_ldap.t | 492 +++++++++++++++++++++++---------------- 1 file changed, 290 insertions(+), 202 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Apr 29 14:35:13 2016 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 29 Apr 2016 12:35:13 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.22.00-1390-g567c994 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 567c99442f7497e747ae4068cdbbf95786c2689e (commit) via eca286349b07c8f32f94c9fc73ef58ec5bf91fa4 (commit) via 497cd04df0dc68b2c3972343a64f0f5221cc6d70 (commit) from fdda5d7d7cf8c724e57e5bb8b1e55533cb0e7b8b (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 567c99442f7497e747ae4068cdbbf95786c2689e Author: Mark Tompsett Date: Tue Apr 5 11:52:22 2016 -0400 Bug 14305: RSS message correction follow-up If a user is not logged in but requests a specific branch, the RSS feed message fails to mention the branch. TEST PLAN --------- 1) Apply first patch 2) go to OPAC's opac-main.pl?branch={some branch with specific news} -- notice bad RSS message 3) Apply this patch 4) Repeat step 2 -- notice branch is properly shown. 5) koha qa test tools Signed-off-by: Mark Tompsett Signed-off-by: Owen Leonard Signed-off-by: Jonathan Druart Signed-off-by: Kyle M Hall commit eca286349b07c8f32f94c9fc73ef58ec5bf91fa4 Author: Martin Persson Date: Wed Aug 5 16:16:50 2015 +0200 Bug 14305: View arbitrary branch's news This patch adds an input named 'branch' to opac-main.pl that allows overriding the home library to view news from any branch. This is part of the 'Use Koha as a CMS' development. To reviewers: Does this create any security implications? The column is text; it is possbile to push SQL statemens into the DB via the opac-membership.pl page, but all the code there seems to use DBIx::Class and prepared statements. When attemped, accepting the changes were rejected because of the foreign key constraint placed on the main borrowers table. It is recommended to use this patch in conjunction with 11584 which adds a WYSIWYG editor to System Preferences. Test plan: * Make sure your Koha installation has multiple branches: * Log in to the Staff interface and select 'Koha administration' * Select 'Libraries and groups', the first item in the list * Add an extra branch named 'BRANCH1': * Press the 'New library' button * Set 'Library code' to 'BRANCH1' * Enter an arbitrary name * Press 'Submit' * Add at least two news items with different branches: * Log in to the Staff interface and select 'Tools' * Under 'Additional tools' select 'News' * On the 'Koha news' page, create a news item for all libraries: * Press the 'New entry' button * Set 'Library' to 'All libraries' and enter a title. * Press 'Submit' * On the 'Koha news' page, create a news item for one library: * Press the 'New entry' button * Set 'Library' to 'BRANCH1' and enter a title * Press 'Submit' * Add links to OPAC to select branch: * Select 'System preferences' and then the 'OPAC' tab * Scroll down to the 'OpacNav' preference and click 'Click to Edit' * Create two hyperlinks with a parameter named 'branch': * 'BRANCH1' * 'none' * Click 'Save all OPAC preferences' * Test OPAC: * By default, global news and news for home branch should show. * When clicking the 'BRANCH1' link, you should see global news plus news for the BRANCH1 branch. * When the parameter 'branch' is set but has no value, news from the home branch should be shown. Issues: Tricky to create a link to the same page which removes existing paramters. The user normally has a home branch set. We can override it with the parameter. If undefined, the home branch should be shown. Sponsored-by: Halland County Library http://bugs.koha-community.org/show_bug.cgi?id=14305 Changed 2015-12-14: Whitespace fix Signed-off-by: Mark Tompsett Signed-off-by: Jonathan Druart Signed-off-by: Kyle M Hall commit 497cd04df0dc68b2c3972343a64f0f5221cc6d70 Author: Martin Persson Date: Tue Aug 18 23:03:54 2015 +0200 Bug 14305: View arbitrary branch's news, RSS fix This fix changes the RSS link to reflect the URL paramter override. This is less elegant than the existing solution which uses the Branches TT module, perhaps there is a better way? Sponsored-By: Halland County Library Test plan: * Follow instructions in the original patch but also check the URLs and contents of the RSS link at the bottom the OPAC page. Signed-off-by: Mark Tompsett Signed-off-by: Jonathan Druart Signed-off-by: Kyle M Hall ----------------------------------------------------------------------- Summary of changes: koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-main.tt | 4 ++-- opac/opac-main.pl | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Apr 29 14:48:13 2016 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 29 Apr 2016 12:48:13 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.22.00-1396-gb4ce86d 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 b4ce86df28ce937ea06b8f31010bf4cd85755c52 (commit) via 71ac88a9d5d163a8ad921095bea71fa853b80f93 (commit) via 1fbf6ab89408275fea5bf14a02e194b57adf87e8 (commit) via a7ab9820fe4e0d8978573554eefbe599e1fc2879 (commit) via f474ca509581d988919b4fcb004ceb77f3d8a850 (commit) via aa64000df5290be9858588893eb8cbe58cb6e9ff (commit) from 567c99442f7497e747ae4068cdbbf95786c2689e (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 b4ce86df28ce937ea06b8f31010bf4cd85755c52 Author: Kyle M Hall Date: Fri Apr 29 12:57:01 2016 +0000 Bug 14377 [QA Followup] - Add supression message to NORMARC XSLT Signed-off-by: Kyle M Hall commit 71ac88a9d5d163a8ad921095bea71fa853b80f93 Author: Marcel de Rooy Date: Thu Apr 28 10:19:16 2016 +0200 Bug 14377: [QA Follow-up] Correct typo and comment [1] Remove a vim inserted i from XSLT.pm: IdRefi => IdRef. [2] The comment about UNIMARC is somewhat confusing. Rephrased it. Signed-off-by: Marcel de Rooy Signed-off-by: Kyle M Hall commit 1fbf6ab89408275fea5bf14a02e194b57adf87e8 Author: Kyle M Hall Date: Wed Apr 27 17:36:29 2016 +0000 Bug 14377 [QA Followup] - Fix conditional Signed-off-by: Marcel de Rooy Signed-off-by: Kyle M Hall commit a7ab9820fe4e0d8978573554eefbe599e1fc2879 Author: Kyle M Hall Date: Wed Apr 27 17:28:54 2016 +0000 Bug 14377 [QA Followup] - Remove biblionumber from messages Signed-off-by: Marcel de Rooy Signed-off-by: Kyle M Hall commit f474ca509581d988919b4fcb004ceb77f3d8a850 Author: Kyle M Hall Date: Mon Apr 18 17:28:36 2016 +0000 Bug 14377 - Don't replace 942$n with authorised value except when using UNIMARC Signed-off-by: Marcel de Rooy Signed-off-by: Kyle M Hall commit aa64000df5290be9858588893eb8cbe58cb6e9ff Author: Winona Salesky Date: Fri Sep 18 10:57:33 2015 -0400 Bug #14377 Show "BIBNO - Suppressed in OPAC" for records with 942$n=1. Includes class="suppressed_opac" for library specific styles. Suggested css: .suppressed_opac { color:red; font-size:1.25em; font-weight:bold; float:right; margin-right:2em; clear:none; } Signed-off-by: Nick Clemens Signed-off-by: Kyle M Hall Signed-off-by: Katrin Fischer Signed-off-by: Marcel de Rooy Signed-off-by: Kyle M Hall ----------------------------------------------------------------------- Summary of changes: C4/XSLT.pm | 10 +++++++--- .../intranet-tmpl/prog/en/xslt/MARC21slim2intranetDetail.xsl | 8 ++++++++ .../prog/en/xslt/MARC21slim2intranetResults.xsl | 8 ++++++++ .../prog/en/xslt/NORMARCslim2intranetDetail.xsl | 8 ++++++++ .../prog/en/xslt/NORMARCslim2intranetResults.xsl | 10 +++++++++- 5 files changed, 40 insertions(+), 4 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Apr 29 14:52:43 2016 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 29 Apr 2016 12:52:43 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.22.00-1401-gdbba8cf 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 dbba8cfeba8b1d6220096fbee98bf886712a1fcf (commit) via 9c5b8191009eba54e851512c9cfa2e3d5ab949df (commit) via 5e8ded21af689f43f9791f19772a478fb3c67afe (commit) via 1a9ca842939ba48789dd11bfa5b9510e73bad645 (commit) via b8076d8ec7236360274e1a4e861969c86bb679ea (commit) from b4ce86df28ce937ea06b8f31010bf4cd85755c52 (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 dbba8cfeba8b1d6220096fbee98bf886712a1fcf Author: Kyle M Hall Date: Fri Apr 29 13:01:07 2016 +0000 Bug 15009 [QA Followup] - Update number of tests run Signed-off-by: Kyle M Hall commit 9c5b8191009eba54e851512c9cfa2e3d5ab949df Author: Jonathan Druart Date: Mon Apr 18 10:37:18 2016 +0100 Bug 15009: QA follow-up This patch adds a test to check the unicity of auth cats, simplify the GetBudgetAuthCats subroutine and make it return an arrayref of scalar instead of an arrayref of hashref with only 1 key. Signed-off-by: Jonathan Druart Signed-off-by: Kyle M Hall commit 5e8ded21af689f43f9791f19772a478fb3c67afe Author: Jonathan Druart Date: Mon Apr 18 10:36:51 2016 +0100 Bug 15009: Correctly populate planning filter The filter for planning values was populated with empty strings. Note that it's not caused by previous patches. Signed-off-by: Jonathan Druart Signed-off-by: Kyle M Hall commit 1a9ca842939ba48789dd11bfa5b9510e73bad645 Author: charles Date: Fri Mar 25 17:09:24 2016 -0400 Bug 15009 - Adds unit tests for C4::Budget::GetBudgetAuthCats Signed-off-by: Marc V?ron Signed-off-by: Jonathan Druart Signed-off-by: Kyle M Hall commit b8076d8ec7236360274e1a4e861969c86bb679ea Author: Blou Date: Tue Oct 13 16:12:49 2015 -0400 Bug 15009 - Planning dropdown button in aqbudget can have empty line When displaying a budget, the Planning button in the admin toolbar displays Plan by months Plan by libraries Plan by item types Plan by The last one is empty, due to C4::Budgets::GetBudgetAuthCats returning an empty field if the budget has no sort defined. This prevents returning an array with empty element(s) TEST: 1) Admin -> Budgets 2) Select a budget a) you must have '' (empty) in your aqbudgets.sort1_authcat field. b) edit the budget (direct DB or interface) to get that. 3) Click on Planning dropdown, see the "Plan by " entry. 4) apply the patch, revalidate. Signed-off-by: Bernardo Gonzalez Kriegel No more empty option No errors Signed-off-by: Jonathan Druart Signed-off-by: Kyle M Hall ----------------------------------------------------------------------- Summary of changes: C4/Budgets.pm | 19 +++--- admin/aqplan.pl | 2 +- .../prog/en/includes/budgets-admin-toolbar.inc | 4 +- .../intranet-tmpl/prog/en/modules/admin/aqplan.tt | 1 + t/db_dependent/Budgets.t | 70 +++++++++++++++++++- 5 files changed, 84 insertions(+), 12 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Apr 29 14:56:29 2016 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 29 Apr 2016 12:56:29 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.22.00-1408-g764fa32 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 764fa320de24f3099712ad5cc5cf451ffb966e34 (commit) via 0f76857b07881e4dae6d764902f84785bb588f36 (commit) via 6ec00c996e3950f85f8b44abbd91f3340dce96d8 (commit) via e14534ed9647a35d7c34bac706cc78458a9857b0 (commit) via 28109bbc5e21c67b0c3c417135695745c0360acb (commit) via 34d1eea0499f5a9359478dd2c4734146125b62c1 (commit) via 2f634f286266261d0139e258439b9229c2c43910 (commit) from dbba8cfeba8b1d6220096fbee98bf886712a1fcf (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 764fa320de24f3099712ad5cc5cf451ffb966e34 Author: Mirko Tietgen Date: Mon Apr 18 11:02:02 2016 +0200 Bug 15303 Followup: If install LE dependencies from backports on Jessie On Debian Jessie, apt needs to be told it should get the dependencies for the LE package from backports, or it will error. We check if we are on Jessie and do that automatically so users don't need to set priorities manually in apt. Changed to lsb_release -c -s. Signed-off-by: Kyle M Hall commit 0f76857b07881e4dae6d764902f84785bb588f36 Author: Jonathan Druart Date: Mon Apr 18 09:03:00 2016 +0100 Bug 15303: Test if the symlink to letsencrypt-auto exists Signed-off-by: Jonathan Druart Signed-off-by: Kyle M Hall commit 6ec00c996e3950f85f8b44abbd91f3340dce96d8 Author: Mirko Tietgen Date: Fri Apr 15 18:28:12 2016 +0200 Bug 15303 QA-Followup: check_letsencrypt only if --letsencrypt is used Signed-off-by: Jonathan Druart Signed-off-by: Kyle M Hall commit e14534ed9647a35d7c34bac706cc78458a9857b0 Author: Mirko Tietgen Date: Fri Apr 15 18:03:55 2016 +0200 Bug 15303 Followup: Fix apt-cache show breaking koha-create Temporarely set +e so the test for the LE package does not break koha-create Signed-off-by: Jonathan Druart Signed-off-by: Kyle M Hall commit 28109bbc5e21c67b0c3c417135695745c0360acb Author: Mirko Tietgen Date: Fri Apr 15 13:35:16 2016 +0200 Bug 15303 Followup for koha-remove This patch makes koha-remove take care of /etc/letsencrypt/renewal/$opacdomain.conf /var/lib/koha/$site/letsencrypt.enabled It also adds a few helper functions. To test - create a koha instance with LE - observe you got both files mentioned above - remove that instance - verify the files are gone Signed-off-by: Jonathan Druart Signed-off-by: Kyle M Hall commit 34d1eea0499f5a9359478dd2c4734146125b62c1 Author: Mirko Tietgen Date: Sun Jan 17 00:15:30 2016 +0100 Bug 15303 LE production server Deletes the --staging option of the letsencrypt command to get real certificates. Rate limits apply. Signed-off-by: Chris Cormack Signed-off-by: Jonathan Druart Signed-off-by: Kyle M Hall commit 2f634f286266261d0139e258439b9229c2c43910 Author: Mirko Tietgen Date: Fri Dec 4 01:11:17 2015 +0100 Bug 15303 Letsencrypt option for Debian package installations New option koha-create --letsencrypt - installs the letsencrypt package if needed - creates - generates letsencrypt certificates for - sets up a https-only website for - redirects http to https for ! you need to enable jessie backports to install letsencrypt: add deb http://http.debian.net/debian jessie-backports main contrib non-free to your /etc/apt/sources.list ! this patch uses the letsencrypt staging server to create real certificates, apply thy "LE production server" patch Test plan: - build a debian package with patch applied - use apache mod_ssl sudo a2enmod ssl - make sure the machine is accessible on 80 (needed for letsencrypt) and 443 from the internet - install koha with your new package - Put your (existing) domain options in /etc/koha/koha-sites.conf - use koha-create with the new options: sudo koha-create --create-db --letsencrypt - if you do not have the letsencrypt package installed, you will be prompted to do that [ if there is no package available, a symlink to the git checkout will work: on your test server, get letsencrypt via git git clone https://github.com/letsencrypt/letsencrypt create a symlink from /usr/bin/letsencrypt to letsencrypt-auto sudo ln -s /path/to/letsencrypt/letsencrypt-auto /usr/bin/letsencrypt ] - wait until setup is finished, check that you got a working OPAC and staff client with certificates - check that http redirects to https Signed-off-by: Chris Cormack Signed-off-by: Jonathan Druart Signed-off-by: Kyle M Hall ----------------------------------------------------------------------- Summary of changes: debian/control.in | 3 +- debian/docs/koha-create.xml | 8 ++ debian/scripts/koha-create | 89 +++++++++++++++++++- debian/scripts/koha-foreach | 2 + debian/scripts/koha-functions.sh | 51 +++++++++++ debian/scripts/koha-list | 81 +++++++++++++----- debian/scripts/koha-remove | 5 ++ ...ache-site.conf.in => apache-site-https.conf.in} | 33 +++++++- install_misc/debian.packages | 1 + 9 files changed, 246 insertions(+), 27 deletions(-) copy debian/templates/{apache-site.conf.in => apache-site-https.conf.in} (50%) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Apr 29 15:05:38 2016 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 29 Apr 2016 13:05:38 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.22.00-1412-g3615c7b 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 3615c7b34bc77f04e1421cab8dca8e094e10f0ed (commit) via 26297903e4cb4663320aac8aee49fca87d92f4a8 (commit) via 97d988b54fa4574faa93edf40940f5e700b5fe2f (commit) via 9501ac2feffa8aca965fd24156560870df4065c3 (commit) from 764fa320de24f3099712ad5cc5cf451ffb966e34 (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 3615c7b34bc77f04e1421cab8dca8e094e10f0ed Author: Kyle M Hall Date: Fri Apr 29 13:14:50 2016 +0000 Bug 15531 - DBRev 3.23.00.057 Signed-off-by: Kyle M Hall commit 26297903e4cb4663320aac8aee49fca87d92f4a8 Author: Jesse Weaver Date: Mon Jan 11 16:07:33 2016 -0700 Bug 15531: (QA followup) Fix several small issues * Add `AFTER` to DB update * Change "Is standing order basket:" to "Orders are standing:" * Disable item creation when adding from a staged file * Correctly show is_standing for existing baskets Signed-off-by: Katrin Fischer Signed-off-by: Kyle M Hall commit 97d988b54fa4574faa93edf40940f5e700b5fe2f Author: Jesse Weaver Date: Mon Jan 11 16:07:33 2016 -0700 Bug 15531: (followup) Use a quantity of 1, not null, for standing orders This seems to cause fewer problems with the existing acquisitions code. Signed-off-by: Katrin Fischer Signed-off-by: Kyle M Hall commit 9501ac2feffa8aca965fd24156560870df4065c3 Author: Jesse Weaver Date: Mon Jan 11 16:07:33 2016 -0700 Bug 15531: Add support for standing orders This allows creation of special baskets that include standing orders. These orders do not have a known quantity (and may not have a known price in advance). Upon receipt, the received items are split into a new completed order. Test plan: 1) Run updatedatabase.pl. 2) Run prove t/db_dependent/Acquisition/StandingOrders.t . (and the other Acquisition tests). 3) Create a new basket, mark it as a standing order basket. 4) Add an order to this basket, and notice that the quantity field is missing (and thus not required). 5) Receive items for this order, and notice that the original order is unchanged. The new child order line should have the correct price and quantity information. (Note: the QA tools output what seems to be a spurious spelling error for Test::More's "isnt" in StandingOrders.t.) Signed-off-by: Katrin Fischer Signed-off-by: Kyle M Hall ----------------------------------------------------------------------- Summary of changes: C4/Acquisition.pm | 40 ++++--- Koha.pm | 2 +- Koha/Acquisition/Order.pm | 5 +- Koha/Schema/Result/Aqbasket.pm | 14 ++- acqui/addorder.pl | 6 +- acqui/addorderiso2709.pl | 6 +- acqui/basket.pl | 16 ++- acqui/basketheader.pl | 3 + acqui/neworderempty.pl | 1 + installer/data/mysql/kohastructure.sql | 1 + installer/data/mysql/updatedatabase.pl | 10 ++ .../intranet-tmpl/prog/en/modules/acqui/basket.tt | 3 + .../prog/en/modules/acqui/basketheader.tt | 9 ++ .../prog/en/modules/acqui/neworderempty.tt | 8 +- t/db_dependent/Acquisition/StandingOrders.t | 122 ++++++++++++++++++++ 15 files changed, 215 insertions(+), 31 deletions(-) create mode 100644 t/db_dependent/Acquisition/StandingOrders.t hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Apr 29 15:15:51 2016 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 29 Apr 2016 13:15:51 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.22.00-1413-gff65237 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 ff6523765ddb76f388a38c1a0fd3a39b5ffe69b6 (commit) from 3615c7b34bc77f04e1421cab8dca8e094e10f0ed (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 ff6523765ddb76f388a38c1a0fd3a39b5ffe69b6 Author: David Cook Date: Tue Jan 12 15:17:35 2016 +1100 Bug 15555: Index 024$a into Identifier-other:u url register when source $2 is uri This patch indexes 024$a into the "phrase" index type, and the "url" index type, if the 024$2 equals "uri". TEST PLAN 1) Apply the patch. 1b) If you're using a gitified Koha or a git install, you'll need to upgrade your instance or copy your zebradb files over to /etc/koha/zebradb or your "kohadev" directory. 2) Add a 024$a with a URL like http://libris.kb.se/resource/bib/219553 to a bibliographic record 3) Re-index Zebra 4) Type "id-other,st-urx,fuzzy=http://libris.kb.se/resource/bib/219553" into the "Search the catalog" box in the Staff Client and search 5) Note that you retrieve your record NOTE: The fuzzy is required because Koha's query "parsing" functions change http:// to http=// which won't correctly match the value in the "Identifier-other:u" index. NOTE: Alternatively, you could do the following search instead: "id-other,phr=http libris kb se resource bib 219553". It would work as well by using the "Identifier-other:p" index. Advanced tester version: 4) In a terminal window, find the "koha-conf.xml" file in your "etc" directory. 5) Open "koha-conf.xml" and find . Copy the URI you find there. (e.g. unix:/home/dcook/koha-dev/var/run/zebradb/bibliosocket). 6) Type "yaz-client unix:/home/dcook/koha-dev/var/run/zebradb/bibliosocket" 7) After it connects, type "base biblios" and press enter 8) Type "format xml" and press enter 9) Type "elements zebra::index" and press enter 10) Type "f id-other,st-urx=http://libris.kb.se/resource/bib/219553" and press enter 11) Note that you should have at least one result 12) Type "show 1" 13) If you scroll through the results, you should find something like the following: @^ http libris kb se resource bib 219553 http libris kb se resource bib 219553 http://libris.kb.se/resource/bib/219553 Signed-off-by: Hector Castro Works as advertised the record is retrieved Signed-off-by: Marcel de Rooy Some of the statements in the commit message do not work for me. A search like "id-other,phr=http libris kb se resource bib 219553" does not have results. Searching for "id-other,phr=libris.kb.se resource" does. The steps in the advanced tester version do not work for me too. I verified the following in yaz-client: [1] Z> f @attr 1=9012 @attr 4=104 http://libris.kb.se/resource/bib/219553 Sent searchRequest. Received SearchResponse. Search was a success. Number of hits: 1, setno 16 [2] First removed $2 and reindexed. Then searched again: Z> f @attr 1=9012 @attr 4=104 http://libris.kb.se/resource/bib/219553 Sent searchRequest. Received SearchResponse. Search was a success. Number of hits: 0, setno 1 Signed-off-by: Kyle M Hall ----------------------------------------------------------------------- Summary of changes: .../marc_defs/marc21/biblios/biblio-koha-indexdefs.xml | 5 ++++- .../marc_defs/marc21/biblios/biblio-zebra-indexdefs.xsl | 11 ++++++++++- 2 files changed, 14 insertions(+), 2 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Apr 29 15:21:53 2016 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 29 Apr 2016 13:21:53 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.22.00-1414-g9e42850 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 9e428504916150edac6d201065610c587bf9ee4e (commit) from ff6523765ddb76f388a38c1a0fd3a39b5ffe69b6 (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 9e428504916150edac6d201065610c587bf9ee4e Author: Owen Leonard Date: Mon Feb 29 11:53:14 2016 -0500 Bug 15938 - Use validation plugin when adding or editing classification sources and filing rules In Administration -> Classification sources there is some embedded JavaScript which checks for empty form values. This patch removes that JS and adds validation using the globally-included validation plugin instead. To test, apply the patch and go to Administration -> Classification sources. - Click to add a new classification source and confirm that you cannot submit the form with empty required values. - Edit an existing classification source and confirm that you cannot empty a required field and submit the form. - Repeat the previous two steps with filing rules. Signed-off-by: Marc V?ron Signed-off-by: Jonathan Druart Signed-off-by: Kyle M Hall ----------------------------------------------------------------------- Summary of changes: .../prog/en/modules/admin/classsources.tt | 90 +++++--------------- 1 file changed, 23 insertions(+), 67 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Apr 29 15:23:49 2016 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 29 Apr 2016 13:23:49 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.22.00-1416-g5c0d28d 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 5c0d28db8838cf1947487bdcfa835a44979d3a2c (commit) via 94af2b32129b663c634ec64e13110f4e2bfad647 (commit) from 9e428504916150edac6d201065610c587bf9ee4e (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 5c0d28db8838cf1947487bdcfa835a44979d3a2c Author: Marc V?ron Date: Sun Apr 17 11:03:48 2016 +0200 Bug 15918: (followup) Correct comment in koha-tmpl/opac-tmpl/bootstrap/js/datatables.js This followup changes comment in koha-tmpl/opac-tmpl/bootstrap/js/datatables.js line 3 to MSG_DT_* variables comes from datatables.inc Signed-off-by: Jonathan Druart Signed-off-by: Kyle M Hall commit 94af2b32129b663c634ec64e13110f4e2bfad647 Author: Owen Leonard Date: Thu Feb 25 14:41:11 2016 -0500 Bug 15918 - Obsolete file datatables-strings.inc can be removed The include file datatables-strings.inc is no longer necessary. Its contents are now in datatables.inc. This patch corrects two references in comments to datatables-strings.inc (replacing it with datatables.inc) and removes the obsolete file. To test, apply the patch and load any page with a DataTables-enabled table configured to show pagination buttons, e.g. Saved Reports. Pagination labels like "Next," "Previous," and "Showing X of X..." should be correct. Search the codebase to confirm that no references remain for datatables-strings.inc. Signed-off-by: Marc V?ron Signed-off-by: Jonathan Druart Signed-off-by: Kyle M Hall ----------------------------------------------------------------------- Summary of changes: .../prog/en/includes/datatables-strings.inc | 19 ------------------- koha-tmpl/intranet-tmpl/prog/en/js/datatables.js | 2 +- .../intranet-tmpl/prog/en/modules/tools/quotes.tt | 2 +- koha-tmpl/opac-tmpl/bootstrap/js/datatables.js | 2 +- 4 files changed, 3 insertions(+), 22 deletions(-) delete mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/datatables-strings.inc hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Apr 29 15:26:40 2016 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 29 Apr 2016 13:26:40 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.22.00-1417-ga6da1c0 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 a6da1c024c26fd4075585de4495bdcace96d1629 (commit) from 5c0d28db8838cf1947487bdcfa835a44979d3a2c (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 a6da1c024c26fd4075585de4495bdcace96d1629 Author: Jonathan Druart Date: Fri Feb 19 16:13:50 2016 +0000 Bug 15863: Show/hide date range selection if not needed - dictionnary When creating a dictionary for a date column, there is a "date range" / "all dates" radio buttons and 2 inputs to select the date range. These inputs should be hidden if "all dates" is selected. Test plan: 1/ Create a new dictionary on reports/dictionary.pl 2/ Select a date column (borrowers.dateofbirth of instance) 3/ On step 4, the start/end of the date range inputs should be hidden/shown depending of the radio buttons. Works as expected. Signed-off-by: Marc V?ron Signed-off-by: Katrin Fischer Signed-off-by: Kyle M Hall ----------------------------------------------------------------------- Summary of changes: .../prog/en/modules/reports/dictionary.tt | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Apr 29 15:35:01 2016 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 29 Apr 2016 13:35:01 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.22.00-1421-g792017e 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 792017e54864341a5604f2b9cf9acb143f1466c1 (commit) via f79ef42b589fca5700acf7f05c30caeb9ac9234c (commit) via 45625c17dbc2b3db6f1e13544a6bccf366383ad7 (commit) via 7ce9008a00a88a1af117e15bb9fb9944786da2d3 (commit) from a6da1c024c26fd4075585de4495bdcace96d1629 (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 792017e54864341a5604f2b9cf9acb143f1466c1 Author: Marcel de Rooy Date: Wed Mar 2 14:19:03 2016 +0100 Bug 15956: New unit test SIP/Message.t This patch adds a unit test for the handlers of Patron Status and Patron Info requests. It can be extended with test for the other handlers later (hopefully). Note: The tests have been written for SIP protocol version 2. Test plan: Run t/db_dependent/SIP/Message.t. Note: If bug 13871 has not yet been pushed, test 12 (subtest 1) should fail with something like 'Code AF not found'. Same for test 15 of subtest 2. That is no problem; after that push, all tests should pass. Signed-off-by: Marcel de Rooy Signed-off-by: Bernardo Gonzalez Kriegel All tests pass t/db_dependent/SIP/ILS.t .......... ok t/db_dependent/SIP/Message.t ...... ok t/db_dependent/SIP/Patron.t ....... ok t/db_dependent/SIP/Transaction.t .. ok All tests successful. No errors Signed-off-by: Katrin Fischer Signed-off-by: Kyle M Hall commit f79ef42b589fca5700acf7f05c30caeb9ac9234c Author: Marcel de Rooy Date: Wed Mar 2 14:33:27 2016 +0100 Bug 15956: Move SIPILS.t to SIP/ILS.t Move the file. Some trivial (cosmetic) edits: whitespace, comments. Test plan: Run SIP/ILS.t Signed-off-by: Marcel de Rooy Signed-off-by: Bernardo Gonzalez Kriegel Signed-off-by: Katrin Fischer Signed-off-by: Kyle M Hall commit 45625c17dbc2b3db6f1e13544a6bccf366383ad7 Author: Marcel de Rooy Date: Wed Mar 2 14:20:59 2016 +0100 Bug 15956: Remove warn from handle_patron_status Removes a warn and some commented warns. Test plan: Nothing to do here. Will be covered later by additional unit test. Signed-off-by: Marcel de Rooy Signed-off-by: Bernardo Gonzalez Kriegel Signed-off-by: Katrin Fischer Signed-off-by: Kyle M Hall commit 7ce9008a00a88a1af117e15bb9fb9944786da2d3 Author: Marcel de Rooy Date: Sun Feb 28 14:13:45 2016 +0100 Bug 15956: Rearranging some SIP unit tests The original SIP_ILS.t is split up into SIP/Patron.t and SIP/Transaction.t. The assumption on a hardcoded existing and non-existing card number is replaced by adding and deleting a card number (:patron) with TestBuilder. Test plan: Run SIP/Patron.t Run SIP/Transaction.t Signed-off-by: Marcel de Rooy Signed-off-by: Bernardo Gonzalez Kriegel Signed-off-by: Katrin Fischer Signed-off-by: Kyle M Hall ----------------------------------------------------------------------- Summary of changes: C4/SIP/Sip/MsgType.pm | 4 - t/db_dependent/{SIPILS.t => SIP/ILS.t} | 14 ++- t/db_dependent/SIP/Message.t | 213 ++++++++++++++++++++++++++++++++ t/db_dependent/SIP/Patron.t | 29 +++++ t/db_dependent/SIP/Transaction.t | 28 +++++ t/db_dependent/SIP_ILS.t | 27 ---- 6 files changed, 278 insertions(+), 37 deletions(-) rename t/db_dependent/{SIPILS.t => SIP/ILS.t} (81%) create mode 100755 t/db_dependent/SIP/Message.t create mode 100755 t/db_dependent/SIP/Patron.t create mode 100755 t/db_dependent/SIP/Transaction.t delete mode 100755 t/db_dependent/SIP_ILS.t hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Apr 29 15:42:04 2016 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 29 Apr 2016 13:42:04 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.22.00-1423-gc22934c 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 c22934c3e6b7900f2400e13a073af4a7c123d635 (commit) via 78605bceb368ed298e7d47fbb64b255dfcdd2842 (commit) from 792017e54864341a5604f2b9cf9acb143f1466c1 (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 c22934c3e6b7900f2400e13a073af4a7c123d635 Author: Kyle M Hall Date: Fri Apr 29 13:51:00 2016 +0000 Bug 16041 - DBRev 3.23.00.058 Signed-off-by: Kyle M Hall commit 78605bceb368ed298e7d47fbb64b255dfcdd2842 Author: Jonathan Druart Date: Wed Mar 30 08:42:12 2016 +0100 Bug 16041: Turn off StaffAuthorisedValueImages by default This feature is enabled by default, but the users are not aware of it and it costs a lot of time processing to get the images. There are 2 prefs to drive this feature: StaffAuthorisedValueImages and AuthorisedValueImages. AuthorisedValueImages is not added by sysprefs.sql and does not appear in updatedatabase.pl, we could easily imagine that nobody uses it. With XSLT enabled, the feature is only visible on a record detail page at the OPAC, if AuthorisedValueImages is set. Otherwise you need to turn the XSLT off. In this case you will see the images on the result list (OPAC+Staff interfaces) and OPAC detail page, but not the Staff detail page. The idea of this patch is to introduce a quick switch if the feature is not used by the library. Test plan: 1/ Turn the pref on and set authorised_values.imageurl to NULL Execute the DB entry => The pref have been turned off 2/ Turn the pref on and set an image for an authorised value Execute the DB entry You will get a warning 3/ Turn the pref off and set an image for an authorised value Execute the DB entry You will get a warning 4/ Turn the pref off and set authorised_values.imageurl to NULL Execute the DB entry You won't get a warning Note that the opac detail page now checks the pref before retrieving the images. Followed test plan, works as expected. Signed-off-by: Marc V?ron Signed-off-by: Katrin Fischer Fixed update message 'that means'. Signed-off-by: Kyle M Hall ----------------------------------------------------------------------- Summary of changes: Koha.pm | 2 +- installer/data/mysql/sysprefs.sql | 2 +- installer/data/mysql/updatedatabase.pl | 33 ++++++++++++++++++++++++++++++++ opac/opac-detail.pl | 4 +++- 4 files changed, 38 insertions(+), 3 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Apr 29 15:46:34 2016 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 29 Apr 2016 13:46:34 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.22.00-1425-gf5ad462 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 f5ad4624891712fab1cba9d0cc1838f09b9a67c9 (commit) via 6381d1853ddff612a72c029f7cc971009da67a4a (commit) from c22934c3e6b7900f2400e13a073af4a7c123d635 (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 f5ad4624891712fab1cba9d0cc1838f09b9a67c9 Author: Owen Leonard Date: Mon Apr 25 08:29:16 2016 -0400 Bug 16241: Move staff client CSS out of language directory This patch corrects CSS paths in three places I missed. To test, apply this follow-up and: - View the patron detail page. DataTables should be styled correctly. - View the tag review page. DataTables should be styled correctly. - From the tag review page, click any tag to see a list of titles with that tag. The DataTable on that page should be styled correctly. Signed-off-by: Hector Castro Works as expected Signed-off-by: Katrin Fischer Signed-off-by: Kyle M Hall commit 6381d1853ddff612a72c029f7cc971009da67a4a Author: Owen Leonard Date: Tue Apr 12 13:21:33 2016 -0400 Bug 16241 - Move staff client CSS out of language directory The staff client CSS is not language-specific, so it can be moved out of the en/ directory and thus not be duplicated for every translation. In order to be able to have a generic path to the YUI CSS files, the YUI directory is moved by this patch to the staff client's lib/ directory. To test, apply the patch and visit various pages in the staff client. Look in particular at pages which include more than the standard CSS. For example: - The staff client login page. - The staff client home page. - Patron -> Set permissions. - The advanced cataloging editor. - Acquisitions -> Vendor -> Basket groups. - Tools -> News -> Edit news. - Administration -> System preferences. Revised: I intended for this to be built on top of Bug 15883. Now it is. Signed-off-by: Bernardo Gonzalez Kriegel On top of 15883 Works as described, all pages on test plan No Errors Signed-off-by: Katrin Fischer Signed-off-by: Kyle M Hall ----------------------------------------------------------------------- Summary of changes: .../en => }/lib/yui/animation/animation-debug.js | 0 .../en => }/lib/yui/animation/animation-min.js | 0 .../{prog/en => }/lib/yui/animation/animation.js | 0 .../en => }/lib/yui/button/assets/button-core.css | 0 .../yui/button/assets/skins/sam/button-skin.css | 0 .../lib/yui/button/assets/skins/sam/button.css | 0 .../skins/sam/menu-button-arrow-disabled.png | Bin 173 -> 173 bytes .../button/assets/skins/sam/menu-button-arrow.png | Bin 173 -> 173 bytes .../assets/skins/sam/split-button-arrow-active.png | Bin 280 -> 280 bytes .../skins/sam/split-button-arrow-disabled.png | Bin 185 -> 185 bytes .../assets/skins/sam/split-button-arrow-focus.png | Bin 185 -> 185 bytes .../assets/skins/sam/split-button-arrow-hover.png | Bin 185 -> 185 bytes .../button/assets/skins/sam/split-button-arrow.png | Bin 185 -> 185 bytes .../en => }/lib/yui/button/button-beta-min.js | 0 .../{prog/en => }/lib/yui/button/button-debug.js | 0 .../{prog/en => }/lib/yui/button/button-min.js | 0 .../{prog/en => }/lib/yui/button/button.js | 0 .../en => }/lib/yui/container/assets/alrt16_1.gif | Bin 971 -> 971 bytes .../en => }/lib/yui/container/assets/blck16_1.gif | Bin 591 -> 591 bytes .../en => }/lib/yui/container/assets/close12_1.gif | Bin 85 -> 85 bytes .../lib/yui/container/assets/container-core.css | 0 .../en => }/lib/yui/container/assets/container.css | 0 .../en => }/lib/yui/container/assets/hlp16_1.gif | Bin 928 -> 928 bytes .../en => }/lib/yui/container/assets/info16_1.gif | Bin 601 -> 601 bytes .../container/assets/skins/sam/container-skin.css | 0 .../yui/container/assets/skins/sam/container.css | 0 .../en => }/lib/yui/container/assets/tip16_1.gif | Bin 552 -> 552 bytes .../en => }/lib/yui/container/assets/warn16_1.gif | Bin 580 -> 580 bytes .../en => }/lib/yui/container/container-debug.js | 0 .../en => }/lib/yui/container/container-min.js | 0 .../{prog/en => }/lib/yui/container/container.js | 0 .../lib/yui/container/container_core-debug.js | 0 .../lib/yui/container/container_core-min.js | 0 .../en => }/lib/yui/container/container_core.js | 0 .../en => }/lib/yui/dragdrop/dragdrop-debug.js | 0 .../{prog/en => }/lib/yui/dragdrop/dragdrop-min.js | 0 .../{prog/en => }/lib/yui/dragdrop/dragdrop.js | 0 .../en => }/lib/yui/element/element-beta-min.js | 0 .../{prog/en => }/lib/yui/element/element-debug.js | 0 .../{prog/en => }/lib/yui/element/element-min.js | 0 .../{prog/en => }/lib/yui/element/element.js | 0 .../{prog/en => }/lib/yui/json/json-debug.js | 0 .../{prog/en => }/lib/yui/json/json-min.js | 0 .../{prog/en => }/lib/yui/json/json.js | 0 .../en => }/lib/yui/menu-button-arrow-disabled.png | Bin 173 -> 173 bytes .../{prog/en => }/lib/yui/menu-button-arrow.png | Bin 173 -> 173 bytes .../en => }/lib/yui/menu/assets/menu-core.css | 0 .../{prog/en => }/lib/yui/menu/assets/menu.css | 0 .../lib/yui/menu/assets/menu_down_arrow.png | Bin 3624 -> 3624 bytes .../yui/menu/assets/menu_down_arrow_disabled.png | Bin 3621 -> 3621 bytes .../en => }/lib/yui/menu/assets/menu_up_arrow.png | Bin 936 -> 936 bytes .../lib/yui/menu/assets/menu_up_arrow_disabled.png | Bin 936 -> 936 bytes .../menu/assets/menubaritem_submenuindicator.png | Bin 3623 -> 3623 bytes .../menubaritem_submenuindicator_disabled.png | Bin 3623 -> 3623 bytes .../menubaritem_submenuindicator_selected.png | Bin 3623 -> 3623 bytes .../lib/yui/menu/assets/menuitem_checkbox.png | Bin 956 -> 956 bytes .../yui/menu/assets/menuitem_checkbox_disabled.png | Bin 956 -> 956 bytes .../yui/menu/assets/menuitem_checkbox_selected.png | Bin 956 -> 956 bytes .../yui/menu/assets/menuitem_submenuindicator.png | Bin 942 -> 942 bytes .../assets/menuitem_submenuindicator_disabled.png | Bin 942 -> 942 bytes .../assets/menuitem_submenuindicator_selected.png | Bin 942 -> 942 bytes .../lib/yui/menu/assets/skins/sam/menu-skin.css | 0 .../en => }/lib/yui/menu/assets/skins/sam/menu.css | 0 .../skins/sam/menubaritem_submenuindicator.png | Bin 3618 -> 3618 bytes .../sam/menubaritem_submenuindicator_disabled.png | Bin 3618 -> 3618 bytes .../menu/assets/skins/sam/menuitem_checkbox.png | Bin 3625 -> 3625 bytes .../skins/sam/menuitem_checkbox_disabled.png | Bin 3625 -> 3625 bytes .../assets/skins/sam/menuitem_submenuindicator.png | Bin 3617 -> 3617 bytes .../sam/menuitem_submenuindicator_disabled.png | Bin 3617 -> 3617 bytes .../{prog/en => }/lib/yui/menu/menu-debug.js | 0 .../{prog/en => }/lib/yui/menu/menu-min.js | 0 .../{prog/en => }/lib/yui/menu/menu.js | 0 .../{prog/en => }/lib/yui/plugins/bubbling-min.js | 0 .../{prog/en => }/lib/yui/plugins/loading-min.js | 0 .../{prog/en => }/lib/yui/reset-fonts-grids.css | 0 .../en => }/lib/yui/split-button-arrow-active.png | Bin 280 -> 280 bytes .../lib/yui/split-button-arrow-disabled.png | Bin 185 -> 185 bytes .../en => }/lib/yui/split-button-arrow-focus.png | Bin 185 -> 185 bytes .../en => }/lib/yui/split-button-arrow-hover.png | Bin 185 -> 185 bytes .../{prog/en => }/lib/yui/split-button-arrow.png | Bin 185 -> 185 bytes .../intranet-tmpl/{prog/en => }/lib/yui/sprite.png | Bin 3123 -> 3123 bytes .../{prog/en => }/lib/yui/utilities/utilities.js | 0 .../lib/yui/yahoo-dom-event/yahoo-dom-event.js | 0 .../intranet-tmpl/prog/{en => }/css/addbiblio.css | 4 +- .../prog/{en => }/css/buttons.dataTables.min.css | 0 .../intranet-tmpl/prog/{en => }/css/cateditor.css | 4 +- .../intranet-tmpl/prog/{en => }/css/datatables.css | 34 ++++----- koha-tmpl/intranet-tmpl/prog/{en => }/css/help.css | 0 .../intranet-tmpl/prog/{en => }/css/hierarchy.css | 0 .../intranet-tmpl/prog/{en => }/css/humanmsg.css | 0 .../prog/{en => }/css/itemsearchform.css | 4 +- .../intranet-tmpl/prog/{en => }/css/login.css | 2 +- .../intranet-tmpl/prog/{en => }/css/mainpage.css | 4 +- .../prog/{en => }/css/preferences.css | 6 +- .../intranet-tmpl/prog/{en => }/css/print.css | 0 .../prog/{en => }/css/printreceiptinvoice.css | 0 .../intranet-tmpl/prog/{en => }/css/quotes.css | 0 .../prog/{en => }/css/right-to-left.css | 6 +- .../intranet-tmpl/prog/{en => }/css/spinelabel.css | 0 .../prog/{en => }/css/staff-global.css | 72 ++++++++++---------- .../intranet-tmpl/prog/{en => }/css/tinymce.css | 0 .../prog/{en => }/css/treeview/images/file.gif | Bin 110 -> 110 bytes .../{en => }/css/treeview/images/folder-closed.gif | Bin 105 -> 105 bytes .../prog/{en => }/css/treeview/images/folder.gif | Bin 106 -> 106 bytes .../prog/{en => }/css/treeview/images/minus.gif | Bin 837 -> 837 bytes .../prog/{en => }/css/treeview/images/plus.gif | Bin 841 -> 841 bytes .../css/treeview/images/treeview-black-line.gif | Bin 1877 -> 1877 bytes .../css/treeview/images/treeview-black.gif | Bin 1216 -> 1216 bytes .../css/treeview/images/treeview-default-line.gif | Bin 1993 -> 1993 bytes .../css/treeview/images/treeview-default.gif | Bin 1222 -> 1222 bytes .../treeview/images/treeview-famfamfam-line.gif | Bin 807 -> 807 bytes .../css/treeview/images/treeview-famfamfam.gif | Bin 1280 -> 1280 bytes .../css/treeview/images/treeview-gray-line.gif | Bin 1877 -> 1877 bytes .../{en => }/css/treeview/images/treeview-gray.gif | Bin 1230 -> 1230 bytes .../css/treeview/images/treeview-red-line.gif | Bin 1877 -> 1877 bytes .../{en => }/css/treeview/images/treeview-red.gif | Bin 1230 -> 1230 bytes .../prog/{en => }/css/treeview/jquery.treeview.css | 0 .../intranet-tmpl/prog/{en => }/css/uploader.css | 2 +- .../intranet-tmpl/prog/en/includes/datatables.inc | 2 +- .../prog/en/includes/doc-head-close-receipt.inc | 2 +- .../prog/en/includes/doc-head-close.inc | 6 +- .../intranet-tmpl/prog/en/includes/help-top.inc | 6 +- .../prog/en/includes/installer-doc-head-close.inc | 2 +- .../prog/en/includes/intranetstylesheet.inc | 4 +- .../prog/en/includes/wysiwyg-systempreferences.inc | 2 +- .../prog/en/modules/acqui/acqui-home.tt | 2 +- .../prog/en/modules/acqui/addorderiso2709.tt | 2 +- .../intranet-tmpl/prog/en/modules/acqui/basket.tt | 2 +- .../prog/en/modules/acqui/basketgroup.tt | 18 ++--- .../prog/en/modules/acqui/booksellers.tt | 2 +- .../prog/en/modules/acqui/edifactmsgs.tt | 2 +- .../prog/en/modules/acqui/histsearch.tt | 2 +- .../prog/en/modules/acqui/invoice-files.tt | 2 +- .../intranet-tmpl/prog/en/modules/acqui/invoice.tt | 2 +- .../prog/en/modules/acqui/invoices.tt | 2 +- .../prog/en/modules/acqui/lateorders.tt | 2 +- .../prog/en/modules/acqui/neworderbiblio.tt | 2 +- .../prog/en/modules/acqui/newordersubscription.tt | 2 +- .../prog/en/modules/acqui/newordersuggestion.tt | 2 +- .../intranet-tmpl/prog/en/modules/acqui/ordered.tt | 2 +- .../intranet-tmpl/prog/en/modules/acqui/parcel.tt | 2 +- .../intranet-tmpl/prog/en/modules/acqui/parcels.tt | 2 +- .../intranet-tmpl/prog/en/modules/acqui/spent.tt | 2 +- .../prog/en/modules/acqui/supplier.tt | 2 +- .../prog/en/modules/acqui/uncertainprice.tt | 2 +- .../prog/en/modules/acqui/z3950_search.tt | 2 +- .../prog/en/modules/admin/aqbudgetperiods.tt | 2 +- .../prog/en/modules/admin/aqbudgets.tt | 2 +- .../prog/en/modules/admin/auth_tag_structure.tt | 2 +- .../prog/en/modules/admin/authorised_values.tt | 2 +- .../prog/en/modules/admin/authtypes.tt | 2 +- .../prog/en/modules/admin/biblio_framework.tt | 2 +- .../en/modules/admin/branch_transfer_limits.tt | 2 +- .../prog/en/modules/admin/branches.tt | 4 +- .../prog/en/modules/admin/categories.tt | 2 +- .../intranet-tmpl/prog/en/modules/admin/cities.tt | 2 +- .../prog/en/modules/admin/currency.tt | 2 +- .../prog/en/modules/admin/itemtypes.tt | 2 +- .../prog/en/modules/admin/localization.tt | 2 +- .../prog/en/modules/admin/marctagstructure.tt | 2 +- .../prog/en/modules/admin/preferences.tt | 8 +-- .../prog/en/modules/admin/systempreferences.tt | 2 +- .../prog/en/modules/admin/z3950servers.tt | 2 +- .../prog/en/modules/authorities/authorities.tt | 4 +- .../intranet-tmpl/prog/en/modules/basket/basket.tt | 4 +- .../prog/en/modules/catalogue/detail.tt | 2 +- .../prog/en/modules/catalogue/issuehistory.tt | 2 +- .../prog/en/modules/catalogue/itemsearch.tt | 4 +- .../prog/en/modules/catalogue/search-history.tt | 2 +- .../prog/en/modules/cataloguing/addbiblio.tt | 4 +- .../prog/en/modules/cataloguing/additem.tt | 6 +- .../prog/en/modules/cataloguing/editor.tt | 8 +-- .../cataloguing/value_builder/cn_browser.tt | 2 +- .../en/modules/cataloguing/z3950_auth_search.tt | 2 +- .../prog/en/modules/cataloguing/z3950_search.tt | 2 +- .../prog/en/modules/circ/circulation.tt | 2 +- .../en/modules/circ/circulation_batch_checkouts.tt | 2 +- .../prog/en/modules/circ/offline-mf.tt | 4 +- .../prog/en/modules/circ/on-site_checkouts.tt | 2 +- .../prog/en/modules/circ/pendingreserves.tt | 2 +- .../prog/en/modules/circ/printslip.tt | 2 +- .../prog/en/modules/circ/reserveratios.tt | 2 +- .../intranet-tmpl/prog/en/modules/circ/returns.tt | 2 +- .../prog/en/modules/circ/transferstoreceive.tt | 2 +- .../prog/en/modules/circ/view_holdsqueue.tt | 2 +- .../prog/en/modules/circ/waitingreserves.tt | 2 +- .../prog/en/modules/common/patron_search.tt | 2 +- .../en/modules/course_reserves/course-details.tt | 2 +- .../en/modules/course_reserves/course-reserves.tt | 2 +- .../intranet-tmpl/prog/en/modules/help/edithelp.tt | 4 +- .../prog/en/modules/help/labels/spinelabel-home.tt | 2 +- .../intranet-tmpl/prog/en/modules/intranet-main.tt | 2 +- .../prog/en/modules/labels/label-edit-batch.tt | 2 +- .../prog/en/modules/labels/label-home.tt | 2 +- .../prog/en/modules/labels/label-manage.tt | 2 +- .../prog/en/modules/labels/spinelabel-print.tt | 2 +- .../prog/en/modules/members/boraccount.tt | 2 +- .../prog/en/modules/members/member-flags.tt | 2 +- .../prog/en/modules/members/member.tt | 2 +- .../prog/en/modules/members/moremember-print.tt | 2 +- .../prog/en/modules/members/moremember-receipt.tt | 2 +- .../prog/en/modules/members/moremember.tt | 2 +- .../prog/en/modules/members/notices.tt | 2 +- .../prog/en/modules/members/printfeercpt.tt | 2 +- .../prog/en/modules/members/printinvoice.tt | 2 +- .../en/modules/members/purchase-suggestions.tt | 2 +- .../prog/en/modules/members/readingrec.tt | 2 +- .../prog/en/modules/members/statistics.tt | 2 +- .../prog/en/modules/members/update-child.tt | 2 +- .../prog/en/modules/patron_lists/list.tt | 2 +- .../prog/en/modules/patron_lists/lists.tt | 2 +- .../prog/en/modules/patroncards/edit-batch.tt | 2 +- .../en/modules/reports/guided_reports_start.tt | 2 +- .../prog/en/modules/reports/itemslost.tt | 2 +- .../prog/en/modules/reports/itemtypes.tt | 2 +- .../prog/en/modules/reports/serials_stats.tt | 2 +- .../prog/en/modules/reserve/request.tt | 2 +- .../rotating_collections/rotatingCollections.tt | 2 +- .../prog/en/modules/serials/add_fields.tt | 2 +- .../prog/en/modules/serials/claims.tt | 2 +- .../prog/en/modules/serials/serials-collection.tt | 2 +- .../prog/en/modules/serials/serials-search.tt | 2 +- .../prog/en/modules/suggestion/suggestion.tt | 2 +- .../intranet-tmpl/prog/en/modules/tags/list.tt | 2 +- .../intranet-tmpl/prog/en/modules/tags/review.tt | 2 +- .../prog/en/modules/tools/batchMod-del.tt | 2 +- .../prog/en/modules/tools/batchMod-edit.tt | 4 +- .../prog/en/modules/tools/batch_delete_records.tt | 2 +- .../en/modules/tools/batch_record_modification.tt | 2 +- .../prog/en/modules/tools/holidays.tt | 2 +- .../prog/en/modules/tools/inventory.tt | 2 +- .../prog/en/modules/tools/koha-news.tt | 4 +- .../intranet-tmpl/prog/en/modules/tools/letter.tt | 2 +- .../prog/en/modules/tools/manage-marc-import.tt | 2 +- .../prog/en/modules/tools/modborrowers.tt | 2 +- .../prog/en/modules/tools/quotes-upload.tt | 6 +- .../intranet-tmpl/prog/en/modules/tools/quotes.tt | 4 +- .../prog/en/modules/virtualshelves/shelves.tt | 2 +- 238 files changed, 222 insertions(+), 222 deletions(-) rename koha-tmpl/intranet-tmpl/{prog/en => }/lib/yui/animation/animation-debug.js (100%) rename koha-tmpl/intranet-tmpl/{prog/en => }/lib/yui/animation/animation-min.js (100%) rename koha-tmpl/intranet-tmpl/{prog/en => }/lib/yui/animation/animation.js (100%) rename koha-tmpl/intranet-tmpl/{prog/en => }/lib/yui/button/assets/button-core.css (100%) rename koha-tmpl/intranet-tmpl/{prog/en => }/lib/yui/button/assets/skins/sam/button-skin.css (100%) rename koha-tmpl/intranet-tmpl/{prog/en => }/lib/yui/button/assets/skins/sam/button.css (100%) rename koha-tmpl/intranet-tmpl/{prog/en => }/lib/yui/button/assets/skins/sam/menu-button-arrow-disabled.png (100%) rename koha-tmpl/intranet-tmpl/{prog/en => }/lib/yui/button/assets/skins/sam/menu-button-arrow.png (100%) rename koha-tmpl/intranet-tmpl/{prog/en => }/lib/yui/button/assets/skins/sam/split-button-arrow-active.png (100%) rename koha-tmpl/intranet-tmpl/{prog/en => }/lib/yui/button/assets/skins/sam/split-button-arrow-disabled.png (100%) rename koha-tmpl/intranet-tmpl/{prog/en => }/lib/yui/button/assets/skins/sam/split-button-arrow-focus.png (100%) rename koha-tmpl/intranet-tmpl/{prog/en => }/lib/yui/button/assets/skins/sam/split-button-arrow-hover.png (100%) rename koha-tmpl/intranet-tmpl/{prog/en => }/lib/yui/button/assets/skins/sam/split-button-arrow.png (100%) rename koha-tmpl/intranet-tmpl/{prog/en => }/lib/yui/button/button-beta-min.js (100%) rename koha-tmpl/intranet-tmpl/{prog/en => }/lib/yui/button/button-debug.js (100%) rename koha-tmpl/intranet-tmpl/{prog/en => }/lib/yui/button/button-min.js (100%) rename koha-tmpl/intranet-tmpl/{prog/en => }/lib/yui/button/button.js (100%) rename koha-tmpl/intranet-tmpl/{prog/en => }/lib/yui/container/assets/alrt16_1.gif (100%) rename koha-tmpl/intranet-tmpl/{prog/en => }/lib/yui/container/assets/blck16_1.gif (100%) rename koha-tmpl/intranet-tmpl/{prog/en => }/lib/yui/container/assets/close12_1.gif (100%) rename koha-tmpl/intranet-tmpl/{prog/en => }/lib/yui/container/assets/container-core.css (100%) rename koha-tmpl/intranet-tmpl/{prog/en => }/lib/yui/container/assets/container.css (100%) rename koha-tmpl/intranet-tmpl/{prog/en => }/lib/yui/container/assets/hlp16_1.gif (100%) rename koha-tmpl/intranet-tmpl/{prog/en => }/lib/yui/container/assets/info16_1.gif (100%) rename koha-tmpl/intranet-tmpl/{prog/en => }/lib/yui/container/assets/skins/sam/container-skin.css (100%) rename koha-tmpl/intranet-tmpl/{prog/en => }/lib/yui/container/assets/skins/sam/container.css (100%) rename koha-tmpl/intranet-tmpl/{prog/en => }/lib/yui/container/assets/tip16_1.gif (100%) rename koha-tmpl/intranet-tmpl/{prog/en => }/lib/yui/container/assets/warn16_1.gif (100%) rename koha-tmpl/intranet-tmpl/{prog/en => }/lib/yui/container/container-debug.js (100%) rename koha-tmpl/intranet-tmpl/{prog/en => }/lib/yui/container/container-min.js (100%) rename koha-tmpl/intranet-tmpl/{prog/en => }/lib/yui/container/container.js (100%) rename koha-tmpl/intranet-tmpl/{prog/en => }/lib/yui/container/container_core-debug.js (100%) rename koha-tmpl/intranet-tmpl/{prog/en => }/lib/yui/container/container_core-min.js (100%) rename koha-tmpl/intranet-tmpl/{prog/en => }/lib/yui/container/container_core.js (100%) rename koha-tmpl/intranet-tmpl/{prog/en => }/lib/yui/dragdrop/dragdrop-debug.js (100%) rename koha-tmpl/intranet-tmpl/{prog/en => }/lib/yui/dragdrop/dragdrop-min.js (100%) rename koha-tmpl/intranet-tmpl/{prog/en => }/lib/yui/dragdrop/dragdrop.js (100%) rename koha-tmpl/intranet-tmpl/{prog/en => }/lib/yui/element/element-beta-min.js (100%) rename koha-tmpl/intranet-tmpl/{prog/en => }/lib/yui/element/element-debug.js (100%) rename koha-tmpl/intranet-tmpl/{prog/en => }/lib/yui/element/element-min.js (100%) rename koha-tmpl/intranet-tmpl/{prog/en => }/lib/yui/element/element.js (100%) rename koha-tmpl/intranet-tmpl/{prog/en => }/lib/yui/json/json-debug.js (100%) rename koha-tmpl/intranet-tmpl/{prog/en => }/lib/yui/json/json-min.js (100%) rename koha-tmpl/intranet-tmpl/{prog/en => }/lib/yui/json/json.js (100%) rename koha-tmpl/intranet-tmpl/{prog/en => }/lib/yui/menu-button-arrow-disabled.png (100%) rename koha-tmpl/intranet-tmpl/{prog/en => }/lib/yui/menu-button-arrow.png (100%) rename koha-tmpl/intranet-tmpl/{prog/en => }/lib/yui/menu/assets/menu-core.css (100%) rename koha-tmpl/intranet-tmpl/{prog/en => }/lib/yui/menu/assets/menu.css (100%) rename koha-tmpl/intranet-tmpl/{prog/en => }/lib/yui/menu/assets/menu_down_arrow.png (100%) rename koha-tmpl/intranet-tmpl/{prog/en => }/lib/yui/menu/assets/menu_down_arrow_disabled.png (100%) rename koha-tmpl/intranet-tmpl/{prog/en => }/lib/yui/menu/assets/menu_up_arrow.png (100%) rename koha-tmpl/intranet-tmpl/{prog/en => }/lib/yui/menu/assets/menu_up_arrow_disabled.png (100%) rename koha-tmpl/intranet-tmpl/{prog/en => }/lib/yui/menu/assets/menubaritem_submenuindicator.png (100%) rename koha-tmpl/intranet-tmpl/{prog/en => }/lib/yui/menu/assets/menubaritem_submenuindicator_disabled.png (100%) rename koha-tmpl/intranet-tmpl/{prog/en => }/lib/yui/menu/assets/menubaritem_submenuindicator_selected.png (100%) rename koha-tmpl/intranet-tmpl/{prog/en => }/lib/yui/menu/assets/menuitem_checkbox.png (100%) rename koha-tmpl/intranet-tmpl/{prog/en => }/lib/yui/menu/assets/menuitem_checkbox_disabled.png (100%) rename koha-tmpl/intranet-tmpl/{prog/en => }/lib/yui/menu/assets/menuitem_checkbox_selected.png (100%) rename koha-tmpl/intranet-tmpl/{prog/en => }/lib/yui/menu/assets/menuitem_submenuindicator.png (100%) rename koha-tmpl/intranet-tmpl/{prog/en => }/lib/yui/menu/assets/menuitem_submenuindicator_disabled.png (100%) rename koha-tmpl/intranet-tmpl/{prog/en => }/lib/yui/menu/assets/menuitem_submenuindicator_selected.png (100%) rename koha-tmpl/intranet-tmpl/{prog/en => }/lib/yui/menu/assets/skins/sam/menu-skin.css (100%) rename koha-tmpl/intranet-tmpl/{prog/en => }/lib/yui/menu/assets/skins/sam/menu.css (100%) rename koha-tmpl/intranet-tmpl/{prog/en => }/lib/yui/menu/assets/skins/sam/menubaritem_submenuindicator.png (100%) rename koha-tmpl/intranet-tmpl/{prog/en => }/lib/yui/menu/assets/skins/sam/menubaritem_submenuindicator_disabled.png (100%) rename koha-tmpl/intranet-tmpl/{prog/en => }/lib/yui/menu/assets/skins/sam/menuitem_checkbox.png (100%) rename koha-tmpl/intranet-tmpl/{prog/en => }/lib/yui/menu/assets/skins/sam/menuitem_checkbox_disabled.png (100%) rename koha-tmpl/intranet-tmpl/{prog/en => }/lib/yui/menu/assets/skins/sam/menuitem_submenuindicator.png (100%) rename koha-tmpl/intranet-tmpl/{prog/en => }/lib/yui/menu/assets/skins/sam/menuitem_submenuindicator_disabled.png (100%) rename koha-tmpl/intranet-tmpl/{prog/en => }/lib/yui/menu/menu-debug.js (100%) rename koha-tmpl/intranet-tmpl/{prog/en => }/lib/yui/menu/menu-min.js (100%) rename koha-tmpl/intranet-tmpl/{prog/en => }/lib/yui/menu/menu.js (100%) rename koha-tmpl/intranet-tmpl/{prog/en => }/lib/yui/plugins/bubbling-min.js (100%) rename koha-tmpl/intranet-tmpl/{prog/en => }/lib/yui/plugins/loading-min.js (100%) rename koha-tmpl/intranet-tmpl/{prog/en => }/lib/yui/reset-fonts-grids.css (100%) rename koha-tmpl/intranet-tmpl/{prog/en => }/lib/yui/split-button-arrow-active.png (100%) rename koha-tmpl/intranet-tmpl/{prog/en => }/lib/yui/split-button-arrow-disabled.png (100%) rename koha-tmpl/intranet-tmpl/{prog/en => }/lib/yui/split-button-arrow-focus.png (100%) rename koha-tmpl/intranet-tmpl/{prog/en => }/lib/yui/split-button-arrow-hover.png (100%) rename koha-tmpl/intranet-tmpl/{prog/en => }/lib/yui/split-button-arrow.png (100%) rename koha-tmpl/intranet-tmpl/{prog/en => }/lib/yui/sprite.png (100%) rename koha-tmpl/intranet-tmpl/{prog/en => }/lib/yui/utilities/utilities.js (100%) rename koha-tmpl/intranet-tmpl/{prog/en => }/lib/yui/yahoo-dom-event/yahoo-dom-event.js (100%) rename koha-tmpl/intranet-tmpl/prog/{en => }/css/addbiblio.css (94%) rename koha-tmpl/intranet-tmpl/prog/{en => }/css/buttons.dataTables.min.css (100%) rename koha-tmpl/intranet-tmpl/prog/{en => }/css/cateditor.css (97%) rename koha-tmpl/intranet-tmpl/prog/{en => }/css/datatables.css (80%) rename koha-tmpl/intranet-tmpl/prog/{en => }/css/help.css (100%) rename koha-tmpl/intranet-tmpl/prog/{en => }/css/hierarchy.css (100%) rename koha-tmpl/intranet-tmpl/prog/{en => }/css/humanmsg.css (100%) rename koha-tmpl/intranet-tmpl/prog/{en => }/css/itemsearchform.css (84%) rename koha-tmpl/intranet-tmpl/prog/{en => }/css/login.css (98%) rename koha-tmpl/intranet-tmpl/prog/{en => }/css/mainpage.css (97%) rename koha-tmpl/intranet-tmpl/prog/{en => }/css/preferences.css (83%) rename koha-tmpl/intranet-tmpl/prog/{en => }/css/print.css (100%) rename koha-tmpl/intranet-tmpl/prog/{en => }/css/printreceiptinvoice.css (100%) rename koha-tmpl/intranet-tmpl/prog/{en => }/css/quotes.css (100%) rename koha-tmpl/intranet-tmpl/prog/{en => }/css/right-to-left.css (96%) rename koha-tmpl/intranet-tmpl/prog/{en => }/css/spinelabel.css (100%) rename koha-tmpl/intranet-tmpl/prog/{en => }/css/staff-global.css (95%) rename koha-tmpl/intranet-tmpl/prog/{en => }/css/tinymce.css (100%) rename koha-tmpl/intranet-tmpl/prog/{en => }/css/treeview/images/file.gif (100%) rename koha-tmpl/intranet-tmpl/prog/{en => }/css/treeview/images/folder-closed.gif (100%) rename koha-tmpl/intranet-tmpl/prog/{en => }/css/treeview/images/folder.gif (100%) rename koha-tmpl/intranet-tmpl/prog/{en => }/css/treeview/images/minus.gif (100%) rename koha-tmpl/intranet-tmpl/prog/{en => }/css/treeview/images/plus.gif (100%) rename koha-tmpl/intranet-tmpl/prog/{en => }/css/treeview/images/treeview-black-line.gif (100%) rename koha-tmpl/intranet-tmpl/prog/{en => }/css/treeview/images/treeview-black.gif (100%) rename koha-tmpl/intranet-tmpl/prog/{en => }/css/treeview/images/treeview-default-line.gif (100%) rename koha-tmpl/intranet-tmpl/prog/{en => }/css/treeview/images/treeview-default.gif (100%) rename koha-tmpl/intranet-tmpl/prog/{en => }/css/treeview/images/treeview-famfamfam-line.gif (100%) rename koha-tmpl/intranet-tmpl/prog/{en => }/css/treeview/images/treeview-famfamfam.gif (100%) rename koha-tmpl/intranet-tmpl/prog/{en => }/css/treeview/images/treeview-gray-line.gif (100%) rename koha-tmpl/intranet-tmpl/prog/{en => }/css/treeview/images/treeview-gray.gif (100%) rename koha-tmpl/intranet-tmpl/prog/{en => }/css/treeview/images/treeview-red-line.gif (100%) rename koha-tmpl/intranet-tmpl/prog/{en => }/css/treeview/images/treeview-red.gif (100%) rename koha-tmpl/intranet-tmpl/prog/{en => }/css/treeview/jquery.treeview.css (100%) rename koha-tmpl/intranet-tmpl/prog/{en => }/css/uploader.css (93%) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Apr 29 15:47:47 2016 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 29 Apr 2016 13:47:47 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.22.00-1426-g025e00b 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 025e00b54eb3fb86e3e07141fac15012901790c2 (commit) from f5ad4624891712fab1cba9d0cc1838f09b9a67c9 (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 025e00b54eb3fb86e3e07141fac15012901790c2 Author: Owen Leonard Date: Wed Mar 9 09:16:18 2016 -0500 Bug 16080 [Revised] Remove unused images from the staff client This patch removes images from the staff client templates which are no longer used. To test you must (as of 2016-04-22) apply the patch for Bug 16241. Apply the patch and search for references in the Koha code to the removed images. You should find none. The staff client CSS file has been updated to remove obsolete references to image files. These old styles were made obsolete by the switch to Font Awesome icons. Revision removes reference to glyphicons-halflings-koha.png from circ/offline-mf.tt Signed-off-by: Bernardo Gonzalez Kriegel On top of Bug 16241 No reference of deleted files (only on PO files but that will be fixed later) No errors Signed-off-by: Katrin Fischer Signed-off-by: Kyle M Hall ----------------------------------------------------------------------- Summary of changes: koha-tmpl/intranet-tmpl/prog/css/staff-global.css | 163 +------------------- .../prog/en/modules/circ/offline-mf.tt | 1 - koha-tmpl/intranet-tmpl/prog/img/cart.gif | Bin 330 -> 0 bytes koha-tmpl/intranet-tmpl/prog/img/checkall.gif | Bin 83 -> 0 bytes koha-tmpl/intranet-tmpl/prog/img/clear-field.png | Bin 279 -> 0 bytes koha-tmpl/intranet-tmpl/prog/img/clone-field.png | Bin 262 -> 0 bytes .../intranet-tmpl/prog/img/dropshadow-alpha.png | Bin 3403 -> 0 bytes .../intranet-tmpl/prog/img/dropshadow-mask.gif | Bin 4043 -> 0 bytes koha-tmpl/intranet-tmpl/prog/img/dropshadow.gif | Bin 4364 -> 0 bytes .../prog/img/glyphicons-halflings-koha.png | Bin 27260 -> 0 bytes .../prog/img/glyphicons-halflings-white-koha.png | Bin 23022 -> 0 bytes koha-tmpl/intranet-tmpl/prog/img/more-arrow.gif | Bin 65 -> 0 bytes koha-tmpl/intranet-tmpl/prog/img/more-up-arrow.gif | Bin 155 -> 0 bytes koha-tmpl/intranet-tmpl/prog/img/more.gif | Bin 61 -> 0 bytes koha-tmpl/intranet-tmpl/prog/img/print-confirm.gif | Bin 400 -> 0 bytes koha-tmpl/intranet-tmpl/prog/img/regularDay.jpg | Bin 1100 -> 0 bytes .../intranet-tmpl/prog/img/regularHoliday.jpg | Bin 1174 -> 0 bytes koha-tmpl/intranet-tmpl/prog/img/repeatable.jpg | Bin 1188 -> 0 bytes .../intranet-tmpl/prog/img/search-audio-books.gif | Bin 232 -> 0 bytes koha-tmpl/intranet-tmpl/prog/img/search-books.gif | Bin 142 -> 0 bytes koha-tmpl/intranet-tmpl/prog/img/search-kids.gif | Bin 197 -> 0 bytes .../intranet-tmpl/prog/img/search-large-print.gif | Bin 213 -> 0 bytes .../prog/img/search-local-history.gif | Bin 190 -> 0 bytes koha-tmpl/intranet-tmpl/prog/img/search-movies.gif | Bin 212 -> 0 bytes koha-tmpl/intranet-tmpl/prog/img/search-music.gif | Bin 211 -> 0 bytes .../intranet-tmpl/prog/img/search-reference.gif | Bin 192 -> 0 bytes .../intranet-tmpl/prog/img/search-software-web.gif | Bin 219 -> 0 bytes .../prog/img/toolbar-add-to-shelf.gif | Bin 130 -> 0 bytes .../intranet-tmpl/prog/img/toolbar-delete.gif | Bin 107 -> 0 bytes .../intranet-tmpl/prog/img/toolbar-duplicate.gif | Bin 117 -> 0 bytes koha-tmpl/intranet-tmpl/prog/img/toolbar-edit.gif | Bin 109 -> 0 bytes koha-tmpl/intranet-tmpl/prog/img/toolbar-hold.gif | Bin 106 -> 0 bytes koha-tmpl/intranet-tmpl/prog/img/toolbar-new.gif | Bin 100 -> 0 bytes .../intranet-tmpl/prog/img/toolbar-orders.gif | Bin 118 -> 0 bytes .../intranet-tmpl/prog/img/toolbar-password.gif | Bin 112 -> 0 bytes koha-tmpl/intranet-tmpl/prog/img/toolbar-print.gif | Bin 115 -> 0 bytes .../intranet-tmpl/prog/img/toolbar-receive.gif | Bin 118 -> 0 bytes koha-tmpl/intranet-tmpl/prog/img/toolbar-renew.gif | Bin 122 -> 0 bytes koha-tmpl/intranet-tmpl/prog/img/toolbar-save.gif | Bin 134 -> 0 bytes .../intranet-tmpl/prog/img/toolbar-search.gif | Bin 124 -> 0 bytes 40 files changed, 3 insertions(+), 161 deletions(-) delete mode 100644 koha-tmpl/intranet-tmpl/prog/img/cart.gif delete mode 100644 koha-tmpl/intranet-tmpl/prog/img/checkall.gif delete mode 100644 koha-tmpl/intranet-tmpl/prog/img/clear-field.png delete mode 100644 koha-tmpl/intranet-tmpl/prog/img/clone-field.png delete mode 100644 koha-tmpl/intranet-tmpl/prog/img/dropshadow-alpha.png delete mode 100644 koha-tmpl/intranet-tmpl/prog/img/dropshadow-mask.gif delete mode 100644 koha-tmpl/intranet-tmpl/prog/img/dropshadow.gif delete mode 100644 koha-tmpl/intranet-tmpl/prog/img/glyphicons-halflings-koha.png delete mode 100644 koha-tmpl/intranet-tmpl/prog/img/glyphicons-halflings-white-koha.png delete mode 100644 koha-tmpl/intranet-tmpl/prog/img/more-arrow.gif delete mode 100644 koha-tmpl/intranet-tmpl/prog/img/more-up-arrow.gif delete mode 100644 koha-tmpl/intranet-tmpl/prog/img/more.gif delete mode 100644 koha-tmpl/intranet-tmpl/prog/img/print-confirm.gif delete mode 100644 koha-tmpl/intranet-tmpl/prog/img/regularDay.jpg delete mode 100644 koha-tmpl/intranet-tmpl/prog/img/regularHoliday.jpg delete mode 100644 koha-tmpl/intranet-tmpl/prog/img/repeatable.jpg delete mode 100644 koha-tmpl/intranet-tmpl/prog/img/search-audio-books.gif delete mode 100644 koha-tmpl/intranet-tmpl/prog/img/search-books.gif delete mode 100644 koha-tmpl/intranet-tmpl/prog/img/search-kids.gif delete mode 100644 koha-tmpl/intranet-tmpl/prog/img/search-large-print.gif delete mode 100644 koha-tmpl/intranet-tmpl/prog/img/search-local-history.gif delete mode 100644 koha-tmpl/intranet-tmpl/prog/img/search-movies.gif delete mode 100644 koha-tmpl/intranet-tmpl/prog/img/search-music.gif delete mode 100644 koha-tmpl/intranet-tmpl/prog/img/search-reference.gif delete mode 100644 koha-tmpl/intranet-tmpl/prog/img/search-software-web.gif delete mode 100644 koha-tmpl/intranet-tmpl/prog/img/toolbar-add-to-shelf.gif delete mode 100644 koha-tmpl/intranet-tmpl/prog/img/toolbar-delete.gif delete mode 100644 koha-tmpl/intranet-tmpl/prog/img/toolbar-duplicate.gif delete mode 100644 koha-tmpl/intranet-tmpl/prog/img/toolbar-edit.gif delete mode 100644 koha-tmpl/intranet-tmpl/prog/img/toolbar-hold.gif delete mode 100644 koha-tmpl/intranet-tmpl/prog/img/toolbar-new.gif delete mode 100644 koha-tmpl/intranet-tmpl/prog/img/toolbar-orders.gif delete mode 100644 koha-tmpl/intranet-tmpl/prog/img/toolbar-password.gif delete mode 100644 koha-tmpl/intranet-tmpl/prog/img/toolbar-print.gif delete mode 100644 koha-tmpl/intranet-tmpl/prog/img/toolbar-receive.gif delete mode 100644 koha-tmpl/intranet-tmpl/prog/img/toolbar-renew.gif delete mode 100644 koha-tmpl/intranet-tmpl/prog/img/toolbar-save.gif delete mode 100644 koha-tmpl/intranet-tmpl/prog/img/toolbar-search.gif hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Apr 29 15:56:34 2016 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 29 Apr 2016 13:56:34 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.22.00-1430-gbed7eb4 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 bed7eb47623356c8e317d64f4fa5dc6a5efadbd2 (commit) via 1b6a3d85a922486c6ffa711806ed47007c2523f0 (commit) via 85e7d186ec2f0a30e479bc924a1023c73eefc28e (commit) via d60c96c8911da0888e4fd4eb5cb8fadda02c44a5 (commit) from 025e00b54eb3fb86e3e07141fac15012901790c2 (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 bed7eb47623356c8e317d64f4fa5dc6a5efadbd2 Author: Kyle M Hall Date: Fri Apr 29 14:04:57 2016 +0000 Bug 16041 - DBRev - Fix print line Signed-off-by: Kyle M Hall commit 1b6a3d85a922486c6ffa711806ed47007c2523f0 Author: Kyle M Hall Date: Fri Apr 29 14:02:52 2016 +0000 Bug 16167 - DBRev 3.23.00.059 Signed-off-by: Kyle M Hall commit 85e7d186ec2f0a30e479bc924a1023c73eefc28e Author: Jonathan Druart Date: Wed Mar 30 09:27:23 2016 +0100 Bug 16167: Remove Authorised value images prefs There are 2 prefs to drive this feature: StaffAuthorisedValueImages and AuthorisedValueImages. AuthorisedValueImages is not added by sysprefs.sql and does not appear in updatedatabase.pl, we could easily imagine that nobody uses it. With XSLT enabled, the feature is only visible on a record detail page at the OPAC, if AuthorisedValueImages is set. Otherwise you need to turn the XSLT off. In this case you will see the images on the result list (OPAC+Staff interfaces) and OPAC detail page, but not the Staff detail page. This patch suggests to remove completely this feature as it does not work correctly. The ability to assign an image to an authorised value is now always displayed, but the image will only be displayed on the advanced search if defined. Test plan: Confirm that the authorised value images are no longer visible at the opac and the staff interfaces. The prefs should have been removed too. Signed-off-by: Owen Leonard Signed-off-by: Katrin Fischer Signed-off-by: Kyle M Hall commit d60c96c8911da0888e4fd4eb5cb8fadda02c44a5 Author: Jonathan Druart Date: Mon Apr 4 08:39:57 2016 +0100 Bug 16167: Atomic update Signed-off-by: Owen Leonard Signed-off-by: Katrin Fischer Signed-off-by: Kyle M Hall ----------------------------------------------------------------------- Summary of changes: C4/Auth.pm | 1 - C4/Biblio.pm | 62 ------------- C4/Items.pm | 98 -------------------- C4/Search.pm | 1 - C4/UsageStats.pm | 2 - Koha.pm | 2 +- installer/data/mysql/sysprefs.sql | 1 - installer/data/mysql/updatedatabase.pl | 12 ++- .../prog/en/modules/admin/preferences/opac.pref | 6 -- .../en/modules/admin/preferences/staff_client.pref | 6 -- .../prog/en/modules/catalogue/results.tt | 8 -- .../en/modules/help/admin/authorised_values.tt | 3 - .../bootstrap/en/includes/item-status.inc | 6 +- .../opac-tmpl/bootstrap/en/modules/opac-detail.tt | 8 -- .../opac-tmpl/bootstrap/en/modules/opac-results.tt | 13 +-- opac/opac-detail.pl | 14 --- t/db_dependent/UsageStats.t | 2 - 17 files changed, 14 insertions(+), 231 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Apr 29 16:01:04 2016 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 29 Apr 2016 14:01:04 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.22.00-1431-g3495cc6 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 3495cc6ad0cd90274f6aeeb0fda2d04bfbd3e0d8 (commit) from bed7eb47623356c8e317d64f4fa5dc6a5efadbd2 (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 3495cc6ad0cd90274f6aeeb0fda2d04bfbd3e0d8 Author: Marc V?ron Date: Thu Apr 7 17:50:52 2016 +0200 Bug 16211: Missing tag in member.tt line 392 This patch fixes the tag in member.tt line 392 To test: - Apply patch - Verify that closing th tag on line 392 is OK - Go to /cgi-bin/koha/members/member.pl, do a search and verify that results display as expected Signed-off-by: Jonathan Druart Signed-off-by: Kyle M Hall ----------------------------------------------------------------------- Summary of changes: koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Apr 29 16:04:00 2016 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 29 Apr 2016 14:04:00 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.22.00-1432-g0aa7876 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 0aa787615a0ac1788a21c3bc31994d0259f4ef04 (commit) from 3495cc6ad0cd90274f6aeeb0fda2d04bfbd3e0d8 (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 0aa787615a0ac1788a21c3bc31994d0259f4ef04 Author: Kyle M Hall Date: Fri Apr 29 14:13:10 2016 +0000 Bug 15533 - DBRev - Change INSERT to INSERT IGNORE for new syspref Signed-off-by: Kyle M Hall ----------------------------------------------------------------------- Summary of changes: installer/data/mysql/updatedatabase.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Apr 29 16:06:09 2016 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 29 Apr 2016 14:06:09 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.22.00-1433-g0b6bc2b 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 0b6bc2b5983f0e66c13902e74352cdcd68971a7f (commit) from 0aa787615a0ac1788a21c3bc31994d0259f4ef04 (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 0b6bc2b5983f0e66c13902e74352cdcd68971a7f Author: Marc V?ron Date: Thu Apr 7 19:10:55 2016 +0200 Bug 16218: printfeercpt.tt (and others) does not include jQuery This patch adds [% INCLUDE 'doc-head-close.inc' %] to the following files (to make them include jQuery): koha-tmpl/intranet-tmpl/prog/en/modules/circ/printslip.tt koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-print.tt koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-receipt.tt koha-tmpl/intranet-tmpl/prog/en/modules/members/printfeercpt.tt To test: 1) Temporarily include the follwing lines in syspref IntranetSlipPrinterJS: function printThenClose() { if (typeof jQuery != 'undefined') { // jQuery is loaded => print the version alert(jQuery.fn.jquery); } else { alert('jQuery not available'); } } 2) Go to a users page and print slips: From the Print button in the tool bar: - Print summary - Print slip - Print quick slip From the "Fines" tab: Account - 'Print' link in the table with paid transactions Without patch, a JavaScript message 'jQuery not avaliable' appears. With patch, the message displays the current jQuery version (1.7.2) 3) Remove IntranetSlipPrinterJS - Verify that the slips above print as expected. Signed-off-by: Hector Castro Works as expected Signed-off-by: Katrin Fischer Signed-off-by: Kyle M Hall ----------------------------------------------------------------------- Summary of changes: koha-tmpl/intranet-tmpl/prog/en/modules/circ/printslip.tt | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-print.tt | 1 + .../intranet-tmpl/prog/en/modules/members/moremember-receipt.tt | 1 + koha-tmpl/intranet-tmpl/prog/en/modules/members/printfeercpt.tt | 1 + 4 files changed, 4 insertions(+), 1 deletion(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Apr 29 16:21:54 2016 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 29 Apr 2016 14:21:54 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.22.00-1438-g64e3914 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 64e391491edca79a7e3e7f749792b3d07812185d (commit) via e73aab40dea379f5948326931038d32e51172624 (commit) via ba49225e25b28a7da1d8afaf7bdca51a2efc600a (commit) via 1c9b9e3e0e1eb3235b20d95afbe5d26b8279a2c2 (commit) via 27770b7c8f9a0d75f7dc17c6b1face67c71533a3 (commit) from 0b6bc2b5983f0e66c13902e74352cdcd68971a7f (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 64e391491edca79a7e3e7f749792b3d07812185d Author: Owen Leonard Date: Fri Apr 22 09:01:26 2016 -0400 Bug 16238 [Follow-up] Upgrade jQuery in staff client: use .prop() instead of .attr() This patch corrects some tabs which should have been replaced with spaces. To test, diff against the previous commit with the '-w' flag. There should be no visible changes. Signed-off-by: Bernardo Gonzalez Kriegel Space changes, no errors. Signed-off-by: Jonathan Druart Signed-off-by: Kyle M Hall commit e73aab40dea379f5948326931038d32e51172624 Author: Julian Maurice Date: Wed Apr 13 20:51:06 2016 +0200 Bug 16238: Use .prop() instead of .attr() for 'readonly' Signed-off-by: Owen Leonard Signed-off-by: Jonathan Druart Signed-off-by: Kyle M Hall commit ba49225e25b28a7da1d8afaf7bdca51a2efc600a Author: Julian Maurice Date: Wed Apr 13 20:27:49 2016 +0200 Bug 16238: Use .prop() instead of .attr() for 'disabled' Signed-off-by: Owen Leonard Signed-off-by: Jonathan Druart Signed-off-by: Kyle M Hall commit 1c9b9e3e0e1eb3235b20d95afbe5d26b8279a2c2 Author: Julian Maurice Date: Wed Apr 13 10:31:05 2016 +0200 Bug 16238: QA fix: remove tab characters Signed-off-by: Marc V?ron Signed-off-by: Owen Leonard Signed-off-by: Jonathan Druart Signed-off-by: Kyle M Hall commit 27770b7c8f9a0d75f7dc17c6b1face67c71533a3 Author: Julian Maurice Date: Sat Apr 9 07:58:42 2016 +0200 Bug 16238: Use .prop() instead of .attr() for 'checked' According to https://jquery.com/upgrade-guide/1.9/#attr-versus-prop- .attr() is no longer correct to access the checked state of a checkbox. This patch do the following replacements: .attr('checked') => .prop('checked') .attr('checked, '') => .prop('checked', false) .attr('checked, 'checked') => .prop('checked', true) .attr('checked', boolValue) => .prop('checked', boolValue) .removeAttr('checked') => .prop('checked', false) .attr('checked') == 'checked' => .is(':checked') Signed-off-by: Marc V?ron Signed-off-by: Owen Leonard Signed-off-by: Jonathan Druart Signed-off-by: Kyle M Hall ----------------------------------------------------------------------- Summary of changes: .../prog/en/includes/messaging-preference-form.inc | 46 ++++++++++---------- koha-tmpl/intranet-tmpl/prog/en/js/acq.js | 8 ++-- koha-tmpl/intranet-tmpl/prog/en/js/ajax.js | 4 +- koha-tmpl/intranet-tmpl/prog/en/js/checkouts.js | 14 +++--- .../prog/en/js/marc_subfields_structure.js | 16 +++---- koha-tmpl/intranet-tmpl/prog/en/js/merge-record.js | 12 ++--- .../intranet-tmpl/prog/en/js/pages/batchMod.js | 16 +++---- .../intranet-tmpl/prog/en/js/pages/circulation.js | 10 ++--- .../intranet-tmpl/prog/en/js/pages/preferences.js | 4 +- .../prog/en/modules/acqui/addorderiso2709.tt | 6 +-- .../intranet-tmpl/prog/en/modules/acqui/basket.tt | 2 +- .../intranet-tmpl/prog/en/modules/acqui/invoice.tt | 2 +- .../prog/en/modules/acqui/invoices.tt | 4 +- .../prog/en/modules/acqui/lateorders.tt | 4 +- .../prog/en/modules/acqui/newordersubscription.tt | 2 +- .../prog/en/modules/acqui/orderreceive.tt | 4 +- .../prog/en/modules/acqui/supplier.tt | 14 +++--- .../intranet-tmpl/prog/en/modules/admin/aqplan.tt | 2 +- .../prog/en/modules/admin/currency.tt | 6 +-- .../prog/en/modules/admin/smart-rules.tt | 12 ++--- .../prog/en/modules/admin/transport-cost-matrix.tt | 6 +-- .../prog/en/modules/catalogue/detail.tt | 4 +- .../prog/en/modules/catalogue/itemsearch.tt | 6 +-- .../prog/en/modules/catalogue/results.tt | 4 +- .../prog/en/modules/cataloguing/additem.tt | 2 +- .../prog/en/modules/cataloguing/merge.tt | 4 +- .../prog/en/modules/circ/circulation.tt | 4 +- .../intranet-tmpl/prog/en/modules/circ/returns.tt | 6 +-- .../prog/en/modules/members/member-flags.tt | 10 ++--- .../prog/en/modules/members/member.tt | 10 ++--- .../prog/en/modules/members/memberentrygen.tt | 8 ++-- .../prog/en/modules/patroncards/edit-layout.tt | 12 ++--- .../prog/en/modules/reports/catalogue_stats.tt | 12 ++--- .../en/modules/reports/guided_reports_start.tt | 36 +++++++-------- .../prog/en/modules/reserve/request.tt | 42 +++++++++--------- .../prog/en/modules/serials/claims.tt | 2 +- .../en/modules/serials/showpredictionpattern.tt | 6 +-- .../prog/en/modules/serials/subscription-add.tt | 20 ++++----- .../intranet-tmpl/prog/en/modules/tags/review.tt | 12 ++--- .../prog/en/modules/tools/batchMod-edit.tt | 4 +- .../prog/en/modules/tools/batch_delete_records.tt | 4 +- .../prog/en/modules/tools/modborrowers.tt | 4 +- 42 files changed, 203 insertions(+), 203 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Apr 29 16:24:08 2016 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 29 Apr 2016 14:24:08 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.22.00-1440-g2f4dde2 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 2f4dde25e804261aac10ce74ce5afb243de30437 (commit) via 5e1bcc4aa79098045a2240be2aaf7d33ea2965f0 (commit) from 64e391491edca79a7e3e7f749792b3d07812185d (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 2f4dde25e804261aac10ce74ce5afb243de30437 Author: Owen Leonard Date: Mon Apr 25 08:06:37 2016 -0400 Bug 16242 [Follow-up] Move staff client JavaScript out of language directory Correcting to a file I missed: circ/offline.tt. This patch corrects the path to offlinecirc.js. To test, go to Circulation -> Built-in offline circulation interface. There should be no errors in the console warning of missing files. The "Check out" link should work correctly. Signed-off-by: Hector Castro File missed was fixed Signed-off-by: Katrin Fischer Signed-off-by: Kyle M Hall commit 5e1bcc4aa79098045a2240be2aaf7d33ea2965f0 Author: Owen Leonard Date: Tue Apr 12 13:50:54 2016 -0400 Bug 16242 - Move staff client JavaScript out of language directory This patch moves the JavaScript files in prog/en/js to prog/js. JavaScript files do not need to be in the directory which is processed by the translator. To test, apply the patch and visit various pages in the staff client to confirm that JavaScript files are still loading correctly. Revised: I intended for this to be built on top of Bug 15883 as well as Bug 16242. Now it is. Signed-off-by: Bernardo Gonzalez Kriegel On top of 15883 and 16241 All seems to work, js files pulled from new dir. No errors Signed-off-by: Katrin Fischer Signed-off-by: Kyle M Hall ----------------------------------------------------------------------- Summary of changes: koha-tmpl/intranet-tmpl/prog/en/includes/datatables.inc | 2 +- koha-tmpl/intranet-tmpl/prog/en/includes/doc-head-close.inc | 6 +++--- koha-tmpl/intranet-tmpl/prog/en/includes/help-top.inc | 2 +- .../intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketheader.tt | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt | 8 ++++---- koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt | 6 +++--- .../intranet-tmpl/prog/en/modules/acqui/uncertainprice.tt | 2 +- .../intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tt | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqcontract.tt | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqplan.tt | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/admin/audio_alerts.tt | 2 +- .../intranet-tmpl/prog/en/modules/admin/biblio_framework.tt | 2 +- .../intranet-tmpl/prog/en/modules/admin/items_search_fields.tt | 2 +- .../prog/en/modules/admin/marc_subfields_structure.tt | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences.tt | 4 ++-- koha-tmpl/intranet-tmpl/prog/en/modules/admin/sms_providers.tt | 2 +- .../intranet-tmpl/prog/en/modules/authorities/authorities.tt | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/authorities/merge.tt | 2 +- .../intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tt | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/merge.tt | 2 +- .../en/modules/cataloguing/value_builder/marc21_field_006.tt | 2 +- .../en/modules/cataloguing/value_builder/marc21_field_008.tt | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt | 6 +++--- koha-tmpl/intranet-tmpl/prog/en/modules/circ/offline-mf.tt | 6 +++--- koha-tmpl/intranet-tmpl/prog/en/modules/circ/offline.tt | 2 +- .../intranet-tmpl/prog/en/modules/members/memberentrygen.tt | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt | 6 +++--- .../intranet-tmpl/prog/en/modules/offline_circ/process_koc.tt | 4 ++-- .../intranet-tmpl/prog/en/modules/serials/serials-edit.tt | 4 ++-- .../intranet-tmpl/prog/en/modules/suggestion/suggestion.tt | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-del.tt | 4 ++-- koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-edit.tt | 6 +++--- .../prog/en/modules/tools/batch_record_modification.tt | 2 +- .../intranet-tmpl/prog/en/modules/tools/manage-marc-import.tt | 2 +- .../prog/en/modules/tools/marc_modification_templates.tt | 2 +- .../intranet-tmpl/prog/en/modules/tools/stage-marc-import.tt | 4 ++-- koha-tmpl/intranet-tmpl/prog/en/modules/tools/upload-images.tt | 4 ++-- koha-tmpl/intranet-tmpl/prog/en/modules/tools/upload.tt | 2 +- koha-tmpl/intranet-tmpl/prog/{en => }/js/acq.js | 0 koha-tmpl/intranet-tmpl/prog/{en => }/js/additem.js | 0 koha-tmpl/intranet-tmpl/prog/{en => }/js/ajax.js | 0 koha-tmpl/intranet-tmpl/prog/{en => }/js/audio_alerts.js | 0 .../prog/{en => }/js/background-job-progressbar.js | 0 koha-tmpl/intranet-tmpl/prog/{en => }/js/basket.js | 0 koha-tmpl/intranet-tmpl/prog/{en => }/js/basketgroup.js | 0 koha-tmpl/intranet-tmpl/prog/{en => }/js/biblio_framework.js | 0 koha-tmpl/intranet-tmpl/prog/{en => }/js/cataloging.js | 0 koha-tmpl/intranet-tmpl/prog/{en => }/js/checkouts.js | 0 koha-tmpl/intranet-tmpl/prog/{en => }/js/datatables.js | 0 koha-tmpl/intranet-tmpl/prog/{en => }/js/file-upload.js | 0 koha-tmpl/intranet-tmpl/prog/{en => }/js/holds.js | 0 koha-tmpl/intranet-tmpl/prog/{en => }/js/item_search_fields.js | 0 koha-tmpl/intranet-tmpl/prog/{en => }/js/localcovers.js | 0 .../prog/{en => }/js/marc_modification_templates.js | 0 .../intranet-tmpl/prog/{en => }/js/marc_subfields_structure.js | 0 koha-tmpl/intranet-tmpl/prog/{en => }/js/members.js | 0 koha-tmpl/intranet-tmpl/prog/{en => }/js/merge-record.js | 0 koha-tmpl/intranet-tmpl/prog/{en => }/js/offlinecirc.js | 0 koha-tmpl/intranet-tmpl/prog/{en => }/js/pages/addbiblio.js | 0 koha-tmpl/intranet-tmpl/prog/{en => }/js/pages/batchMod.js | 0 koha-tmpl/intranet-tmpl/prog/{en => }/js/pages/circulation.js | 0 koha-tmpl/intranet-tmpl/prog/{en => }/js/pages/preferences.js | 0 koha-tmpl/intranet-tmpl/prog/{en => }/js/prevent_submit.js | 0 koha-tmpl/intranet-tmpl/prog/{en => }/js/sms_providers.js | 0 koha-tmpl/intranet-tmpl/prog/{en => }/js/staff-global.js | 0 koha-tmpl/intranet-tmpl/prog/{en => }/js/xmlControlfield.js | 0 70 files changed, 63 insertions(+), 63 deletions(-) rename koha-tmpl/intranet-tmpl/prog/{en => }/js/acq.js (100%) rename koha-tmpl/intranet-tmpl/prog/{en => }/js/additem.js (100%) rename koha-tmpl/intranet-tmpl/prog/{en => }/js/ajax.js (100%) rename koha-tmpl/intranet-tmpl/prog/{en => }/js/audio_alerts.js (100%) rename koha-tmpl/intranet-tmpl/prog/{en => }/js/background-job-progressbar.js (100%) rename koha-tmpl/intranet-tmpl/prog/{en => }/js/basket.js (100%) rename koha-tmpl/intranet-tmpl/prog/{en => }/js/basketgroup.js (100%) rename koha-tmpl/intranet-tmpl/prog/{en => }/js/biblio_framework.js (100%) rename koha-tmpl/intranet-tmpl/prog/{en => }/js/cataloging.js (100%) rename koha-tmpl/intranet-tmpl/prog/{en => }/js/checkouts.js (100%) rename koha-tmpl/intranet-tmpl/prog/{en => }/js/datatables.js (100%) rename koha-tmpl/intranet-tmpl/prog/{en => }/js/file-upload.js (100%) rename koha-tmpl/intranet-tmpl/prog/{en => }/js/holds.js (100%) rename koha-tmpl/intranet-tmpl/prog/{en => }/js/item_search_fields.js (100%) rename koha-tmpl/intranet-tmpl/prog/{en => }/js/localcovers.js (100%) rename koha-tmpl/intranet-tmpl/prog/{en => }/js/marc_modification_templates.js (100%) rename koha-tmpl/intranet-tmpl/prog/{en => }/js/marc_subfields_structure.js (100%) rename koha-tmpl/intranet-tmpl/prog/{en => }/js/members.js (100%) rename koha-tmpl/intranet-tmpl/prog/{en => }/js/merge-record.js (100%) rename koha-tmpl/intranet-tmpl/prog/{en => }/js/offlinecirc.js (100%) rename koha-tmpl/intranet-tmpl/prog/{en => }/js/pages/addbiblio.js (100%) rename koha-tmpl/intranet-tmpl/prog/{en => }/js/pages/batchMod.js (100%) rename koha-tmpl/intranet-tmpl/prog/{en => }/js/pages/circulation.js (100%) rename koha-tmpl/intranet-tmpl/prog/{en => }/js/pages/preferences.js (100%) rename koha-tmpl/intranet-tmpl/prog/{en => }/js/prevent_submit.js (100%) rename koha-tmpl/intranet-tmpl/prog/{en => }/js/sms_providers.js (100%) rename koha-tmpl/intranet-tmpl/prog/{en => }/js/staff-global.js (100%) rename koha-tmpl/intranet-tmpl/prog/{en => }/js/xmlControlfield.js (100%) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Apr 29 16:25:27 2016 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 29 Apr 2016 14:25:27 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.22.00-1441-g61d6707 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 61d670795fe89aca2d244668c51b1b75145bb5a5 (commit) from 2f4dde25e804261aac10ce74ce5afb243de30437 (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 61d670795fe89aca2d244668c51b1b75145bb5a5 Author: Aleisha Date: Tue Apr 26 01:15:47 2016 +0000 Bug 16253: Changing 'delete order' to 'cancel order' To test: 1) Go to Acqui -> do a vendor search and view an open basket 2) Confirm last column heading says cancel instead of delete 3) Confirm link to cancel order says cancel instead of delete 4) If can't delete record, confirm reasons say cancel order instead of delete 5) Click the vendor name, then Baskets tab, then Receive Shipment 6) Fill vendor invoice field and click next 7) If there are any pending orders, confirm that all instances of 'delete order' now say cancel Sponsored-by: Catalyst IT Signed-off-by: Mirko Tietgen Signed-off-by: Katrin Fischer Signed-off-by: Kyle M Hall ----------------------------------------------------------------------- Summary of changes: koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt | 10 +++++----- koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt | 8 ++++---- 2 files changed, 9 insertions(+), 9 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Apr 29 16:33:14 2016 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 29 Apr 2016 14:33:14 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.22.00-1442-ge2556f6 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 e2556f6c4288d763c20beed1499f5c38bf1e0ea4 (commit) from 61d670795fe89aca2d244668c51b1b75145bb5a5 (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 e2556f6c4288d763c20beed1499f5c38bf1e0ea4 Author: Kyle M Hall Date: Tue Apr 26 18:25:14 2016 +0000 Bug 16257 - EDIfact messages link on tools page results error There is a link to EDIfact messages on the tools home page that will lead to an error. I assume that the link should be removed in favor of the link on the acquisitions homepage. Test Plan: 1) Note the EDIfact messages link on the Tools home page 2) Apply this patch 3) Refresh the page, the link should be gone Signed-off-by: Marc V?ron Signed-off-by: Katrin Fischer Signed-off-by: Kyle M Hall ----------------------------------------------------------------------- Summary of changes: koha-tmpl/intranet-tmpl/prog/en/modules/tools/tools-home.tt | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Apr 29 16:35:04 2016 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 29 Apr 2016 14:35:04 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.22.00-1444-ge297342 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 e297342f52bcdbc09b4a0c1b4d28cbb50ae2518f (commit) via 1c85d476aa8604fb93f0c27bec207aa9f4048467 (commit) from e2556f6c4288d763c20beed1499f5c38bf1e0ea4 (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 e297342f52bcdbc09b4a0c1b4d28cbb50ae2518f Author: Marc V?ron Date: Fri Apr 15 16:18:37 2016 +0200 Bug 16270 (followup) Typo authentification vs authentication Additionally fix typo in following files: koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref koha-tmpl/opac-tmpl/bootstrap/en/modules/errors/errorpage.tt To test: Apply patch, verify in files that authentification is replaced by authentication Signed-off-by: Chris Cormack Signed-off-by: Katrin Fischer Signed-off-by: Kyle M Hall commit 1c85d476aa8604fb93f0c27bec207aa9f4048467 Author: Jonathan Druart Date: Fri Apr 15 08:05:37 2016 +0100 Bug 16270: Typo authentification/authentication Test plan; Trigger /cgi-bin/koha/errors/404.pl Confirm the typo without the patch and that it's fixed with this patch applied. Signed-off-by: Owen Leonard Signed-off-by: Chris Cormack Signed-off-by: Katrin Fischer Signed-off-by: Kyle M Hall ----------------------------------------------------------------------- Summary of changes: koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/errors/errorpage.tt | 2 +- koha-tmpl/opac-tmpl/bootstrap/en/modules/errors/errorpage.tt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Apr 29 16:39:10 2016 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 29 Apr 2016 14:39:10 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.22.00-1445-g064cce9 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 064cce955b64240c5a6a4c9e0b9cc2b878f96d68 (commit) from e297342f52bcdbc09b4a0c1b4d28cbb50ae2518f (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 064cce955b64240c5a6a4c9e0b9cc2b878f96d68 Author: Owen Leonard Date: Thu Apr 14 13:40:17 2016 -0400 Bug 16262 - Remove the use of "onclick" from acquisitions basket template In order to bring the acquisitions basket template into compliance with coding guideline JS9, this patch changes with way some JavaScript events are handled by moving JS handling out of the HTML markup. Also changed: Replaced the use of [% script_name %] (which is undefined), with the actual script path. To test, apply the patch and locate an open basket in Acquisitions which has more than one order in it. - Test the "Managed by: Add user" button and verify that it triggers a popup where you can search for patrons. - Select two or more patrons to be managers for the basket. - Close the search windows and confirm that your choices appear on the basket page. - Click "Delete user" next to one of the patrons. The patron should be removed. - Click "Save changes" and verify that your choices are correctly saved. - Click "Delete user" next to one of the remaining patrons. The patron should be removed. - Click "Save changes" and verify that the patron stays deleted. - In the list of orders, click the "Transfer" link and confirm that the correct pop-up window is triggered. - Test the "Delete this basket" button in the toolbar. A modal window should be triggered. - In a basket with orders: - The "Delete basket and orders" button should do what it says, leaving associated bibliographic records intact. - The "Delete basket, orders, and records" button should do what it says, deleting any bibliographic records associated with orders. - In a basket with no orders: - The "Delete basket" button should work correctly. - Test the "Create edifact order" button. - Click "Send EDI order" on the resulting page. - In the resulting dialog, "Are you sure you want to generate an edifact order," verify that both the "Yes" and "No" options work correctly. Followed test plan, works as expected. Signed-off-by: Marc V?ron Signed-off-by: Jonathan Druart Signed-off-by: Kyle M Hall ----------------------------------------------------------------------- Summary of changes: .../intranet-tmpl/prog/en/modules/acqui/basket.tt | 80 ++++++++++++++------ 1 file changed, 58 insertions(+), 22 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Apr 29 16:46:38 2016 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 29 Apr 2016 14:46:38 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.22.00-1446-gf471ed3 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 f471ed3903e9aedb2db06b634ffded308b23d198 (commit) from 064cce955b64240c5a6a4c9e0b9cc2b878f96d68 (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 f471ed3903e9aedb2db06b634ffded308b23d198 Author: Owen Leonard Date: Fri Apr 15 14:56:14 2016 -0400 Bug 16286 - Use validation plugin when adding or editing patron category This patch updates the patron category entry form so that it is validated using the staff client's globally-included form validation plugin. This patch also moves the page's JavaScript into a separate file. To test, apply the patch and go to Administration -> Patron categories. - Create a new category. Try to submit the form with the following fields empty: - Category code - Description - Both enrollment period fields - Category type - Try to enter data in the category code field which contains characters other than letters, numbers, hyphens, or underscores. - Try to enter non-numeric data in the following fields: - Enrollment period in months - Age required - Upper age limit - Enrollment fee - Hold fee - Try to submit the form with both enrollment period fields filled. Followed test plan, works as expected. Signed-off-by: Marc V?ron Signed-off-by: Katrin Fischer Signed-off-by: Kyle M Hall ----------------------------------------------------------------------- Summary of changes: koha-tmpl/intranet-tmpl/prog/en/js/categories.js | 97 +++++++++++++++++ .../prog/en/modules/admin/categories.tt | 114 +++----------------- 2 files changed, 112 insertions(+), 99 deletions(-) create mode 100644 koha-tmpl/intranet-tmpl/prog/en/js/categories.js hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Apr 29 17:15:36 2016 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 29 Apr 2016 15:15:36 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.22.00-1447-gdb1e5db 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 db1e5db285932fdaeca9cb17dc4b26ca8f0caf53 (commit) from f471ed3903e9aedb2db06b634ffded308b23d198 (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 db1e5db285932fdaeca9cb17dc4b26ca8f0caf53 Author: Kyle M Hall Date: Fri Apr 29 15:25:03 2016 +0000 Bug 15533 - DBRev - Fix typo Signed-off-by: Kyle M Hall ----------------------------------------------------------------------- Summary of changes: installer/data/mysql/updatedatabase.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Apr 29 17:19:43 2016 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 29 Apr 2016 15:19:43 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.22.00-1448-ga196dfc 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 a196dfc4f0ba674eb649c35bbc761c750f25579f (commit) from db1e5db285932fdaeca9cb17dc4b26ca8f0caf53 (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 a196dfc4f0ba674eb649c35bbc761c750f25579f Author: Owen Leonard Date: Tue Apr 19 12:56:38 2016 -0400 Bug 16298: Standardize on "Patron categories" when referring to patron category administration This patch modifies references to the patron categories administration page in two places: Replacing "Patron types and categories" in the administration sidebar menu and replacing "Patron category administration" in the heading of categories.tt. Both should now read "Patron categories." To test, apply the patch and confirm that the text has been updated correctly. Signed-off-by: Hector Castro Text has been updated correctly Signed-off-by: Katrin Fischer Signed-off-by: Kyle M Hall ----------------------------------------------------------------------- Summary of changes: koha-tmpl/intranet-tmpl/prog/en/includes/admin-menu.inc | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/admin/categories.tt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Apr 29 17:23:05 2016 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 29 Apr 2016 15:23:05 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.22.00-1449-g29292c9 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 29292c9f8deead33c07c5c46ba27e749de648e8f (commit) from a196dfc4f0ba674eb649c35bbc761c750f25579f (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 29292c9f8deead33c07c5c46ba27e749de648e8f Author: Owen Leonard Date: Tue Apr 19 12:40:29 2016 -0400 Bug 16297 - Remove the use of "onclick" from OAI sets configuration template In order to bring the OAI sets configuration template into compliance with coding guideline JS9, this patch changes with way some JavaScript events are handled by moving JS handling out of the HTML markup. To test, apply the patch and go to Administration -> OAI sets configuration. - Create or edit a set. - Test the "Add description" link. Clicking it should add a description textarea. - Test the "Remove" link associated with multiple description lines. Click them should remove the corresponding textarea. - Test that additions and removals are saved correctly. Signed-off-by: Marc V?ron Signed-off-by: Katrin Fischer Signed-off-by: Kyle M Hall ----------------------------------------------------------------------- Summary of changes: .../intranet-tmpl/prog/en/modules/admin/oai_sets.tt | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Apr 29 17:28:21 2016 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 29 Apr 2016 15:28:21 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.22.00-1450-g97b27b9 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 97b27b94bb79525ca630f8e902bb44c1a96c9d73 (commit) from 29292c9f8deead33c07c5c46ba27e749de648e8f (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 97b27b94bb79525ca630f8e902bb44c1a96c9d73 Author: Owen Leonard Date: Fri Apr 8 08:11:11 2016 -0400 Bug 16228 - Move some patron entry form JavaScript into members.js again Bug 15206 undid the changes Bug 15692 made to memberentrygen.tt. This patch re-removes the JS from the template and moves the additions made by Bug 15206 into members.js. Two other minor edits: Changes to quiet JSHint errors. To test, apply the patch and repeat the test plan for Bug 15692. Confirm that the following interactions still work on the patron entry form: 1. clear_entry(): With ExtendedPatronAttributes enabled, the "Clear" link next to any attribute form field should work to clear the field. 2. clone_entry(): With ExtendedPatronAttributes enabled and a repeatable attribute defined, it should be possible to click the "New" link to add another instance of that attribute's entry field. 3. update_category_code(): With ExtendedPatronAttributes enabled and an attribute defined which is limited to a single patron category, changing the patron category selection should correctly show or hide the attribute entry form. 4. select_user(): When adding or editing a patron with a "Child" category it should be possible to search for and select a guarantor to add to the record by clicking the "Set to patron" button. Selecting a new guarantor should change the text of the button from "Set to patron" to "Change." 5. noEnterSubmit(): This function should be correctly preventing you from hitting "ENTER" in any form field to submit the form. 6. guarantordelete(): When adding or editing a patron with a "Child" category, it should be possible to clear existing guarantor information by clicking the "Delete" button. Clicking the "Delete" button should change the text of the adjacent button to "Set to patron." 7. select_city(): With one or more cities defined it should be possible to use the drop-down menu of cities to populate the city, state, zip, and country fields. 8. Date of birth entry should have a maximum date limit of yesterday. The drop-down menu of years should go back 100 years. 9. Selecting a date of birth should replace the date format hint with a message showing the user's age in years or months. Test with values which will show an age of 1 month, between 2 and 11 months, 1 year, and more than one year. 10. Client-side validation rules should be in effect, requiring that a valid email address be entered in the primary email, secondary email, and alternate address email fields. 11.When editing a patron, the "Add manual restriction" link should display the form for adding a manual restriction, and clicking the "Cancel" link should hide it. Followed test plan, everything works OK. Signed-off-by: Marc V?ron Signed-off-by: Jonathan Druart Signed-off-by: Kyle M Hall ----------------------------------------------------------------------- Summary of changes: .../prog/en/modules/members/memberentrygen.tt | 148 +------------------- koha-tmpl/intranet-tmpl/prog/js/members.js | 38 ++++- 2 files changed, 41 insertions(+), 145 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Apr 29 17:31:00 2016 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 29 Apr 2016 15:31:00 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v3.22.00-1451-gfef8129 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 fef8129588ee6715931c5565a6e493104b5e48c0 (commit) from 97b27b94bb79525ca630f8e902bb44c1a96c9d73 (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 fef8129588ee6715931c5565a6e493104b5e48c0 Author: Owen Leonard Date: Tue Apr 19 13:58:12 2016 -0400 Bug 16299 - Use validation plugin when creating a patron attribute type This patch replaces custom client-side form validation with use of the jQuery validation plugin. Besides reducing the amount of code in the template, this allows us to eliminate use of "onclick." This patch also makes a correction for HTML validity: