[koha-commits] main Koha release repository branch 3.14.x updated. v3.14.00-46-ge8405b1

Git repo owner gitmaster at git.koha-community.org
Fri Dec 13 16:08:20 CET 2013


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.14.x has been updated
       via  e8405b1c427b92b50dcc0e66a6f0e6cbf0fc5636 (commit)
       via  98b4b3e982890438a3f8c0b909f75798d4e3356a (commit)
       via  c03a0229d3cfb16e7c67c4123158558f66b480a2 (commit)
       via  212a4aa37188d792f88058c16c412e057246a873 (commit)
      from  a907c28a1e408cc73ab0437d90dca8c861ae08f5 (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 e8405b1c427b92b50dcc0e66a6f0e6cbf0fc5636
Author: Galen Charlton <gmc at esilibrary.com>
Date:   Tue Dec 3 15:54:26 2013 +0000

    Bug 11035: (follow-up) update licenses section
    
    The OpenJS keyboard shortcuts library by Binny V A is licensed under
    the BSD license.
    
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>
    (cherry picked from commit 097d5d5c8e9e4ba2ec3839f376bd81e4c2d915b5)
    Signed-off-by: Fridolin SOMERS <fridolin.somers at biblibre.com>

commit 98b4b3e982890438a3f8c0b909f75798d4e3356a
Author: Galen Charlton <gmc at esilibrary.com>
Date:   Tue Dec 3 15:35:15 2013 +0000

    Bug 11035: (follow-up) move shortcut.js
    
    shortcut.js is not a jQuery plugin, so this patch
    moves it out of the jquery plugin directory.
    
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>
    (cherry picked from commit e0dcb44ae169d22108b3636999cc1609a739cb94)
    Signed-off-by: Fridolin SOMERS <fridolin.somers at biblibre.com>

commit c03a0229d3cfb16e7c67c4123158558f66b480a2
Author: Blou <philippe.blouin at inlibro.com>
Date:   Wed Oct 23 08:35:55 2013 -0400

    Bug 11035: (follow-up) update offline circ manifest
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>
    (cherry picked from commit 58432bf777b1c50debd25479cfab5b2a141fab27)
    Signed-off-by: Fridolin SOMERS <fridolin.somers at biblibre.com>

commit 212a4aa37188d792f88058c16c412e057246a873
Author: Blou <philippe.blouin at inlibro.com>
Date:   Thu Oct 10 13:44:27 2013 -0400

    Bug 11035: Replace shortcut plugin jquery.hotkeys.min.js
    
    To old plugin prevents the upgrade to the latest jquery. By replacing
    with openjs' shortcut.js, we have now one less hurdle in upgrading
    Koha to latest.
    
    Changes:
    - removed jquery.hotkeys.min.js
    - added shortcut.js
    - modified the related includes (doc-head-close.inc and help-top.inc)
    - modified the calls in staff-global.js
    
    Regression test:
    1) apply the patch
    2) in the intranet, test the shortcuts alt-q, alt-r, alt-u.
    
    These are the only affected functionalities.  There is no new functionality.
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
    Passes all tests and QA script. Tested existing
    shortcuts for the search bar tabs on various circulation
    related pages.
    
    This uses a Javascript under BSD license, I wonder if it
    should be listed in the About>licenses section that we
    are using it. As Yui is also BSD I assume the license is
    compatible.
    
    +/**
    + * http://www.openjs.com/scripts/events/keyboard_shortcuts/
    + * Version : 2.01.B
    + * By Binny V A
    + * License : BSD
    + */
    
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>
    (cherry picked from commit 39830ac023fb2276ed2fee29913a4ba3fdff9feb)
    Signed-off-by: Fridolin SOMERS <fridolin.somers at biblibre.com>

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

Summary of changes:
 .../lib/jquery/plugins/jquery.hotkeys.min.js       |   19 --
 koha-tmpl/intranet-tmpl/lib/shortcut/shortcut.js   |  223 ++++++++++++++++++++
 .../prog/en/includes/doc-head-close.inc            |    2 +-
 .../intranet-tmpl/prog/en/includes/help-top.inc    |    2 +-
 koha-tmpl/intranet-tmpl/prog/en/js/staff-global.js |    6 +-
 koha-tmpl/intranet-tmpl/prog/en/modules/about.tt   |    4 +
 .../prog/en/modules/circ/offline-mf.tt             |    2 +-
 7 files changed, 233 insertions(+), 25 deletions(-)
 delete mode 100644 koha-tmpl/intranet-tmpl/lib/jquery/plugins/jquery.hotkeys.min.js
 create mode 100644 koha-tmpl/intranet-tmpl/lib/shortcut/shortcut.js


hooks/post-receive
-- 
main Koha release repository


More information about the koha-commits mailing list