[koha-commits] main Koha release repository branch 20.05.x updated. v20.05.00-71-g9526d6efea

[Git repo owner]

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

The branch, 20.05.x has been updated
       via  9526d6efea15c95d3d0d1195f3ba72b7f7f7c7d1 (commit)
       via  18e7cf8db66a616d5fe97a7d980644475b3c0cad (commit)
      from  b10242084cd2e970511559cb114e8c07f1ee646f (commit)

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

- Log -----------------------------------------------------------------
commit 9526d6efea15c95d3d0d1195f3ba72b7f7f7c7d1
Author: Owen Leonard <oleonard at myacpl.org>
Date:   Mon May 4 12:36:57 2020 +0000

    Bug 25363: Merge common.js with staff-global.js
    
    This patch merges the contents of common.js with staff-global.js. Both
    are included globally in the staff interface, and there doesn't seem to
    be any reason to require that the user downloads two different
    JavaScript files.
    
    To test, apply the patch and perform a catalog search in the staff
    client.
    
    View the detail page for a title in the search results. On the detail
    page you should see navigation controls in the sidebar for browsing
    through search results. Confirm they work correctly.
    
    Signed-off-by: Lucas Gass <lucas at bywatersolutions.com>
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit 814a7ecf47b087a60b35bca6a4d23deeb596a0e8)
    
    Signed-off-by: Lucas Gass <lucas at bywatersolutions.com>

commit 18e7cf8db66a616d5fe97a7d980644475b3c0cad
Author: Owen Leonard <oleonard at myacpl.org>
Date:   Thu Jun 4 12:33:47 2020 +0000

    Bug 25593: Terminology: Fix "There is no order for this biblio." on catalog detail page
    
    This patch changes the phrase "There is no order for this biblio" to
    "There is no order for this bibliographic record." on the catalog
    detail page.
    
    To test, apply the patch and view the bibliographic detail page for a
    record which has no order associated with it. The text in the
    "Acquisitions details" tab should be correct.
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    (cherry picked from commit 953a53d9d6bffbad9303532c113f50864a03a0ae)
    
    Signed-off-by: Lucas Gass <lucas at bywatersolutions.com>

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

Summary of changes:
 .../intranet-tmpl/prog/en/includes/js_includes.inc |  1 -
 .../prog/en/modules/catalogue/detail.tt            |  2 +-
 koha-tmpl/intranet-tmpl/prog/js/commons.js         | 73 ---------------------
 koha-tmpl/intranet-tmpl/prog/js/staff-global.js    | 75 ++++++++++++++++++++++
 4 files changed, 76 insertions(+), 75 deletions(-)
 delete mode 100644 koha-tmpl/intranet-tmpl/prog/js/commons.js


hooks/post-receive
-- 
main Koha release repository