This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "main Koha release repository".

The branch, master has been updated
       via  fe4846d0017e17fefe3c134d30d4230a3864be4e (commit)
       via  a73aa7c23231a582464f609bdf100ccbec2d714e (commit)
       via  5ee536c715f90262c344b2afc9a9456382c858b1 (commit)
       via  2e1fe25748f4454b52170f37d19cdb26a819e517 (commit)
       via  ff3ca4a489ce5ba16c732e477b1829552c4ccbe8 (commit)
       via  e4d39fd00f38aeb05d01d0df84ac1a5b47036347 (commit)
       via  49c289eb1f747da7530fa93e43760afcfcf016f0 (commit)
       via  6dfff20145b90a58747d7daccd2bf1abe233da11 (commit)
       via  dc8879ce4332401eae248ccf8998298b6a1ece7c (commit)
       via  ec0ea67a43455b94a9d8bd3cf4ba8f68d1678e4a (commit)
       via  0798dcb0baef1cb2bd391188b49fee3ff270370a (commit)
       via  ad37e87b0af454086a08adb97060552ccf1aaa9b (commit)
       via  7e220e0d8f107cce63f32bfaa1919c04b4dea6e2 (commit)
       via  76eb3a0549efe4c1f1557071a6cb4b33d4bd3e4d (commit)
      from  a2cccbd2314ea1832dae4c1c4ba738fa5c3510d2 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit fe4846d0017e17fefe3c134d30d4230a3864be4e
Author: Jonathan Druart <jonathan.dru...@bugs.koha-community.org>
Date:   Mon Apr 9 16:14:23 2018 -0300

    Bug 19804: DBRev 17.12.00.026
    
    Signed-off-by: Jonathan Druart <jonathan.dru...@bugs.koha-community.org>

commit a73aa7c23231a582464f609bdf100ccbec2d714e
Author: Jonathan Druart <jonathan.dru...@bugs.koha-community.org>
Date:   Wed Apr 4 17:36:28 2018 -0300

    Bug 19804: (follow-up) Fix wording and columns order
    
    Signed-off-by: Katrin Fischer <katrin.fischer...@web.de>
    
    Signed-off-by: Jonathan Druart <jonathan.dru...@bugs.koha-community.org>

commit 5ee536c715f90262c344b2afc9a9456382c858b1
Author: Jonathan Druart <jonathan.dru...@bugs.koha-community.org>
Date:   Wed Dec 13 18:05:50 2017 -0300

    Bug 19804: Add the new column to the circ rules interface
    
    Signed-off-by: Hugo Agud <ha...@orex.es>
    
    Signed-off-by: Katrin Fischer <katrin.fischer...@web.de>
    
    Signed-off-by: Jonathan Druart <jonathan.dru...@bugs.koha-community.org>

commit 2e1fe25748f4454b52170f37d19cdb26a819e517
Author: Jonathan Druart <jonathan.dru...@bugs.koha-community.org>
Date:   Wed Dec 13 16:57:40 2017 -0300

    Bug 19804: Add a 'Fine charging interval' for suspension days
    
    We already have a chargeperiod (Fine charging interval) value which is
    taken into account for fine ($) for not for the suspension period.
    
    This patch adds a new column suspension_chargeperiod (Fine day charging
    interval) to add the same behaviour when a suspension is calculated.
    
    Test plan:
    Add overdue item and play with the circulation rules (and the calendar).
    The suspension period must be correctly calculated.
    Please provide the different tests you made.
    
    Signed-off-by: Hugo Agud <ha...@orex.es>
    
    Signed-off-by: Katrin Fischer <katrin.fischer...@web.de>
    
    Signed-off-by: Jonathan Druart <jonathan.dru...@bugs.koha-community.org>

commit ff3ca4a489ce5ba16c732e477b1829552c4ccbe8
Author: Jonathan Druart <jonathan.dru...@bugs.koha-community.org>
Date:   Wed Dec 13 16:56:57 2017 -0300

    Bug 19804: DBIC Schema changes
    
    Signed-off-by: Hugo Agud <ha...@orex.es>
    
    Signed-off-by: Katrin Fischer <katrin.fischer...@web.de>
    
    Signed-off-by: Jonathan Druart <jonathan.dru...@bugs.koha-community.org>

commit e4d39fd00f38aeb05d01d0df84ac1a5b47036347
Author: Jonathan Druart <jonathan.dru...@bugs.koha-community.org>
Date:   Wed Dec 13 16:56:38 2017 -0300

    Bug 19804: Add new DB column issuingrules.suspension_chargeperiod
    
    Signed-off-by: Hugo Agud <ha...@orex.es>
    
    Signed-off-by: Katrin Fischer <katrin.fischer...@web.de>
    
    Signed-off-by: Jonathan Druart <jonathan.dru...@bugs.koha-community.org>

commit 49c289eb1f747da7530fa93e43760afcfcf016f0
Author: Nick Clemens <n...@bywatersolutions.com>
Date:   Fri Mar 16 09:03:46 2018 +0000

    Bug 19581: (follow-up) Fix handling of new and old arrays for auth compat
    
    Stolen from bug 20244
    
    Signed-off-by: Julian Maurice <julian.maur...@biblibre.com>
    
    Signed-off-by: Jonathan Druart <jonathan.dru...@bugs.koha-community.org>

commit 6dfff20145b90a58747d7daccd2bf1abe233da11
Author: Nick Clemens <n...@bywatersolutions.com>
Date:   Tue Mar 13 09:32:04 2018 +0000

    Bug 19581: Remove unused comment and line
    
    Signed-off-by: Julian Maurice <julian.maur...@biblibre.com>
    
    Signed-off-by: Jonathan Druart <jonathan.dru...@bugs.koha-community.org>

commit dc8879ce4332401eae248ccf8998298b6a1ece7c
Author: Nick Clemens <n...@bywatersolutions.com>
Date:   Sun Nov 5 01:47:49 2017 +0000

    Bug 19581: Unit tests
    
    This patch makes a few changes to the tests to take into account the
    change to indexing.
    
    To test:
    prove t/db_dependent/Koha_Elasticsearch_Indexer.t
    Should return green
    
    Signed-off-by: David Bourgault <david.bourga...@inlibro.com>
    Signed-off-by: Julian Maurice <julian.maur...@biblibre.com>
    
    Signed-off-by: Jonathan Druart <jonathan.dru...@bugs.koha-community.org>

commit ec0ea67a43455b94a9d8bd3cf4ba8f68d1678e4a
Author: Nick Clemens <n...@bywatersolutions.com>
Date:   Sun Nov 5 01:51:39 2017 +0000

    Bug 19581: Remove 'split' option from Catmandu fixes for marc
    
    This option in combination with append seems to add null entries in the 
indexes
    for fields that don't exist. These fields then affect sorting. Removing it 
solves
    the issue
    
    To test:
    1 - Have an ES setup
    2 - Catalog and index some records
    3 - View a record in ES:
        curl 'localhost:9200/koha_kohadev_biblios/data/4?pretty=yes'
    4 - Note there are 'null' entries in the indexes, save this result for
    comparison
    5 - Apply patch
    6 - Reindex, amking sure to delete existing indexes
        perl misc/search_tools/rebuild_elastic_search.pl -d
    7 - View the record again
    8 - Note the null entries are removed
    9 - Note indices are otherwise intact
    
    Signed-off-by: David Bourgault <david.bourga...@inlibro.com>
    Signed-off-by: Julian Maurice <julian.maur...@biblibre.com>
    
    Signed-off-by: Jonathan Druart <jonathan.dru...@bugs.koha-community.org>

commit 0798dcb0baef1cb2bd391188b49fee3ff270370a
Author: Mark Tompsett <mtomp...@hotmail.com>
Date:   Fri Apr 6 14:59:28 2018 +0000

    Bug 20122: Explicitly set path to fix emptying cart functionality
    
    This is caused by bib_list not being deleted.
    The path was not explicitly set.
    This patch adds path=/ explicitly to ensure it
    does get deleted.
    
    TEST PLAN
    ---------
    1) search for 'the' in OPAC
    2) add several items to cart.
    3) look at your cart.
    4) empty and close the cart, select all->remove
       -- either way window closes and it looks empty.
    5) refresh the page
       -- cart comes back.
       -- in chromium inspecting the page, specifically
          the "Application" area, bib_list is shown as
          a cookie still.
    6) apply patch
    7) restart_all and empty cache forcing JS reload
    8) repeat steps 1-5
       -- this time cart stays empty.
       -- and the bib_list cookie is gone
    
    Signed-off-by: Roch D'Amour <roch.dam...@inlibro.com> using firefox 59.0.2
    
    Signed-off-by: Katrin Fischer <katrin.fischer...@web.de>
    
    Signed-off-by: Jonathan Druart <jonathan.dru...@bugs.koha-community.org>

commit ad37e87b0af454086a08adb97060552ccf1aaa9b
Author: Jonathan Druart <jonathan.dru...@bugs.koha-community.org>
Date:   Wed Feb 7 12:26:53 2018 -0300

    Bug 20180: [sql_modes] Remove GROUP BY clause in manage-marc-import.pl
    
    Replaced with a distinct.
    
    Fix for:
    'koha_kohadev.me.frameworktext' isn't in GROUP BY
    
    t/db_dependent/www/search_utf8.t
    
    NOTE: I added a [% frameworks.count %] into the template file,
          and compared master and a branch with this applied when
          managing a staged marc import. Values were identical.
    
    Signed-off-by: Mark Tompsett <mtomp...@hotmail.com>
    Signed-off-by: Julian Maurice <julian.maur...@biblibre.com>
    
    Signed-off-by: Jonathan Druart <jonathan.dru...@bugs.koha-community.org>

commit 7e220e0d8f107cce63f32bfaa1919c04b4dea6e2
Author: Jonathan Druart <jonathan.dru...@bugs.koha-community.org>
Date:   Tue Feb 6 11:04:50 2018 -0300

    Bug 20179: [sql_modes] Remove GROUP BY in get_shelves_containing_record
    
    Replaced with distinct.
    Fix for:
    'koha_kohadev.me.shelfname' isn't in GROUP BY
    
    t/db_dependent/Virtualshelves.t
    
    Signed-off-by: Roch D'Amour <roch.dam...@inlibro.com>
    Signed-off-by: Julian Maurice <julian.maur...@biblibre.com>
    
    Signed-off-by: Jonathan Druart <jonathan.dru...@bugs.koha-community.org>

commit 76eb3a0549efe4c1f1557071a6cb4b33d4bd3e4d
Author: Jonathan Druart <jonathan.dru...@bugs.koha-community.org>
Date:   Mon Apr 9 15:59:32 2018 -0300

    Bug 18789: (follow-up) Pass a Koha::Patron object from returns.pl
    
    Signed-off-by: Jonathan Druart <jonathan.dru...@bugs.koha-community.org>

-----------------------------------------------------------------------

Summary of changes:
 C4/Circulation.pm                                  |    8 ++
 Koha.pm                                            |    2 +-
 Koha/Schema/Result/Issuingrule.pm                  |   12 ++-
 Koha/SearchEngine/Elasticsearch.pm                 |    9 +-
 Koha/SearchEngine/Elasticsearch/Search.pm          |    6 +-
 Koha/Virtualshelves.pm                             |    2 +-
 admin/smart-rules.pl                               |    2 +
 circ/returns.pl                                    |    4 +-
 installer/data/mysql/kohastructure.sql             |    1 +
 installer/data/mysql/updatedatabase.pl             |   12 +++
 .../prog/en/modules/admin/smart-rules.tt           |    4 +
 .../intranet-tmpl/prog/en/modules/circ/returns.tt  |    7 +-
 koha-tmpl/opac-tmpl/bootstrap/js/basket.js         |    4 +-
 t/db_dependent/Circulation.t                       |  113 +++++++++++++++++++-
 t/db_dependent/Koha_Elasticsearch_Indexer.t        |   23 ++--
 tools/manage-marc-import.pl                        |    2 +-
 16 files changed, 178 insertions(+), 33 deletions(-)


hooks/post-receive
-- 
main Koha release repository
_______________________________________________
koha-commits mailing list
koha-commits@lists.koha-community.org
http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-commits

Reply via email to