[koha-commits] main Koha release repository branch master updated. v18.05.00-1064-gefd2b75

Git repo owner gitmaster at git.koha-community.org
Wed Oct 17 21:32:39 CEST 2018


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

The branch, master has been updated
       via  efd2b75b6741f95a79a88e0765bcb0802a7cf1fd (commit)
       via  5151b27c5d4fc74ef678eab8b45be7388c310923 (commit)
       via  5bd71cc789275572b0fc10be0a8f85ca46b19f8c (commit)
       via  da604a9006e86bf569f60ac3cd5b60d7e70447c2 (commit)
       via  62285d2de463811380262e4cc65c82937145d477 (commit)
       via  aafd0476342ca9691fd8a7c2c754c425ae1cf61f (commit)
       via  2cffe3a574e14d5f35ce7b1d9ffe28a153dcb37e (commit)
       via  81875ab282c1daa98dec2e0f5f20ba74f411ac32 (commit)
       via  796e4e5d2be5ec87970f8b586f940e4abddb687d (commit)
       via  bf7c8303ca7f9e4955f25fc4d1f30d65d8c52dc9 (commit)
       via  074cb8d5b9a2f78fec56df9069253d22c9678084 (commit)
       via  706d21ee53dd5072eec2234415fc5c8ff4b1ea17 (commit)
       via  5ca776d6e171de1b093163ab83ba589d5ae4d7cc (commit)
       via  23265158fcab25f8f5188cea6f07af46812d41cc (commit)
       via  55225ba10b824f7e881738a20c751200843d3ec9 (commit)
       via  7f0207d2ad162a86cf5e09e437565b66b91c5004 (commit)
       via  4e6d9defc180204461f80477be287ade7fcfc11b (commit)
       via  f902041e244cc35ecc99e3ca256ff24c843a8b04 (commit)
       via  32dc4a7bfaeebcff2be739fdf5f15e0f8bad4faa (commit)
      from  dc6bea7860aba7933f7e979cbe7c53e9cb15ba05 (commit)

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

- Log -----------------------------------------------------------------
commit efd2b75b6741f95a79a88e0765bcb0802a7cf1fd
Author: Andrew Isherwood <andrew.isherwood at ptfs-europe.com>
Date:   Tue Jun 26 11:36:33 2018 +0100

    Bug 20995: Add Request ID to table and request view
    
    This patch adds the display of Request ID to the OPAC views of all a
    user's requests and the individual request.
    
    To test:
    
    1) Ensure you have ILL enabled
    2) Log into the OPAC as a user with at least one request
    3) Go to the "your interlibrary loan requests" page
    4) TEST: Ensure that Request ID is displayed as the first column in the
    table
    5) Click the "View" button on a request
    6) TEST: Ensure that Request ID is displayed along with all the other
    request information
    
    Signed-off-by: mmg at interleaf.ie
    
    Signed-off-by: Katrin Fischer <katrin.fischer at bsz-bw.de>
    
    Bug 20995: (QA follow-up) Add html filters and fix doubled up columns from merge
    
    Signed-off-by: Katrin Fischer <katrin.fischer at bsz-bw.de>
    
    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>

commit 5151b27c5d4fc74ef678eab8b45be7388c310923
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Tue Oct 9 13:38:34 2018 -0300

    Bug 21174: (follow-up) Removed MSG_IN_YOUR_CART and its usage in OPAC JS
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    
    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>

commit 5bd71cc789275572b0fc10be0a8f85ca46b19f8c
Author: Alex Buckley <alexbuckley at catalyst.net.nz>
Date:   Sun Sep 30 16:22:10 2018 +0000

    Bug 21174: Removed MSG_IN_YOUR_CART and its usage in OPAC JS
    
    The 'Items in your cart' message is obsolete with the cart dropdown
    box being removed.
    
    Therefore the assignment of this text into the
    MSG_IN_YOUR_CART variable (which is done in the opac-bottom.inc), and
    the use of the MSG_IN_YOUR_CART variable in the updateBasket() function
    (in the OPAC's basket.js) has been removed.
    
    Sponsored-By: Toi Ohomai Institute of Technology, New Zealand
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    
    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>

commit da604a9006e86bf569f60ac3cd5b60d7e70447c2
Author: Alex Buckley <alexbuckley at catalyst.net.nz>
Date:   Sat Sep 29 05:24:22 2018 +0000

    Bug 21174: Open the OPAC cart with one click by default
    
    Feedback from the Koha mailing list in Aug 2018 showed there was
    widespread concensus for making the default behaviour of the OPAC cart
    to be to open with one click, rather than clicking on the cart icon then
    on the dropdown box to load the cart popup.
    
    This commit is a combination of Owen Leonard's alternative patch
    (slightly changing the markup in masthead.inc) and my
    work to remove the dropdown elements from the template and basket.js
    
    Test plan:
    1. In Koha OPAC click on the cart icon (making sure to have items in the
       cart and the dropdown box 'Items in your cart:..' appears.
    
    2. Click this dropdown and the cart popup appears.
    
    3. Confirm you can successfully remove items from and empty the
       cart
    
    4. Apply patch
    
    5. Restart memcached, and plack
    
    6. Click on the cart icon (making sure to have items in the cart) and
       notice no 'Items in your: ..' dropdown appears
       instead the cart popup loads straight away.
    
    7. Confirm the items in your cart are displayed by the cart popup
    
    8. Confirm you can remove items from/empty the cart, and that as you do
       this the number of cart items shown by the number to the right of the
       cart icon changes accordingly
    
    Sponsored-By: Toi Ohomai Institute of Technology, New Zealand
    
    Signed-off-by: Owen Leonard <oleonard at myacpl.org>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    
    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>

commit 62285d2de463811380262e4cc65c82937145d477
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Tue May 8 14:25:57 2018 -0300

    Bug 20351: Shortcut serials scripts if a blocking error appeared
    
    The idea of output_and_exit_if_error (added by bug 18403) is to make sure
    parameters are valid before executing the script.
    If not (old or broken URLs), we shortcut everything coming next to display a
    generic error ("object does not exist", "you do not have permission to do that", etc.)
    
    This bug report fixes the scripts under serials/*.
    
    Test plan:
    Hit the script under the serials directory with an invalid subscriptionid parameter
    and confirm you get an error instead of the normal view with empty values.
    
    The goal is not to be exhaustive during the first iteration, but at least to fix
    the most common views.
    
    For instance:
    /cgi-bin/koha/serials/subscription-detail.pl?subscriptionid=XXX
    /cgi-bin/koha/serials/serials-collection.pl?subscriptionid=XXX
    /cgi-bin/koha/serials/routing.pl?subscriptionid=XXX&op=new
    /cgi-bin/koha/serials/subscription-add.pl?op=modify&subscriptionid=XXx
    /cgi-bin/koha/serials/subscription-add.pl?op=dup&subscriptionid=XXX
    
    Signed-off-by: Séverine QUEUNE <severine.queune at bulac.fr>
    Signed-off-by: Séverine QUEUNE <severine.queune at bulac.fr>
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    
    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>

commit aafd0476342ca9691fd8a7c2c754c425ae1cf61f
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Wed Apr 4 16:28:53 2018 -0300

    Bug 20521: Enable problematic SQL modes for dev installs
    
    So far we have bug 17258 (omnibus to list the issue we have with the new
    default SQL modes), bug 20144 (which fixed our test suite with these
    modes) and bug 20229.
    This last one forces the SQL modes to avoid to modify the DBMS
    configuration and define the SQL modes we support.
    
    We should let developers catch the issues and report/fix them.
    Also Jenkins must alert us if there is a regression with the test suite.
    
    I suggest to enable the problematic SQL modes on dev installs.
    
    Test plan:
    - Revert commit 0180524bb9b1464c441bb1b858d0d8df37524d72
    - prove t/db_dependent/Koha/Biblios.t
    
    => If you have dev_install defined in your Koha config file, the test
    will fail with "Field 'datecreated' doesn't have a default value"
    => If you do not have dev_install, the tests will pass
    
    NOTE: The commit number was wrong. Using
        git log -- t/db_dependent/Koha/Biblios.t
        This showed bug 20176 which was 524eab678833b2719187e67128ee4f83a2a48ba4
        Also dev_install was in koha_conf.xml already, so I just had to
        toggle 0 and 1.
    
    Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
    
    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>

commit 2cffe3a574e14d5f35ce7b1d9ffe28a153dcb37e
Author: Andreas Roussos <arouss1980 at gmail.com>
Date:   Sun Oct 7 21:00:09 2018 +0300

    Bug 21513: Add a 'Cancel' button to the authority editor and remove duplicate 'Save' button
    
    The authority editor (authorities/authorities.pl) does not have
    a 'Cancel' button. Also, it has two 'Save' buttons.
    
    This patch fixes that by:
    a) adding a 'Cancel' button to the floating toolbar at the top
    b) removing the 'Save' button from the bottom of the page
    
    Test plan:
    1) Go to Home > Authorities and launch the authority editor by
       clicking on 'New authority'. Notice how the editor doesn't
       have a 'Cancel' button. Also notice the two 'Save' buttons.
    2) Apply the patch.
    3) Re-launch the authority editor, and hit cancel; you should
       be taken back to Home > Authorities.
    4) Edit an existing authority, and hit cancel; you should be
       taken back to the details page for the authority you chose.
    5) Edit an authority as new (duplicate), and hit cancel; you
       should be taken back to Home > Authorities (this behaviour
       is mimicking the bibliographic editor: when duplicating a
       biblio the 'Cancel' button will take you back to Home >
       Cataloging).
    
    Signed-off-by: Michal Denar <black23 at gmail.com>
    Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
    
    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>

commit 81875ab282c1daa98dec2e0f5f20ba74f411ac32
Author: Katrin Fischer <katrin.fischer.83 at web.de>
Date:   Sun Aug 12 17:08:57 2018 +0200

    Bug 14786: Use MARC istead of ISO2709 everywhere
    
    This patch changes the term ISO2709 in the templates to use
    MARC instead.
    
    Test plan:
    - The term was changed on the following pages in staff:
      - Advanced catalouging editor > Save to catalog
      - Patron account > Check out (Activate ExportCircHistory) > Format
      - Patron account > Check out > Help page
      - Lists > Download list
      - Acquisitions > Add order to basket > From a staged file (breadcrumbs)
      - Administration > System preferences > ExportRemoveFields
      - Cart > Download
      - Tools > Export data > Output format
    
    Signed-off-by: Michal Denar <black23 at gmail.com>
    Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
    
    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>

commit 796e4e5d2be5ec87970f8b586f940e4abddb687d
Author: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Date:   Mon Oct 8 15:25:50 2018 +0100

    Bug 21456: (QA follow-up) Catch missed case in authorities merge
    
    Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
    
    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>

commit bf7c8303ca7f9e4955f25fc4d1f30d65d8c52dc9
Author: Andreas Roussos <arouss1980 at gmail.com>
Date:   Sun Sep 30 13:06:28 2018 +0300

    Bug 21456: The 'New authority' button lists authority types inconsistently
    
    The 'New authority' button does not always list the available
    authority types in A-Z order based on their description.
    
    This patch fixes that.
    
    Test plan:
    1) Go to Home > Authorities in the staff client; notice how the
       'New authority' button lists auth types sorted by description.
    2) Go to an authority's detail page; notice how the same 'New
       authority' button will list auth types sorted by their code.
    3) Apply the patch.
    4) In an authority's detail page, the 'New authority' button will
       now list the available authority types sorted by description.
    
    Signed-off-by: Michal Denar <black23 at gmail.com>
    Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
    
    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>

commit 074cb8d5b9a2f78fec56df9069253d22c9678084
Author: Owen Leonard <oleonard at myacpl.org>
Date:   Thu May 3 12:58:36 2018 +0000

    Bug 21439: Update two-column templates with Bootstrap grid: Rotating collections
    
    This patch modifies rotating collections templates to use the
    Bootstrap grid instead of YUI.
    
    To test, apply the patch and view the following pages, confirming that
    they look correct at various browser widths:
    
     - Tools -> Rotating collections
       - View rotating collection
       - Transfer rotating collection
       - Edit rotating collection
    
    Signed-off-by: Michal Denar <black23 at gmail.com>
    Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
    
    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>

commit 706d21ee53dd5072eec2234415fc5c8ff4b1ea17
Author: Caroline Cyr La Rose <caroline.cyr-la-rose at inlibro.com>
Date:   Thu Oct 4 14:52:53 2018 -0400

    Bug 21490: Disambiguation of 'Order' part 2
    
    This patch changes the 'Order' term in neworderbiblio.tt,
    newordersubscription.tt, newordersuggestion.tt, and
    z3950_search.tt for 'Place order'.
    
    Signed-off-by: Owen Leonard <oleonard at myacpl.org>
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    
    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>

commit 5ca776d6e171de1b093163ab83ba589d5ae4d7cc
Author: Caroline Cyr La Rose <caroline.cyr-la-rose at inlibro.com>
Date:   Thu Oct 4 14:38:25 2018 -0400

    Bug 21490: Disambiguation of 'Order'
    
    This patch changes the 'Order' term in marc_modification_template.tt
    for 'Rank'.
    
    Signed-off-by: Owen Leonard <oleonard at myacpl.org>
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    
    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>

commit 23265158fcab25f8f5188cea6f07af46812d41cc
Author: Owen Leonard <oleonard at myacpl.org>
Date:   Thu Jun 16 09:28:01 2016 -0400

    Bug 16754: Use validation plugin in budgets, planning, and contracts
    
    This patch removes the custom javascript form validation from three
    templates: Budgets, budget planning, and contracts. Validation via the
    validation plugin is done instead.
    
    This patch also removes use of event attributes like onclick and
    onchange. Also changed: I added the "Required" text next to required
    fields as necessary.
    
    To test, apply the patch and go to Administration -> Budgets.
    
    - Test the budget creation process for adding, editing, and duplicating
      budgets. In all cases:
      - The start date and end date should be required
      - You should be warned if you enter an end date which falls before the
        start date.
      - The description should be required
      - The budget amount should be required to be a number
    
    To test the budget planning page:
    
    Note that much of the JS removed from this template was unused. It
    looked for inputs by the name 'est_total' which don't exist.
    
    - When viewing the table of funds for a budget, select a choice from the
      'planning' toolbar menu.
      - Verify that after entering a numeric value in any cell, the
        'remaning' value at the end of the row is correctly updated.
      - Verify that after entering non-numeric data an error is displayed.
      - Verify that clicking the 'auto-fill' button at the end of the row
        works to fill any empty or zero-value fields with the remaning funds
        available.
    
    To test the vendor contracts page:
    
    - Go to Acquisitions -> Vendor -> Contracts
    - Add or edit a contract
      - Confirm that name, start date, and end date are required.
      - Confirm that you are warned if you enter an end date which falls
        before the start date.
    
    Signed-off-by: Michal Denar <black23 at gmail.com>
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    
    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>

commit 55225ba10b824f7e881738a20c751200843d3ec9
Author: Nick Clemens <nick at bywatersolutions.com>
Date:   Tue Oct 16 17:09:29 2018 +0000

    Bug 21583: Don't use Asset.js for external script files
    
    To test:
    1 - Enable Novelist in staff client:
        NovelistSelectStaffEnabled: Add
        NovelistSelectStaffProfile: anything
        NovelistSelectPassword: anything
        ( these don't need to be valid, just not blank )
    2 - Pull up a record detail page in staff client
    3 - View page source - search for ns2init.js
    4 - You won't find it
    5 - Apply patch
    6 - Reload details
    7 - Search page source for ns2init.js
    8 - It loaded! Huzzah!
    
    Signed-off-by: George Williams <george at nekls.org>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    
    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>

commit 7f0207d2ad162a86cf5e09e437565b66b91c5004
Author: Nick Clemens <nick at bywatersolutions.com>
Date:   Tue Oct 16 14:00:59 2018 +0000

    Bug 21579: Make showdiffmarc.pl work for authorities and biblios
    
    To test:
     1 - Have or make some authority records
     2 - Have or make an authority matching rule
     3 - Export your authrotities
     4 - Import them using the matching rule
     5 - On the 'Manage staged records' page view some diffs
     6 - The import record is correct, but the existing records pull form
     bibs
     7 - Apply patch
     8 - Repeat
     9 - Confirm you see the expected authority matches
    
    Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
    
    Signed-off-by: Marjorie Vila <marjorie.barry-vila at collecto.ca>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    
    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>

commit 4e6d9defc180204461f80477be287ade7fcfc11b
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Tue Oct 16 10:27:37 2018 -0300

    Bug 21155: Prevent SwitchOnSiteCheckouts.t to fail randomly
    
     #   Failed test 'The date_due should have been set depending on the circ
     rules when the on-site checkout has been switched'
     #   at t/db_dependent/Circulation/SwitchOnSiteCheckouts.t line 126.
     #          got: '2018-10-16T23:59:00'
     #     expected: '2018-10-21T23:59:00'
    
    TestBuilder set date to today, so issuingrules.harduedate will be set to
    today.
    issuingrules.hardduedatecompare will be set to an integer.
    If set to 0, $datedue will be reset to the hard due date
    
    The call stack is: AddIssue > CalcDateDue > GetHardDueDate
    
    In GetHardDueDate:
    3509         if ( $hardduedatecompare == 0 || $hardduedatecompare == $cmp ) {
    3510             $datedue = $hardduedate->clone;
    3511         }
    
    To fix this random failure we need to set issuingrules.harduedate to undef.
    
    Test plan:
    0. Do not apply this patch
    1. Modify the test to set hardduedatecompare to 0 (search 'my $issuingrule = ')
    2. Execute the test and confirm the failure
    3. Apply this patch
    4. Execute the test and confirm the it is no longer failing
    
    Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
    
    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>

commit f902041e244cc35ecc99e3ca256ff24c843a8b04
Author: Katrin Fischer <katrin.fischer.83 at web.de>
Date:   Tue Oct 9 12:22:35 2018 +0000

    Bug 21552: Use raw filter for displaying RoutingListNote
    
    The RoutingListNote system preference works like other prefs
    allowing you to insert your own content on the routling list
    template using HTML. The default text even uses HTML, so it
    looks broken without this patch.
    
    To test:
    - Add a subscription
    - Add a new routing list to it
    - Add some patrons to it
    - Save
    - preview routing list
    - Verify that the note shows and is formatted correctly.
    
    Signed-off-by: Pierre-Marc Thibault <pierre-marc.thibault at inLibro.com>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    
    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>

commit 32dc4a7bfaeebcff2be739fdf5f15e0f8bad4faa
Author: Nick Clemens <nick at bywatersolutions.com>
Date:   Wed Oct 10 15:53:13 2018 +0000

    Bug 21542: Use modal and password field for overdrive password
    
    To test:
     1 - Enabled Overdrive and fill all preferences
     2 - Make sure OverDrivePasswordRequired is true
     3 - Go to opac account
     4 - Log in to overdrive
     5 - Note the input is shown
     6 - Apply patch
     7 - Repeat
     8 - Note popup is now a modal
     9 - Note password is now hidden
    10 - Confirm overdrive integration works as before
    
    Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
    
    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>

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

Summary of changes:
 C4/Serials.pm                                      |    2 +
 Koha/Database.pm                                   |    6 +-
 authorities/detail.pl                              |    2 +-
 authorities/merge.pl                               |    2 +-
 .../prog/en/includes/blocking_errors.inc           |    2 +
 .../intranet-tmpl/prog/en/includes/calendar.inc    |   33 ++++++
 .../prog/en/includes/cateditor-ui.inc              |    2 +-
 .../prog/en/includes/checkouts-table.inc           |    6 +-
 .../prog/en/includes/virtualshelves-toolbar.inc    |    2 +-
 .../prog/en/modules/acqui/addorderiso2709.tt       |    3 +-
 .../prog/en/modules/acqui/neworderbiblio.tt        |    2 +-
 .../prog/en/modules/acqui/newordersubscription.tt  |    2 +-
 .../prog/en/modules/acqui/newordersuggestion.tt    |    4 +-
 .../prog/en/modules/acqui/z3950_search.tt          |    4 +-
 .../prog/en/modules/admin/aqbudgetperiods.tt       |  108 ++++++--------------
 .../prog/en/modules/admin/aqcontract.tt            |   71 +++++--------
 .../intranet-tmpl/prog/en/modules/admin/aqplan.tt  |   52 +++-------
 .../en/modules/admin/preferences/circulation.pref  |    2 +-
 .../prog/en/modules/authorities/authorities.tt     |   11 +-
 .../intranet-tmpl/prog/en/modules/basket/basket.tt |    2 +-
 .../prog/en/modules/basket/downloadcart.tt         |    2 +-
 .../prog/en/modules/catalogue/detail.tt            |    2 +-
 .../prog/en/modules/cataloguing/editor.tt          |    2 +-
 .../en/modules/rotating_collections/addItems.tt    |   24 +++--
 .../rotating_collections/editCollections.tt        |   23 +++--
 .../rotating_collections/rotatingCollections.tt    |   23 +++--
 .../rotating_collections/transferCollection.tt     |   23 +++--
 .../en/modules/serials/routing-preview-slip.tt     |    4 +-
 .../prog/en/modules/serials/routing.tt             |   10 +-
 .../prog/en/modules/serials/subscription-add.tt    |    9 +-
 .../prog/en/modules/serials/subscription-detail.tt |    6 +-
 .../prog/en/modules/serials/subscription-renew.tt  |    2 +
 .../intranet-tmpl/prog/en/modules/tools/export.tt  |    8 +-
 .../modules/tools/marc_modification_templates.tt   |    2 +-
 .../prog/en/modules/tools/showdiffmarc.tt          |    4 +-
 .../en/modules/virtualshelves/downloadshelf.tt     |    2 +-
 .../opac-tmpl/bootstrap/en/includes/masthead.inc   |   11 +-
 .../bootstrap/en/includes/opac-bottom.inc          |    1 -
 .../bootstrap/en/includes/overdrive-login.inc      |   18 ++++
 .../bootstrap/en/modules/opac-illrequests.tt       |    6 ++
 .../opac-tmpl/bootstrap/en/modules/opac-user.tt    |    5 +-
 koha-tmpl/opac-tmpl/bootstrap/js/basket.js         |    9 +-
 koha-tmpl/opac-tmpl/bootstrap/js/overdrive.js      |   11 +-
 serials/routing-preview.pl                         |    1 -
 serials/routing.pl                                 |    7 +-
 serials/serials-collection.pl                      |    5 +
 serials/serials-edit.pl                            |    1 +
 serials/subscription-add.pl                        |    3 +
 serials/subscription-detail.pl                     |    4 +
 serials/subscription-renew.pl                      |    4 +
 t/db_dependent/Circulation/SwitchOnSiteCheckouts.t |    2 +
 tools/batch_records_ajax.pl                        |    2 +-
 tools/showdiffmarc.pl                              |   34 +++---
 53 files changed, 321 insertions(+), 267 deletions(-)
 create mode 100644 koha-tmpl/opac-tmpl/bootstrap/en/includes/overdrive-login.inc


hooks/post-receive
-- 
main Koha release repository


More information about the koha-commits mailing list