[koha-commits] main Koha release repository branch 19.05.x updated. v19.05.09-53-g83cb6a7077

[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, 19.05.x has been updated
       via  83cb6a7077ed891568b34e39a4bdbb80631c4417 (commit)
       via  bcd43d5cf729b0fda91e6e1af8e55aa8021340e5 (commit)
      from  b3843211de3181f56918a4e9c7dfafeaef8cb5e3 (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 83cb6a7077ed891568b34e39a4bdbb80631c4417
Author: Nick Clemens <nick at bywatersolutions.com>
Date:   Mon Mar 16 14:55:31 2020 +0000

    Bug 24789: [follow-up] Fix saving of macros
    
    Saving was accidentally commented out in patches, this restores that
    
    To test:
    1 - Create a new macro
    2 - Add some content
    3 - Reload the macro, no content
    4 - Apply patch
    5 - Repeat
    6 - Macro saves/loads correctly
    
    Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
    
    Signed-off-by: Joy Nelson <joy at bywatersolutions.com>
    (cherry picked from commit 66742f6e705d5841c6559f346883bdc2f6ee1053)
    
    Signed-off-by: Lucas Gass <lucas at bywatersolutions.com>

commit bcd43d5cf729b0fda91e6e1af8e55aa8021340e5
Author: Nick Clemens <nick at bywatersolutions.com>
Date:   Tue Mar 3 13:26:02 2020 +0000

    Bug 24789: Remove ITS macro format
    
    To test:
    1 - Apply patches
    2 - Confirm you can save, load, and run macros
    3 - Confirm you have no choice of format
    
    Signed-off-by: Andrew Fuerste-Henry <andrew at bywatersolutions.com>
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
    
    Signed-off-by: Joy Nelson <joy at bywatersolutions.com>
    (cherry picked from commit b58bb48b0b7401d010bb89bdaf7edbee1c6163ce)
    
    Signed-off-by: Lucas Gass <lucas at bywatersolutions.com>

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

Summary of changes:
 .../intranet-tmpl/lib/koha/cateditor/macros.js     |   6 +-
 .../intranet-tmpl/lib/koha/cateditor/macros/its.js | 208 ---------------------
 .../prog/en/includes/cateditor-ui.inc              |  15 +-
 .../prog/en/modules/cataloguing/editor.tt          |   1 -
 4 files changed, 3 insertions(+), 227 deletions(-)
 delete mode 100644 koha-tmpl/intranet-tmpl/lib/koha/cateditor/macros/its.js


hooks/post-receive
-- 
main Koha release repository