[koha-commits] main Koha release repository branch 18.05.x updated. v18.05.04-42-g721cefd

[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.05.x has been updated
       via  721cefdb95ba6d3f8fb59f6b02255cd76d8a3fbf (commit)
       via  73b197df9ed8e038684e1821ab4d9090d7af225a (commit)
       via  49158f3369617b9a4ad8d247308f2a4aea653cde (commit)
       via  5fbbdb915f9a41070ff71aac902622f0a7bb5ef7 (commit)
      from  6bf50445b151ef94e6100da482e5826458a5136b (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 721cefdb95ba6d3f8fb59f6b02255cd76d8a3fbf
Author: Mark Tompsett <mtompset at hotmail.com>
Date:   Wed Sep 26 22:57:32 2018 +0000

    Bug 13272: (follow-up) add missing type="text"
    
    This addresses comment #13.
    This also applies cleanly.
    
    Signed-off-by: Owen Leonard <oleonard at myacpl.org>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    
    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
    (cherry picked from commit 623f1db90ac8d0361a879813c66a4bccbf0ea23e)
    Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>

commit 73b197df9ed8e038684e1821ab4d9090d7af225a
Author: Mark Tompsett <mtompset at hotmail.com>
Date:   Wed Sep 19 18:49:02 2018 +0000

    Bug 13272: (follow-up) Replace tabs with spaces
    
    Cleaned up whitespace issues tab vs. space in template.
    After applying all patches:
        git diff -w origin/master
    For the koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt
    only the changed type="text" lines will show, but without the
    -w, there will be more whitespace changes.
    
    Signed-off-by: Owen Leonard <oleonard at myacpl.org>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    
    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
    (cherry picked from commit 5edd363a1f2e3b1ea34f3f2aa7ace86cbf467df8)
    Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>

commit 49158f3369617b9a4ad8d247308f2a4aea653cde
Author: Mark Tompsett <mtompset at hotmail.com>
Date:   Wed Sep 19 16:48:13 2018 +0000

    Bug 13272: (follow-up) fix concerns from comment #5
    
    Correct the two issues I pointed out.
    
    Signed-off-by: Owen Leonard <oleonard at myacpl.org>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    
    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
    (cherry picked from commit 77871b408c9a8e120f8415cc0b32683ee8f57e7d)
    Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>

commit 5fbbdb915f9a41070ff71aac902622f0a7bb5ef7
Author: Christopher Brannon <cbrannon at cdalibrary.org>
Date:   Sun Sep 16 22:06:10 2018 +0000

    Bug 13272: Adds type="text" to inputs missing it
    
    Signed-off-by: Owen Leonard <oleonard at myacpl.org>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    
    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
    (cherry picked from commit 92a2d74c1c134674b9798981208b9ad5863a6b42)
    Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>

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

Summary of changes:
 .../intranet-tmpl/prog/en/includes/adv-search.inc    |    4 ++--
 .../prog/en/includes/borrower_debarments.inc         |    2 +-
 .../intranet-tmpl/prog/en/includes/cat-search.inc    |    5 +++--
 .../prog/en/includes/cataloging-search.inc           |    4 ++--
 .../prog/en/includes/checkin-search.inc              |    2 +-
 .../intranet-tmpl/prog/en/includes/circ-search.inc   |    4 ++--
 .../intranet-tmpl/prog/en/includes/home-search.inc   |    4 ++--
 .../intranet-tmpl/prog/en/includes/patron-search.inc |    4 ++--
 .../prog/en/modules/acqui/z3950_search.tt            |    4 ++--
 .../prog/en/modules/admin/smart-rules.tt             |    4 ++--
 .../prog/en/modules/cataloguing/z3950_auth_search.tt |    4 ++--
 .../prog/en/modules/cataloguing/z3950_search.tt      |    4 ++--
 .../prog/en/modules/circ/branchtransfers.tt          |    2 +-
 .../intranet-tmpl/prog/en/modules/circ/offline.tt    |    2 +-
 .../intranet-tmpl/prog/en/modules/circ/renew.tt      |    2 +-
 .../intranet-tmpl/prog/en/modules/circ/returns.tt    |   18 +++++++++---------
 .../prog/en/modules/clubs/templates-add-modify.tt    |   18 +++++++++---------
 .../prog/en/modules/members/memberentrygen.tt        |    2 +-
 .../prog/en/modules/members/paycollect.tt            |    6 +++---
 .../intranet-tmpl/prog/en/modules/reserve/request.tt |    4 ++--
 .../en/modules/serials/subscription-batchedit.tt     |    2 +-
 .../prog/en/modules/tools/import_borrowers.tt        |    8 ++++----
 .../opac-tmpl/bootstrap/en/modules/opac-basket.tt    |    2 +-
 .../opac-tmpl/bootstrap/en/modules/opac-reserve.tt   |    4 ++--
 .../opac-tmpl/bootstrap/en/modules/opac-results.tt   |    2 +-
 .../bootstrap/en/modules/opac-shareshelf.tt          |    2 +-
 .../opac-tmpl/bootstrap/en/modules/opac-shelves.tt   |    5 +++--
 .../opac-tmpl/bootstrap/en/modules/opac-user.tt      |    4 ++--
 28 files changed, 65 insertions(+), 63 deletions(-)


hooks/post-receive
-- 
main Koha release repository