[koha-commits] main Koha release repository branch master updated. v3.22.00-490-ga8942c2
Git repo owner
gitmaster at git.koha-community.org
Thu Feb 11 20:36:04 CET 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 a8942c28847e145f74e8373c3447313672cafe1d (commit)
from 59fc32531071e3d4594a8b5555acd41a17921de3 (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 a8942c28847e145f74e8373c3447313672cafe1d
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Thu Feb 11 01:26:46 2016 +0000
Revert bug 13618 - "Prevent XSS in the Staff Client and the OPAC" due to performance issues
Revert "DBRev to make notes of the XSS patches and the new important dependency."
This reverts commit e140603a594576180b846cf9299bee4629442c84.
Revert "Bug 13618: Specific for branches.opac_info"
This reverts commit 06e4a50f00efc62bbeb54260350f6f402d2e5e98.
Revert "Bug 13618: (follow-up) Specific for other prefs"
This reverts commit d6475a111fb701df68862afc6b23a7bfc774787b.
Revert "Bug 13618: Fix for debarredcomment and patron messages"
This reverts commit dd98c9df92503885f4f88e4cb6ca4c555fb28ee8.
Revert "Bug 13618: Do not display html tags in patron's notices"
This reverts commit a065b243feaef07586779d7943e00bbda6023db3.
Revert "Bug 13618: Do not display and html tags in item fields content"
This reverts commit baeeaffbf894d6eb7d12666071d2d9b9ab66e874.
Revert "Bug 13618: Fix for system preference description"
This reverts commit a967a09261fb2eebf27cc4a2c523122432a37203.
Revert "Bug 13618: Remove html filters for newly pushed code"
This reverts commit 0e98662b10197b1d92f2fb8ad50206e598a571e6.
Revert "Bug 13618: (follow-up) add missing lines for opac-shelves"
This reverts commit fc2fb605e53d8c5774a952bcf620335fbf77c004.
Revert "Bug 13618: (follow-up) Specific for ColumnsSettings"
This reverts commit bc308fdd9c95b13810bac57a2da9514ff37f570d.
Revert "Bug 13618: Fix for edit biblios and items"
This reverts commit 811c4e8402593127074ad47a81098f3aad389c94.
Revert "Bug 13618: followup to remove tabs"
This reverts commit ca8e8c397c8c2392b85d4c3232309ded66f3b8f1.
Revert "Bug 13618: Fix last occurrences recently introduced to master"
This reverts commit bb417b256b319d8a99ea611b76bad80c4d47004c.
Revert "Bug 13618: Fix for news"
This reverts commit ae5b98020aeec7d56faa7170cbad3319a8245379.
Revert "Bug 13618: Fix escape on sending baskets or shelves by email"
This reverts commit a7731ffe25e89d900d57e07f8e3de7b398090980.
Revert "Bug 13618: Specific for XSLTBloc"
This reverts commit 11fa38dc29e16d94a5ed81eb9e29b84f7e166d6c.
Revert "Bug 13618: Specific for Salutation on editing a patron"
This reverts commit 36c07ad6d3cf57c31bad4b11370b53aafd4d4806.
Revert "Bug 13618: Specific for other prefs"
This reverts commit e6ea281a3bcd2c3550578e8f2dd188a7701c77fb.
Revert "Bug 13618 - memberentrygen.tt errors Not a GLOB reference"
This reverts commit 782487455770a59ab7b30b5e92a1a66c28d30b88.
Revert "Bug 13618: Specific for ColumnsSettings"
This reverts commit 1834da3da367321771530331e7420ffa94d52979.
Revert "Bug 13618: Specific for IntranetUser* and OPACUser* prefs"
This reverts commit 21ae62b25310ea0876b087b729cf0b3a2ad7b1e6.
Revert "Bug 13618: Fix error 'Not a GLOB reference'"
This reverts commit 602bdbab4c6f86aa136158e1459d800d9530e243.
Revert "Bug 13618: Specific for the ISBD view"
This reverts commit d254362435a9ada5dffa8b5ef1c2a19f5d525f5e.
Revert "Bug 13618: Specific for pagination_bar"
This reverts commit 8837a8ae68f8089777b824203f3878735ff96591.
Revert "Bug 13618: Specific places where we don't need to escape variables - intra"
This reverts commit 00eff140b3402a043e31915d1a7b29aec3605433.
Revert "Bug 13618: Remove html filters at the intranet"
This reverts commit 7db851ff03a168fa46d56bb0e472be249dbd5410.
Revert "Bug 13618: Specific places where we don't need to escape variables"
This reverts commit 49a3738b8d54580e80e92e74fdba0483008b5cfd.
Revert "Bug 13618: Remove html filters at the OPAC"
This reverts commit cedaa0e23e0927884f1c5ef2cafde4bcdd6d55ff.
Revert "Bug 13618: Use Template::Stash::AutoEscaping to use the html filter"
This reverts commit 01b38d3b13f09b927201cba5eb146b6597d4bfeb.
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Brendan Gallagher brendan at bywatersolutions.com
-----------------------------------------------------------------------
Summary of changes:
C4/Installer/PerlDependencies.pm | 5 --
C4/Templates.pm | 2 -
Koha.pm | 2 +-
installer/data/mysql/updatedatabase.pl | 8 --
.../prog/en/includes/acquisitions-search.inc | 2 +-
.../prog/en/includes/auth-finder-search.inc | 8 +-
.../en/includes/authorities-search-results.inc | 22 +++---
.../prog/en/includes/authorities-search.inc | 8 +-
.../intranet-tmpl/prog/en/includes/authorities.inc | 4 +-
.../prog/en/includes/borrower_debarments.inc | 2 +-
.../en/includes/catalogue/itemsearch_item.csv.inc | 2 +-
.../prog/en/includes/catalogue/itemsearch_item.inc | 2 +-
.../en/includes/catalogue/itemsearch_item.json.inc | 24 +++---
.../intranet-tmpl/prog/en/includes/circ-menu.inc | 9 +--
.../prog/en/includes/doc-head-close.inc | 4 +-
.../intranet-tmpl/prog/en/includes/facets.inc | 6 +-
.../intranet-tmpl/prog/en/includes/header.inc | 2 +-
.../prog/en/includes/merge-record.inc | 2 +-
.../prog/en/includes/page-numbers.inc | 6 +-
.../prog/en/includes/prefs-admin-search.inc | 2 +-
.../intranet-tmpl/prog/en/includes/slip-print.inc | 4 +-
koha-tmpl/intranet-tmpl/prog/en/modules/about.tt | 20 ++---
.../prog/en/modules/acqui/addorder.tt | 2 +-
.../prog/en/modules/acqui/addorderiso2709.tt | 4 +-
.../intranet-tmpl/prog/en/modules/acqui/basket.tt | 18 ++---
.../prog/en/modules/acqui/basketgroup.tt | 14 ++--
.../prog/en/modules/acqui/histsearch.tt | 4 +-
.../prog/en/modules/acqui/invoice-files.tt | 8 +-
.../intranet-tmpl/prog/en/modules/acqui/invoice.tt | 6 +-
.../prog/en/modules/acqui/lateorders.tt | 10 +--
.../prog/en/modules/acqui/modordernotes.tt | 2 +-
.../prog/en/modules/acqui/neworderbiblio.tt | 4 +-
.../prog/en/modules/acqui/neworderempty.tt | 4 +-
.../prog/en/modules/acqui/newordersubscription.tt | 2 +-
.../prog/en/modules/acqui/newordersuggestion.tt | 2 +-
.../prog/en/modules/acqui/orderreceive.tt | 2 +-
.../intranet-tmpl/prog/en/modules/acqui/parcel.tt | 8 +-
.../en/modules/acqui/tables/members_results.tt | 6 +-
.../prog/en/modules/acqui/transferorder.tt | 2 +-
.../prog/en/modules/acqui/z3950_search.tt | 6 +-
.../prog/en/modules/admin/aqbudgetperiods.tt | 6 +-
.../en/modules/admin/auth_subfields_structure.tt | 24 +++---
.../prog/en/modules/admin/auth_tag_structure.tt | 4 +-
.../prog/en/modules/admin/authtypes.tt | 6 +-
.../prog/en/modules/admin/biblio_framework.tt | 6 +-
.../prog/en/modules/admin/branches.tt | 81 ++++++++++----------
.../prog/en/modules/admin/categories.tt | 30 ++++----
.../intranet-tmpl/prog/en/modules/admin/cities.tt | 6 +-
.../prog/en/modules/admin/classsources.tt | 16 ++--
.../prog/en/modules/admin/currency.tt | 6 +-
.../prog/en/modules/admin/itemtypes.tt | 8 +-
.../en/modules/admin/marc_subfields_structure.tt | 22 +++---
.../prog/en/modules/admin/marctagstructure.tt | 4 +-
.../prog/en/modules/admin/matching-rules.tt | 46 +++++------
.../prog/en/modules/admin/patron-attr-types.tt | 22 +++---
.../prog/en/modules/admin/preferences.tt | 4 +-
.../prog/en/modules/admin/systempreferences.tt | 22 +++---
.../prog/en/modules/admin/z3950servers.tt | 2 +-
koha-tmpl/intranet-tmpl/prog/en/modules/auth.tt | 2 +-
.../prog/en/modules/authorities/authorities.tt | 8 +-
.../modules/authorities/searchresultlist-auth.tt | 2 +-
.../en/modules/authorities/searchresultlist.tt | 4 +-
.../intranet-tmpl/prog/en/modules/basket/basket.tt | 6 +-
.../prog/en/modules/basket/sendbasket.tt | 46 +++++------
.../prog/en/modules/catalogue/ISBDdetail.tt | 2 +-
.../prog/en/modules/catalogue/MARCdetail.tt | 10 +--
.../prog/en/modules/catalogue/detail.tt | 24 +++---
.../prog/en/modules/catalogue/imageviewer.tt | 6 +-
.../prog/en/modules/catalogue/issuehistory.tt | 8 +-
.../prog/en/modules/catalogue/itemsearch.tt | 2 +-
.../prog/en/modules/catalogue/moredetail.tt | 8 +-
.../prog/en/modules/catalogue/results.tt | 28 +++----
.../prog/en/modules/catalogue/search-history.tt | 8 +-
.../prog/en/modules/catalogue/subject.tt | 2 +-
.../prog/en/modules/cataloguing/addbiblio.tt | 16 ++--
.../prog/en/modules/cataloguing/addbooks.tt | 6 +-
.../prog/en/modules/cataloguing/additem.tt | 16 ++--
.../prog/en/modules/cataloguing/linkitem.tt | 6 +-
.../prog/en/modules/cataloguing/moveitem.tt | 8 +-
.../en/modules/cataloguing/value_builder/macles.tt | 14 ++--
.../value_builder/marc21_linking_section.tt | 5 +-
.../value_builder/unimarc_field_210c.tt | 4 +-
.../cataloguing/value_builder/unimarc_field_4XX.tt | 24 +++---
.../value_builder/unimarc_field_686a.tt | 6 +-
.../en/modules/cataloguing/z3950_auth_search.tt | 10 +--
.../prog/en/modules/cataloguing/z3950_search.tt | 4 +-
.../prog/en/modules/circ/bookcount.tt | 6 +-
.../prog/en/modules/circ/branchoverdues.tt | 8 +-
.../prog/en/modules/circ/branchtransfers.tt | 2 +-
.../prog/en/modules/circ/circulation.tt | 18 ++---
.../en/modules/circ/circulation_batch_checkouts.tt | 4 +-
.../prog/en/modules/circ/on-site_checkouts.tt | 2 +-
.../intranet-tmpl/prog/en/modules/circ/overdue.tt | 38 ++++-----
.../prog/en/modules/circ/pendingreserves.tt | 2 +-
.../prog/en/modules/circ/printslip.tt | 4 +-
.../intranet-tmpl/prog/en/modules/circ/renew.tt | 2 +-
.../prog/en/modules/circ/reserveratios.tt | 2 +-
.../intranet-tmpl/prog/en/modules/circ/returns.tt | 22 +++---
.../prog/en/modules/circ/selectbranchprinter.tt | 8 +-
.../prog/en/modules/circ/transfer-slip.tt | 2 +-
.../prog/en/modules/circ/transferstoreceive.tt | 4 +-
.../prog/en/modules/circ/view_holdsqueue.tt | 2 +-
.../prog/en/modules/circ/waitingreserves.tt | 4 +-
.../prog/en/modules/installer/auth.tt | 2 +-
.../prog/en/modules/installer/step3.tt | 4 +-
.../intranet-tmpl/prog/en/modules/intranet-main.tt | 4 +-
.../prog/en/modules/labels/label-edit-layout.tt | 4 +-
.../intranet-tmpl/prog/en/modules/labels/result.tt | 2 +-
.../prog/en/modules/labels/spinelabel-print.tt | 4 +-
.../prog/en/modules/members/boraccount.tt | 2 +-
.../prog/en/modules/members/member.tt | 2 +-
.../prog/en/modules/members/memberentrygen.tt | 36 ++++-----
.../prog/en/modules/members/moremember-print.tt | 4 +-
.../prog/en/modules/members/moremember-receipt.tt | 8 +-
.../prog/en/modules/members/moremember.tt | 13 ++--
.../prog/en/modules/members/notices.tt | 2 +-
.../en/modules/members/purchase-suggestions.tt | 4 +-
.../prog/en/modules/members/readingrec.tt | 2 +-
.../en/modules/members/tables/guarantor_search.tt | 4 +-
.../en/modules/members/tables/members_results.tt | 8 +-
.../prog/en/modules/offline_circ/process_koc.tt | 6 +-
.../prog/en/modules/patron_lists/lists.tt | 2 +-
.../prog/en/modules/patroncards/edit-layout.tt | 44 +++++------
.../modules/patroncards/tables/members_results.tt | 4 +-
.../en/modules/reports/guided_reports_start.tt | 12 +--
.../prog/en/modules/reports/issues_stats.tt | 4 +-
.../prog/en/modules/reports/itemslost.tt | 4 +-
.../prog/en/modules/reports/reserves_stats.tt | 4 +-
.../prog/en/modules/reports/serials_stats.tt | 2 +-
.../prog/en/modules/reserve/request.tt | 14 ++--
.../prog/en/modules/reviews/reviewswaiting.tt | 4 +-
.../en/modules/rotating_collections/addItems.tt | 2 +-
.../prog/en/modules/serials/add_fields.tt | 4 +-
.../prog/en/modules/serials/checkexpiration.tt | 2 +-
.../prog/en/modules/serials/claims.tt | 2 +-
.../prog/en/modules/serials/result.tt | 10 +--
.../en/modules/serials/routing-preview-slip.tt | 2 +-
.../prog/en/modules/serials/routing-preview.tt | 4 +-
.../prog/en/modules/serials/routing.tt | 8 +-
.../prog/en/modules/serials/serials-collection.tt | 2 +-
.../prog/en/modules/serials/serials-edit.tt | 12 +--
.../prog/en/modules/serials/serials-search.tt | 28 +++----
.../prog/en/modules/serials/subscription-add.tt | 6 +-
.../en/modules/serials/subscription-bib-search.tt | 4 +-
.../en/modules/serials/tables/members_results.tt | 2 +-
.../prog/en/modules/services/itemrecorddisplay.tt | 6 +-
.../prog/en/modules/suggestion/suggestion.tt | 50 ++++++------
.../intranet-tmpl/prog/en/modules/tags/list.tt | 8 +-
.../intranet-tmpl/prog/en/modules/tags/review.tt | 2 +-
.../prog/en/modules/tools/batchMod-del.tt | 2 +-
.../prog/en/modules/tools/batchMod-edit.tt | 6 +-
.../prog/en/modules/tools/batch_delete_records.tt | 2 +-
.../prog/en/modules/tools/inventory.tt | 16 ++--
.../prog/en/modules/tools/koha-news.tt | 4 +-
.../intranet-tmpl/prog/en/modules/tools/viewlog.tt | 4 +-
.../en/modules/virtualshelves/addbybiblionumber.tt | 12 +--
.../prog/en/modules/virtualshelves/sendshelf.tt | 50 ++++++------
.../prog/en/modules/virtualshelves/shelves.tt | 20 ++---
.../virtualshelves/tables/shelves_results.tt | 2 +-
.../en/includes/authorities-search-results.inc | 22 +++---
.../opac-tmpl/bootstrap/en/includes/bodytag.inc | 10 +--
.../bootstrap/en/includes/doc-head-close.inc | 2 +-
.../bootstrap/en/includes/masthead-sco.inc | 2 +-
.../opac-tmpl/bootstrap/en/includes/masthead.inc | 12 +--
.../opac-tmpl/bootstrap/en/includes/navigation.inc | 4 +-
.../bootstrap/en/includes/opac-authorities.inc | 4 +-
.../bootstrap/en/includes/opac-bottom.inc | 6 +-
.../bootstrap/en/includes/opac-detail-sidebar.inc | 2 +-
.../bootstrap/en/includes/opac-facets.inc | 6 +-
.../bootstrap/en/includes/page-numbers.inc | 6 +-
.../bootstrap/en/includes/shelfbrowser.inc | 4 +-
.../opac-tmpl/bootstrap/en/modules/maintenance.tt | 2 +-
.../bootstrap/en/modules/opac-ISBDdetail.tt | 2 +-
.../bootstrap/en/modules/opac-MARCdetail.tt | 20 ++---
.../bootstrap/en/modules/opac-addbybiblionumber.tt | 14 ++--
.../bootstrap/en/modules/opac-auth-MARCdetail.tt | 2 +-
.../opac-tmpl/bootstrap/en/modules/opac-auth.tt | 4 +-
.../en/modules/opac-authoritiessearchresultlist.tt | 12 +--
.../opac-tmpl/bootstrap/en/modules/opac-basket.tt | 14 ++--
.../opac-tmpl/bootstrap/en/modules/opac-blocked.tt | 2 +-
.../opac-tmpl/bootstrap/en/modules/opac-browser.tt | 6 +-
.../opac-tmpl/bootstrap/en/modules/opac-detail.tt | 46 +++++------
.../bootstrap/en/modules/opac-downloadcart.tt | 2 +-
.../bootstrap/en/modules/opac-downloadshelf.tt | 6 +-
.../bootstrap/en/modules/opac-imageviewer.tt | 2 +-
.../opac-tmpl/bootstrap/en/modules/opac-main.tt | 8 +-
.../bootstrap/en/modules/opac-mymessages.tt | 10 +--
.../bootstrap/en/modules/opac-news-rss.tt | 6 +-
.../bootstrap/en/modules/opac-opensearch.tt | 52 ++++++-------
.../bootstrap/en/modules/opac-overdrive-search.tt | 8 +-
.../bootstrap/en/modules/opac-readingrecord.tt | 10 +--
.../en/modules/opac-registration-confirmation.tt | 4 +-
.../opac-tmpl/bootstrap/en/modules/opac-reserve.tt | 2 +-
.../bootstrap/en/modules/opac-restrictedpage.tt | 2 +-
.../bootstrap/en/modules/opac-results-grouped.tt | 14 ++--
.../opac-tmpl/bootstrap/en/modules/opac-results.tt | 40 +++++-----
.../opac-tmpl/bootstrap/en/modules/opac-review.tt | 10 +--
.../bootstrap/en/modules/opac-search-history.tt | 8 +-
.../bootstrap/en/modules/opac-sendbasket.tt | 52 ++++++-------
.../bootstrap/en/modules/opac-sendshelf.tt | 52 ++++++-------
.../bootstrap/en/modules/opac-serial-issues.tt | 4 +-
.../bootstrap/en/modules/opac-shelves-rss.tt | 6 +-
.../opac-tmpl/bootstrap/en/modules/opac-shelves.tt | 71 ++++++++---------
.../bootstrap/en/modules/opac-showreviews-rss.tt | 20 ++---
.../bootstrap/en/modules/opac-showreviews.tt | 6 +-
.../bootstrap/en/modules/opac-suggestions.tt | 18 ++---
.../opac-tmpl/bootstrap/en/modules/opac-tags.tt | 13 ++--
.../bootstrap/en/modules/opac-tags_subject.tt | 2 +-
.../bootstrap/en/modules/opac-topissues.tt | 4 +-
.../opac-tmpl/bootstrap/en/modules/opac-user.tt | 17 ++--
.../opac-tmpl/bootstrap/en/modules/sco/help.tt | 8 +-
.../opac-tmpl/bootstrap/en/modules/sco/sco-main.tt | 14 ++--
.../bootstrap/en/modules/svc/suggestion.tt | 2 +-
213 files changed, 1058 insertions(+), 1076 deletions(-)
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list