[koha-commits] main Koha release repository branch master updated. v3.22.00-120-gdbae2bd

[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, master has been updated
       via  dbae2bdf2fc3f15c448525e8f9dfb92deb8d40c0 (commit)
       via  a2293ff6f5b77176506f182c9ac5f19fdc51ab63 (commit)
      from  c92b1556ef9250d7e038dce2d083c60415035b95 (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 dbae2bdf2fc3f15c448525e8f9dfb92deb8d40c0
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date:   Wed Dec 30 16:49:16 2015 +0000

    Bug 15099 [QA Followup] - Make bug pass koha-qa.pl
    
    Cleaned up additional tab characters and such well. This is a very
    good time to take care of these.
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>

commit a2293ff6f5b77176506f182c9ac5f19fdc51ab63
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Wed Dec 2 08:49:50 2015 +0000

    Bug 15099: Move admin/categorie.pl to admin/categories.pl
    
    This patch fixes the filename categorie.pl correcting it by categories.pl
    The plurial is usually used for script names in the admin module.
    
    Test plan:
    Navigate to the patron categories page.
    
    Signed-off-by: Frédéric Demians <f.demians at tamil.fr>
      No reference to categorie.pl anywhere in the code
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>

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

Summary of changes:
 C4/Form/MessagingPreferences.pm                    |    2 +-
 admin/{categorie.pl => categories.pl}              |    2 +-
 .../intranet-tmpl/prog/en/includes/admin-menu.inc  |   29 ++-
 .../prog/en/modules/admin/admin-home.tt            |  200 ++++++++++----------
 .../modules/admin/{categorie.tt => categories.tt}  |  180 +++++++++---------
 .../prog/en/modules/members/member.tt              |    2 +-
 .../prog/en/modules/members/memberentrygen.tt      |    2 +-
 .../prog/en/modules/tools/overduerules.tt          |    2 +-
 8 files changed, 211 insertions(+), 208 deletions(-)
 rename admin/{categorie.pl => categories.pl} (99%)
 rename koha-tmpl/intranet-tmpl/prog/en/modules/admin/{categorie.tt => categories.tt} (85%)


hooks/post-receive
-- 
main Koha release repository