[koha-commits] main Koha release repository branch 18.11.x updated. v18.11.06-22-g132f143

[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, 18.11.x has been updated
       via  132f143a9ddef1369bae07235e9151a4e6977f2b (commit)
       via  ca0d9d0e84ba5db57130890a8197e97a35b8c32b (commit)
      from  8001aae5039d5a95d4c100437f4ec47255921616 (commit)

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

- Log -----------------------------------------------------------------
commit 132f143a9ddef1369bae07235e9151a4e6977f2b
Author: Liz Rea <wizzyrea at gmail.com>
Date:   Thu May 9 02:02:55 2019 +0000

    Bug 8558: (QA follow-up) a little more text clean up
    
    You can take or leave it, honestly, I just thought
    we could be a little more explicit about what we were overwriting.
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
    (cherry picked from commit 6d046c2e3d301a7e1d37b376b49a0db516e67bda)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
    (cherry picked from commit cf681f6682eee0aea6ae647835a628d88fa180b9)
    
    Signed-off-by: Lucas Gass <lucas at bywatersolutions.com>

commit ca0d9d0e84ba5db57130890a8197e97a35b8c32b
Author: Aleisha Amohia <aleishaamohia at hotmail.com>
Date:   Mon Apr 29 03:30:30 2019 +0000

    Bug 8558: Improve confirmation message for importing frameworks
    
    This patch updates the confirmation message from:
    "Do you really want to import the framework fields and subfields? This
    will overwrite the current configuration. For safety reasons please use
    the export option to make a backup"
    to:
    "Are you sure you want to import the [% frameworkcode %]
    framework structure? This will overwrite the current configuration. For
    safety reasons, it is recommended to use the export option to make a
    backup first."
    
    To test:
    1) Go to Administration -> MARC bibliographic frameworks
    2) Export one of the frameworks
    3) Create a new test framework
    4) Import the new test framework structure using the exported file
    5) Upon clicking Confirm, confirm the message is improved and makes
    sense.
    
    Sponsored-by: Catalyst IT
    Signed-off-by: Liz Rea <wizzyrea at gmail.com>
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
    (cherry picked from commit e4d1318550af78f76b7a43757bbdc4c5bddb4d5f)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
    (cherry picked from commit f8b24adc75ef145b96556893d555de4971b8251d)
    
    Signed-off-by: Lucas Gass <lucas at bywatersolutions.com>

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

Summary of changes:
 koha-tmpl/intranet-tmpl/prog/en/modules/admin/biblio_framework.tt |    3 +--
 koha-tmpl/intranet-tmpl/prog/js/biblio_framework.js               |    3 ++-
 2 files changed, 3 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
main Koha release repository