[koha-commits] main Koha release repository branch 20.05.x updated. v20.05.02-125-g1d08b9fdc9

Thu Aug 6 23:01:24 CEST 2020

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  1d08b9fdc9abfa57bf3916545cd62ffbeced6530 (commit)
       via  5b6756a3e69027c7b903a2d9107a4d188ca5f84d (commit)
       via  f659b89d3ec253ab0e7d6addf8309bedb1fac592 (commit)
       via  fa7f9049cae584c5065e9a84b360aa6256540b42 (commit)
       via  fb0c35650c59a9bbe420d016a3f169b71c578fee (commit)
      from  10d515257c0c68a4ca07c8ab8108068ded1298e0 (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 1d08b9fdc9abfa57bf3916545cd62ffbeced6530
Author: Lucas Gass <lucas at bywatersolutions.com>
Date:   Thu Aug 6 20:28:34 2020 +0000

    Bug 22660: DBrev 20.05.02.009

    Signed-off-by: Lucas Gass <lucas at bywatersolutions.com>

commit 5b6756a3e69027c7b903a2d9107a4d188ca5f84d
Author: Katrin Fischer <katrin.fischer.83 at web.de>
Date:   Wed Jul 29 22:51:34 2020 +0000

    Bug 22660: (QA follow-up) Fix capitalization in system preference

    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 9e0d097a5692af07db020e6f806eeaa97d43ae1e)

    Signed-off-by: Lucas Gass <lucas at bywatersolutions.com>

commit f659b89d3ec253ab0e7d6addf8309bedb1fac592
Author: Owen Leonard <oleonard at myacpl.org>
Date:   Thu Jul 23 18:20:51 2020 +0000

    Bug 22660: (follow-up) Re-word system preference description

    This patch rewords the system preference description to focus on the
    generic description of the editor rather than the name of the plugin:

        tinymce: "a WYSIWYG editor (TinyMCE)"
        codemirror: "a text editor (CodeMirror)"

    Signed-off-by: Lisette Scheer <lisetteslatah at gmail.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 23846781751d7fb808b3fa4b857da72706653575)

    Signed-off-by: Lucas Gass <lucas at bywatersolutions.com>

commit fa7f9049cae584c5065e9a84b360aa6256540b42
Author: Owen Leonard <oleonard at myacpl.org>
Date:   Thu Jul 23 17:58:22 2020 +0000

    Bug 22660: (follow-up) Improve asset handling, add linting

    This patch makes some changes to the way assets are included based on
    the value of the system preferece in order to minimize unnecessary
    JavaScript includes.

    The patch also adds HTML syntax-highlighting and linting like we have in
    the system preferences editor.

    Removed are two JS files which were not required.

    To test, apply the patch and set the NewsToolEditor preference to
    "CodeMirror."

     - Edit a news item and confirm that the contents of the
       editor show HTML syntax highlighting.
     - Test HTML linting by adding some malformed HTML (missing closing tag,
       for instance). The error should be highlighted.
     - Set the NewsToolEditor to "TinyMCE" and confirm that WYSIWYG editing
       still works correctly.

    https://bugs.koha-community.org/show_bug.cgi?id=22600

    Signed-off-by: Lisette Scheer <lisetteslatah at gmail.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 5bec404420c6dd9251b511d12e2425e5a6039a95)

    Signed-off-by: Lucas Gass <lucas at bywatersolutions.com>

commit fb0c35650c59a9bbe420d016a3f169b71c578fee
Author: Lucas Gass <lucas at bywatersolutions.com>
Date:   Fri May 8 22:57:40 2020 +0000

    Bug 22660: Add system pref to allow switching of editors in News Tool

    This patch adds a system preference called 'NewsToolEditor' which allows for the choice between TinyMCE and CodeMirror in the News Feature.

    TEST PLAN:
    1. Apply patch and run updatedatabase
    2. Go to Tools > News and make a new entry or edit an existing News item.
    3. When you initially load you should gte the TinyMCE editor (WYSIWYG)
    4. Search for the NewsToolEditor system preference and switch to CodeMirror.
    5. Reload your News item and now you should see the CodeMirror editor.
    6. Try saving content with both and maki sure it works.
    7. Try adding some different HTML tags in CodeMirror mode, saving, and making sure it looks right when you switch back to TinyMCE

    Signed-off-by: Owen Leonard <oleonard at myacpl.org>

    Signed-off-by: Lisette Scheer <lisetteslatah at gmail.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 980dd605031e616f1d481852dffe9cc6779eb3e3)

    Signed-off-by: Lucas Gass <lucas at bywatersolutions.com>

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

Summary of changes:
 Koha.pm                                            |  2 +-
 installer/data/mysql/sysprefs.sql                  |  1 +
 installer/data/mysql/updatedatabase.pl             |  7 +++
 .../prog/en/modules/admin/preferences/tools.pref   |  8 ++-
 .../prog/en/modules/tools/koha-news.tt             | 70 +++++++++++++++-------
 5 files changed, 66 insertions(+), 22 deletions(-)

hooks/post-receive
-- 
main Koha release repository