From gitmaster at git.koha-community.org Fri Nov 1 07:43:23 2019 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 01 Nov 2019 06:43:23 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v19.05.00-1171-gc0b911c Message-ID: This is an automated email from the git hooks/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 c0b911c2d740951b2722a0f484b3848fd679ac25 (commit) from 5dfbe1c8cd2c2d86bdf0017892c82d98e6c86b8d (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit c0b911c2d740951b2722a0f484b3848fd679ac25 Author: Nightly Build Bot Date: Fri Nov 1 00:28:04 2019 +0100 Bug 17084: Automatic debian/control updates Signed-off-by: Martin Renvoize ----------------------------------------------------------------------- Summary of changes: debian/control | 2 ++ 1 file changed, 2 insertions(+) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Nov 1 10:12:03 2019 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 01 Nov 2019 09:12:03 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v19.05.00-1177-g4fd5265 Message-ID: This is an automated email from the git hooks/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 4fd52650bcb2f8a549ea55d22aadeeac7202d19d (commit) via abf530ddbf1897c6fc798f6fa94d643b55823d44 (commit) via e1179b27e0ef7912364bc46ddf845b63443ef338 (commit) via 7f1f52f2e52705eacb428916a209d4c05bd9fd9d (commit) via 4de24b70e5d5cd2a4c5808509b6b47855a409dac (commit) via bd7a012c524a7eb89283aabb1fefa956e47b79ee (commit) from c0b911c2d740951b2722a0f484b3848fd679ac25 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 4fd52650bcb2f8a549ea55d22aadeeac7202d19d Author: Tomas Cohen Arazi Date: Tue Oct 22 13:56:15 2019 -0300 Bug 23860: Update tests to new style Signed-off-by: Tomas Cohen Arazi Signed-off-by: Martin Renvoize commit abf530ddbf1897c6fc798f6fa94d643b55823d44 Author: Tomas Cohen Arazi Date: Mon Oct 21 16:21:16 2019 -0300 Bug 23860: Make the patrons endpoint add the Location header Signed-off-by: Tomas Cohen Arazi Signed-off-by: Martin Renvoize commit e1179b27e0ef7912364bc46ddf845b63443ef338 Author: Tomas Cohen Arazi Date: Mon Oct 21 16:20:54 2019 -0300 Bug 23860: Regression tests Signed-off-by: Tomas Cohen Arazi Signed-off-by: Martin Renvoize commit 7f1f52f2e52705eacb428916a209d4c05bd9fd9d Author: Tomas Cohen Arazi Date: Mon Oct 21 16:12:16 2019 -0300 Bug 23859: Update tests to new style The /cities endpoint is refered in several places as the reference implementation of a route for devs to pick it for copy and pasting. Yet, it is outdated in terms of how the tests are written. This patch rewrites some bits so it uses BASIC auth and the built-ins Test::Mojo provides. Signed-off-by: Tomas Cohen Arazi Signed-off-by: Martin Renvoize commit 4de24b70e5d5cd2a4c5808509b6b47855a409dac Author: Tomas Cohen Arazi Date: Mon Oct 21 14:42:28 2019 -0300 Bug 23859: Make POST add the Location header on cities endpoint According to the coding guidelines, this endpoint should be adding the Location header on POST actions. To test: 1. Apply the tests patch 2. Run: $ kshell k$ prove t/db_dependent/api/v1/cities.t => FAIL: Tests fail! 3. Apply this patch 4. Repeat (1) => SUCCESS: Tests pass! 5. Sign off :-D Signed-off-by: Tomas Cohen Arazi Signed-off-by: Martin Renvoize commit bd7a012c524a7eb89283aabb1fefa956e47b79ee Author: Tomas Cohen Arazi Date: Mon Oct 21 14:41:59 2019 -0300 Bug 23859: Regression tests Signed-off-by: Tomas Cohen Arazi Signed-off-by: Martin Renvoize ----------------------------------------------------------------------- Summary of changes: Koha/REST/V1/Cities.pm | 6 +- Koha/REST/V1/Patrons.pm | 6 +- api/v1/swagger/paths/cities.json | 2 +- t/db_dependent/api/v1/cities.t | 294 ++++++++++++++++++-------------------- t/db_dependent/api/v1/patrons.t | 260 +++++++++++++++++---------------- 5 files changed, 280 insertions(+), 288 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Nov 1 10:16:13 2019 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 01 Nov 2019 09:16:13 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v19.05.00-1181-g7ddedd7 Message-ID: This is an automated email from the git hooks/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 7ddedd7b4266975d49e41481b8129f3efc5b0dfd (commit) via 1bb3ed4f5b8ab81072dac85f41744c8f08c92477 (commit) via 67d6c469a98ec5b39dabfb6c38feaf560727fc6e (commit) via 4764c439f9e19e0b1a88a7503e2bb502dbd3b7ac (commit) from 4fd52650bcb2f8a549ea55d22aadeeac7202d19d (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 7ddedd7b4266975d49e41481b8129f3efc5b0dfd Author: Jonathan Druart Date: Thu Dec 13 18:24:32 2018 -0300 Bug 21824: Add tests Signed-off-by: Bouzid Fergani Signed-off-by: Martin Renvoize commit 1bb3ed4f5b8ab81072dac85f41744c8f08c92477 Author: Kyle M Hall Date: Tue Nov 13 12:36:17 2018 -0500 Bug 21824: Add KohaDates method 'output_preference' to make it easy to store formatted dates in TT variable Signed-off-by: Owen Leonard Signed-off-by: Bouzid Fergani Signed-off-by: Martin Renvoize commit 67d6c469a98ec5b39dabfb6c38feaf560727fc6e Author: Kyle M Hall Date: Tue Nov 13 11:09:05 2018 -0500 Bug 21824: Add ability to format dates in various formats in templates This patch adds the ability to set a date format for the Template Toolkit filter KohaDates Test plan: 1) Apply this patch 2) In a template, use the filter param "dateformat => 'iso'" 3) Note the output is in ISO format Signed-off-by: Owen Leonard Signed-off-by: Bouzid Fergani Signed-off-by: Martin Renvoize commit 4764c439f9e19e0b1a88a7503e2bb502dbd3b7ac Author: Katrin Fischer Date: Thu Oct 10 12:53:10 2019 +0000 Bug 22814: Make patron names on holds modal consistent (second check-in) Bug 22203 changed the behavior on the hold-found2 modal that pops up when a hold is found so that whether or not the patron's name is displayed is now governed by the HidePatronName system preference. However, if a hold is confirmed and you check the item in a second time, the modal that pops up is hold-found1 and whether or not the patron's name is displayed in the hold-found1 modal is not governed by the HidePatronName system preference. For the sake of consistency, the display of the patron's name on hold-found2 and hold-found1 should both be governed by the HidePatronName system preference. To test: - Place a hold on an item - Check in the item to trigger the hold modal - Confirm hold - Check the item in again - verify name of patron displays - Apply patch - Repeat - Verify name display now matches between the two modals - change HidePatronName pref - Repeat - Name display should still match Signed-off-by: Owen Leonard Signed-off-by: Marcel de Rooy Signed-off-by: Martin Renvoize ----------------------------------------------------------------------- Summary of changes: Koha/Template/Plugin/KohaDates.pm | 9 +++- .../intranet-tmpl/prog/en/modules/circ/returns.tt | 2 +- t/db_dependent/Letters/TemplateToolkit.t | 52 +++++++++++++++++++- t/db_dependent/Template/Plugin/KohaDates.t | 11 ++++- 4 files changed, 68 insertions(+), 6 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Nov 1 14:34:34 2019 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 01 Nov 2019 13:34:34 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v19.05.00-1182-gf7325a6 Message-ID: This is an automated email from the git hooks/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 f7325a6ed70fab67576eb0b5a74314d6a6191372 (commit) from 7ddedd7b4266975d49e41481b8129f3efc5b0dfd (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit f7325a6ed70fab67576eb0b5a74314d6a6191372 Author: Martin Renvoize Date: Fri Nov 1 13:09:31 2019 +0000 Bug 23805: (RM follow-up) Remove CHECK constraints MariaDB and MySQL support different syntaxes for CHECK constraints at different versions. To remove complexities in the updatedatabase script I have opted to remove all CHECK constraints entirely. Signed-off-by: Martin Renvoize ----------------------------------------------------------------------- Summary of changes: installer/data/mysql/updatedatabase.pl | 47 -------------------------------- 1 file changed, 47 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Sun Nov 3 09:10:42 2019 From: gitmaster at git.koha-community.org (Git repo owner) Date: Sun, 03 Nov 2019 08:10:42 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v19.05.00-1193-g8f23c95 Message-ID: This is an automated email from the git hooks/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 8f23c95052ffd52885e849c9c004a3572ffb2226 (commit) via 838dd983b2eca723f4c67f91b3825652ec3f8663 (commit) via b53e068651c521a989bd13387cef7fef8975d1e7 (commit) via 5b8d2d8658b7b8c7f70963c296428ee8cad49998 (commit) via 374f59f3cd7bebc9fe7d8c7fd8eae5afda769bf4 (commit) via 687d3035eec7a99d1737dfdcc460a16dd4e2d476 (commit) via dfdf3a74454d3844b6ed82f549d67f25c7001ded (commit) via e0a9cbd8a4446bb771d0a8104aa5e58e8da1dd60 (commit) via cce9d03bf911a2279a62e742f48fbe56be91e021 (commit) via 6a2ba8b6b23f482dcf8bbe53668d93519a11edf5 (commit) via fe4a9bdc94d1a1a7c89be645ee74b6c8991fadf1 (commit) from f7325a6ed70fab67576eb0b5a74314d6a6191372 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 8f23c95052ffd52885e849c9c004a3572ffb2226 Author: Martin Renvoize Date: Sun Nov 3 07:46:29 2019 +0000 Bug 23841: Compiled CSS Signed-off-by: Martin Renvoize commit 838dd983b2eca723f4c67f91b3825652ec3f8663 Author: Owen Leonard Date: Mon Oct 21 12:00:03 2019 +0000 Bug 23841: Add link to bibliographic details page in item details breadcrumbs This patch adds a link to the default bibliographic details page from the breadcrumbs menu on the item details page. The patch also makes a minor update to staff client CSS to allow for use of biblio-default-view.inc to generate the link and have it styled correctly. To test, apply the patch and update the staff client CSS (https://wiki.koha-community.org/wiki/Working_with_SCSS_in_the_OPAC_and_staff_client). Locate an record in the catalog and view the item details page. Verify that the breadcrumbs menu includes a link back to the bibliographic details page as defined in the IntranetBiblioDefaultView system preference. Signed-off-by: Katrin Fischer Signed-off-by: Martin Renvoize commit b53e068651c521a989bd13387cef7fef8975d1e7 Author: Lucas Gass Date: Tue Oct 29 17:40:47 2019 +0000 Bug 23506: Display correct icon in staff client and OPAC When the leader6 is set to 'i' the MARC21slim2intranetDetail.xsl attempts to display 'SO.png' which does not exist. TEST PLAN: 1. Find or create a record with an 'i' as the 6th position in the 000 leader. 2. Do to the OPAC detail page and staff detail for an item in that record. 3. Notice the material type icon does not display because SO.png does not exist. 4. Apply patch and restart_all 5. Look at the opac detail and staff detail page again after clearning the browser cache. 6. The material type icon now displays (MU.png), this is the same icon used on the OPAC results page. Signed-off-by: Katrin Fischer Signed-off-by: Martin Renvoize commit 5b8d2d8658b7b8c7f70963c296428ee8cad49998 Author: Owen Leonard Date: Fri Nov 1 15:38:49 2019 +0000 Bug 23946: Remove Noun Project icons from the About page This patch removes the part of the About page which gives attribution for Noun Project icons on the staff client home page. To test, apply the patch and view the About page in the staff client. There should be no reference to Noun Project icons. Signed-off-by: Katrin Fischer Signed-off-by: Martin Renvoize commit 374f59f3cd7bebc9fe7d8c7fd8eae5afda769bf4 Author: Owen Leonard Date: Mon Oct 7 14:57:32 2019 +0000 Bug 22661: TinyMCE/WYSIWYG editor doesn't translate This patch updates the TinyMCE editor to the latest version (5.0.16) and adds a translatable include file which will allow the TinyMCE interface to show the same translation as Koha. The configuration of the editor has been updated according to the new version's requirements, keeping all the tools available we had before and adding emoji support. To test, apply the patch and enable the UseWYSIWYGinSystemPreferences system preference. TESTING THE UPGRADED EDITOR - Go to Administration -> System preferences -> OPAC. - Multiple instances of the TinyMCE editor should appear on the page: opaccredits, OpacCustomSearch, OpacLoginInstructions, etc. - Test adding and editing content to one or more of these editors. Confirm that the various editor tools work correctly. - Verify that changing the contents of any editor (including via paste) enables the corresponding "Save all X preferences" button. - Test the news editor under Tools -> News. - Test the library "OPAC info" editor in libraries administration: Administration -> Libraries -> Edit library -> OPAC info. TESTING TRANSLATABILITY - Update a translation: > cd misc/translator > perl translate update fr-FR - Open the corresponding .po file for the staff client, e.g. misc/translator/po/fr-FR-staff-prog.po - Locate strings pulled from includes/str/tinymce_i18n.inc for translation, e.g.: #. SCRIPT #: intranet-tmpl/prog/en/includes/str/tinymce_i18n.inc:1 #, fuzzy msgid "File" msgstr "Fichier :" - Edit the "msgstr" string however you want (it's just for testing) and remove the "fuzzy" line. - Install the updated translation: > perl translate install fr-FR - Go to Administration -> System preferences -> OPAC. - In each instance of the TinyMCE editor, the first menu item should have as its label the translation "msgstr" string you edited. - Check that the "About" page shows updated information about the TinyMCE version, 5.0.16. Signed-off-by: Michal Denar Signed-off-by: Josef Moravec Signed-off-by: Katrin Fischer Signed-off-by: Martin Renvoize commit 687d3035eec7a99d1737dfdcc460a16dd4e2d476 Author: Lucas Gass Date: Fri Oct 18 12:56:43 2019 +0000 Bug 23862: add enumchron to holds-table Signed-off-by: Kyle M Hall Signed-off-by: Séverine QUEUNE Signed-off-by: Katrin Fischer Signed-off-by: Martin Renvoize commit dfdf3a74454d3844b6ed82f549d67f25c7001ded Author: Nick Clemens Date: Thu Oct 31 19:03:59 2019 +0000 Bug 23938: Restore title display in last checked out box To test: 1 - Check out to a patron 2 - Note the display under the checkotu box does not have title 3 - Apply patch 4 - Checkout another item 5 - Note the title displays Signed-off-by: Owen Leonard Signed-off-by: Martin Renvoize commit e0a9cbd8a4446bb771d0a8104aa5e58e8da1dd60 Author: Bin Wen Date: Mon Oct 7 09:01:39 2019 -0400 Bug 23762: Editing is_html status of email template fails under multi-languages To test: 1.Enable multi-languages 2.Set the preference 'TranslateNotices' on 'Allow' 3.Go to: tools==>Notices & slips==>Edit (one notice) 4.Click on the "Email" in the Default, uncheck the checkbox for 'HTML Messages'. 5.Save 6.Reopen the notice, nothing changed. 7.Apply the patch 8.Repeat the steps 4 and 5 9.Success. Signed-off-by: Katrin Fischer Signed-off-by: Martin Renvoize commit cce9d03bf911a2279a62e742f48fbe56be91e021 Author: Ere Maijala Date: Thu Oct 24 13:35:52 2019 +0300 Bug 23089: Fix QueryBuilder tests. Signed-off-by: Nick Clemens Signed-off-by: Martin Renvoize commit 6a2ba8b6b23f482dcf8bbe53668d93519a11edf5 Author: Nick Date: Thu Oct 10 16:06:08 2019 +0000 Bug 23089: Fix sorting on sum and regular fields As of bug 20589 we no longer analyze sort fields and so we no longer need to append ".phrase" to our sort in searches. Additionally, sort fields based on 'sum' should also use sum in building the value to sort on To test: 0 - Be using ES 1 - Find the most circulated item in your collection 2 - Search for '*' 3 - Sort by popularity DESC 4 - Note that item is not first 5 - Try to sort by anything but relevancy, it fails 6 - Apply patch 7 - Redo searches and sorts 8 - Things should now work as expected Signed-off-by: Ere Maijala Signed-off-by: Martin Renvoize commit fe4a9bdc94d1a1a7c89be645ee74b6c8991fadf1 Author: Nick Date: Thu Oct 10 16:05:50 2019 +0000 Bug 23089: Unit tests Signed-off-by: Ere Maijala Signed-off-by: Martin Renvoize ----------------------------------------------------------------------- Summary of changes: Koha/SearchEngine/Elasticsearch.pm | 1 + Koha/SearchEngine/Elasticsearch/QueryBuilder.pm | 3 - admin/searchengine/elasticsearch/field_config.yaml | 1 + .../lib/tiny_mce/jquery.tinymce.min.js | 91 + koha-tmpl/intranet-tmpl/lib/tiny_mce/langs/en.js | 1 - koha-tmpl/intranet-tmpl/lib/tiny_mce/license.txt | 12 +- .../lib/tiny_mce/plugins/advhr/css/advhr.css | 5 - .../lib/tiny_mce/plugins/advhr/editor_plugin.js | 1 - .../lib/tiny_mce/plugins/advhr/js/rule.js | 43 - .../lib/tiny_mce/plugins/advhr/langs/en_dlg.js | 1 - .../lib/tiny_mce/plugins/advhr/rule.htm | 58 - .../lib/tiny_mce/plugins/advimage/css/advimage.css | 13 - .../lib/tiny_mce/plugins/advimage/editor_plugin.js | 1 - .../tiny_mce/plugins/advimage/editor_plugin_src.js | 50 - .../lib/tiny_mce/plugins/advimage/image.htm | 235 - .../lib/tiny_mce/plugins/advimage/img/sample.gif | Bin 1624 -> 0 bytes .../lib/tiny_mce/plugins/advimage/js/image.js | 464 - .../lib/tiny_mce/plugins/advimage/langs/en_dlg.js | 1 - .../lib/tiny_mce/plugins/advlink/css/advlink.css | 8 - .../lib/tiny_mce/plugins/advlink/editor_plugin.js | 1 - .../lib/tiny_mce/plugins/advlink/js/advlink.js | 543 -- .../lib/tiny_mce/plugins/advlink/langs/en_dlg.js | 1 - .../lib/tiny_mce/plugins/advlink/link.htm | 338 - .../lib/tiny_mce/plugins/autoresize/plugin.min.js | 9 + .../lib/tiny_mce/plugins/charmap/plugin.min.js | 9 + .../lib/tiny_mce/plugins/code/plugin.min.js | 9 + .../tiny_mce/plugins/contextmenu/editor_plugin.js | 1 - .../lib/tiny_mce/plugins/emoticons/js/emojis.js | 9015 ++++++++++++++++++++ .../tiny_mce/plugins/emoticons/js/emojis.min.js | 2 + .../lib/tiny_mce/plugins/emoticons/plugin.min.js | 9 + .../lib/tiny_mce/plugins/hr/plugin.min.js | 9 + .../lib/tiny_mce/plugins/image/plugin.min.js | 9 + .../lib/tiny_mce/plugins/link/plugin.min.js | 9 + .../lib/tiny_mce/plugins/lists/plugin.min.js | 9 + .../lib/tiny_mce/plugins/print/editor_plugin.js | 1 - .../lib/tiny_mce/plugins/save/editor_plugin.js | 1 - .../plugins/searchreplace/css/searchreplace.css | 6 - .../plugins/searchreplace/editor_plugin.js | 1 - .../plugins/searchreplace/js/searchreplace.js | 142 - .../tiny_mce/plugins/searchreplace/langs/en_dlg.js | 1 - .../plugins/searchreplace/searchreplace.htm | 100 - .../lib/tiny_mce/plugins/table/cell.htm | 180 - .../lib/tiny_mce/plugins/table/css/cell.css | 17 - .../lib/tiny_mce/plugins/table/css/row.css | 25 - .../lib/tiny_mce/plugins/table/css/table.css | 13 - .../lib/tiny_mce/plugins/table/editor_plugin.js | 1 - .../lib/tiny_mce/plugins/table/js/cell.js | 319 - .../lib/tiny_mce/plugins/table/js/merge_cells.js | 27 - .../lib/tiny_mce/plugins/table/js/row.js | 254 - .../lib/tiny_mce/plugins/table/js/table.js | 501 -- .../lib/tiny_mce/plugins/table/langs/en_dlg.js | 1 - .../lib/tiny_mce/plugins/table/merge_cells.htm | 32 - .../lib/tiny_mce/plugins/table/plugin.min.js | 9 + .../lib/tiny_mce/plugins/table/row.htm | 158 - .../lib/tiny_mce/plugins/table/table.htm | 188 - .../tiny_mce/skins/content/dark/content.min.css | 7 + .../tiny_mce/skins/content/default/content.min.css | 7 + .../skins/content/document/content.min.css | 7 + .../tiny_mce/skins/content/writer/content.min.css | 7 + .../skins/ui/oxide-dark/content.inline.min.css | 7 + .../tiny_mce/skins/ui/oxide-dark/content.min.css | 7 + .../skins/ui/oxide-dark/content.mobile.min.css | 7 + .../skins/ui/oxide-dark/fonts/tinymce-mobile.woff | Bin 0 -> 4624 bytes .../lib/tiny_mce/skins/ui/oxide-dark/skin.min.css | 7 + .../skins/ui/oxide-dark/skin.mobile.min.css | 7 + .../tiny_mce/skins/ui/oxide/content.inline.min.css | 7 + .../lib/tiny_mce/skins/ui/oxide/content.min.css | 7 + .../tiny_mce/skins/ui/oxide/content.mobile.min.css | 7 + .../skins/ui/oxide/fonts/tinymce-mobile.woff | Bin 0 -> 4624 bytes .../lib/tiny_mce/skins/ui/oxide/skin.min.css | 7 + .../tiny_mce/skins/ui/oxide/skin.mobile.min.css | 7 + .../lib/tiny_mce/themes/advanced/about.htm | 52 - .../lib/tiny_mce/themes/advanced/anchor.htm | 26 - .../lib/tiny_mce/themes/advanced/charmap.htm | 55 - .../lib/tiny_mce/themes/advanced/color_picker.htm | 70 - .../tiny_mce/themes/advanced/editor_template.js | 1 - .../lib/tiny_mce/themes/advanced/image.htm | 80 - .../tiny_mce/themes/advanced/img/colorpicker.jpg | Bin 2584 -> 0 bytes .../lib/tiny_mce/themes/advanced/img/flash.gif | Bin 239 -> 0 bytes .../lib/tiny_mce/themes/advanced/img/icons.gif | Bin 11982 -> 0 bytes .../lib/tiny_mce/themes/advanced/img/iframe.gif | Bin 600 -> 0 bytes .../lib/tiny_mce/themes/advanced/img/pagebreak.gif | Bin 325 -> 0 bytes .../lib/tiny_mce/themes/advanced/img/quicktime.gif | Bin 301 -> 0 bytes .../lib/tiny_mce/themes/advanced/img/realmedia.gif | Bin 439 -> 0 bytes .../lib/tiny_mce/themes/advanced/img/shockwave.gif | Bin 384 -> 0 bytes .../lib/tiny_mce/themes/advanced/img/trans.gif | Bin 43 -> 0 bytes .../lib/tiny_mce/themes/advanced/img/video.gif | Bin 597 -> 0 bytes .../tiny_mce/themes/advanced/img/windowsmedia.gif | Bin 415 -> 0 bytes .../lib/tiny_mce/themes/advanced/js/about.js | 73 - .../lib/tiny_mce/themes/advanced/js/anchor.js | 56 - .../lib/tiny_mce/themes/advanced/js/charmap.js | 363 - .../tiny_mce/themes/advanced/js/color_picker.js | 345 - .../lib/tiny_mce/themes/advanced/js/image.js | 253 - .../lib/tiny_mce/themes/advanced/js/link.js | 159 - .../tiny_mce/themes/advanced/js/source_editor.js | 78 - .../lib/tiny_mce/themes/advanced/langs/en.js | 1 - .../lib/tiny_mce/themes/advanced/langs/en_dlg.js | 1 - .../lib/tiny_mce/themes/advanced/link.htm | 57 - .../lib/tiny_mce/themes/advanced/shortcuts.htm | 47 - .../themes/advanced/skins/default/content.css | 50 - .../themes/advanced/skins/default/dialog.css | 118 - .../themes/advanced/skins/default/img/buttons.png | Bin 3133 -> 0 bytes .../themes/advanced/skins/default/img/items.gif | Bin 64 -> 0 bytes .../advanced/skins/default/img/menu_arrow.gif | Bin 68 -> 0 bytes .../advanced/skins/default/img/menu_check.gif | Bin 70 -> 0 bytes .../themes/advanced/skins/default/img/progress.gif | Bin 1787 -> 0 bytes .../themes/advanced/skins/default/img/tabs.gif | Bin 1322 -> 0 bytes .../tiny_mce/themes/advanced/skins/default/ui.css | 219 - .../themes/advanced/skins/highcontrast/content.css | 24 - .../themes/advanced/skins/highcontrast/dialog.css | 106 - .../themes/advanced/skins/highcontrast/ui.css | 106 - .../themes/advanced/skins/o2k7/content.css | 48 - .../tiny_mce/themes/advanced/skins/o2k7/dialog.css | 118 - .../themes/advanced/skins/o2k7/img/button_bg.png | Bin 2766 -> 0 bytes .../advanced/skins/o2k7/img/button_bg_black.png | Bin 651 -> 0 bytes .../advanced/skins/o2k7/img/button_bg_silver.png | Bin 2084 -> 0 bytes .../lib/tiny_mce/themes/advanced/skins/o2k7/ui.css | 222 - .../themes/advanced/skins/o2k7/ui_black.css | 8 - .../themes/advanced/skins/o2k7/ui_silver.css | 5 - .../lib/tiny_mce/themes/advanced/source_editor.htm | 25 - .../lib/tiny_mce/themes/mobile/theme.min.js | 9 + .../lib/tiny_mce/themes/silver/theme.min.js | 9 + .../lib/tiny_mce/themes/simple/editor_template.js | 1 - .../lib/tiny_mce/themes/simple/img/icons.gif | Bin 806 -> 0 bytes .../lib/tiny_mce/themes/simple/langs/en.js | 1 - .../themes/simple/skins/default/content.css | 25 - .../tiny_mce/themes/simple/skins/default/ui.css | 32 - .../tiny_mce/themes/simple/skins/o2k7/content.css | 17 - .../themes/simple/skins/o2k7/img/button_bg.png | Bin 5102 -> 0 bytes .../lib/tiny_mce/themes/simple/skins/o2k7/ui.css | 35 - koha-tmpl/intranet-tmpl/lib/tiny_mce/tiny_mce.js | 1 - .../intranet-tmpl/lib/tiny_mce/tiny_mce_gzip.js | 137 - .../intranet-tmpl/lib/tiny_mce/tiny_mce_gzip.pl | 369 - .../intranet-tmpl/lib/tiny_mce/tiny_mce_popup.js | 5 - .../intranet-tmpl/lib/tiny_mce/tinymce.min.js | 9 + .../lib/tiny_mce/utils/editable_selects.js | 70 - .../intranet-tmpl/lib/tiny_mce/utils/form_utils.js | 210 - .../intranet-tmpl/lib/tiny_mce/utils/mctabs.js | 162 - .../intranet-tmpl/lib/tiny_mce/utils/validate.js | 252 - .../intranet-tmpl/prog/css/src/staff-global.scss | 5 + koha-tmpl/intranet-tmpl/prog/css/staff-global.css | 2 +- .../prog/en/includes/str/tinymce_i18n.inc | 400 + .../prog/en/includes/wysiwyg-systempreferences.inc | 82 +- koha-tmpl/intranet-tmpl/prog/en/modules/about.tt | 21 +- .../prog/en/modules/admin/branches.tt | 24 +- .../prog/en/modules/catalogue/moredetail.tt | 2 +- .../prog/en/modules/circ/circulation.tt | 2 +- .../prog/en/modules/tools/koha-news.tt | 29 +- .../intranet-tmpl/prog/en/modules/tools/letter.tt | 4 +- .../prog/en/xslt/MARC21slim2intranetDetail.xsl | 2 +- koha-tmpl/intranet-tmpl/prog/js/holds.js | 4 + .../bootstrap/en/xslt/MARC21slim2OPACDetail.xsl | 2 +- svc/holds | 1 + t/Koha/SearchEngine/Elasticsearch.t | 22 +- .../Koha/SearchEngine/Elasticsearch/QueryBuilder.t | 4 +- tools/letter.pl | 4 +- 156 files changed, 9811 insertions(+), 7946 deletions(-) create mode 100644 koha-tmpl/intranet-tmpl/lib/tiny_mce/jquery.tinymce.min.js delete mode 100644 koha-tmpl/intranet-tmpl/lib/tiny_mce/langs/en.js delete mode 100644 koha-tmpl/intranet-tmpl/lib/tiny_mce/plugins/advhr/css/advhr.css delete mode 100644 koha-tmpl/intranet-tmpl/lib/tiny_mce/plugins/advhr/editor_plugin.js delete mode 100644 koha-tmpl/intranet-tmpl/lib/tiny_mce/plugins/advhr/js/rule.js delete mode 100644 koha-tmpl/intranet-tmpl/lib/tiny_mce/plugins/advhr/langs/en_dlg.js delete mode 100644 koha-tmpl/intranet-tmpl/lib/tiny_mce/plugins/advhr/rule.htm delete mode 100644 koha-tmpl/intranet-tmpl/lib/tiny_mce/plugins/advimage/css/advimage.css delete mode 100644 koha-tmpl/intranet-tmpl/lib/tiny_mce/plugins/advimage/editor_plugin.js delete mode 100644 koha-tmpl/intranet-tmpl/lib/tiny_mce/plugins/advimage/editor_plugin_src.js delete mode 100644 koha-tmpl/intranet-tmpl/lib/tiny_mce/plugins/advimage/image.htm delete mode 100644 koha-tmpl/intranet-tmpl/lib/tiny_mce/plugins/advimage/img/sample.gif delete mode 100644 koha-tmpl/intranet-tmpl/lib/tiny_mce/plugins/advimage/js/image.js delete mode 100644 koha-tmpl/intranet-tmpl/lib/tiny_mce/plugins/advimage/langs/en_dlg.js delete mode 100644 koha-tmpl/intranet-tmpl/lib/tiny_mce/plugins/advlink/css/advlink.css delete mode 100644 koha-tmpl/intranet-tmpl/lib/tiny_mce/plugins/advlink/editor_plugin.js delete mode 100644 koha-tmpl/intranet-tmpl/lib/tiny_mce/plugins/advlink/js/advlink.js delete mode 100644 koha-tmpl/intranet-tmpl/lib/tiny_mce/plugins/advlink/langs/en_dlg.js delete mode 100644 koha-tmpl/intranet-tmpl/lib/tiny_mce/plugins/advlink/link.htm create mode 100644 koha-tmpl/intranet-tmpl/lib/tiny_mce/plugins/autoresize/plugin.min.js create mode 100644 koha-tmpl/intranet-tmpl/lib/tiny_mce/plugins/charmap/plugin.min.js create mode 100644 koha-tmpl/intranet-tmpl/lib/tiny_mce/plugins/code/plugin.min.js delete mode 100644 koha-tmpl/intranet-tmpl/lib/tiny_mce/plugins/contextmenu/editor_plugin.js create mode 100644 koha-tmpl/intranet-tmpl/lib/tiny_mce/plugins/emoticons/js/emojis.js create mode 100644 koha-tmpl/intranet-tmpl/lib/tiny_mce/plugins/emoticons/js/emojis.min.js create mode 100644 koha-tmpl/intranet-tmpl/lib/tiny_mce/plugins/emoticons/plugin.min.js create mode 100644 koha-tmpl/intranet-tmpl/lib/tiny_mce/plugins/hr/plugin.min.js create mode 100644 koha-tmpl/intranet-tmpl/lib/tiny_mce/plugins/image/plugin.min.js create mode 100644 koha-tmpl/intranet-tmpl/lib/tiny_mce/plugins/link/plugin.min.js create mode 100644 koha-tmpl/intranet-tmpl/lib/tiny_mce/plugins/lists/plugin.min.js delete mode 100644 koha-tmpl/intranet-tmpl/lib/tiny_mce/plugins/print/editor_plugin.js delete mode 100644 koha-tmpl/intranet-tmpl/lib/tiny_mce/plugins/save/editor_plugin.js delete mode 100644 koha-tmpl/intranet-tmpl/lib/tiny_mce/plugins/searchreplace/css/searchreplace.css delete mode 100644 koha-tmpl/intranet-tmpl/lib/tiny_mce/plugins/searchreplace/editor_plugin.js delete mode 100644 koha-tmpl/intranet-tmpl/lib/tiny_mce/plugins/searchreplace/js/searchreplace.js delete mode 100644 koha-tmpl/intranet-tmpl/lib/tiny_mce/plugins/searchreplace/langs/en_dlg.js delete mode 100644 koha-tmpl/intranet-tmpl/lib/tiny_mce/plugins/searchreplace/searchreplace.htm delete mode 100644 koha-tmpl/intranet-tmpl/lib/tiny_mce/plugins/table/cell.htm delete mode 100644 koha-tmpl/intranet-tmpl/lib/tiny_mce/plugins/table/css/cell.css delete mode 100644 koha-tmpl/intranet-tmpl/lib/tiny_mce/plugins/table/css/row.css delete mode 100644 koha-tmpl/intranet-tmpl/lib/tiny_mce/plugins/table/css/table.css delete mode 100644 koha-tmpl/intranet-tmpl/lib/tiny_mce/plugins/table/editor_plugin.js delete mode 100644 koha-tmpl/intranet-tmpl/lib/tiny_mce/plugins/table/js/cell.js delete mode 100644 koha-tmpl/intranet-tmpl/lib/tiny_mce/plugins/table/js/merge_cells.js delete mode 100644 koha-tmpl/intranet-tmpl/lib/tiny_mce/plugins/table/js/row.js delete mode 100644 koha-tmpl/intranet-tmpl/lib/tiny_mce/plugins/table/js/table.js delete mode 100644 koha-tmpl/intranet-tmpl/lib/tiny_mce/plugins/table/langs/en_dlg.js delete mode 100644 koha-tmpl/intranet-tmpl/lib/tiny_mce/plugins/table/merge_cells.htm create mode 100644 koha-tmpl/intranet-tmpl/lib/tiny_mce/plugins/table/plugin.min.js delete mode 100644 koha-tmpl/intranet-tmpl/lib/tiny_mce/plugins/table/row.htm delete mode 100644 koha-tmpl/intranet-tmpl/lib/tiny_mce/plugins/table/table.htm create mode 100644 koha-tmpl/intranet-tmpl/lib/tiny_mce/skins/content/dark/content.min.css create mode 100644 koha-tmpl/intranet-tmpl/lib/tiny_mce/skins/content/default/content.min.css create mode 100644 koha-tmpl/intranet-tmpl/lib/tiny_mce/skins/content/document/content.min.css create mode 100644 koha-tmpl/intranet-tmpl/lib/tiny_mce/skins/content/writer/content.min.css create mode 100644 koha-tmpl/intranet-tmpl/lib/tiny_mce/skins/ui/oxide-dark/content.inline.min.css create mode 100644 koha-tmpl/intranet-tmpl/lib/tiny_mce/skins/ui/oxide-dark/content.min.css create mode 100644 koha-tmpl/intranet-tmpl/lib/tiny_mce/skins/ui/oxide-dark/content.mobile.min.css create mode 100644 koha-tmpl/intranet-tmpl/lib/tiny_mce/skins/ui/oxide-dark/fonts/tinymce-mobile.woff create mode 100644 koha-tmpl/intranet-tmpl/lib/tiny_mce/skins/ui/oxide-dark/skin.min.css create mode 100644 koha-tmpl/intranet-tmpl/lib/tiny_mce/skins/ui/oxide-dark/skin.mobile.min.css create mode 100644 koha-tmpl/intranet-tmpl/lib/tiny_mce/skins/ui/oxide/content.inline.min.css create mode 100644 koha-tmpl/intranet-tmpl/lib/tiny_mce/skins/ui/oxide/content.min.css create mode 100644 koha-tmpl/intranet-tmpl/lib/tiny_mce/skins/ui/oxide/content.mobile.min.css create mode 100644 koha-tmpl/intranet-tmpl/lib/tiny_mce/skins/ui/oxide/fonts/tinymce-mobile.woff create mode 100644 koha-tmpl/intranet-tmpl/lib/tiny_mce/skins/ui/oxide/skin.min.css create mode 100644 koha-tmpl/intranet-tmpl/lib/tiny_mce/skins/ui/oxide/skin.mobile.min.css delete mode 100644 koha-tmpl/intranet-tmpl/lib/tiny_mce/themes/advanced/about.htm delete mode 100644 koha-tmpl/intranet-tmpl/lib/tiny_mce/themes/advanced/anchor.htm delete mode 100644 koha-tmpl/intranet-tmpl/lib/tiny_mce/themes/advanced/charmap.htm delete mode 100644 koha-tmpl/intranet-tmpl/lib/tiny_mce/themes/advanced/color_picker.htm delete mode 100644 koha-tmpl/intranet-tmpl/lib/tiny_mce/themes/advanced/editor_template.js delete mode 100644 koha-tmpl/intranet-tmpl/lib/tiny_mce/themes/advanced/image.htm delete mode 100644 koha-tmpl/intranet-tmpl/lib/tiny_mce/themes/advanced/img/colorpicker.jpg delete mode 100644 koha-tmpl/intranet-tmpl/lib/tiny_mce/themes/advanced/img/flash.gif delete mode 100644 koha-tmpl/intranet-tmpl/lib/tiny_mce/themes/advanced/img/icons.gif delete mode 100644 koha-tmpl/intranet-tmpl/lib/tiny_mce/themes/advanced/img/iframe.gif delete mode 100644 koha-tmpl/intranet-tmpl/lib/tiny_mce/themes/advanced/img/pagebreak.gif delete mode 100644 koha-tmpl/intranet-tmpl/lib/tiny_mce/themes/advanced/img/quicktime.gif delete mode 100644 koha-tmpl/intranet-tmpl/lib/tiny_mce/themes/advanced/img/realmedia.gif delete mode 100644 koha-tmpl/intranet-tmpl/lib/tiny_mce/themes/advanced/img/shockwave.gif delete mode 100644 koha-tmpl/intranet-tmpl/lib/tiny_mce/themes/advanced/img/trans.gif delete mode 100644 koha-tmpl/intranet-tmpl/lib/tiny_mce/themes/advanced/img/video.gif delete mode 100644 koha-tmpl/intranet-tmpl/lib/tiny_mce/themes/advanced/img/windowsmedia.gif delete mode 100644 koha-tmpl/intranet-tmpl/lib/tiny_mce/themes/advanced/js/about.js delete mode 100644 koha-tmpl/intranet-tmpl/lib/tiny_mce/themes/advanced/js/anchor.js delete mode 100644 koha-tmpl/intranet-tmpl/lib/tiny_mce/themes/advanced/js/charmap.js delete mode 100644 koha-tmpl/intranet-tmpl/lib/tiny_mce/themes/advanced/js/color_picker.js delete mode 100644 koha-tmpl/intranet-tmpl/lib/tiny_mce/themes/advanced/js/image.js delete mode 100644 koha-tmpl/intranet-tmpl/lib/tiny_mce/themes/advanced/js/link.js delete mode 100644 koha-tmpl/intranet-tmpl/lib/tiny_mce/themes/advanced/js/source_editor.js delete mode 100644 koha-tmpl/intranet-tmpl/lib/tiny_mce/themes/advanced/langs/en.js delete mode 100644 koha-tmpl/intranet-tmpl/lib/tiny_mce/themes/advanced/langs/en_dlg.js delete mode 100644 koha-tmpl/intranet-tmpl/lib/tiny_mce/themes/advanced/link.htm delete mode 100644 koha-tmpl/intranet-tmpl/lib/tiny_mce/themes/advanced/shortcuts.htm delete mode 100644 koha-tmpl/intranet-tmpl/lib/tiny_mce/themes/advanced/skins/default/content.css delete mode 100644 koha-tmpl/intranet-tmpl/lib/tiny_mce/themes/advanced/skins/default/dialog.css delete mode 100644 koha-tmpl/intranet-tmpl/lib/tiny_mce/themes/advanced/skins/default/img/buttons.png delete mode 100644 koha-tmpl/intranet-tmpl/lib/tiny_mce/themes/advanced/skins/default/img/items.gif delete mode 100644 koha-tmpl/intranet-tmpl/lib/tiny_mce/themes/advanced/skins/default/img/menu_arrow.gif delete mode 100644 koha-tmpl/intranet-tmpl/lib/tiny_mce/themes/advanced/skins/default/img/menu_check.gif delete mode 100644 koha-tmpl/intranet-tmpl/lib/tiny_mce/themes/advanced/skins/default/img/progress.gif delete mode 100644 koha-tmpl/intranet-tmpl/lib/tiny_mce/themes/advanced/skins/default/img/tabs.gif delete mode 100644 koha-tmpl/intranet-tmpl/lib/tiny_mce/themes/advanced/skins/default/ui.css delete mode 100644 koha-tmpl/intranet-tmpl/lib/tiny_mce/themes/advanced/skins/highcontrast/content.css delete mode 100644 koha-tmpl/intranet-tmpl/lib/tiny_mce/themes/advanced/skins/highcontrast/dialog.css delete mode 100644 koha-tmpl/intranet-tmpl/lib/tiny_mce/themes/advanced/skins/highcontrast/ui.css delete mode 100644 koha-tmpl/intranet-tmpl/lib/tiny_mce/themes/advanced/skins/o2k7/content.css delete mode 100644 koha-tmpl/intranet-tmpl/lib/tiny_mce/themes/advanced/skins/o2k7/dialog.css delete mode 100644 koha-tmpl/intranet-tmpl/lib/tiny_mce/themes/advanced/skins/o2k7/img/button_bg.png delete mode 100644 koha-tmpl/intranet-tmpl/lib/tiny_mce/themes/advanced/skins/o2k7/img/button_bg_black.png delete mode 100644 koha-tmpl/intranet-tmpl/lib/tiny_mce/themes/advanced/skins/o2k7/img/button_bg_silver.png delete mode 100644 koha-tmpl/intranet-tmpl/lib/tiny_mce/themes/advanced/skins/o2k7/ui.css delete mode 100644 koha-tmpl/intranet-tmpl/lib/tiny_mce/themes/advanced/skins/o2k7/ui_black.css delete mode 100644 koha-tmpl/intranet-tmpl/lib/tiny_mce/themes/advanced/skins/o2k7/ui_silver.css delete mode 100644 koha-tmpl/intranet-tmpl/lib/tiny_mce/themes/advanced/source_editor.htm create mode 100644 koha-tmpl/intranet-tmpl/lib/tiny_mce/themes/mobile/theme.min.js create mode 100644 koha-tmpl/intranet-tmpl/lib/tiny_mce/themes/silver/theme.min.js delete mode 100644 koha-tmpl/intranet-tmpl/lib/tiny_mce/themes/simple/editor_template.js delete mode 100644 koha-tmpl/intranet-tmpl/lib/tiny_mce/themes/simple/img/icons.gif delete mode 100644 koha-tmpl/intranet-tmpl/lib/tiny_mce/themes/simple/langs/en.js delete mode 100644 koha-tmpl/intranet-tmpl/lib/tiny_mce/themes/simple/skins/default/content.css delete mode 100644 koha-tmpl/intranet-tmpl/lib/tiny_mce/themes/simple/skins/default/ui.css delete mode 100644 koha-tmpl/intranet-tmpl/lib/tiny_mce/themes/simple/skins/o2k7/content.css delete mode 100644 koha-tmpl/intranet-tmpl/lib/tiny_mce/themes/simple/skins/o2k7/img/button_bg.png delete mode 100644 koha-tmpl/intranet-tmpl/lib/tiny_mce/themes/simple/skins/o2k7/ui.css delete mode 100644 koha-tmpl/intranet-tmpl/lib/tiny_mce/tiny_mce.js delete mode 100644 koha-tmpl/intranet-tmpl/lib/tiny_mce/tiny_mce_gzip.js delete mode 100644 koha-tmpl/intranet-tmpl/lib/tiny_mce/tiny_mce_gzip.pl delete mode 100644 koha-tmpl/intranet-tmpl/lib/tiny_mce/tiny_mce_popup.js create mode 100644 koha-tmpl/intranet-tmpl/lib/tiny_mce/tinymce.min.js delete mode 100644 koha-tmpl/intranet-tmpl/lib/tiny_mce/utils/editable_selects.js delete mode 100644 koha-tmpl/intranet-tmpl/lib/tiny_mce/utils/form_utils.js delete mode 100644 koha-tmpl/intranet-tmpl/lib/tiny_mce/utils/mctabs.js delete mode 100644 koha-tmpl/intranet-tmpl/lib/tiny_mce/utils/validate.js create mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/str/tinymce_i18n.inc hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Sun Nov 3 09:15:57 2019 From: gitmaster at git.koha-community.org (Git repo owner) Date: Sun, 03 Nov 2019 08:15:57 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v19.05.00-1195-g6e1d759 Message-ID: This is an automated email from the git hooks/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 6e1d759981b442b00306405ddb0c0c970dea9d29 (commit) via ce6ba9aac97689d296d46a200a95aa36a64a5201 (commit) from 8f23c95052ffd52885e849c9c004a3572ffb2226 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 6e1d759981b442b00306405ddb0c0c970dea9d29 Author: Ere Maijala Date: Thu Mar 28 13:37:13 2019 +0200 Bug 22592: Add index scan emulation to Elasticsearch Adds support for using the "scan indexes" action in advanced search by using faceting with a prefix filter. Requires that the field be set as facetable for anything to be found. Test plan: 1. Apply patch 2. Go to advanced search and click "More options" 3. Select author as the search field, enter a last name and check "Scan indexes" 4. Perform search and observe the result list resembling scan results Signed-off-by: Michal Denar Signed-off-by: Séverine QUEUNE Signed-off-by: Katrin Fischer Signed-off-by: Martin Renvoize commit ce6ba9aac97689d296d46a200a95aa36a64a5201 Author: Alex Arnaud Date: Thu Oct 25 11:19:01 2018 +0200 Bug 20194: Display both biblioitems.itemtype and items.itype in circulation screens Test plan: 1. Verify that biblioitems.itemtype, items.itype are mapped to a MARC field. Otherwise create those mappings. 2. Create a biblio with an itemtype 3. Create an item with a different itemtype for this biblio 4. Check out this item to a patron (P1) 5. Verify that both itemtypes are displayed in the checkouts table (moremember.pl, circulation.pl, returns.pl) 6. Create a patron whose guarantor is P1 and verify that both itemtypes and the ccode are displayed in the 'relatives checkouts' table Followed test plan, patch worked as described, also passes QA test tool Signed-off-by: Alex Buckley Signed-off-by: Nick Clemens Signed-off-by: Martin Renvoize ----------------------------------------------------------------------- Summary of changes: Koha/SearchEngine/Elasticsearch/QueryBuilder.pm | 191 ++++++++++++-------- Koha/SearchEngine/Elasticsearch/Search.pm | 80 +++++++- admin/columns_settings.yml | 6 + catalogue/search.pl | 9 +- circ/returns.pl | 4 +- .../prog/en/includes/checkouts-table-footer.inc | 2 +- .../prog/en/includes/checkouts-table.inc | 1 + .../prog/en/includes/relatives-issues-table.inc | 1 + .../prog/en/modules/catalogue/results.tt | 3 +- .../intranet-tmpl/prog/en/modules/circ/returns.tt | 8 +- koha-tmpl/intranet-tmpl/prog/js/checkouts.js | 12 +- svc/checkouts | 7 +- .../Koha/SearchEngine/Elasticsearch/QueryBuilder.t | 42 ++++- .../Koha/SearchEngine/Elasticsearch/Search.t | 12 +- 14 files changed, 278 insertions(+), 100 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Sun Nov 3 09:37:22 2019 From: gitmaster at git.koha-community.org (Git repo owner) Date: Sun, 03 Nov 2019 08:37:22 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v19.05.00-1200-gebf7c6e Message-ID: This is an automated email from the git hooks/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 ebf7c6eacb09f3ec4d128eb4032e215d87238e64 (commit) via 9cf52fe8912dd860da4c5b0b88e0acde41f405c5 (commit) via 426a055a07a6b8c019d71831f1cf7aca512ee592 (commit) via 292262367ee39eb112b44b1dd27f8071521ab713 (commit) via 6ea1afa89a646b636a326166c7d1a37031d877b0 (commit) from 6e1d759981b442b00306405ddb0c0c970dea9d29 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit ebf7c6eacb09f3ec4d128eb4032e215d87238e64 Author: Martin Renvoize Date: Sun Nov 3 08:14:08 2019 +0000 Bug 22581: DBRev 19.06.00.048 Signed-off-by: Martin Renvoize commit 9cf52fe8912dd860da4c5b0b88e0acde41f405c5 Author: Martin Renvoize Date: Sun Nov 3 08:10:42 2019 +0000 Bug 22581: (RM follow-up) Add License to about page. Signed-off-by: Martin Renvoize commit 426a055a07a6b8c019d71831f1cf7aca512ee592 Author: Agustin Moyano Date: Mon Oct 28 18:15:22 2019 -0300 Bug 22581: Show and play musical inscripts This patch adds musical inscripts to OPAC's detail page To test: 1. run previous patch test plan 2. apply this patch 3. edit a the marc structure of a MARC bibliographic framework, and in tag 031 enable the following subfiels to be visible in editor: 2, g, n, o, p, u 4. search the catalog for a record that belongs to that framework, and edit tag 031 with the following: * 2:pe * g:G-2 * n:xFCGD * o:3/8 * p:'6B/{8B+(6B''E'B})({AFD})/{6.E3G},8B-/({6'EGF})({FAG})({GEB})/4F6- * u:http://nonexistent.org/url/of/a/midi 5. save and click in opac view CHECK => even though you add a 031 tag there is no musical inscript shown in opac view 6. in admin module enable OPACShowMusicalInscripts preference 7. refresh opac view SUCCESS => it takes a few seconds to load, but you see a link that says 'Audio file' pointing to the URL you placed in 'u' subfield, and below you see the musical inscript 8. in admin module enable OPACPlayMusicalInscripts preference 9. refresh opac view SUCCESS => You see a play button below the musical inscript, and when you click, the song is played 10. sign off Sponsored-by: Biblioteca Provincial Fr. Mamerto Esquiú (Provincia Franciscana de la Asunción) Co-authored-by: Owen Leonard Signed-off-by: Martin Renvoize Signed-off-by: Katrin Fischer Signed-off-by: Martin Renvoize commit 292262367ee39eb112b44b1dd27f8071521ab713 Author: Agustin Moyano Date: Mon Oct 28 18:15:22 2019 -0300 Bug 22581: Add new system preferences This patch adds 2 new system preferences: 1. OPACShowMusicalInscripts - to toggle musical inscripts to appear in opac's detail page 2. OPACPlayMusicalInscripts - to toggle musical inscripts to be transformed and payed in midi. Depends on OPACShowMusicalInscripts to be enabled. To test: 1. apply this patch 2. perl installer/data/mysql/updatedatabase.pl 3. search for this new preferences in admin module SUCCESS => they appear in OPAC section. 4. sign off Sponsored-by: Biblioteca Provincial Fr. Mamerto Esquiú (Provincia Franciscana de la Asunción) Signed-off-by: Martin Renvoize Signed-off-by: Katrin Fischer Signed-off-by: Martin Renvoize commit 6ea1afa89a646b636a326166c7d1a37031d877b0 Author: Owen Leonard Date: Thu Oct 17 13:46:42 2019 +0000 Bug 23834: Add default ESLint configuration This patch adds a default ESLint configuration for use when editing JavaScript, as recommended in the coding guidelines: https://wiki.koha-community.org/wiki/Coding_Guidelines#JS8:_Follow_guidelines_set_by_ESLint Signed-off-by: Katrin Fischer Signed-off-by: Martin Renvoize ----------------------------------------------------------------------- Summary of changes: .eslintrc.json | 21 + C4/XSLT.pm | 2 +- Koha.pm | 2 +- installer/data/mysql/sysprefs.sql | 2 + installer/data/mysql/updatedatabase.pl | 13 + koha-tmpl/intranet-tmpl/prog/en/modules/about.tt | 3 + .../prog/en/modules/admin/preferences/opac.pref | 14 + .../opac-tmpl/bootstrap/en/modules/opac-detail.tt | 11 + .../bootstrap/en/xslt/MARC21slim2OPACDetail.xsl | 50 +++ .../bootstrap/en/xslt/NORMARCslim2OPACDetail.xsl | 50 +++ .../bootstrap/en/xslt/UNIMARCslim2OPACDetail.xsl | 50 +++ koha-tmpl/opac-tmpl/bootstrap/js/verovio.js | 108 +++++ .../lib/verovio/000_acoustic_grand_piano.data | Bin 0 -> 1340706 bytes .../lib/verovio/000_acoustic_grand_piano.js | 29 ++ koha-tmpl/opac-tmpl/lib/verovio/midiplayer.css | 27 ++ koha-tmpl/opac-tmpl/lib/verovio/midiplayer.js | 439 ++++++++++++++++++++ koha-tmpl/opac-tmpl/lib/verovio/verovio-toolkit.js | 230 ++++++++++ opac/opac-detail.pl | 4 +- 18 files changed, 1052 insertions(+), 3 deletions(-) create mode 100644 .eslintrc.json create mode 100644 koha-tmpl/opac-tmpl/bootstrap/js/verovio.js create mode 100644 koha-tmpl/opac-tmpl/lib/verovio/000_acoustic_grand_piano.data create mode 100644 koha-tmpl/opac-tmpl/lib/verovio/000_acoustic_grand_piano.js create mode 100644 koha-tmpl/opac-tmpl/lib/verovio/midiplayer.css create mode 100644 koha-tmpl/opac-tmpl/lib/verovio/midiplayer.js create mode 100644 koha-tmpl/opac-tmpl/lib/verovio/verovio-toolkit.js hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Mon Nov 4 12:21:23 2019 From: gitmaster at git.koha-community.org (Git repo owner) Date: Mon, 04 Nov 2019 11:21:23 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v19.05.00-1202-g3675e9c Message-ID: This is an automated email from the git hooks/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 3675e9cf78ba40c6efcf78742e62b88fda3646b2 (commit) via bd9c93da5479747ab3682d0761b4dfe5eeaf9a55 (commit) from ebf7c6eacb09f3ec4d128eb4032e215d87238e64 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 3675e9cf78ba40c6efcf78742e62b88fda3646b2 Author: Martin Renvoize Date: Mon Nov 4 10:43:49 2019 +0000 Bug 22581: (RM follow-up) Add sysprefs to Search.t This patch adds explicit disablement of the sysprefs introduced by this bug to the Search.t test to silence warnings. Signed-off-by: Martin Renvoize commit bd9c93da5479747ab3682d0761b4dfe5eeaf9a55 Author: Martin Renvoize Date: Mon Nov 4 10:09:40 2019 +0000 Bug 23834: (RM follow-up) Add new file to Makefile.PL Signed-off-by: Martin Renvoize ----------------------------------------------------------------------- Summary of changes: Makefile.PL | 1 + t/db_dependent/Search.t | 4 ++++ 2 files changed, 5 insertions(+) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Mon Nov 4 12:28:14 2019 From: gitmaster at git.koha-community.org (Git repo owner) Date: Mon, 04 Nov 2019 11:28:14 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v19.05.00-1203-g6ce9ce4 Message-ID: This is an automated email from the git hooks/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 6ce9ce442d89f46a67d68aa55cb030b96131d46f (commit) from 3675e9cf78ba40c6efcf78742e62b88fda3646b2 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 6ce9ce442d89f46a67d68aa55cb030b96131d46f Author: Jonathan Druart Date: Mon Nov 4 12:01:21 2019 +0100 Bug 23903: (QA follow-up) Fix selenium tests Signed-off-by: Martin Renvoize ----------------------------------------------------------------------- Summary of changes: t/db_dependent/selenium/regressions.t | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Mon Nov 4 14:53:48 2019 From: gitmaster at git.koha-community.org (Git repo owner) Date: Mon, 04 Nov 2019 13:53:48 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v19.05.00-1207-g35670b0 Message-ID: This is an automated email from the git hooks/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 35670b0495e0333f57773b0375ea7aa1122d5372 (commit) via 86e3a73e49dc5ad6bbe5488d6f3b26afb8ffab2e (commit) via f5b6ad48e0a2ccccb62d811059bbd4c28ec0c7db (commit) via dc9e2a4e6940ff75040fea976b53dc80d057e201 (commit) from 6ce9ce442d89f46a67d68aa55cb030b96131d46f (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 35670b0495e0333f57773b0375ea7aa1122d5372 Author: Martin Renvoize Date: Mon Nov 4 13:25:19 2019 +0000 Bug 23963: Revert bug 21987 to restore image quality Bug 21987 had unexpected effects upon image quality for thumbnails. Currently, we are working to resolve those issues but have not managed to correct them inside the release window for this cycle. As such, I have chosen to revert the original bug whilst we work on a resolution. Signed-off-by: Martin Renvoize commit 86e3a73e49dc5ad6bbe5488d6f3b26afb8ffab2e Author: Martin Renvoize Date: Mon Nov 4 13:21:16 2019 +0000 Revert "Bug 21987: Add tests" This reverts commit afb39b132b10b74efec31cd8191cdcd72a61d8d3. Signed-off-by: Martin Renvoize commit f5b6ad48e0a2ccccb62d811059bbd4c28ec0c7db Author: Martin Renvoize Date: Mon Nov 4 13:21:13 2019 +0000 Revert "Bug 21987: Do not generate true color thumbnails if not needed" This reverts commit 5c41d584cb654efbfd8c854bac0d30d87a054ab5. Signed-off-by: Martin Renvoize commit dc9e2a4e6940ff75040fea976b53dc80d057e201 Author: Martin Renvoize Date: Mon Nov 4 13:21:09 2019 +0000 Revert "Bug 21987: (RM follow-up) Add text for simple tests" This reverts commit 1464328718619a673f233406fdb238f0391b0785. Signed-off-by: Martin Renvoize ----------------------------------------------------------------------- Summary of changes: C4/Images.pm | 4 ++-- t/db_dependent/Images.t | 39 --------------------------------------- 2 files changed, 2 insertions(+), 41 deletions(-) delete mode 100644 t/db_dependent/Images.t hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Mon Nov 4 16:47:39 2019 From: gitmaster at git.koha-community.org (Git repo owner) Date: Mon, 04 Nov 2019 15:47:39 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v19.05.00-1210-gc4466e7 Message-ID: This is an automated email from the git hooks/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 c4466e7d714d32808ee2e553320431005ec7cc69 (commit) via 88db3b587e319f97f47e6699c1af1ac2acd0ae6d (commit) via 323c57bf53dc929230b1c07645879636eb8f2077 (commit) from 35670b0495e0333f57773b0375ea7aa1122d5372 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit c4466e7d714d32808ee2e553320431005ec7cc69 Author: Kyle M Hall Date: Fri Jun 21 08:51:15 2019 -0400 Bug 23181: Unable to use payment library in ACCOUNT_PAYMENT or ACCOUNT_WRITEOFF notices Do to a simple semantic typo, the branches key will always be null for the tables key of the parameters for GetPreparedLetter. Test Plan: 0) Activate UseEmailReceipts 1) Attempt to use [% branch.branchname %] in the ACCOUNT_PAYMENT notice 2) Note it produces no output 3) Apply this patch 4) Make another payment 5) You should now see the branche's name! Signed-off-by: Katrin Fischer Also requires UseEmailReceipts to be activated. Signed-off-by: Josef Moravec Signed-off-by: Martin Renvoize commit 88db3b587e319f97f47e6699c1af1ac2acd0ae6d Author: Katrin Fischer Date: Sat Nov 2 01:05:06 2019 +0000 Bug 23181: Extend unit tests Run t/db_dependent/Accounts.t Signed-off-by: Josef Moravec Signed-off-by: Martin Renvoize commit 323c57bf53dc929230b1c07645879636eb8f2077 Author: Jon Knight Date: Wed Aug 21 15:14:19 2019 +0100 Bug 23429: ilsdi.pl GetRecords documentation does not match output Updated contents of Describe for GetRecords to match current behaviour. To test, ensure ILSDI is configured and then compare the output of: http://yourserver/cgi-bin/koha/ilsdi.pl?service=Describe&verb=GetRecords before and after applying the patch. Note that afterwards it includes things like and has removed elements such as that no longer get returned. https://bugs.koha-community.org/show_bug.cgi?id=23429 Signed-off-by: Katrin Fischer Signed-off-by: Josef Moravec Signed-off-by: Martin Renvoize ----------------------------------------------------------------------- Summary of changes: Koha/Account.pm | 2 +- koha-tmpl/opac-tmpl/bootstrap/en/modules/ilsdi.tt | 37 ++++++++++++--------- t/db_dependent/Accounts.t | 12 +++---- 3 files changed, 29 insertions(+), 22 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Mon Nov 4 18:50:17 2019 From: gitmaster at git.koha-community.org (Git repo owner) Date: Mon, 04 Nov 2019 17:50:17 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v19.05.00-1211-g549a09c Message-ID: This is an automated email from the git hooks/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 549a09c52178937af28cc11c5bfa7f00cbced1b5 (commit) from c4466e7d714d32808ee2e553320431005ec7cc69 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 549a09c52178937af28cc11c5bfa7f00cbced1b5 Author: Jonathan Druart Date: Thu Oct 24 12:29:23 2019 +0200 Bug 23234: Mock DateTime->now using the time zone The timezone of the two dt was different, one was UTC, the other one was my local one. When we mocked DateTime->now we did not use the time zone, we must use dt_from_string instead Test plan: Make sure your environment has a different time zone than UTC `prove t/db_dependent/Circulation.t` should fail without this patch Signed-off-by: Martin Renvoize ----------------------------------------------------------------------- Summary of changes: t/db_dependent/Circulation.t | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Tue Nov 5 09:37:28 2019 From: gitmaster at git.koha-community.org (Git repo owner) Date: Tue, 05 Nov 2019 08:37:28 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v19.05.00-1220-g9b2d782 Message-ID: This is an automated email from the git hooks/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 9b2d782813589fe4cd30ce51f8f61428f7e82c3d (commit) via e7b3f8e362b2198233a92710b82a40fb1d534168 (commit) via f981da7494cd094d45a5e21159642dd54f688bdb (commit) via 00db9a7624306c3f9282bce1a133b0e45396aeac (commit) via d753993290a867752fcdd439fe65e94691a996fb (commit) via 73c0100a3dfb542710fd338b15672cd122f02152 (commit) via 39bc68c90b9e6ebdd880c4450b426ba30fe6f893 (commit) via 025f9ebe80125fdfacf86f95274b249762384a7f (commit) via f601941b50eae7e1a09829313ed020afbf915c0f (commit) from 549a09c52178937af28cc11c5bfa7f00cbced1b5 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 9b2d782813589fe4cd30ce51f8f61428f7e82c3d Author: Tomas Cohen Arazi Date: Mon Nov 4 11:52:33 2019 -0300 Bug 23050: (QA follow-up) Add Koha::Plugins::Tab class This minimal class encapsulates the tabs to be passed around to the templates, so error checking on missing bits is done in a single place. It throws exceptions on errors Signed-off-by: Tomas Cohen Arazi Signed-off-by: Martin Renvoize commit e7b3f8e362b2198233a92710b82a40fb1d534168 Author: Julian Maurice Date: Mon Sep 30 10:10:17 2019 +0200 Bug 23050: Fix creation of biblio tab's id (Too much javascript in my head...) Signed-off-by: Tomas Cohen Arazi Signed-off-by: Martin Renvoize commit f981da7494cd094d45a5e21159642dd54f688bdb Author: Julian Maurice Date: Mon Jul 15 14:28:47 2019 +0200 Bug 23050: Fix tab's id to avoid compatibility issues MDN says: Using characters except ASCII letters, digits, '_', '-' and '.' may cause compatibility problems, as they weren't allowed in HTML 4. Though this restriction has been lifted in HTML5, an ID should start with a letter for compatibility. https://developer.mozilla.org/en-US/docs/Web/HTML/Global_attributes/id Signed-off-by: Tomas Cohen Arazi Signed-off-by: Martin Renvoize commit 00db9a7624306c3f9282bce1a133b0e45396aeac Author: Julian Maurice Date: Mon Jul 15 14:10:25 2019 +0200 Bug 23050: Add missing template filters Signed-off-by: Tomas Cohen Arazi Signed-off-by: Martin Renvoize commit d753993290a867752fcdd439fe65e94691a996fb Author: Julian Maurice Date: Wed Jun 5 16:26:34 2019 +0200 Bug 23050: Plugin hook to add tabs in intranet biblio details page Test Plan: 1) Enable plugins 2) Download and install the latest version of this plugin https://git.biblibre.com/biblibre/koha-plugin-intranet-detail-hook 3) Browse to catalogue/detail.pl for a record 4) Note you see two new tabs with content Signed-off-by: Claire Gravely Signed-off-by: Tomas Cohen Arazi Signed-off-by: Martin Renvoize commit 73c0100a3dfb542710fd338b15672cd122f02152 Author: Martin Renvoize Date: Mon Nov 4 20:25:11 2019 +0000 Bug 23522: (QA follow-up) Typo fix in comment Tiny typo fix in a new code comment Signed-off-by: Martin Renvoize commit 39bc68c90b9e6ebdd880c4450b426ba30fe6f893 Author: Nick Clemens Date: Thu Aug 29 14:51:16 2019 +0000 Bug 23522: Show actual price on in baskets To test: 1 - Create a new basket in acq, mark it as 'standing' 2 - Add an item, leave the RRP and Vendor price as 0 3 - Receive shipments for the vendor 4 - Select the title from this basket 5 - On receipt enter an actual cost 6 - Finsih receiving 7 - Go to the basket 8 - Note the total for the order and the basket are 0, keep this browser tab open 9 - Open a new browser tab and create a new non standing basket 10 - Add to basket, again with no RRP or vendor price 11 - Close the basket, receive the item 12 - Enter an actual cost on receipt 13 - Return to view the basket 14 - Total and order are $0 15 - Apply patch 16 - Refresh the basket in both tabs 17 - You now see the actual price for the orders Signed-off-by: Rhonda Kuiper Signed-off-by: Bouzid Fergani Signed-off-by: Martin Renvoize commit 025f9ebe80125fdfacf86f95274b249762384a7f Author: Martin Renvoize Date: Mon Nov 4 20:12:58 2019 +0000 Bug 23523: (QA follow-up) Minor POD corrections This just fixes a couple of typos in the POD that predate this patch but I noticed whilst QAing this ;) Signed-off-by: Martin Renvoize commit f601941b50eae7e1a09829313ed020afbf915c0f Author: Nick Clemens Date: Thu Aug 29 18:42:24 2019 +0000 Bug 23523: unitprice tax column values are not populated if entered upon ordering To test: 1 - Add an item to an acquisitions basket 2 - Make sure to enter 'Actual cost' 3 - Check the db: SELECT * FROM aqorders WHERE ordernumber={your ordernumber} 4 - Note that unitprice_tax_included and unitprice_tax_excluded are not populated 5 - Apply patch 6 - Edit that order 7 - Check DB 8 - Values should be populated 9 - Place another order, ensude values populated on creation 10 - QA people: prove -v t/db_dependent/Acquisition/populate_order_with_prices.t Signed-off-by: Claire Gravely Signed-off-by: Martin Renvoize ----------------------------------------------------------------------- Summary of changes: C4/Acquisition.pm | 30 +++++--- Koha/Plugins/Tab.pm | 72 ++++++++++++++++++++ acqui/basket.pl | 7 +- catalogue/detail.pl | 25 ++++++- .../intranet-tmpl/prog/en/modules/acqui/basket.tt | 8 +++ .../prog/en/modules/catalogue/detail.tt | 9 +++ t/Koha/Plugins/Tab.t | 62 +++++++++++++++++ .../Acquisition/populate_order_with_prices.t | 46 +++++++++++-- t/lib/Koha/Plugin/Test.pm | 24 ++++++- 9 files changed, 263 insertions(+), 20 deletions(-) create mode 100644 Koha/Plugins/Tab.pm create mode 100644 t/Koha/Plugins/Tab.t hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Tue Nov 5 15:16:24 2019 From: gitmaster at git.koha-community.org (Git repo owner) Date: Tue, 05 Nov 2019 14:16:24 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v19.05.00-1221-gdda82b5 Message-ID: This is an automated email from the git hooks/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 dda82b52a77411e3ab76b262a0c0a1d1d1a21638 (commit) from 9b2d782813589fe4cd30ce51f8f61428f7e82c3d (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit dda82b52a77411e3ab76b262a0c0a1d1d1a21638 Author: Martin Renvoize Date: Tue Nov 5 13:53:06 2019 +0000 Bug 23050: (RM follow-up) Add Try::Tiny to controller Signed-off-by: Martin Renvoize ----------------------------------------------------------------------- Summary of changes: catalogue/detail.pl | 1 + 1 file changed, 1 insertion(+) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Tue Nov 5 15:43:27 2019 From: gitmaster at git.koha-community.org (Git repo owner) Date: Tue, 05 Nov 2019 14:43:27 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v19.05.00-1222-g622d4f7 Message-ID: This is an automated email from the git hooks/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 622d4f713be7d3984443f4c5d3a25fd88671fa82 (commit) from dda82b52a77411e3ab76b262a0c0a1d1d1a21638 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 622d4f713be7d3984443f4c5d3a25fd88671fa82 Author: Martin Renvoize Date: Tue Nov 5 14:18:28 2019 +0000 Bug 23382: (RM follow-up) Revert "hours_between should match..." This reverts commit a693c7243c23f888e2fad38a4fff9f37ff4a9301 which caused regressions. The original loop compared start date to end date and iterated all the way to start date equals end date. The alternate implimentation inadvertantly looped from start date, skipped the first day then iterated up to one day beyond end date. Signed-off-by: Martin Renvoize ----------------------------------------------------------------------- Summary of changes: Koha/Calendar.pm | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Wed Nov 6 13:35:42 2019 From: gitmaster at git.koha-community.org (Git repo owner) Date: Wed, 06 Nov 2019 12:35:42 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v19.05.00-1223-gb8a5194 Message-ID: This is an automated email from the git hooks/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 b8a5194d24cb8ce5c2f7687376cdcd24cd52e67a (commit) from 622d4f713be7d3984443f4c5d3a25fd88671fa82 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit b8a5194d24cb8ce5c2f7687376cdcd24cd52e67a Author: Martin Renvoize Date: Wed Nov 6 12:09:49 2019 +0000 Bug 23068: (RM follow-up) Make Net::Netmask required Net::Netmask is used in the new Plack::Middleware::RealIP module, which is in turn used in the psgi plack startup script. We don't have access to C4::Context inside the startup script and as such don't have access to the config to work out if loading this module should be optional. As such, I'm taking the easy route and just making the dependancy a required one. It's small and already packaged for debian and as such should not cause anyone any issues. Signed-off-by: Martin Renvoize ----------------------------------------------------------------------- Summary of changes: C4/Installer/PerlDependencies.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Wed Nov 6 13:53:00 2019 From: gitmaster at git.koha-community.org (Git repo owner) Date: Wed, 06 Nov 2019 12:53:00 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v19.05.00-1225-g137f4d1 Message-ID: This is an automated email from the git hooks/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 137f4d167982c3be488592a573fc732644582877 (commit) via 2e0a69609f0577829d089222d07747d33006b427 (commit) from b8a5194d24cb8ce5c2f7687376cdcd24cd52e67a (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 137f4d167982c3be488592a573fc732644582877 Author: Nick Clemens Date: Wed Nov 6 12:12:31 2019 +0000 Bug 23523: (follow-up) Clarify meaning configurations in tests Signed-off-by: Martin Renvoize commit 2e0a69609f0577829d089222d07747d33006b427 Author: Nick Clemens Date: Wed Nov 6 12:09:11 2019 +0000 Bug 23523: (follow-up) Adjust tests for new expectations Signed-off-by: Martin Renvoize ----------------------------------------------------------------------- Summary of changes: t/Prices.t | 55 ++++++++++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 46 insertions(+), 9 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Wed Nov 6 16:15:04 2019 From: gitmaster at git.koha-community.org (Git repo owner) Date: Wed, 06 Nov 2019 15:15:04 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v19.05.00-1226-ge395844 Message-ID: This is an automated email from the git hooks/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 e395844982d952d627dd40180f38303c50eb5402 (commit) from 137f4d167982c3be488592a573fc732644582877 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit e395844982d952d627dd40180f38303c50eb5402 Author: Martin Renvoize Date: Wed Nov 6 14:45:12 2019 +0000 Bug 23382: (RM follow-up) Ensure tests pass on Wednesdays Koha::Calendar assumes we never issue an item on a closed day.. this is a fair assumption but the hardcoded closed day in our tests means it does not hold true in this case. This patch sets the closed day dynamically to prevent such a case. Signed-off-by: Martin Renvoize ----------------------------------------------------------------------- Summary of changes: t/db_dependent/Circulation.t | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Wed Nov 6 18:25:59 2019 From: gitmaster at git.koha-community.org (Git repo owner) Date: Wed, 06 Nov 2019 17:25:59 +0000 Subject: [koha-commits] main Koha release repository branch 18.11.x updated. v18.11.10-38-g15ffaa3 Message-ID: This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "main Koha release repository". The branch, 18.11.x has been updated via 15ffaa305aab7e27ab8c1fa04846209b35ccf627 (commit) from d340a6766f9c343c4a1cd3f657d5ade29c301e63 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 15ffaa305aab7e27ab8c1fa04846209b35ccf627 Author: Liz Rea Date: Thu Sep 19 00:14:23 2019 +0000 Bug 23658: fix wrong transfer modal dropping specified checkin date To test: Have an item that needs a transfer use the check in page, and backdate the checkin date check in the item, click ok or print - backdating is OK Check it in again - backdating drops off Apply this patch, restart the things run tests again, backdating should be retained in all cases. Signed-off-by: Katrin Fischer Signed-off-by: Martin Renvoize Signed-off-by: Lucas Gass ----------------------------------------------------------------------- Summary of changes: koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt | 5 +++++ 1 file changed, 5 insertions(+) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Wed Nov 6 18:30:27 2019 From: gitmaster at git.koha-community.org (Git repo owner) Date: Wed, 06 Nov 2019 17:30:27 +0000 Subject: [koha-commits] main Koha release repository branch 18.11.x updated. v18.11.10-39-g5d01029 Message-ID: This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "main Koha release repository". The branch, 18.11.x has been updated via 5d0102901208a76ff414bfe75f62ace3b7534da5 (commit) from 15ffaa305aab7e27ab8c1fa04846209b35ccf627 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 5d0102901208a76ff414bfe75f62ace3b7534da5 Author: Jonathan Druart Date: Wed Nov 6 11:17:33 2019 +0100 Bug 23961: (bug 22851 follow-up) Restore Add subscription fields link This fix a wrong rebase conflict resolution from commit 414869eb9d7b29754b75bd0c798d6a566df88a7e Bug 22851: Style navigation links in serials modules like same links in other modules It only affects 18.11.x Signed-off-by: Katrin Fischer Signed-off-by: Lucas Gass ----------------------------------------------------------------------- Summary of changes: koha-tmpl/intranet-tmpl/prog/en/includes/serials-menu.inc | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Wed Nov 6 18:33:40 2019 From: gitmaster at git.koha-community.org (Git repo owner) Date: Wed, 06 Nov 2019 17:33:40 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v19.05.00-1241-g89931b4 Message-ID: This is an automated email from the git hooks/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 89931b4bb02d6ca1796ece2647fc6104382c0b7d (commit) via a4f2ad76f98e023489dec44f481f290302f44c78 (commit) via 45a89f47090e783513841a087256c76fff84b29f (commit) via 4a36c1ac044ed9da3b67d32e9c315e61d2adc3bd (commit) via 33595e1a3edd881e6b5489894c4676293839ed19 (commit) via 4c0786a1106ed170cbf80f0ebf71599b7ac9d3e9 (commit) via 42ebef689fb45255613381a4d176977cddc9dc9d (commit) via 1e47e5a849fb0297f7da1a5ebd5d94f5b8cd46f9 (commit) via a1161ced1d977d872ab4238fc38ae30440978204 (commit) via b920cb708b8acacbf2075b00c0c68e70b6d5a29b (commit) via 5b03d4be39497be0dbdce17ef26867ca80affec1 (commit) via c58fc50128eff5d23ac7e9c71b6f78da3bba3c71 (commit) via cffa7623e13d8a21e66f5c9dc8caaa5668738411 (commit) via d5c501bf63f9d42bc9d872eef391c0864753c8ba (commit) via fad70512c0d6ebe72f34848406e00d9eb927930b (commit) from e395844982d952d627dd40180f38303c50eb5402 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 89931b4bb02d6ca1796ece2647fc6104382c0b7d Author: Katrin Fischer Date: Sun Nov 3 22:48:04 2019 +0000 Bug 23483: Show the description, not the patron's title when writing off an individual fine/fee When writing off an individual fine, the description shown was the patron's title, instead of the fine description. Fixing it by changing it to the same template variable used for paying individuals so they match up. To test: - Pick a patron and make sure salutation is set (Mr, Mrs, ...) - Create a manual fine - For the fine, compare the description shown when using the Writeoff and Pay buttons next to the fine - Verify the display is different and writeoff displays the salutation - Apply patch - Repeat, descriptions now should match up Signed-off-by: Séverine QUEUNE Signed-off-by: Martin Renvoize commit a4f2ad76f98e023489dec44f481f290302f44c78 Author: Jonathan Druart Date: Wed Nov 6 10:59:26 2019 +0100 Bug 23467: Exit after output_html - opac-reserve.pl To avoid double screen There are several ways to recreate the issue, the easiest is: /cgi-bin/koha/opac-reserve.pl?biblionumber= You should see "ERROR: No record id specified." Signed-off-by: Katrin Fischer Signed-off-by: Martin Renvoize commit 45a89f47090e783513841a087256c76fff84b29f Author: Lari Taskula Date: Mon Nov 4 16:32:58 2019 +0000 Bug 23774: Server-side confirmation for hold pickup location in OPAC While placing a hold on a book, if a user opens up Inspect Element on the Pick up location drop down box they can change the pick up location in the code to a library that is not listed as a pick up location. How to replicate: Search for a book Select book Click Place Hold On the screen Home > Placing a hold Right click on Pick up location Select 'Inspect Element' Under
  • Pick Up location:=$0 Option values are listed that relate to the pick up location, this value can be changed to another new location and when the hold is placed the hold will be placed for this new location instead of the listed options in the Pick up location drop down list. To test: 1. Apply patch 2. Repeat "How to replicate" 3. Observe it is no longer possible to place holds on libraries not defined as pickup location by changing option value via Inspect Element tool Signed-off-by: Martin Renvoize Signed-off-by: Jonathan Druart Signed-off-by: Martin Renvoize (cherry picked from commit 45a89f47090e783513841a087256c76fff84b29f) Signed-off-by: Fridolin Somers ----------------------------------------------------------------------- Summary of changes: C4/AuthoritiesMarc.pm | 3 +- C4/Images.pm | 4 +- Koha/SearchEngine/Elasticsearch/Indexer.pm | 2 +- catalogue/detail.pl | 9 ++++- cataloguing/additem.pl | 12 +++++- debian/templates/koha-conf-site.xml.in | 11 ++++++ etc/koha-conf.xml | 16 ++++++++ .../prog/en/modules/catalogue/detail.tt | 6 +++ .../prog/en/modules/ill/ill-requests.tt | 6 +-- koha-tmpl/intranet-tmpl/prog/js/ill-list-table.js | 15 +++++--- .../maintenance/search_for_data_inconsistencies.pl | 14 +++++++ opac/opac-detail.pl | 4 +- opac/opac-reserve.pl | 9 ++++- t/db_dependent/Images.t | 39 -------------------- 14 files changed, 92 insertions(+), 58 deletions(-) delete mode 100644 t/db_dependent/Images.t hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Nov 15 14:16:27 2019 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 15 Nov 2019 13:16:27 +0000 Subject: [koha-commits] main Koha release repository branch 19.05.x updated. v19.05.04-98-gb9dbe40 Message-ID: This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "main Koha release repository". The branch, 19.05.x has been updated via b9dbe40cfb0b9842273ceedc13c9592bb4ca1aff (commit) via 556aa6f65eec6cde5697e4af58da8b35dcddc8b9 (commit) via 9b18a475a596fc6e56bf49341fd5074b4e591995 (commit) from 828a9ecd2983f9117af3852dbf834f09bfd0471e (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit b9dbe40cfb0b9842273ceedc13c9592bb4ca1aff Author: Jonathan Druart Date: Thu Nov 7 11:41:29 2019 +0100 Bug 23765: Do not display localized templates if TranslateNotices is off To test: 1. Enable multi-languages 2. Set the preference 'TranslateNotices' on 'Allow' 3. Go to: tools==>Notices & slips==>Edit, make sure it has multilingual email templates. 4. Set the preference TranslateNotices on 'Don't allow'. 5. Go to: tools==>Notices & slips==>Edit, the template shows several tab for the same transport type. 6. Apply the patch. 7. Repeat the steps 4 and 5 8. Success. It only shows the default template when TranslateNotices is 'Dont allow'. Signed-off-by: Martin Renvoize Signed-off-by: Katrin Fischer Signed-off-by: Martin Renvoize (cherry picked from commit 86f999812e1fb281742d79757964227ea0f5d330) Signed-off-by: Fridolin Somers commit 556aa6f65eec6cde5697e4af58da8b35dcddc8b9 Author: Jonathan Druart Date: Tue Oct 22 11:10:59 2019 +0200 Bug 23854: Fix failure on dates when editing a suggestion - Watch plack-error-log - Change an accepted suggestion to 'No Status' - Verify error in the logs (use strict mode, depending on DBMS version) - Status changed was not saved - Apply patch - Verify the error is gone, change is saved now. Signed-off-by: Katrin Fischer Signed-off-by: Martin Renvoize (cherry picked from commit 73198bc4bdafa6817c916c777a51a73d937ba2aa) Signed-off-by: Fridolin Somers commit 9b18a475a596fc6e56bf49341fd5074b4e591995 Author: Jonathan Druart Date: Tue Nov 12 18:00:02 2019 +0100 Bug 23985: (bug 21206 follow-up) Fix checkout list when "Hold pickup library match" not set This patch restores the behavior prior to bug 21206. If "Hold pickup library match" is "Not set", then hold_fulfillment_policy equals an empty string. Test plan: 1. Go to "Circulation and fines rules" 2. Under "Default checkout, hold and return policy", unset "Hold pickup library match" and Save 3. Place a hold on one item for one patron 4. Try to checkout the same item with another patron => Without this patch you the checkout list do not show, and the logs contain "The method Koha::Item-> is not covered by tests!" => With this patch applied you see the checkout list QA will take care of comparing the statement with the one before bug 21206 and make sure they are equivalent Signed-off-by: Julian Maurice Signed-off-by: Martin Renvoize (cherry picked from commit 17d221144605875b6efb1569093b76f412f8aea5) Signed-off-by: Fridolin Somers ----------------------------------------------------------------------- Summary of changes: C4/Letters.pm | 26 +++++++++++----------- C4/Reserves.pm | 8 ++++++- suggestion/suggestion.pl | 7 ++++-- t/db_dependent/Letters/GetLetterTemplates.t | 31 ++++++++++++++++----------- 4 files changed, 43 insertions(+), 29 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Mon Nov 18 10:17:46 2019 From: gitmaster at git.koha-community.org (Git repo owner) Date: Mon, 18 Nov 2019 09:17:46 +0000 Subject: [koha-commits] main Koha release repository branch 19.05.x updated. v19.05.04-99-gc433411 Message-ID: This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "main Koha release repository". The branch, 19.05.x has been updated via c433411ba763ed6c021d4d4ab487a2bcb3e17ac7 (commit) from b9dbe40cfb0b9842273ceedc13c9592bb4ca1aff (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit c433411ba763ed6c021d4d4ab487a2bcb3e17ac7 Author: Jonathan Druart Date: Mon Nov 11 12:35:30 2019 +0100 Bug 23822: Fix deletion of patrons with credit There are bugs in both master and 19.05, but different. Anyway we should have this check to make sure a negative value will have the same behavior: trigger the confirmation message (instead of a blank page). If we want to reject the deletion of a patron with credit we should handle it on a separate bug report (behavior change) Signed-off-by: Martin Renvoize Signed-off-by: Katrin Fischer Signed-off-by: Martin Renvoize (cherry picked from commit d23e50f0b239603a05ddbb62591e80657f5f6cae) Signed-off-by: Fridolin Somers ----------------------------------------------------------------------- Summary of changes: members/deletemem.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Tue Nov 19 08:43:49 2019 From: gitmaster at git.koha-community.org (Git repo owner) Date: Tue, 19 Nov 2019 07:43:49 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v19.05.00-1319-g468513a Message-ID: This is an automated email from the git hooks/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 468513a5de60696a7d98ca64ba5d5babaddbbaa5 (commit) from 73198bc4bdafa6817c916c777a51a73d937ba2aa (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 468513a5de60696a7d98ca64ba5d5babaddbbaa5 Author: Martin Renvoize Date: Tue Nov 19 07:19:14 2019 +0000 Bug 23049: (RM follow-up) Add missing userpermission to installer The manage_accounts permission was duly added to updatedatabase.pl, but it was missed from userpermissions.sql. Signed-off-by: Martin Renvoize ----------------------------------------------------------------------- Summary of changes: installer/data/mysql/userpermissions.sql | 1 + 1 file changed, 1 insertion(+) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Tue Nov 19 16:34:13 2019 From: gitmaster at git.koha-community.org (Git repo owner) Date: Tue, 19 Nov 2019 15:34:13 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v19.05.00-1320-g24f780e Message-ID: This is an automated email from the git hooks/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 24f780e22f68fb0e5968ae065cf0f73a9c978799 (commit) from 468513a5de60696a7d98ca64ba5d5babaddbbaa5 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 24f780e22f68fb0e5968ae065cf0f73a9c978799 Author: Jonathan Druart Date: Mon Nov 18 11:20:46 2019 +0100 Bug 23982: (bug 23624 follow-up) Handle SQL error caused by derived table Caused by commit bca4453c50d8b5b1d3c7029ded2b522a9a2bf868 Bug 23624: (QA follow-up) Optimize even more A report like: SELECT * FROM issues JOIN borrowers USING (borrowernumber) will have two borrowernumber columns - SQL will give us there rsults, but if we try to wrap them in a SELECT COUNT(*) FROM (report) it throws a duplicated column error. This patch suggests to execute the query the old way if the derived table optimization failed. Signed-off-by: Martin Renvoize Signed-off-by: Nick Clemens Signed-off-by: Martin Renvoize ----------------------------------------------------------------------- Summary of changes: C4/Reports/Guided.pm | 38 ++++++++++++++++++++++++++++---------- 1 file changed, 28 insertions(+), 10 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Tue Nov 19 16:40:24 2019 From: gitmaster at git.koha-community.org (Git repo owner) Date: Tue, 19 Nov 2019 15:40:24 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v19.05.00-1323-gfda209c Message-ID: This is an automated email from the git hooks/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 fda209ca505a2a0e0099788aa5f654601f1caf07 (commit) via cbe22553fe4bdcb9bf1bfc127dd4371f09ef43e9 (commit) via 5df9c63eea6ecbd75079dbd62759db01927548dd (commit) from 24f780e22f68fb0e5968ae065cf0f73a9c978799 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit fda209ca505a2a0e0099788aa5f654601f1caf07 Author: Jonathan Druart Date: Tue Nov 19 10:14:31 2019 +0100 Bug 24062: Make sure TestBuilder will stop generate X or other invalid category's types To make sure this kind of random failures will not appear in a future we are going to fix it at TestBuilder level. Test plan: prove t/db_dependent/TestBuilder.t and confirm it returns green You could also only apply the tests against master, run them several times and confirm that they fail most of the time. Signed-off-by: Martin Renvoize Signed-off-by: Marcel de Rooy Signed-off-by: Martin Renvoize commit cbe22553fe4bdcb9bf1bfc127dd4371f09ef43e9 Author: Jonathan Druart Date: Tue Nov 19 09:40:07 2019 +0100 Bug 24062: Fix the failing test Signed-off-by: Martin Renvoize Signed-off-by: Marcel de Rooy Signed-off-by: Martin Renvoize commit 5df9c63eea6ecbd75079dbd62759db01927548dd Author: Magnus Enger Date: Mon Nov 18 21:41:45 2019 +0100 Bug 24064: DUEDGST typoed as DUEGST Bug 20478 introduced a typo where the letter code DUEDGST was changed to DUEGST. This patch fixes it. To test: - Run "grep -r DUEDGST *" on the Koha git repo. Notice that this letter code is used in e.g. sample notices. - Run "grep -r DUEGST *" and notice that this code only occurs twice, in misc/cronjobs/advance_notices.pl. - Aply this patch. - Run "grep -r DUEGST *" again, and notice there are no more occurences of this typo. Signed-off-by: David Nind Signed-off-by: Jonathan Druart Signed-off-by: Martin Renvoize ----------------------------------------------------------------------- Summary of changes: misc/cronjobs/advance_notices.pl | 4 ++-- t/db_dependent/Circulation.t | 21 +++++++++------------ t/db_dependent/TestBuilder.t | 13 ++++++++++++- t/lib/TestBuilder.pm | 6 +++++- 4 files changed, 28 insertions(+), 16 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Wed Nov 20 10:23:42 2019 From: gitmaster at git.koha-community.org (Git repo owner) Date: Wed, 20 Nov 2019 09:23:42 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v19.05.00-1324-gc0a3404 Message-ID: This is an automated email from the git hooks/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 c0a34045df6eb84c2622fcfc69ce48debb365a5d (commit) from fda209ca505a2a0e0099788aa5f654601f1caf07 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit c0a34045df6eb84c2622fcfc69ce48debb365a5d Author: Jonathan Druart Date: Wed Nov 20 09:49:23 2019 +0100 Bug 23982: Fix the failing test # Failed test 'nb_rows returns 0 on bad queries' # at t/db_dependent/Reports/Guided.t line 441. # got: undef # expected: '0' Signed-off-by: Jonathan Druart Signed-off-by: Martin Renvoize ----------------------------------------------------------------------- Summary of changes: C4/Reports/Guided.pm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Wed Nov 20 13:20:10 2019 From: gitmaster at git.koha-community.org (Git repo owner) Date: Wed, 20 Nov 2019 12:20:10 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v19.05.00-1325-g75c2cbe Message-ID: This is an automated email from the git hooks/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 75c2cbed874f32fafe4df31f832e9c3259b5e887 (commit) from c0a34045df6eb84c2622fcfc69ce48debb365a5d (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 75c2cbed874f32fafe4df31f832e9c3259b5e887 Author: Martin Renvoize Date: Wed Nov 20 10:17:27 2019 +0000 Bug 23805: (RM follow-up) Add credit_type relation to Koha::Account::Line The credit_type relation was missing when I pushed this patchset originally; It is already referenced in the account description include files and as such should be added Signed-off-by: Martin Renvoize ----------------------------------------------------------------------- Summary of changes: Koha/Account/Line.pm | 14 ++++++++++++++ 1 file changed, 14 insertions(+) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Thu Nov 21 13:00:20 2019 From: gitmaster at git.koha-community.org (Git repo owner) Date: Thu, 21 Nov 2019 12:00:20 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v19.05.00-1335-g000c42c Message-ID: This is an automated email from the git hooks/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 000c42cd60f324a9c1d3fd92900b3be834505327 (commit) via 43a72e09989a8a8fd943fa3a87a1488b4078fe4f (commit) via fbd46dd3a7f231479c031808df967a9286a864d0 (commit) via d4589500d197ddb543b63b4c84e87e763d050b40 (commit) via 2e310fa7f38426b2a53bcca6e66d2ffae3688d17 (commit) via 5cd071d66e2bba70f712b4fa4347648a51e1ed1a (commit) via b9422bef708fb8e57bb7cf482efbddd62860ab61 (commit) via f847cfdd7efa8dcf13985409dcd333a933dbe416 (commit) via e083287048f8672f3a32372b88e13d53fb3a8c97 (commit) via 838b8cb2f4bdbaaeba1e6958cbeddc0672b776e8 (commit) from 75c2cbed874f32fafe4df31f832e9c3259b5e887 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 000c42cd60f324a9c1d3fd92900b3be834505327 Author: Lisette Scheer Date: Wed Nov 13 19:41:20 2019 +0000 Bug 24034: Capitalization on suggestion edit form: No Status When editing a purchase suggestion, the "No status" option in the status pulldown is incorrectly capatalized. This patch fixes the capitazliation. To test: 1) Create a purchase suggestion in the acquisitions module. 2) Edit the suggestion. Notice the capitalization in the status dropdown is incorrect. 3) Apply the patch. 4) Repeat step 2. 5) Note the capitalization has been fixed. 6) Sign off. Signed-off-by: George Williams Signed-off-by: Katrin Fischer Signed-off-by: Martin Renvoize commit 43a72e09989a8a8fd943fa3a87a1488b4078fe4f Author: Owen Leonard Date: Mon Nov 18 18:55:39 2019 +0000 Bug 24058: acquisition table displayed even if no order exist (bib detail) This patch corrects the template check for existence of acquisitions data on the bibliographic detail page. Now it will correctly hide the DataTable when there is no data. To test, apply the patch and enable the AcquisitionDetails system preference. - View the bibliographic detail page for a title which has no associated Acquisitions data. Under the "Acquisitions details" tab you should see only a message, "There is no order for this biblio." - View the detail page for a title which has associated Acquisitions data. The "Acquisitions details" tab should show the correct information. Signed-off-by: Séverine QUEUNE Signed-off-by: Marcel de Rooy Signed-off-by: Martin Renvoize commit fbd46dd3a7f231479c031808df967a9286a864d0 Author: Jonathan Druart Date: Tue Nov 19 11:12:32 2019 +0100 Bug 23721: Use basketgroup's name to name the CSV export file When exporting a basket group, the names of the files are different: * pdf => aqbasketgroup.name(.pdf) * csv => aqbasketgroup.id(.csv) Better to use basketgroup's name for consistency and readability Test plan: Create a basketgroup and export it in pdf and CSV. The name of the generated file must be the basketgroup's name suffixed by the extension. Signed-off-by: Séverine QUEUNE Signed-off-by: Marcel de Rooy Signed-off-by: Martin Renvoize commit d4589500d197ddb543b63b4c84e87e763d050b40 Author: Nick Clemens Date: Tue Nov 19 13:01:56 2019 +0000 Bug 24065: Fail shib login if multiple users matched Ideally you could test against active shib, but is a small code change and covered by tests and should be readable To test: prove -v t/Auth_with_shibboleth.t Signed-off-by: Liz Rea Signed-off-by: Marcel de Rooy Signed-off-by: Martin Renvoize commit 2e310fa7f38426b2a53bcca6e66d2ffae3688d17 Author: Nick Clemens Date: Mon Nov 4 12:45:16 2019 +0000 Bug 23184: Don't select branches for export by default This patch changes the include to require passing "selectall=1" to select all items This include is only used in this page, so changes should not have side effects git grep "branch-selector\.inc" This patch also corrects a mismatch in the class names To test: 1 - Browse to Tools->Export data 2 - Note all branches are selected 3 - Note this will exclude records wiuthout items if you click 'Export bibiographic records' 4 - Apply patch 5 - Visit page again 6 - Note no branches are selected by default 7 - Confirm 'Select all/Clear all' still work 8 - Note record with no items are exported by default now Signed-off-by: Myka Kennedy Stephens Signed-off-by: Marcel de Rooy Signed-off-by: Martin Renvoize commit 5cd071d66e2bba70f712b4fa4347648a51e1ed1a Author: Nick Clemens Date: Tue Nov 12 18:29:58 2019 +0000 Bug 24024: Invert names on halds waiting report Signed-off-by: Rhonda Kuiper Signed-off-by: Marcel de Rooy Signed-off-by: Martin Renvoize commit b9422bef708fb8e57bb7cf482efbddd62860ab61 Author: Jonathan Druart Date: Mon Nov 11 09:42:42 2019 +0100 Bug 23964: Clarify and expand tests Signed-off-by: Jonathan Druart Signed-off-by: Marcel de Rooy Signed-off-by: Martin Renvoize commit f847cfdd7efa8dcf13985409dcd333a933dbe416 Author: Nick Clemens Date: Wed Nov 6 14:59:03 2019 +0000 Bug 23964: (follow-up) Add comments and improve readability Signed-off-by: Jonathan Druart Signed-off-by: Marcel de Rooy Signed-off-by: Martin Renvoize commit e083287048f8672f3a32372b88e13d53fb3a8c97 Author: Nick Clemens Date: Mon Nov 4 16:06:15 2019 +0000 Bug 23964: ReservesNeedReturn should only apply to available items To test: 1 - Checkout an item to a patron 2 - Make sure 'ReservesNeedReturn' is set to 'Automatically' 3 - Place an item level hold on the checked out item 4 - Note the hold is marked waiting 5 - Delete the hold 6 - Apply patch 7 - Place a new hold 8 - Hold is not marked waiting 9 - Please a hold on a different item 10 - Note it is marked waiting 11 - Test when item is damaged and hold not allowed on damaged items 12 - Test when item is in transit 13 - Test when item has another hold 14 - Only in the case where none of the above are true should the hold be marked waiting Signed-off-by: Martin Renvoize Signed-off-by: Jonathan Druart Signed-off-by: Marcel de Rooy Signed-off-by: Martin Renvoize commit 838b8cb2f4bdbaaeba1e6958cbeddc0672b776e8 Author: Nick Clemens Date: Mon Nov 4 16:06:02 2019 +0000 Bug 23964: Unit tests Signed-off-by: Martin Renvoize Signed-off-by: Jonathan Druart Signed-off-by: Marcel de Rooy Signed-off-by: Martin Renvoize ----------------------------------------------------------------------- Summary of changes: C4/Auth_with_shibboleth.pm | 11 ++- C4/Reserves.pm | 20 +++- acqui/basketgroup.pl | 3 +- .../prog/en/includes/branch-selector.inc | 10 +- .../prog/en/includes/waiting_holds.inc | 2 +- .../prog/en/modules/catalogue/detail.tt | 2 +- .../prog/en/modules/suggestion/suggestion.tt | 2 +- t/Auth_with_shibboleth.t | 31 ++++++- t/db_dependent/Reserves.t | 97 +++++++++++++------- 9 files changed, 127 insertions(+), 51 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Nov 22 16:22:00 2019 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 22 Nov 2019 15:22:00 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v19.05.00-1337-g737d8d1 Message-ID: This is an automated email from the git hooks/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 737d8d1c7c044905c22e4ed735f7782589cf1f80 (commit) via 9abdc5945b937dd7a7d9888c63654c35a67c2675 (commit) from 000c42cd60f324a9c1d3fd92900b3be834505327 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 737d8d1c7c044905c22e4ed735f7782589cf1f80 Author: Martin Renvoize Date: Fri Nov 22 14:47:19 2019 +0000 Bug 24068: (RM follow-up) Enhance the POD Signed-off-by: Martin Renvoize commit 9abdc5945b937dd7a7d9888c63654c35a67c2675 Author: Jonathan Druart Date: Tue Nov 19 17:26:52 2019 +0100 Bug 24068: Fix I18 plugin - tnpx must call __npx Test plan: Use the following code to test this change [% PROCESS 'i18n.inc' %] [% SET nb_stuffs = 1 %] [% tnpx('context', 'There is one stuff.', 'There are {count} stuffs.', nb_stuffs, { count = nb_stuffs }) | $raw %] [% SET nb_stuffs = 42 %] [% tnpx('context', 'There is one stuff.', 'There are {count} stuffs.', nb_stuffs, { count = nb_stuffs }) | $raw %] Compare with and without the patch Signed-off-by: Martin Renvoize ----------------------------------------------------------------------- Summary of changes: Koha/Template/Plugin/I18N.pm | 54 ++++++++++++++++++++++++++++++++++++++---- 1 file changed, 50 insertions(+), 4 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Fri Nov 22 16:32:24 2019 From: gitmaster at git.koha-community.org (Git repo owner) Date: Fri, 22 Nov 2019 15:32:24 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v19.05.00-1339-g1ca7b6c Message-ID: This is an automated email from the git hooks/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 1ca7b6c40cfc78bbeaf0c9d5bebeeb2e3b5ce611 (commit) via 39cc13d070e1613b4a903ec5e0e2513ebd561285 (commit) from 737d8d1c7c044905c22e4ed735f7782589cf1f80 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 1ca7b6c40cfc78bbeaf0c9d5bebeeb2e3b5ce611 Author: Kyle M Hall Date: Thu Nov 21 06:34:11 2019 -0500 Bug 24075: Unit tests Signed-off-by: Tomas Cohen Arazi Signed-off-by: Martin Renvoize commit 39cc13d070e1613b4a903ec5e0e2513ebd561285 Author: Martin Renvoize Date: Fri Nov 22 12:31:09 2019 +0000 Bug 24075: Backdating a return to the exact due date and time results in the fine not being refunded When you use the date picker or book drop mode and check in an item that is due on that date, a fine is assessed and not refunded. For example: item 12345 is due on 11/19/2109 23:59. On 11/20/2019 I check the item in using date picker/book drop setting the check in date to 11/19/2019 23:59, the patron is charged a fine, and the fine is not cleared as would be expected, since the item is being checked in before it is overdue. Test Plan: 1) Back date a checkout so it is overdue 2) Run fines.pl to generate the fine 3) Return the item, backdating to the same date/time is was due 4) Note the fine was not removed 5) Apply this patch 6) Repeat steps 1-3 7) Fine should be zeroed out now! Signed-off-by: Kyle M Hall Signed-off-by: Tomas Cohen Arazi Signed-off-by: Martin Renvoize ----------------------------------------------------------------------- Summary of changes: C4/Circulation.pm | 6 ++---- C4/Overdues.pm | 4 ++++ t/db_dependent/Circulation.t | 45 +++++++++++++++++++++++++++++++++++++++++- 3 files changed, 50 insertions(+), 5 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Mon Nov 25 10:07:57 2019 From: gitmaster at git.koha-community.org (Git repo owner) Date: Mon, 25 Nov 2019 09:07:57 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v19.05.00-1346-g1f3a972 Message-ID: This is an automated email from the git hooks/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 1f3a9722e4f8d32c7a839137252fc935ad599f74 (commit) via 8606ca9a0e8d476b4674ec0325402c16de8e58da (commit) via 7b8780daa14dad446c0c7b0cdf4f01fe90531ed3 (commit) via 4c853b0034e20d127a42149dd9d6239867d9df67 (commit) via 95d5be238cb69b8f4a38bebc6128b82c23d1c208 (commit) via e9163adf3f7bbd4ca0ae7721b272ab2493e4d5ff (commit) via 770f24d4f7da01434fb2318425e4275ec791db8f (commit) from 1ca7b6c40cfc78bbeaf0c9d5bebeeb2e3b5ce611 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 1f3a9722e4f8d32c7a839137252fc935ad599f74 Author: Magnus Enger Date: Wed Nov 20 15:15:15 2019 +0100 Bug 24072: Typos in advance_notices.pl causes DUEDGST not to be sent There are two typos in advance_notics.pl that cause DUEDGST messages not to be sent. See Bugzilla for full details. If you think the typo is sufficiently obvious, you can just eyeball the patch and sign off, methinks. Otherwise, testing can be done something like this: - Make sure you have enabled enhanced messaging preferences, and a patron with "Email" and "Digests only" set for "Item due" messages - Issue an item to this patron, with due date today - Run something like this to generate advance notices: $ sudo koha-shell -c "perl \ /home/vagrant/kohaclone/misc/cronjobs/advance_notices.pl -n -c" kohadev - See that no notices are shown (-n means messages will go to stdout, instead of into the message queue). - Apply the patch and run advance_notices.pl again, as before. A DUEDGST message should now be displayed. Signed-off-by: Martin Renvoize Signed-off-by: Katrin Fischer Signed-off-by: Martin Renvoize commit 8606ca9a0e8d476b4674ec0325402c16de8e58da Author: Lari Taskula Date: Fri Oct 25 13:39:12 2019 +0000 Bug 23901: Fix indentation This patch only fixes the indentation of code inside the if-block. To test: 1. Apply patch 2. Run: git diff -w HEAD~1 and observe no result Sponsored-by: Koha-Suomi Oy Signed-off-by: Katrin Fischer Signed-off-by: Martin Renvoize commit 7b8780daa14dad446c0c7b0cdf4f01fe90531ed3 Author: Lari Taskula Date: Fri Oct 25 13:36:11 2019 +0000 Bug 23901: Fix sms_input is null in opac-messaging.tt When sms messaging is disabled, JavaScript breaks in opac-messaging.tt. Bug introduced in Bug 22862. To test: 1. Enable EnhancedMessagingPreferences system preference 2. Disable sms messaging by unsetting SMSSendDriver system preference 3. Go to OPAC -> your messaging 4. Observe JavaScript error "sms_input is null" in your browser console 5. Apply patch 6. Refresh page and observe the error is gone Sponsored-by: Koha-Suomi Oy Signed-off-by: Katrin Fischer Signed-off-by: Martin Renvoize commit 4c853b0034e20d127a42149dd9d6239867d9df67 Author: Jonathan Druart Date: Wed Nov 20 11:52:04 2019 +0100 Bug 24013: Fix transferbook if item is checked out Wrong conflict resolution, the following commit 6eade474ed3a84a5ba372a26ac27bf9fb4bd2299 Bug 18276: Remove GetBiblioFromItemNumber - Easy ones restored a previous change from commit 546379cc92b733cb29a0b70247a72c770afdad26 Bug 17680: C4::Circulation - Remove GetItemIssue, simple calls Not that "easy" or "simple"... Test plan: Run the test before and after this patch. Signed-off-by: Martin Renvoize Signed-off-by: Katrin Fischer Signed-off-by: Martin Renvoize commit 95d5be238cb69b8f4a38bebc6128b82c23d1c208 Author: Jonathan Druart Date: Wed Nov 20 11:55:55 2019 +0100 Bug 24013: Add tests Signed-off-by: Martin Renvoize commit e9163adf3f7bbd4ca0ae7721b272ab2493e4d5ff Author: Owen Leonard Date: Fri Nov 22 18:41:28 2019 +0000 Bug 24093: Sorting indicators broken on list contents view This patch updates the table markup for the lists contents view so that the table sort state is correctly indicated by arrows in the table headers. The markup changes allow the standard DataTables CSS to apply to this table even though it is not a DataTable. To test, apply the patch, go to Lists, and view any list with multiple titles attached. - The list should be sorted by default according to the list's settings, and the arrow in the header row should correctly reflect the sorting column and direction. - Test re-sorting the table by each of the different sortable columns, confirming each time that the sorting arrows are correct. Signed-off-by: Maryse Simard Signed-off-by: Katrin Fischer Signed-off-by: Martin Renvoize commit 770f24d4f7da01434fb2318425e4275ec791db8f Author: Owen Leonard Date: Thu Nov 21 18:08:48 2019 +0000 Bug 24084: PlainMARC view broken on OPAC if other $.ajax calls produce errors This patch removes the use of jQuery's ajaxSetup() and load() to get the "plain" MARC view and replaces it with $.get(). This allows for error-handling on this specific AJAX request rather than all on the page. To test, apply the patch and view a bibliographic record in the OPAC. - Click the "MARC view" tab. - Click the "view plain" link. - The plain-text MARC view should load. - Clicking "view labeled" should return you to the original view. To test error handling, edit opac-MARCdetail.tt line 185 and add a typo to the URL, e.g. "opac-showmark.pl." Repeat the above steps. Clicking the "view plain" link should trigger an error message: "Sorry, plain view is temporarily unavailable." Signed-off-by: Lucas Gass Signed-off-by: Katrin Fischer Signed-off-by: Martin Renvoize ----------------------------------------------------------------------- Summary of changes: C4/Circulation.pm | 2 +- .../prog/en/modules/virtualshelves/shelves.tt | 50 ++++++++-------- .../bootstrap/en/modules/opac-MARCdetail.tt | 62 +++++++++----------- .../bootstrap/en/modules/opac-messaging.tt | 22 +++---- misc/cronjobs/advance_notices.pl | 4 +- t/db_dependent/Circulation/transferbook.t | 33 ++++++++++- 6 files changed, 100 insertions(+), 73 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Mon Nov 25 18:02:06 2019 From: gitmaster at git.koha-community.org (Git repo owner) Date: Mon, 25 Nov 2019 17:02:06 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v19.05.00-1347-g0f4bc4f Message-ID: This is an automated email from the git hooks/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 0f4bc4fd812b34bf15f593d769363dde1ca0247b (commit) from 1f3a9722e4f8d32c7a839137252fc935ad599f74 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 0f4bc4fd812b34bf15f593d769363dde1ca0247b Author: Nick Clemens Date: Mon Nov 25 11:32:32 2019 +0000 Bug 23964: (follow-up) We should check for only active holds when determining to set waiting Signed-off-by: Jonathan Druart Signed-off-by: Martin Renvoize ----------------------------------------------------------------------- Summary of changes: C4/Reserves.pm | 2 +- t/db_dependent/Reserves.t | 29 ++++++++++++++++++++++++----- 2 files changed, 25 insertions(+), 6 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Mon Nov 25 18:27:26 2019 From: gitmaster at git.koha-community.org (Git repo owner) Date: Mon, 25 Nov 2019 17:27:26 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v19.05.00-1348-gfc7da40 Message-ID: This is an automated email from the git hooks/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 fc7da400acfb26c33bfa941ba0f63e3aeba97c04 (commit) from 0f4bc4fd812b34bf15f593d769363dde1ca0247b (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit fc7da400acfb26c33bfa941ba0f63e3aeba97c04 Author: Martin Renvoize Date: Mon Nov 25 11:21:52 2019 +0000 Bug 24100: (bug 23788 follow-up) Capitalization correction Correct the capitalization of the class name introduced in bug 23788. Test plan: 1) Prior to patch attempt to 'pay off selected' - Note a server error 2) Apply patch 3) Attempt to 'pay off selected' - Note it now works as expected. 4) Signoff Signed-off-by: Tomas Cohen Arazi Signed-off-by: Martin Renvoize ----------------------------------------------------------------------- Summary of changes: members/paycollect.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Tue Nov 26 09:03:21 2019 From: gitmaster at git.koha-community.org (Git repo owner) Date: Tue, 26 Nov 2019 08:03:21 +0000 Subject: [koha-commits] main Koha release repository branch 19.11.x created. v19.05.00-1348-gfc7da40 Message-ID: This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "main Koha release repository". The branch, 19.11.x has been created at fc7da400acfb26c33bfa941ba0f63e3aeba97c04 (commit) - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Tue Nov 26 12:34:42 2019 From: gitmaster at git.koha-community.org (Git repo owner) Date: Tue, 26 Nov 2019 11:34:42 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v19.05.00-1349-g53c8014 Message-ID: This is an automated email from the git hooks/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 53c8014557326e9a67c3c53b016e2fd10ac4f3ad (commit) from fc7da400acfb26c33bfa941ba0f63e3aeba97c04 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 53c8014557326e9a67c3c53b016e2fd10ac4f3ad Author: Owen Leonard Date: Thu Nov 21 17:12:30 2019 +0000 Bug 14741: Selecting all child permissions doesn't select the top level check box This patch modifies the patron flags page so that manually selecting all the child permissions also checks the checkbox for the parent permission. To test, apply the patch, open a patron record, select More -> Set permissions. - Expand a set of permissions, for instance "Add, modify, and view patron information." - If any boxes are checked, uncheck them. - Check each of the "child" checkboxes ("Add, modify, and view..." and "View patron infos..." ). - When both checkboxes are checked, the "Add, modify, and view" parent permission should be automatically checked. Signed-off-by: Maryse Simard Signed-off-by: Jonathan Druart Signed-off-by: Martin Renvoize ----------------------------------------------------------------------- Summary of changes: .../prog/en/modules/members/member-flags.tt | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Tue Nov 26 12:40:45 2019 From: gitmaster at git.koha-community.org (Git repo owner) Date: Tue, 26 Nov 2019 11:40:45 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v19.05.00-1351-g2d9bfcb Message-ID: This is an automated email from the git hooks/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 2d9bfcbfbecca0418ed9cb7f1247a5ce37a95a1c (commit) via dcb9bf358151bcca6189581871aeb937125bc896 (commit) from 53c8014557326e9a67c3c53b016e2fd10ac4f3ad (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 2d9bfcbfbecca0418ed9cb7f1247a5ce37a95a1c Author: Jonathan Druart Date: Tue Nov 26 10:16:19 2019 +0100 Bug 23905: Remove extra closing span Signed-off-by: Jonathan Druart Signed-off-by: Martin Renvoize commit dcb9bf358151bcca6189581871aeb937125bc896 Author: Kyle M Hall Date: Mon Nov 25 11:50:46 2019 -0500 Bug 23905: Button "Search to add" doesn't work on Quick add new patron This issue is caused by duplicating the patron guarantor fieldset. The solution is to move it between the two forms insetad. In addition, this patch moves the guarantor information fieldset to the area below the "Quick add" fieldset, instead of *inside* it. This change preserves the correct styling and layout of the Guarantor information fieldset whilst it is moved back and forth by the "quick add"/"full form" toggle. Test Plan: 1) Quick add a child patron 2) Attempt to use the "Search to add" button 3) Note it does nothing 4) Apply this patch 5) Repeat steps 1 and 2 6) It works now! 7) Test toggling between the quick add and full form views, note the "Guarantor information" fieldset shows correctly in the full form view. Signed-off-by: Jonathan Druart Signed-off-by: Martin Renvoize ----------------------------------------------------------------------- Summary of changes: .../prog/en/modules/members/memberentrygen.tt | 17 +++++++++-------- koha-tmpl/intranet-tmpl/prog/js/members.js | 4 +--- 2 files changed, 10 insertions(+), 11 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Tue Nov 26 13:03:39 2019 From: gitmaster at git.koha-community.org (Git repo owner) Date: Tue, 26 Nov 2019 12:03:39 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v19.05.00-1355-geb27902 Message-ID: This is an automated email from the git hooks/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 eb279027e826af140bf3d781e94c54a55464fdec (commit) via 4d0c49e1ee8fbe4e3a48154f34cd8f51d2f2452c (commit) via 24c2e88640562a7ba5851edd271f337124882d0b (commit) via 03847f77b755dac9e6f1eb06fe0651c6ca91b542 (commit) from 2d9bfcbfbecca0418ed9cb7f1247a5ce37a95a1c (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit eb279027e826af140bf3d781e94c54a55464fdec Author: Martin Renvoize Date: Tue Nov 26 11:38:34 2019 +0000 Bug 23624: (RM follow-up) Add Sponsor Sponsored-by: Higher Education Libraries of Massachusetts Sponsored-by: Fenway Library Organization Signed-off-by: Martin Renvoize commit 4d0c49e1ee8fbe4e3a48154f34cd8f51d2f2452c Author: Martin Renvoize Date: Tue Nov 26 11:35:17 2019 +0000 Bug 23626: (RM follow-up) Add Sponsor Sponsored-by: Higher Education Libraries of Massachusetts Sponsored-by: Fenway Library Organization Signed-off-by: Martin Renvoize commit 24c2e88640562a7ba5851edd271f337124882d0b Author: Martin Renvoize Date: Tue Nov 26 11:28:45 2019 +0000 Bug 14697: (RM follow-up) Add Sponsor Sponsored-by: Fargo Public Library Signed-off-by: Martin Renvoize commit 03847f77b755dac9e6f1eb06fe0651c6ca91b542 Author: Martin Renvoize Date: Tue Nov 26 11:21:34 2019 +0000 Bug 17179: (RM follow-up) Add Sponsor Sponsored-by: Round Rock Public Library Signed-off-by: Martin Renvoize ----------------------------------------------------------------------- Summary of changes: hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Tue Nov 26 13:08:11 2019 From: gitmaster at git.koha-community.org (Git repo owner) Date: Tue, 26 Nov 2019 12:08:11 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v19.05.00-1356-gd69762d Message-ID: This is an automated email from the git hooks/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 d69762d931d88d159a21856d7dfb21a1d6969c63 (commit) from eb279027e826af140bf3d781e94c54a55464fdec (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit d69762d931d88d159a21856d7dfb21a1d6969c63 Author: Lisette Scheer Date: Tue Nov 19 16:58:45 2019 +0000 Bug 21574: Local use system preferences page doesn't have the system preferences menu The "local use" tab in system preferences is showing the admin menu instead of the system preferences menu tabs. This patch fixes the menu display. To test: 1) Go to the system preferences in administration. 2) Click the 'Local use' tab. 3) Observe the inncorrect menu. 4) Apply the patch. 5) Repeat steps 1-2 6) Observe the correct menu. Signed-off-by: Caroline Cyr La Rose Signed-off-by: Katrin Fischer Signed-off-by: Martin Renvoize ----------------------------------------------------------------------- Summary of changes: koha-tmpl/intranet-tmpl/prog/en/modules/admin/systempreferences.tt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Tue Nov 26 13:10:06 2019 From: gitmaster at git.koha-community.org (Git repo owner) Date: Tue, 26 Nov 2019 12:10:06 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v19.05.00-1358-g7657163 Message-ID: This is an automated email from the git hooks/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 7657163d8f9fb0f2932dc663fdec1ce8e2c8e3c4 (commit) via 7da1644fd5ad7506cfe410f8c04f6d0f2e416668 (commit) from d69762d931d88d159a21856d7dfb21a1d6969c63 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 7657163d8f9fb0f2932dc663fdec1ce8e2c8e3c4 Author: Bernardo Gonzalez Kriegel Date: Mon Nov 4 10:50:11 2019 -0300 Bug 23452: Multiple select options in system preferences are not translatable Translate script ignores multiple options in system preferences, this patch fix that. To test: 1) Apply the patch 2) Go to misc/translator cd misc/translator 3) Update your preferred language perl translate update xx-YY 4) Updated pref file must contain new strings, eg. egrep "when cataloguing an item" po/xx-YY-pref.po 5) Edit & translate that string 6) Install the updated translation perl translate install xx-YY 7) Check that the translated pref file has a) multiple options present b) the message from 5) is translated see for example circulation.pref en: koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref xx: koha-tmpl/intranet-tmpl/prog/xx-YY/modules/admin/preferences/circulation.pref Signed-off-by: Katrin Fischer Signed-off-by: Jonathan Druart Signed-off-by: Martin Renvoize commit 7da1644fd5ad7506cfe410f8c04f6d0f2e416668 Author: Jonathan Druart Date: Wed Nov 20 14:35:10 2019 +0100 Bug 23256: Remove the http:// prefix before OPACBaseURL in OPAC_REG_VERIFY The title explained everything, compare with installer/data/mysql/fr-FR/1-Obligatoire/sample_notices.sql and other notices. It's certainly due to the fact that fr-CA took time to be integrated and the change happened in the meanwhile Signed-off-by: Katrin Fischer Signed-off-by: Martin Renvoize ----------------------------------------------------------------------- Summary of changes: installer/data/mysql/fr-CA/obligatoire/sample_notices.sql | 2 +- misc/translator/LangInstaller.pm | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Tue Nov 26 13:11:55 2019 From: gitmaster at git.koha-community.org (Git repo owner) Date: Tue, 26 Nov 2019 12:11:55 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v19.05.00-1359-g164eda8 Message-ID: This is an automated email from the git hooks/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 164eda8333e60608c8e74893bc351c318daccb32 (commit) from 7657163d8f9fb0f2932dc663fdec1ce8e2c8e3c4 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 164eda8333e60608c8e74893bc351c318daccb32 Author: Owen Leonard Date: Wed Nov 20 18:11:55 2019 +0000 Bug 24076: Remove inline CSS to center patron home library in search results This patch removes code from the patron search results DataTable configuration which was designed to add "text-align:center" to the table cells containing patron home library. I don't think there's a good reason to centering to that data. To test, apply the patch and perform a patron search in the staff client. The "Library" column should contain left-aligned data, matching almost every other column in the table. Signed-off-by: Katrin Fischer Signed-off-by: Martin Renvoize ----------------------------------------------------------------------- Summary of changes: koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tt | 6 ------ 1 file changed, 6 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Tue Nov 26 17:27:00 2019 From: gitmaster at git.koha-community.org (Git repo owner) Date: Tue, 26 Nov 2019 16:27:00 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v19.05.00-1361-g067403e Message-ID: This is an automated email from the git hooks/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 067403e437803fd6a6c28571b491da3a231c67c1 (commit) via 1e919d431a51915d54e19cb1d6a62cd115b0e176 (commit) from 164eda8333e60608c8e74893bc351c318daccb32 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 067403e437803fd6a6c28571b491da3a231c67c1 Author: Martin Renvoize Date: Tue Nov 26 16:02:07 2019 +0000 Bug 21390: (RM follow-up) Add Sponsor Sponsored-by: Goethe-Institut Signed-off-by: Martin Renvoize commit 1e919d431a51915d54e19cb1d6a62cd115b0e176 Author: Martin Renvoize Date: Tue Nov 26 16:01:16 2019 +0000 Bug 14570: (RM follow-up) Stray console.log Signed-off-by: Martin Renvoize ----------------------------------------------------------------------- Summary of changes: koha-tmpl/intranet-tmpl/prog/js/members.js | 2 -- 1 file changed, 2 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Wed Nov 27 09:16:30 2019 From: gitmaster at git.koha-community.org (Git repo owner) Date: Wed, 27 Nov 2019 08:16:30 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v19.05.00-1362-g7f6f4f3 Message-ID: This is an automated email from the git hooks/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 7f6f4f3c687cf287ac19a6035f11c63b7a66ade8 (commit) from 067403e437803fd6a6c28571b491da3a231c67c1 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 7f6f4f3c687cf287ac19a6035f11c63b7a66ade8 Author: Kyle M Hall Date: Tue Nov 26 10:23:36 2019 -0500 Bug 24113: guarantor info lost when a duplicate is found When a patron is created with a guarantor but a duplicate is found (or any other warnings I guess) the guarantor's info are lost. This patch improves on previous functionality by retaining the select guarantor relationship as well. Test Plan: 1) Create a new child with a name already used, add a guarantor 2) Attempt to save, no the guarantor is not shown when the editor is redisplayed 3) Apply this patch 4) Restart all the things! 5) Repeat 1 6) Note the guarantor is retained and the relationship is as well! Signed-off-by: Jonathan Druart Signed-off-by: Martin Renvoize ----------------------------------------------------------------------- Summary of changes: .../prog/en/modules/members/memberentrygen.tt | 6 ++++-- koha-tmpl/intranet-tmpl/prog/js/members.js | 6 +++++- members/memberentry.pl | 13 +++++++++++++ 3 files changed, 22 insertions(+), 3 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Wed Nov 27 09:18:43 2019 From: gitmaster at git.koha-community.org (Git repo owner) Date: Wed, 27 Nov 2019 08:18:43 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v19.05.00-1364-g04fab26 Message-ID: This is an automated email from the git hooks/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 04fab26ccc25d70a3b94b3bd2ceea22752b8714e (commit) via 59ea9b3cc27c27d16880fc238f4a173a9e38b479 (commit) from 7f6f4f3c687cf287ac19a6035f11c63b7a66ade8 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 04fab26ccc25d70a3b94b3bd2ceea22752b8714e Author: Nick Clemens Date: Tue Nov 26 14:12:01 2019 +0000 Bug 24120: (follow-up) input_name too Signed-off-by: Tomas Cohen Arazi Signed-off-by: Jonathan Druart Signed-off-by: Martin Renvoize commit 59ea9b3cc27c27d16880fc238f4a173a9e38b479 Author: Nick Clemens Date: Tue Nov 26 13:19:28 2019 +0000 Bug 24120: URI filter search terms in sort dropdowns To test: 1 - Search for C++ 2 - Sort your results 3 - Note search is now for "C " 4 - Apply patch 5 - Search for C++ 6 - Reorder results 7 - Still searching for C++ Signed-off-by: Tomas Cohen Arazi Signed-off-by: Jonathan Druart Signed-off-by: Martin Renvoize ----------------------------------------------------------------------- Summary of changes: koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Wed Nov 27 10:42:17 2019 From: gitmaster at git.koha-community.org (Git repo owner) Date: Wed, 27 Nov 2019 09:42:17 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v19.05.00-1366-g5b694fe Message-ID: This is an automated email from the git hooks/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 5b694fea9a00db7470d0942195ec4d131ee16928 (commit) via 4d2f7668665f9fafc945be93cda71eab333029f9 (commit) from 04fab26ccc25d70a3b94b3bd2ceea22752b8714e (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 5b694fea9a00db7470d0942195ec4d131ee16928 Author: Jonathan Druart Date: Mon Nov 25 11:53:45 2019 +0100 Bug 23927: Do not copy invoiceid for a new duplicated order When an order is created from an existing one (duplication), then the invoice should be set to null instead of retrieved. Test plan: - receive an order - in a new basket, add an order "From exisitions orders (copy)" - search your received order - duplicate - go to the bibliographic record "Acquisition details" tab => Without this patch you will see that the invoice is the same for the two orders => With this patch the invoice for the new order is not set Signed-off-by: Séverine QUEUNE Signed-off-by: Martin Renvoize commit 4d2f7668665f9fafc945be93cda71eab333029f9 Author: Jonathan Druart Date: Mon Nov 25 11:53:00 2019 +0100 Bug 23927: Add tests Signed-off-by: Séverine QUEUNE Signed-off-by: Martin Renvoize ----------------------------------------------------------------------- Summary of changes: Koha/Acquisition/Order.pm | 1 + t/db_dependent/Koha/Acquisition/Order.t | 9 ++++++++- 2 files changed, 9 insertions(+), 1 deletion(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Wed Nov 27 10:50:20 2019 From: gitmaster at git.koha-community.org (Git repo owner) Date: Wed, 27 Nov 2019 09:50:20 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v19.05.00-1370-g0a597b6 Message-ID: This is an automated email from the git hooks/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 0a597b6ef855e987e0a1d6ce726799b7f1622a03 (commit) via f23e49c08cabe4ee76ac0683dffc157c02c0905d (commit) via d6dc7622d39630667909942c53720873bbb77473 (commit) via 528b1e2905b6f224d47677613fda4ae4e9631212 (commit) from 5b694fea9a00db7470d0942195ec4d131ee16928 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 0a597b6ef855e987e0a1d6ce726799b7f1622a03 Author: Martin Renvoize Date: Wed Nov 27 09:26:01 2019 +0000 Bug 23958: Compiled CSS Signed-off-by: Martin Renvoize commit f23e49c08cabe4ee76ac0683dffc157c02c0905d Author: Owen Leonard Date: Sun Nov 3 19:38:20 2019 -0500 Bug 23958: Use Font Awesome icon to replace "new window" icon image This patch modifies several templates in order to eliminate the dependency on an image file for styling certain links which open popups or new windows. A Font Awesome icon is used instead. To test, apply the patch and rebuild the staff client CSS (https://wiki.koha-community.org/wiki/Working_with_SCSS_in_the_OPAC_and_staff_client). Cataloging: - Create a new MARC record which has the same ISBN as a record in your catalog. - When you save the record it should warn you that it is a possible duplicate. The message should contain an icon-prefixed link to the existing record. - Clicking the link should open details about the title in a new window. Circulation: - Enable the itemBarcodeFallbackSearch system preference. - Open a patron for checkout and enter a word in the "barcode" field instead of a barcode. - The page should return a list of titles to choose from. Each title should be a link with an icon. Clicking the link should open details about the title in a new window. Acquisitions: - Go to Acquistisions -> Vendor -> Basket. - Choose "Add to basket" -> From an external source. - Search for and select a record which exists in your catalog. - You should be taken to a page with a "Duplicate warning" message. The message should contain an icon-prefixed link to the existing record. - Clicking this link should open details about the title in a new window. - Create a MARC file with two records: One which exists in your catalog and one which doesn't. Stage that file for import. - Choose "Add to basket" again and select "From a staged file." - Select the file you staged. - You should be taken to a page with a "Duplicate warning" message. The message should contain an icon-prefixed link to the existing record. - Clicking the link should open details about the title in a new window. Patrons: - Create a new patron which has the same name and birthday as an existing patron. - When you save the record you should be shown a duplicate warning. The link to the possible duplicate patron should be prefixed with an icon and should open the patron's details in a popup window. Signed-off-by: Maryse Simard Signed-off-by: Katrin Fischer Signed-off-by: Martin Renvoize commit d6dc7622d39630667909942c53720873bbb77473 Author: Martin Renvoize Date: Wed Nov 27 09:24:39 2019 +0000 Bug 23955: Compiled CSS Signed-off-by: Martin Renvoize commit 528b1e2905b6f224d47677613fda4ae4e9631212 Author: Owen Leonard Date: Sun Nov 3 22:03:46 2019 +0000 Bug 23955: Replace famfamfam icon in OPAC holds template This patch modifies the OPAC holds template so that when an item isn't available for an item-level hold a Font Awesome icon is displayed instead of a famfamfam image. To test, apply the patch and regenerate the OPAC CSS (https://wiki.koha-community.org/wiki/Working_with_SCSS_in_the_OPAC_and_staff_client). - Make sure you have items which can be placed on hold at the item level. - Locate a title with more than one item, at least one of which isn't available to be placed on hold (item is marked withdrawn, for instance). - Start the process of placing a hold on the item. - On the "Confirm holds" scren, click "Show more options" and select "A specific item." - In the table of items, any item which isn't available to be put on hold should be inidicated with a red X. The title attribute of the icon should show "Cannot be put on hold." Signed-off-by: Katrin Fischer Signed-off-by: Martin Renvoize ----------------------------------------------------------------------- Summary of changes: koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss | 5 ----- koha-tmpl/intranet-tmpl/prog/css/staff-global.css | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt | 2 +- .../prog/en/modules/acqui/neworderempty_duplicate.tt | 8 ++++---- .../intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt | 2 +- .../intranet-tmpl/prog/en/modules/members/memberentrygen.tt | 2 +- koha-tmpl/opac-tmpl/bootstrap/css/opac.css | 2 +- koha-tmpl/opac-tmpl/bootstrap/css/src/opac.scss | 4 ++++ koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-reserve.tt | 2 +- 10 files changed, 15 insertions(+), 16 deletions(-) hooks/post-receive -- main Koha release repository From gitmaster at git.koha-community.org Wed Nov 27 12:54:06 2019 From: gitmaster at git.koha-community.org (Git repo owner) Date: Wed, 27 Nov 2019 11:54:06 +0000 Subject: [koha-commits] main Koha release repository branch master updated. v19.05.00-1376-ga5339bb Message-ID: This is an automated email from the git hooks/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 a5339bb41f3dc8607c82aedec698e12c79003650 (commit) via 17ee5f70866c906fc5eef552bf93ca64ff6cdd79 (commit) via 8f350a34314f3a2a63193587631ac4d3f295e9af (commit) via cd5b4807f48d013d81360de6b5dc9f7cac82eac8 (commit) via 4ac4c4316b17c5f6731b473be113c8607024aaa8 (commit) via 051a646bd74c4e2128511719b1872674ddd64709 (commit) from 0a597b6ef855e987e0a1d6ce726799b7f1622a03 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit a5339bb41f3dc8607c82aedec698e12c79003650 Author: Martin Renvoize Date: Wed Nov 27 11:19:32 2019 +0000 Bug 20954: (RM follow-up) Add Sponsor Sponsored-by: South East Kansas Library System [http://www.sekls.org] Signed-off-by: Martin Renvoize commit 17ee5f70866c906fc5eef552bf93ca64ff6cdd79 Author: Martin Renvoize Date: Wed Nov 27 11:18:01 2019 +0000 Bug 20292: (RM follow-up) Add Sponsor Sponsored-by: Duchesne County Library [http://uintahlibrary.org/] Signed-off-by: Martin Renvoize commit 8f350a34314f3a2a63193587631ac4d3f295e9af Author: Martin Renvoize Date: Wed Nov 27 11:16:04 2019 +0000 Bug 17168: (RM follow-up) Add Sponsors Sponsored-by: Sponsored by: Round Rock Public Library [https://www.roundrocktexas.gov/departments/library/] Signed-off-by: Martin Renvoize commit cd5b4807f48d013d81360de6b5dc9f7cac82eac8 Author: Martin Renvoize Date: Wed Nov 27 11:06:31 2019 +0000 Bug 20595: (RM follow-up) Add Sponsor Sponsored-by: PTFS Europe Signed-off-by: Martin Renvoize commit 4ac4c4316b17c5f6731b473be113c8607024aaa8 Author: Martin Renvoize Date: Wed Nov 27 11:03:56 2019 +0000 Bug 23522: (RM follow-up) Add Sponsors Sponsored-by: Virginia Tech [https://lib.vt.edu/] Signed-off-by: Martin Renvoize commit 051a646bd74c4e2128511719b1872674ddd64709 Author: Martin Renvoize Date: Wed Nov 27 10:39:36 2019 +0000 Bug 14570: (RM follow-up) Add Sponsors Sponsored-by: Northeast Kansas Library System [http://www.nekls.org] Sponsored-by: Vermont Organization of Koha Automated Libraries [http://gmlc.org/index.php/vokal] Signed-off-by: Martin Renvoize ----------------------------------------------------------------------- Summary of changes: hooks/post-receive -- main Koha release repository