[koha-commits] main Koha release repository branch master updated. v16.05.00-261-g9b399a8

[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  9b399a806100eb9568ae43d71b257f0801185072 (commit)
       via  a50eb52a425dbe8ec774e2664fe9df179d32ceaa (commit)
      from  68c0c94b94227a9d73456a50f08a735ee9746af7 (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 9b399a806100eb9568ae43d71b257f0801185072
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Sun Jul 3 16:07:33 2016 +0100

    Bug 16794: Group the 2 action buttons into the same column
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>

commit a50eb52a425dbe8ec774e2664fe9df179d32ceaa
Author: Hector Castro <hector.hecaxmmx at gmail.com>
Date:   Wed Jun 22 09:22:11 2016 -0600

    Bug 16794: Revise layout for Admistration > Patron categories
    
    Add Bootstrap buttons and Font Awesome Icons to "Delete" and "Edit" links
    
    To test
    - Go to Administration -> Patron categories
     - Confirm that two button appear instead of links for "Edit" and "Delete"
     - Edit an existing category and confirm that works as expected
     - Delete a category and confirm that works properly.
    
    Patch fix it according with QA comment 3
    Fix copy and paste according with QA comment 6
    Fix column "Default privacy" to be sorted again according with comment 8
    Patch set squashed
    
    Buttons appear now as requested in comment #3 (2 buttons, no action menu)
    
    Re-tested, works as expected.
    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>

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

Summary of changes:
 koha-tmpl/intranet-tmpl/prog/en/js/categories.js            |    4 ++--
 koha-tmpl/intranet-tmpl/prog/en/modules/admin/categories.tt |    9 +++++----
 2 files changed, 7 insertions(+), 6 deletions(-)


hooks/post-receive
-- 
main Koha release repository