[koha-commits] main Koha release repository branch 3.22.x updated. v3.22.04-47-gc4e6488

[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, 3.22.x has been updated
       via  c4e64889fd1b1cf99f974a28e3f40f6f06f6def7 (commit)
       via  35afb973780a463b29632771cfad2f28886ff961 (commit)
      from  3c9ed309ba2e308800e9c596c3c28d4a911813d2 (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 c4e64889fd1b1cf99f974a28e3f40f6f06f6def7
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date:   Wed Feb 3 15:22:40 2016 +0000

    Bug 12920 [QA Followup] - Show override option below checkouts table when allowed
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    
    Signed-off-by: Brendan Gallagher brendan at bywatersolutions.com
    (cherry picked from commit 05be0f29cd2d7175acdf2ddf4a8805ec5b3df15e)
    Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>

commit 35afb973780a463b29632771cfad2f28886ff961
Author: Natasha <tasham_8 at hotmail.com>
Date:   Tue Jan 19 00:56:56 2016 +0000

    Bug 12920: Remove AllowRenewalLimitOverride from pl scripts and tt files
    
    use Koha.Preference instead
    
    Test Plan:
    1) Apply this patch
    2) Go to circulation.pl
    3) Ensure you can still override renewal limits with pref enabled
    4) Ensure you can not override renewal limits with pref disabled
    5) Go to moremember.pl
    6) Repeat steps 3-4
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    
    Signed-off-by: Brendan Gallagher brendan at bywatersolutions.com
    (cherry picked from commit 17190de524c58b8abeca5c65506fe44bfdd93adc)
    Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>

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

Summary of changes:
 circ/circulation.pl                                           |    1 -
 koha-tmpl/intranet-tmpl/prog/en/includes/checkouts-table.inc  |    3 ++-
 koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt   |    2 +-
 koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt |    2 +-
 members/moremember.pl                                         |    1 -
 5 files changed, 4 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
main Koha release repository