[koha-commits] main Koha release repository branch master updated. v18.05.00-1380-g09c76aa

Thu Nov 8 14:41:16 CET 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  09c76aa01020dc68c22136a6549eeb90530d37e4 (commit)
       via  ccae80f5e87d1b86754d092e74c1af03850bc1b2 (commit)
       via  1fa74499070da0aca19ccc3d4c1e1e97d8f500db (commit)
       via  63595cce65f54ad46029976786d381b944bfe0ff (commit)
       via  812b3d66b573beabefdb3f66d74d3df3abb3eccd (commit)
       via  6932e104f31bc80e7320fe9f5d48ed16d5fb4d3a (commit)
       via  f9e83266d1e4c987412a57a77ca7d0a4d653a65b (commit)
      from  f3c51f99d164a31e10161fdf5d2b80a989735854 (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 09c76aa01020dc68c22136a6549eeb90530d37e4
Author: Nick Clemens <nick at bywatersolutions.com>
Date:   Thu Nov 8 12:09:37 2018 +0000

    Bug 12365: DBRev 18.06.00.055

    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>

commit ccae80f5e87d1b86754d092e74c1af03850bc1b2
Author: Aleisha Amohia <aleishaamohia at hotmail.com>
Date:   Mon Oct 22 23:31:29 2018 +0000

    Bug 12365: (follow-up) Fixing broken circ rules table

    Adding filters to note to satisfy qa test tools

    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>

    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>

commit 1fa74499070da0aca19ccc3d4c1e1e97d8f500db
Author: Aleisha Amohia <aleishaamohia at hotmail.com>
Date:   Thu Oct 18 02:36:35 2018 +0000

    Bug 12365: (follow-up) Putting backticks in atomicupdate

    Signed-off-by: Michal Denar <black23 at gmail.com>

    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 63595cce65f54ad46029976786d381b944bfe0ff
Author: Aleisha Amohia <aleishaamohia at hotmail.com>
Date:   Wed Jul 4 00:12:21 2018 +0000

    Bug 12365: (follow-up) Adding maxlength attribute and popover

    Test that you can't add a note of more than 100 characters.
    Test notes with rules, notes are hidden by 'View note' and the
    popover correctly displays note.
    View the note by hovering over the link
    I've moved the Note column so the popover displays nicely and doesn't
    cover the buttons. I've also changed the placement so that it doesn't
    cover information in the row.

    Update: Test that you can edit the note when clicking 'Edit' and that
    behaviour is the same for editing all other fields

    Signed-off-by: Michal Denar <black23 at gmail.com>

    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 812b3d66b573beabefdb3f66d74d3df3abb3eccd
Author: Aleisha Amohia <aleishaamohia at hotmail.com>
Date:   Mon Jun 19 19:47:52 2017 +0000

    Bug 12365: Notes for rules

    This patch adds a note column to the circ and fine rules to act as a
    description line for the rule.

    To test:
    1) Apply patch, update database (may have to also update schema)
    2) Go to Admin -> Circ and fine rules
    3) Scroll to the right, notice new Note column
    4) Confirm it works to create a brand new rule with a Note
    5) Confirm it works to modify an existing rule with a Note

    Sponsored-by: Catalyst IT

    Lee Jamison <ldjamison at marywood.edu> rescued this patch.
    It is a clean re-build of attachments 61865 and 63902
    to fix the merge conflict introduced during application of both
    attachments.

    Signed-off-by: Mark Tompsett <mtompset at hotmail.com>

    Signed-off-by: macon  lauren KohaCon17 <caballeromaricon at gmail.com>

    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>

    Signed-off-by: Owen Leonard <oleonard at myacpl.org>
    Signed-off-by: Michal Denar <black23 at gmail.com>

    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 6932e104f31bc80e7320fe9f5d48ed16d5fb4d3a
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Tue Nov 6 11:03:28 2018 -0300

    Bug 21770: Allow html_entity for href

    We certainly should not expect this filter to be used much for href, but
    we have one occurrence that needs it.

    Test plan:
    t/template_filters.t and xt/find-missing-filters.t must return green

    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>

    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>

commit f9e83266d1e4c987412a57a77ca7d0a4d653a65b
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Tue Nov 6 10:55:50 2018 -0300

    Bug 21770: Add tests for html_entity

    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>

    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>

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

Summary of changes:
 Koha.pm                                            |    2 +-
 Koha/Schema/Result/Issuingrule.pm                  |    8 +++++++
 admin/smart-rules.pl                               |    2 ++
 installer/data/mysql/kohastructure.sql             |    1 +
 installer/data/mysql/updatedatabase.pl             |    9 ++++++++
 .../prog/en/modules/admin/smart-rules.tt           |   22 ++++++++++++++++----
 t/lib/QA/TemplateFilters.pm                        |    2 +-
 t/template_filters.t                               |   10 ++++++++-
 8 files changed, 49 insertions(+), 7 deletions(-)

hooks/post-receive
-- 
main Koha release repository