[koha-commits] main Koha release repository branch master updated. v3.22.00-1440-g2f4dde2

Git repo owner gitmaster at git.koha-community.org
Fri Apr 29 16:24:08 CEST 2016 

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  2f4dde25e804261aac10ce74ce5afb243de30437 (commit)
       via  5e1bcc4aa79098045a2240be2aaf7d33ea2965f0 (commit)
      from  64e391491edca79a7e3e7f749792b3d07812185d (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 2f4dde25e804261aac10ce74ce5afb243de30437
Author: Owen Leonard <oleonard at myacpl.org>
Date:   Mon Apr 25 08:06:37 2016 -0400

    Bug 16242 [Follow-up] Move staff client JavaScript out of language directory
    
    Correcting to a file I missed: circ/offline.tt. This patch corrects the
    path to offlinecirc.js.
    
    To test, go to Circulation -> Built-in offline circulation interface.
    There should be no errors in the console warning of missing files. The
    "Check out" link should work correctly.
    
    Signed-off-by: Hector Castro <hector.hecaxmmx at gmail.com>
    File missed was fixed
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>

commit 5e1bcc4aa79098045a2240be2aaf7d33ea2965f0
Author: Owen Leonard <oleonard at myacpl.org>
Date:   Tue Apr 12 13:50:54 2016 -0400

    Bug 16242 - Move staff client JavaScript out of language directory
    
    This patch moves the JavaScript files in prog/en/js to prog/js.
    JavaScript files do not need to be in the directory which is processed
    by the translator.
    
    To test, apply the patch and visit various pages in the staff client to
    confirm that JavaScript files are still loading correctly.
    
    Revised: I intended for this to be built on top of Bug 15883 as well as
    Bug 16242. Now it is.
    
    Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
    On top of 15883 and 16241
    All seems to work, js files pulled from new dir.
    No errors
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>

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

Summary of changes:
 koha-tmpl/intranet-tmpl/prog/en/includes/datatables.inc        |    2 +-
 koha-tmpl/intranet-tmpl/prog/en/includes/doc-head-close.inc    |    6 +++---
 koha-tmpl/intranet-tmpl/prog/en/includes/help-top.inc          |    2 +-
 .../intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt     |    2 +-
 koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt   |    2 +-
 koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketheader.tt  |    2 +-
 koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt |    8 ++++----
 koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt  |    6 +++---
 .../intranet-tmpl/prog/en/modules/acqui/uncertainprice.tt      |    2 +-
 .../intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tt     |    2 +-
 koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt     |    2 +-
 koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqcontract.tt    |    2 +-
 koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqplan.tt        |    2 +-
 koha-tmpl/intranet-tmpl/prog/en/modules/admin/audio_alerts.tt  |    2 +-
 .../intranet-tmpl/prog/en/modules/admin/biblio_framework.tt    |    2 +-
 .../intranet-tmpl/prog/en/modules/admin/items_search_fields.tt |    2 +-
 .../prog/en/modules/admin/marc_subfields_structure.tt          |    2 +-
 koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences.tt   |    4 ++--
 koha-tmpl/intranet-tmpl/prog/en/modules/admin/sms_providers.tt |    2 +-
 .../intranet-tmpl/prog/en/modules/authorities/authorities.tt   |    2 +-
 koha-tmpl/intranet-tmpl/prog/en/modules/authorities/merge.tt   |    2 +-
 .../intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt     |    2 +-
 koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tt |    2 +-
 koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/merge.tt   |    2 +-
 .../en/modules/cataloguing/value_builder/marc21_field_006.tt   |    2 +-
 .../en/modules/cataloguing/value_builder/marc21_field_008.tt   |    2 +-
 koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt    |    6 +++---
 koha-tmpl/intranet-tmpl/prog/en/modules/circ/offline-mf.tt     |    6 +++---
 koha-tmpl/intranet-tmpl/prog/en/modules/circ/offline.tt        |    2 +-
 .../intranet-tmpl/prog/en/modules/members/memberentrygen.tt    |    2 +-
 koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt  |    6 +++---
 .../intranet-tmpl/prog/en/modules/offline_circ/process_koc.tt  |    4 ++--
 .../intranet-tmpl/prog/en/modules/serials/serials-edit.tt      |    4 ++--
 .../intranet-tmpl/prog/en/modules/suggestion/suggestion.tt     |    2 +-
 koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-del.tt  |    4 ++--
 koha-tmpl/intranet-tmpl/prog/en/modules/tools/batchMod-edit.tt |    6 +++---
 .../prog/en/modules/tools/batch_record_modification.tt         |    2 +-
 .../intranet-tmpl/prog/en/modules/tools/manage-marc-import.tt  |    2 +-
 .../prog/en/modules/tools/marc_modification_templates.tt       |    2 +-
 .../intranet-tmpl/prog/en/modules/tools/stage-marc-import.tt   |    4 ++--
 koha-tmpl/intranet-tmpl/prog/en/modules/tools/upload-images.tt |    4 ++--
 koha-tmpl/intranet-tmpl/prog/en/modules/tools/upload.tt        |    2 +-
 koha-tmpl/intranet-tmpl/prog/{en => }/js/acq.js                |    0
 koha-tmpl/intranet-tmpl/prog/{en => }/js/additem.js            |    0
 koha-tmpl/intranet-tmpl/prog/{en => }/js/ajax.js               |    0
 koha-tmpl/intranet-tmpl/prog/{en => }/js/audio_alerts.js       |    0
 .../prog/{en => }/js/background-job-progressbar.js             |    0
 koha-tmpl/intranet-tmpl/prog/{en => }/js/basket.js             |    0
 koha-tmpl/intranet-tmpl/prog/{en => }/js/basketgroup.js        |    0
 koha-tmpl/intranet-tmpl/prog/{en => }/js/biblio_framework.js   |    0
 koha-tmpl/intranet-tmpl/prog/{en => }/js/cataloging.js         |    0
 koha-tmpl/intranet-tmpl/prog/{en => }/js/checkouts.js          |    0
 koha-tmpl/intranet-tmpl/prog/{en => }/js/datatables.js         |    0
 koha-tmpl/intranet-tmpl/prog/{en => }/js/file-upload.js        |    0
 koha-tmpl/intranet-tmpl/prog/{en => }/js/holds.js              |    0
 koha-tmpl/intranet-tmpl/prog/{en => }/js/item_search_fields.js |    0
 koha-tmpl/intranet-tmpl/prog/{en => }/js/localcovers.js        |    0
 .../prog/{en => }/js/marc_modification_templates.js            |    0
 .../intranet-tmpl/prog/{en => }/js/marc_subfields_structure.js |    0
 koha-tmpl/intranet-tmpl/prog/{en => }/js/members.js            |    0
 koha-tmpl/intranet-tmpl/prog/{en => }/js/merge-record.js       |    0
 koha-tmpl/intranet-tmpl/prog/{en => }/js/offlinecirc.js        |    0
 koha-tmpl/intranet-tmpl/prog/{en => }/js/pages/addbiblio.js    |    0
 koha-tmpl/intranet-tmpl/prog/{en => }/js/pages/batchMod.js     |    0
 koha-tmpl/intranet-tmpl/prog/{en => }/js/pages/circulation.js  |    0
 koha-tmpl/intranet-tmpl/prog/{en => }/js/pages/preferences.js  |    0
 koha-tmpl/intranet-tmpl/prog/{en => }/js/prevent_submit.js     |    0
 koha-tmpl/intranet-tmpl/prog/{en => }/js/sms_providers.js      |    0
 koha-tmpl/intranet-tmpl/prog/{en => }/js/staff-global.js       |    0
 koha-tmpl/intranet-tmpl/prog/{en => }/js/xmlControlfield.js    |    0
 70 files changed, 63 insertions(+), 63 deletions(-)
 rename koha-tmpl/intranet-tmpl/prog/{en => }/js/acq.js (100%)
 rename koha-tmpl/intranet-tmpl/prog/{en => }/js/additem.js (100%)
 rename koha-tmpl/intranet-tmpl/prog/{en => }/js/ajax.js (100%)
 rename koha-tmpl/intranet-tmpl/prog/{en => }/js/audio_alerts.js (100%)
 rename koha-tmpl/intranet-tmpl/prog/{en => }/js/background-job-progressbar.js (100%)
 rename koha-tmpl/intranet-tmpl/prog/{en => }/js/basket.js (100%)
 rename koha-tmpl/intranet-tmpl/prog/{en => }/js/basketgroup.js (100%)
 rename koha-tmpl/intranet-tmpl/prog/{en => }/js/biblio_framework.js (100%)
 rename koha-tmpl/intranet-tmpl/prog/{en => }/js/cataloging.js (100%)
 rename koha-tmpl/intranet-tmpl/prog/{en => }/js/checkouts.js (100%)
 rename koha-tmpl/intranet-tmpl/prog/{en => }/js/datatables.js (100%)
 rename koha-tmpl/intranet-tmpl/prog/{en => }/js/file-upload.js (100%)
 rename koha-tmpl/intranet-tmpl/prog/{en => }/js/holds.js (100%)
 rename koha-tmpl/intranet-tmpl/prog/{en => }/js/item_search_fields.js (100%)
 rename koha-tmpl/intranet-tmpl/prog/{en => }/js/localcovers.js (100%)
 rename koha-tmpl/intranet-tmpl/prog/{en => }/js/marc_modification_templates.js (100%)
 rename koha-tmpl/intranet-tmpl/prog/{en => }/js/marc_subfields_structure.js (100%)
 rename koha-tmpl/intranet-tmpl/prog/{en => }/js/members.js (100%)
 rename koha-tmpl/intranet-tmpl/prog/{en => }/js/merge-record.js (100%)
 rename koha-tmpl/intranet-tmpl/prog/{en => }/js/offlinecirc.js (100%)
 rename koha-tmpl/intranet-tmpl/prog/{en => }/js/pages/addbiblio.js (100%)
 rename koha-tmpl/intranet-tmpl/prog/{en => }/js/pages/batchMod.js (100%)
 rename koha-tmpl/intranet-tmpl/prog/{en => }/js/pages/circulation.js (100%)
 rename koha-tmpl/intranet-tmpl/prog/{en => }/js/pages/preferences.js (100%)
 rename koha-tmpl/intranet-tmpl/prog/{en => }/js/prevent_submit.js (100%)
 rename koha-tmpl/intranet-tmpl/prog/{en => }/js/sms_providers.js (100%)
 rename koha-tmpl/intranet-tmpl/prog/{en => }/js/staff-global.js (100%)
 rename koha-tmpl/intranet-tmpl/prog/{en => }/js/xmlControlfield.js (100%)


hooks/post-receive
-- 
main Koha release repository

More information about the koha-commits mailing list