[koha-commits] main Koha release repository branch 3.22.x updated. v3.22.10-24-g4c8ca85

[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  4c8ca85c45f706290ca6009fc3e33c5dee81f7d0 (commit)
      from  a718feffc52a5bbdd91d3f11a269e0acf9c991f8 (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 4c8ca85c45f706290ca6009fc3e33c5dee81f7d0
Author: Owen Leonard <oleonard at myacpl.org>
Date:   Thu Aug 18 13:08:33 2016 -0400

    Bug 14612 - Overdue notice triggers should show branchname instead of branchcode
    
    This patch adds the Branches template plugin to the overdue notice
    triggers template so that the library name can be shown instead of the
    branchcode.
    
    Also changed: Updated page title to match the name used in tools menus.
    
    To test, apply the patch and go to Tools -> Overdue notice/status
    triggers.
    
    - Select a library.
    - When the page reloads, the 'Defining overdue actions for...' and
      'Rules for overdue actions: ' headings should show the library name
      instead of the branchcode.
    
    Signed-off-by: Marc Véron <veron at veron.ch>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    (cherry picked from commit ead7b938d8da426798eb7337aa1b623fa545da5c)
    Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
    (cherry picked from commit b711695552e293ddf8f649b12122297c688ced73)
    Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
    
    Conflicts:
    	koha-tmpl/intranet-tmpl/prog/en/modules/tools/overduerules.tt

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

Summary of changes:
 koha-tmpl/intranet-tmpl/prog/en/modules/tools/overduerules.tt |    9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
main Koha release repository