[koha-commits] main Koha release repository branch master updated. v3.22.00-568-gd929b0f

[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  d929b0faa67808b98dbe28bdefef386c33dcf19a (commit)
       via  d0950e61944628645c51b912e02f49732c599dd3 (commit)
       via  243b797dd11bc0ac1f475195ab765ffbf2220f8b (commit)
       via  2e4bf9f40e4523e29d241dceb22a114cc70d95ee (commit)
      from  adef1d1020255373ec6f954bcd1a02e382305047 (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 d929b0faa67808b98dbe28bdefef386c33dcf19a
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Fri Jan 15 10:01:54 2016 +0000

    Bug 15285: Fix conflict with the treetable plugin
    
    The tables using the treetable plugin don't display correctly (with JS
    error).
    The lazy way to fix it is to redefine the dom of the table and remove
    the button area (B).
    
    Signed-off-by: Marc Véron <veron at veron.ch>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    
    Signed-off-by: Brendan Gallagher brendan at bywatersolutions.com

commit d0950e61944628645c51b912e02f49732c599dd3
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Mon Dec 14 12:18:33 2015 +0000

    Bug 15285: Update for 3 specific tables
    
    The checkouts, currency and items lost tables redefine the dom/sDom and
    the older C(olvis) should be replaced with the current B(utton).
    
    Test plan:
    To test the whole patch set, you will have to test the 4 tables impacted
    by this patch as well as the others using the columns settings.
    
    The additem has specific code and should be tested keeping that in mind.
    
    Signed-off-by: Marc Véron <veron at veron.ch>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    
    Signed-off-by: Brendan Gallagher brendan at bywatersolutions.com

commit 243b797dd11bc0ac1f475195ab765ffbf2220f8b
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Mon Dec 14 12:17:43 2015 +0000

    Bug 15285: Update common files
    
    This patch moves the Button area all tables which does not redefine the
    dom/sDom DT parameter.
    
    Signed-off-by: Marc Véron <veron at veron.ch>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    
    Signed-off-by: Brendan Gallagher brendan at bywatersolutions.com

commit 2e4bf9f40e4523e29d241dceb22a114cc70d95ee
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Mon Dec 14 12:15:58 2015 +0000

    Bug 15285: Upgrade DataTables to 1.10.10
    
    The ColVis DataTables plugin is now retired.
    We need to upgrade the plugin to 1.10.10 and use the column visibility
    module for Buttons.
    
    Signed-off-by: Marc Véron <veron at veron.ch>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    
    Signed-off-by: Brendan Gallagher brendan at bywatersolutions.com

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

Summary of changes:
 C4/Utils/DataTables/ColumnsSettings.pm             |   13 +-
 .../lib/jquery/plugins/buttons.colVis.min.js       |    5 +
 .../lib/jquery/plugins/dataTables.buttons.min.js   |   35 +
 .../lib/jquery/plugins/jquery.dataTables.colvis.js | 1013 --------------------
 .../lib/jquery/plugins/jquery.dataTables.min.js    |  319 +++---
 .../prog/en/css/buttons.dataTables.min.css         |    1 +
 .../prog/en/css/datatables.colvis.css              |   77 --
 .../prog/en/includes/columns_settings.inc          |   18 +-
 .../intranet-tmpl/prog/en/includes/datatables.inc  |    2 +
 koha-tmpl/intranet-tmpl/prog/en/js/checkouts.js    |    2 +-
 koha-tmpl/intranet-tmpl/prog/en/js/datatables.js   |    2 +-
 .../prog/en/modules/acqui/acqui-home.tt            |    1 +
 .../prog/en/modules/admin/aqbudgets.tt             |    1 +
 .../prog/en/modules/admin/currency.tt              |   10 +-
 .../prog/en/modules/reports/itemslost.tt           |    2 +-
 15 files changed, 240 insertions(+), 1261 deletions(-)
 create mode 100644 koha-tmpl/intranet-tmpl/lib/jquery/plugins/buttons.colVis.min.js
 create mode 100644 koha-tmpl/intranet-tmpl/lib/jquery/plugins/dataTables.buttons.min.js
 delete mode 100644 koha-tmpl/intranet-tmpl/lib/jquery/plugins/jquery.dataTables.colvis.js
 create mode 100644 koha-tmpl/intranet-tmpl/prog/en/css/buttons.dataTables.min.css
 delete mode 100644 koha-tmpl/intranet-tmpl/prog/en/css/datatables.colvis.css


hooks/post-receive
-- 
main Koha release repository