[koha-commits] main Koha release repository branch master updated. v17.11.00-1193-g274974f

Git repo owner gitmaster at git.koha-community.org
Fri Apr 13 18:41:21 CEST 2018


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  274974fdb82c0ed712b1198200554dc849ce2b67 (commit)
       via  952c03d6f9d8be29decb4585f3810017f64917ca (commit)
       via  6c36042e858068f01494bf129e82a62b48cc4e10 (commit)
       via  b7960a7311bccab007e50d586159814f94f848c3 (commit)
       via  8470024657a9516ae4f50c4cb75f59f16056824a (commit)
       via  639591f072a64f228a9eb0bb62c0337aea91c322 (commit)
       via  4626a6f5a58bd8cd3992d9e369b5ae94593443fd (commit)
       via  ae542767cbe496c19aba159325f005bbe7b804f4 (commit)
       via  0ac45a4a68a567b249d4b5220541ae5461dfed81 (commit)
       via  ed7543287b5e0bb3fadf851d761eb116a79ea727 (commit)
       via  4fe8b62f8429bde8f73d893ca34d0dec4de0f91c (commit)
       via  32b6c50855166efbfbc21e08cb9f417577d29e44 (commit)
       via  c43af09eb4976e1790f601cd262d22b731a74ea0 (commit)
       via  2a04fdbe609ddf1abe7a74a5046e0e517035ae38 (commit)
      from  39be84754fd5cf4a1bd1f41ed901ad7fa59f8892 (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 274974fdb82c0ed712b1198200554dc849ce2b67
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Fri Apr 13 13:31:23 2018 -0300

    Bug 19882: DBRev 17.12.00.030
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

commit 952c03d6f9d8be29decb4585f3810017f64917ca
Author: Nick Clemens <nick at bywatersolutions.com>
Date:   Thu Apr 12 13:51:17 2018 +0000

    Bug 19882: (follow-up) Add 'IGNORE' in DB update
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

commit 6c36042e858068f01494bf129e82a62b48cc4e10
Author: Nick Clemens <nick at bywatersolutions.com>
Date:   Wed Dec 27 13:18:26 2017 +0000

    Bug 19882: Add Novelist Select staff client profile
    
    This patchset allows for use of a separate Novelist profile for the
    staff client and opac. This allows Novelist to determine links and
    special styling for each. Testing is best with novelist credentials,
    however, confirming that values are set and used correctly and nothing
    is broken should suffice.
    
    To test:
    1 - Apply patches
    2 - Update database
    3 - View detail pages for some records on opac and staff client and ensure no changes have been
    made
    4 - Enable NovelistSelectStaffEnabled (and enter or have info in the Profile and password)
    5 - Set NovelistSelectStaffView to 'above'
    6 - View detail pages for some records, verify that if novelist info is
    available it is displayed and nothing is displayed if not
    7 - Repeat with all staff view options
    
    Signed-off-by: Owen Leonard <oleonard at myacpl.org>
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

commit b7960a7311bccab007e50d586159814f94f848c3
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Fri Apr 13 12:08:07 2018 -0300

    Bug 20538: ->tag is private - tell it explicitly
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

commit 8470024657a9516ae4f50c4cb75f59f16056824a
Author: Julian Maurice <julian.maurice at biblibre.com>
Date:   Thu Apr 12 11:21:05 2018 +0200

    Bug 20538: Add POD for Asset.pm
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

commit 639591f072a64f228a9eb0bb62c0337aea91c322
Author: Julian Maurice <julian.maurice at biblibre.com>
Date:   Thu Apr 12 11:05:31 2018 +0200

    Bug 20538: Move categories.js out of language directory
    
    This was the last js/css file inside a language directory
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

commit 4626a6f5a58bd8cd3992d9e369b5ae94593443fd
Author: Julian Maurice <julian.maurice at biblibre.com>
Date:   Thu Apr 12 10:30:10 2018 +0200

    Bug 20538: Fix 2 JS paths
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

commit ae542767cbe496c19aba159325f005bbe7b804f4
Author: Julian Maurice <julian.maurice at biblibre.com>
Date:   Thu Apr 12 10:28:45 2018 +0200

    Bug 20538: Fix copyright notice in Asset.pm
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

commit 0ac45a4a68a567b249d4b5220541ae5461dfed81
Author: Josef Moravec <josef.moravec at gmail.com>
Date:   Thu Apr 12 06:57:25 2018 +0000

    Bug 20538: (follow-up) Update discharges request page with Asset plugin
    
    This is follow-up of bug 20524
    
    Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

commit ed7543287b5e0bb3fadf851d761eb116a79ea727
Author: Julian Maurice <julian.maurice at biblibre.com>
Date:   Fri Apr 6 17:02:55 2018 +0200

    Bug 20538: Remove the need of writing [% KOHA_VERSION %] everywhere
    
    Having to write [% KOHA_VERSION %] for each url is bad because:
    - It's easily forgettable when adding new <script> or <link>
    - It prevents grep'ing for the full filename
    - It violates the DRY principle
    - If at some point we want to change the "force js and css reload"
      mechanism, it will be tedious
    
    This patch:
    - adds a Template::Toolkit plugin that generates <script> and
      <link> tags for JS and CSS files, and inserts automatically the Koha
      version in the filename
    - use the new plugin to remove all occurences of [% KOHA_VERSION %]
    - remove the code that was adding KOHA_VERSION as a template variable
    
    Test plan:
    1. Apply patch
    2. Go to several different pages in Koha (opac and intranet) while
       checking your browser's dev tools (there should be no 404 for JS and
       CSS files, and the Koha version should appear in filenames) and the
       server logs (there should be no "File not found")
    3. `git grep KOHA_VERSION` should return nothing
    4. prove t/db_dependent/Koha/Template/Plugin/Asset.t
    
    Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

commit 4fe8b62f8429bde8f73d893ca34d0dec4de0f91c
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Thu Apr 12 12:31:28 2018 -0300

    Bug 20499: just check if GetItem returns something is enough
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

commit 32b6c50855166efbfbc21e08cb9f417577d29e44
Author: Mark Tompsett <mtompset at hotmail.com>
Date:   Thu Mar 29 18:47:25 2018 +0000

    Bug 20499: Fix the Internal Server Error
    
    TEST PLAN
    ---------
    See comment #1
    
    Applying the test without the patch: messy.
    Applyin both patches: smooth.
    Run koha qa test tools
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

commit c43af09eb4976e1790f601cd262d22b731a74ea0
Author: Mark Tompsett <mtompset at hotmail.com>
Date:   Thu Mar 29 18:44:32 2018 +0000

    Bug 20499: Unit Test to prove the problem
    
    TEST PLAN
    ---------
    1) apply this patch
    2) prove t/db_dependent/Circulation.t
       -- horrible death.
    3) apply next path
    4) prove t/db_dependent/Circulation.t
       -- passes.
    5) run koha qa test tools
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

commit 2a04fdbe609ddf1abe7a74a5046e0e517035ae38
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Fri Apr 13 11:47:47 2018 -0300

    Bug 7143: Update about page for new dev - Joachim Ganseman
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

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

Summary of changes:
 C4/Circulation.pm                                  |   12 +-
 C4/Templates.pm                                    |    3 -
 Koha.pm                                            |    2 +-
 Koha/Template/Plugin/Asset.pm                      |  173 ++++++++++++++++++++
 docs/history.txt                                   |    1 +
 installer/data/mysql/sysprefs.sql                  |    5 +-
 installer/data/mysql/updatedatabase.pl             |   11 ++
 .../intranet-tmpl/prog/en/includes/datatables.inc  |   11 +-
 .../prog/en/includes/doc-head-close-receipt.inc    |    3 +-
 .../prog/en/includes/doc-head-close.inc            |   15 +-
 .../intranet-tmpl/prog/en/includes/greybox.inc     |    9 +-
 .../intranet-tmpl/prog/en/includes/help-top.inc    |   19 ++-
 .../prog/en/includes/intranetstylesheet.inc        |    5 +-
 .../intranet-tmpl/prog/en/includes/js_includes.inc |   25 +--
 .../intranet-tmpl/prog/en/includes/select2.inc     |    5 +-
 .../prog/en/includes/wysiwyg-systempreferences.inc |    3 +-
 koha-tmpl/intranet-tmpl/prog/en/modules/about.tt   |    1 +
 .../prog/en/modules/acqui/acqui-home.tt            |    9 +-
 .../prog/en/modules/acqui/addorderiso2709.tt       |    9 +-
 .../intranet-tmpl/prog/en/modules/acqui/basket.tt  |    7 +-
 .../prog/en/modules/acqui/basketgroup.tt           |   21 +--
 .../prog/en/modules/acqui/basketheader.tt          |    5 +-
 .../prog/en/modules/acqui/booksellers.tt           |    5 +-
 .../prog/en/modules/acqui/edifactmsgs.tt           |    5 +-
 .../prog/en/modules/acqui/histsearch.tt            |    7 +-
 .../prog/en/modules/acqui/invoice-files.tt         |    5 +-
 .../intranet-tmpl/prog/en/modules/acqui/invoice.tt |    5 +-
 .../prog/en/modules/acqui/invoices.tt              |    5 +-
 .../prog/en/modules/acqui/lateorders.tt            |    7 +-
 .../prog/en/modules/acqui/neworderbiblio.tt        |    5 +-
 .../prog/en/modules/acqui/neworderempty.tt         |   11 +-
 .../prog/en/modules/acqui/newordersubscription.tt  |    5 +-
 .../prog/en/modules/acqui/newordersuggestion.tt    |    5 +-
 .../intranet-tmpl/prog/en/modules/acqui/ordered.tt |    5 +-
 .../prog/en/modules/acqui/orderreceive.tt          |    9 +-
 .../intranet-tmpl/prog/en/modules/acqui/parcel.tt  |    9 +-
 .../intranet-tmpl/prog/en/modules/acqui/parcels.tt |    5 +-
 .../intranet-tmpl/prog/en/modules/acqui/spent.tt   |    5 +-
 .../prog/en/modules/acqui/supplier.tt              |    5 +-
 .../prog/en/modules/acqui/uncertainprice.tt        |    7 +-
 .../prog/en/modules/acqui/z3950_search.tt          |    9 +-
 .../prog/en/modules/admin/aqbudgetperiods.tt       |    9 +-
 .../prog/en/modules/admin/aqbudgets.tt             |   11 +-
 .../prog/en/modules/admin/aqcontract.tt            |    3 +-
 .../intranet-tmpl/prog/en/modules/admin/aqplan.tt  |    5 +-
 .../prog/en/modules/admin/audio_alerts.tt          |    5 +-
 .../en/modules/admin/auth_subfields_structure.tt   |    3 +-
 .../prog/en/modules/admin/auth_tag_structure.tt    |    5 +-
 .../prog/en/modules/admin/authorised_values.tt     |    5 +-
 .../prog/en/modules/admin/authtypes.tt             |    5 +-
 .../prog/en/modules/admin/biblio_framework.tt      |    7 +-
 .../en/modules/admin/branch_transfer_limits.tt     |    7 +-
 .../prog/en/modules/admin/branches.tt              |    7 +-
 .../prog/en/modules/admin/categories.tt            |    9 +-
 .../prog/en/modules/admin/checkmarc.tt             |    3 +-
 .../intranet-tmpl/prog/en/modules/admin/cities.tt  |    5 +-
 .../prog/en/modules/admin/classsources.tt          |    3 +-
 .../prog/en/modules/admin/clone-rules.tt           |    3 +-
 .../prog/en/modules/admin/columns_settings.tt      |    3 +-
 .../prog/en/modules/admin/currency.tt              |    5 +-
 .../prog/en/modules/admin/didyoumean.tt            |    3 +-
 .../prog/en/modules/admin/edi_accounts.tt          |    3 +-
 .../prog/en/modules/admin/edi_ean_accounts.tt      |    3 +-
 .../prog/en/modules/admin/fieldmapping.tt          |    3 +-
 .../en/modules/admin/item_circulation_alerts.tt    |    3 +-
 .../prog/en/modules/admin/items_search_field.tt    |    3 +-
 .../prog/en/modules/admin/items_search_fields.tt   |    5 +-
 .../prog/en/modules/admin/itemtypes.tt             |    5 +-
 .../prog/en/modules/admin/koha2marclinks.tt        |    5 +-
 .../prog/en/modules/admin/library_groups.tt        |    5 +-
 .../prog/en/modules/admin/localization.tt          |    3 +-
 .../en/modules/admin/marc_subfields_structure.tt   |    5 +-
 .../prog/en/modules/admin/marctagstructure.tt      |    7 +-
 .../prog/en/modules/admin/matching-rules.tt        |    3 +-
 .../prog/en/modules/admin/oai_set_mappings.tt      |    3 +-
 .../prog/en/modules/admin/oai_sets.tt              |    3 +-
 .../prog/en/modules/admin/patron-attr-types.tt     |    3 +-
 .../prog/en/modules/admin/preferences.tt           |   13 +-
 .../admin/preferences/enhanced_content.pref        |    8 +-
 .../prog/en/modules/admin/printers.tt              |    3 +-
 .../admin/searchengine/elasticsearch/mappings.tt   |    3 +-
 .../prog/en/modules/admin/smart-rules.tt           |    3 +-
 .../prog/en/modules/admin/sms_providers.tt         |    5 +-
 .../prog/en/modules/admin/sru_modmapping.tt        |    3 +-
 .../prog/en/modules/admin/systempreferences.tt     |    3 +-
 .../prog/en/modules/admin/transport-cost-matrix.tt |    3 +-
 .../prog/en/modules/admin/usage_statistics.tt      |    5 +-
 .../prog/en/modules/admin/z3950servers.tt          |    5 +-
 .../prog/en/modules/authorities/auth_finder.tt     |    3 +-
 .../prog/en/modules/authorities/authorities.tt     |    9 +-
 .../prog/en/modules/authorities/detail.tt          |    3 +-
 .../prog/en/modules/authorities/merge.tt           |    3 +-
 .../modules/authorities/searchresultlist-auth.tt   |    3 +-
 .../intranet-tmpl/prog/en/modules/basket/basket.tt |    7 +-
 .../prog/en/modules/catalogue/ISBDdetail.tt        |    5 +-
 .../prog/en/modules/catalogue/MARCdetail.tt        |    5 +-
 .../prog/en/modules/catalogue/advsearch.tt         |    3 +-
 .../prog/en/modules/catalogue/detail.tt            |   27 +--
 .../prog/en/modules/catalogue/imageviewer.tt       |    3 +-
 .../prog/en/modules/catalogue/issuehistory.tt      |    3 +-
 .../prog/en/modules/catalogue/itemsearch.tt        |    9 +-
 .../prog/en/modules/catalogue/labeledMARCdetail.tt |    5 +-
 .../prog/en/modules/catalogue/moredetail.tt        |    5 +-
 .../prog/en/modules/catalogue/results.tt           |    7 +-
 .../prog/en/modules/catalogue/search-history.tt    |    5 +-
 .../prog/en/modules/cataloguing/addbiblio.tt       |   11 +-
 .../prog/en/modules/cataloguing/additem.tt         |   11 +-
 .../prog/en/modules/cataloguing/editor.tt          |   11 +-
 .../prog/en/modules/cataloguing/merge.tt           |    3 +-
 .../cataloguing/value_builder/cn_browser.tt        |    3 +-
 .../cataloguing/value_builder/marc21_field_006.tt  |    3 +-
 .../cataloguing/value_builder/marc21_field_008.tt  |    3 +-
 .../en/modules/cataloguing/z3950_auth_search.tt    |    7 +-
 .../prog/en/modules/cataloguing/z3950_search.tt    |    7 +-
 .../prog/en/modules/circ/circulation.tt            |   19 ++-
 .../en/modules/circ/circulation_batch_checkouts.tt |    3 +-
 .../intranet-tmpl/prog/en/modules/circ/offline.tt  |    7 +-
 .../prog/en/modules/circ/on-site_checkouts.tt      |    3 +-
 .../intranet-tmpl/prog/en/modules/circ/overdue.tt  |    3 +-
 .../prog/en/modules/circ/pendingreserves.tt        |    3 +-
 .../prog/en/modules/circ/printslip.tt              |    3 +-
 .../prog/en/modules/circ/request-article.tt        |    3 +-
 .../prog/en/modules/circ/reserveratios.tt          |    3 +-
 .../intranet-tmpl/prog/en/modules/circ/returns.tt  |    5 +-
 .../prog/en/modules/circ/transferstoreceive.tt     |    3 +-
 .../prog/en/modules/circ/view_holdsqueue.tt        |    3 +-
 .../prog/en/modules/circ/waitingreserves.tt        |    3 +-
 .../prog/en/modules/clubs/club-enrollments.tt      |    5 +-
 .../intranet-tmpl/prog/en/modules/clubs/clubs.tt   |    5 +-
 .../prog/en/modules/common/patron_search.tt        |    3 +-
 .../en/modules/course_reserves/course-details.tt   |    3 +-
 .../en/modules/course_reserves/course-reserves.tt  |    3 +-
 .../intranet-tmpl/prog/en/modules/help/edithelp.tt |    5 +-
 .../prog/en/modules/ill/ill-requests.tt            |    5 +-
 .../intranet-tmpl/prog/en/modules/intranet-main.tt |    3 +-
 .../prog/en/modules/labels/label-edit-batch.tt     |    3 +-
 .../prog/en/modules/labels/label-home.tt           |    3 +-
 .../prog/en/modules/labels/label-manage.tt         |    3 +-
 .../intranet-tmpl/prog/en/modules/labels/result.tt |    3 +-
 .../prog/en/modules/labels/spinelabel-print.tt     |    7 +-
 .../prog/en/modules/members/boraccount.tt          |    5 +-
 .../prog/en/modules/members/deletemem.tt           |    3 +-
 .../prog/en/modules/members/discharge.tt           |    3 +-
 .../prog/en/modules/members/discharges.tt          |    5 +-
 .../intranet-tmpl/prog/en/modules/members/files.tt |    3 +-
 .../prog/en/modules/members/holdshistory.tt        |    5 +-
 .../prog/en/modules/members/housebound.tt          |    3 +-
 .../prog/en/modules/members/mancredit.tt           |    3 +-
 .../prog/en/modules/members/maninvoice.tt          |    3 +-
 .../prog/en/modules/members/member-flags.tt        |    7 +-
 .../prog/en/modules/members/member-password.tt     |    3 +-
 .../prog/en/modules/members/member.tt              |    5 +-
 .../prog/en/modules/members/memberentrygen.tt      |    9 +-
 .../prog/en/modules/members/members-update.tt      |    3 +-
 .../prog/en/modules/members/moremember-receipt.tt  |    3 +-
 .../prog/en/modules/members/moremember.tt          |   19 ++-
 .../prog/en/modules/members/nl-search.tt           |    3 +-
 .../prog/en/modules/members/notices.tt             |    5 +-
 .../intranet-tmpl/prog/en/modules/members/pay.tt   |    5 +-
 .../prog/en/modules/members/paycollect.tt          |    3 +-
 .../prog/en/modules/members/printfeercpt.tt        |    3 +-
 .../prog/en/modules/members/printinvoice.tt        |    3 +-
 .../en/modules/members/purchase-suggestions.tt     |    5 +-
 .../prog/en/modules/members/readingrec.tt          |    5 +-
 .../prog/en/modules/members/routing-lists.tt       |    3 +-
 .../prog/en/modules/members/statistics.tt          |    5 +-
 .../prog/en/modules/members/update-child.tt        |    5 +-
 .../prog/en/modules/offline_circ/list.tt           |    3 +-
 .../prog/en/modules/offline_circ/process_koc.tt    |    5 +-
 .../prog/en/modules/patron_lists/add-modify.tt     |    3 +-
 .../prog/en/modules/patron_lists/list.tt           |    7 +-
 .../prog/en/modules/patron_lists/lists.tt          |    5 +-
 .../prog/en/modules/patroncards/edit-batch.tt      |    3 +-
 .../prog/en/modules/patroncards/edit-template.tt   |    3 +-
 .../prog/en/modules/patroncards/print.tt           |    5 +-
 .../prog/en/modules/plugins/plugins-home.tt        |    3 +-
 .../prog/en/modules/reports/cash_register_stats.tt |    3 +-
 .../en/modules/reports/guided_reports_start.tt     |    3 +-
 .../prog/en/modules/reports/itemslost.tt           |    9 +-
 .../prog/en/modules/reports/itemtypes.tt           |    3 +-
 .../prog/en/modules/reports/orders_by_budget.tt    |    3 +-
 .../prog/en/modules/reports/serials_stats.tt       |    3 +-
 .../prog/en/modules/reserve/request.tt             |    5 +-
 .../prog/en/modules/reviews/reviewswaiting.tt      |    3 +-
 .../en/modules/rotating_collections/addItems.tt    |    5 +-
 .../rotating_collections/editCollections.tt        |    5 +-
 .../rotating_collections/rotatingCollections.tt    |    7 +-
 .../rotating_collections/transferCollection.tt     |    5 +-
 .../prog/en/modules/serials/add_fields.tt          |    3 +-
 .../prog/en/modules/serials/claims.tt              |    3 +-
 .../prog/en/modules/serials/serials-collection.tt  |    7 +-
 .../prog/en/modules/serials/serials-edit.tt        |    5 +-
 .../prog/en/modules/serials/serials-home.tt        |    3 +-
 .../prog/en/modules/serials/serials-search.tt      |    5 +-
 .../prog/en/modules/serials/subscription-add.tt    |    5 +-
 .../prog/en/modules/serials/subscription-detail.tt |    3 +-
 .../modules/serials/subscription-numberpatterns.tt |    5 +-
 .../prog/en/modules/suggestion/suggestion.tt       |    9 +-
 .../intranet-tmpl/prog/en/modules/tags/list.tt     |    3 +-
 .../intranet-tmpl/prog/en/modules/tags/review.tt   |    7 +-
 .../tools/automatic_item_modification_by_age.tt    |    7 +-
 .../prog/en/modules/tools/batchMod-del.tt          |    9 +-
 .../prog/en/modules/tools/batchMod-edit.tt         |   13 +-
 .../prog/en/modules/tools/batchMod.tt              |    3 +-
 .../prog/en/modules/tools/batch_delete_records.tt  |    7 +-
 .../en/modules/tools/batch_record_modification.tt  |    9 +-
 .../prog/en/modules/tools/cleanborrowers.tt        |    3 +-
 .../prog/en/modules/tools/csv-profiles.tt          |    3 +-
 .../intranet-tmpl/prog/en/modules/tools/export.tt  |    3 +-
 .../prog/en/modules/tools/holidays.tt              |    5 +-
 .../prog/en/modules/tools/import_borrowers.tt      |    5 +-
 .../prog/en/modules/tools/inventory.tt             |    7 +-
 .../prog/en/modules/tools/koha-news.tt             |    7 +-
 .../intranet-tmpl/prog/en/modules/tools/letter.tt  |    9 +-
 .../prog/en/modules/tools/manage-marc-import.tt    |    7 +-
 .../modules/tools/marc_modification_templates.tt   |    5 +-
 .../prog/en/modules/tools/modborrowers.tt          |    5 +-
 .../prog/en/modules/tools/overduerules.tt          |    3 +-
 .../prog/en/modules/tools/picture-upload.tt        |    5 +-
 .../prog/en/modules/tools/quotes-upload.tt         |   11 +-
 .../intranet-tmpl/prog/en/modules/tools/quotes.tt  |   11 +-
 .../prog/en/modules/tools/scheduler.tt             |    3 +-
 .../prog/en/modules/tools/showdiffmarc.tt          |    5 +-
 .../prog/en/modules/tools/stage-marc-import.tt     |    7 +-
 .../prog/en/modules/tools/upload-images.tt         |    7 +-
 .../intranet-tmpl/prog/en/modules/tools/upload.tt  |    7 +-
 .../intranet-tmpl/prog/en/modules/tools/viewlog.tt |    3 +-
 .../prog/en/modules/virtualshelves/shelves.tt      |    9 +-
 .../intranet-tmpl/prog/{en => }/js/categories.js   |    0
 .../opac-tmpl/bootstrap/en/includes/datatables.inc |    5 +-
 .../bootstrap/en/includes/doc-head-close.inc       |   21 +--
 .../opac-tmpl/bootstrap/en/includes/greybox.inc    |    9 +-
 .../bootstrap/en/includes/opac-bottom.inc          |   45 ++---
 .../opac-tmpl/bootstrap/en/modules/opac-account.tt |    3 +-
 .../bootstrap/en/modules/opac-advsearch.tt         |    5 +-
 .../bootstrap/en/modules/opac-auth-MARCdetail.tt   |    3 +-
 .../bootstrap/en/modules/opac-auth-detail.tt       |    3 +-
 .../bootstrap/en/modules/opac-course-details.tt    |    3 +-
 .../bootstrap/en/modules/opac-course-reserves.tt   |    3 +-
 .../opac-tmpl/bootstrap/en/modules/opac-detail.tt  |   11 +-
 .../bootstrap/en/modules/opac-memberentry.tt       |    3 +-
 .../bootstrap/en/modules/opac-overdrive-search.tt  |    7 +-
 .../opac-tmpl/bootstrap/en/modules/opac-passwd.tt  |    3 +-
 .../bootstrap/en/modules/opac-results-grouped.tt   |    3 +-
 .../opac-tmpl/bootstrap/en/modules/opac-results.tt |   11 +-
 .../bootstrap/en/modules/opac-search-history.tt    |    3 +-
 .../opac-tmpl/bootstrap/en/modules/opac-shelves.tt |    3 +-
 .../bootstrap/en/modules/opac-suggestions.tt       |    3 +-
 .../opac-tmpl/bootstrap/en/modules/opac-user.tt    |    3 +-
 .../opac-tmpl/bootstrap/en/modules/sci/sci-main.tt |   11 +-
 .../opac-tmpl/bootstrap/en/modules/sco/help.tt     |    9 +-
 .../bootstrap/en/modules/sco/printslip.tt          |    7 +-
 .../opac-tmpl/bootstrap/en/modules/sco/sco-main.tt |    9 +-
 t/db_dependent/Circulation.t                       |    6 +-
 t/db_dependent/Koha/Template/Plugin/Asset.t        |   99 +++++++++++
 255 files changed, 1126 insertions(+), 590 deletions(-)
 create mode 100644 Koha/Template/Plugin/Asset.pm
 rename koha-tmpl/intranet-tmpl/prog/{en => }/js/categories.js (100%)
 create mode 100644 t/db_dependent/Koha/Template/Plugin/Asset.t


hooks/post-receive
-- 
main Koha release repository


More information about the koha-commits mailing list