[koha-commits] main Koha release repository branch master updated. v3.12.00-beta1-343-gc98d65a
Git repo owner
gitmaster at git.koha-community.org
Fri Apr 26 04:09:27 CEST 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, master has been updated
via c98d65adf742ab0cadacd1ae0811a83d4d711c27 (commit)
via 0942cac72e8910b3ed6e557c42f6665060c14bd0 (commit)
via 141048bd9759689a7927895f3a50cf2c1dae5d23 (commit)
via 5959154bc140a60164dd8652dd4285e2ec51f5d3 (commit)
via fe85af6929c0ad0ce9fdc7817a69286cb53f2a38 (commit)
via cd14dae7720b93f1ed101cd6383828885237aa02 (commit)
via 8f40b04dcc55c10420b79ec7050028399b73131f (commit)
via fc34239c7d161b82d923dbf318537d6a22e7ed9f (commit)
via 8ffd35d8c1d3cb940b56b5702fac88f593e8f416 (commit)
via 8e222dcdcc1f4aad9147f584df9d2f983f803a48 (commit)
via 0b21236d2e7690bd3b499634fdb8fede249b4ff2 (commit)
via 28518a033bf9a1b3f86270cfab438b5b9cdee8be (commit)
via 1d1cd09456e263218befea64c023124fe4ce1e51 (commit)
via 44a8ed7dec205dd264797ecf2638fea7f1ea67c8 (commit)
via 4b1749c170a534f315b17093c21b188837844868 (commit)
via 68e8f724c0a9d185ba5a21fe240cd91d05fabd09 (commit)
via 38421614a43d5aebbd3403ae8ee543e0e6dca07e (commit)
via 80488c7bcf4a163d0cb7515d22f5b63dc3499c8f (commit)
via 8b574a02ba194c07d15104bb185c331993770880 (commit)
via 3bac3ffd32f48ba223b118925f1fd6a71d0ee07f (commit)
via f2071b351e99a67108cc4a59ed5dc921f4470c55 (commit)
via 595ac425b86864c2d52ca093bdc865a4804c033a (commit)
via e6ebc86a07dee5843f7fffae3605fc3d00a183c8 (commit)
via 3cac78bdb83b0a510f062e683698f5f253014296 (commit)
via a7cfa33058c7b469869bedb8cb8dc838b37135da (commit)
via c4629aaffed8afb1dab2a812e16dddd6dbf1acce (commit)
via 50c46f52c27c6be63fa0cd268dd29d0de10fdef3 (commit)
via 418d5706a1e474a4d06377cf685563199064490a (commit)
via bec43ed6404a629d5a4384b38531842f1209897d (commit)
via d45cd0f8b0a70cb20fd84053a4cecac47b7f9bab (commit)
via dbb7a1e08a02d6ec1e201b98cf8f9152a464a0b3 (commit)
via aadcdf7c7e4c254edea4f2c96229add6ec8c74b1 (commit)
via 7d5c915e3cd9f4cbfb64d610b16c9c4e2168588b (commit)
via d8d4d9973fcd992570c6bfc0b2f8d1acd94a2aca (commit)
via 60db9a9e244e1a93522384bf3b715fcfea364927 (commit)
via 40cd834c74d0a8b5b1d92941c0ec651655630103 (commit)
via 21786fb71e5b7e0cf0c58d8a9b18a79af56063ef (commit)
via 52db043347016e106033c4c372bd9ec34cf8dee1 (commit)
from f5709c00988bfd8c401d07d52b5925c105a61072 (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 c98d65adf742ab0cadacd1ae0811a83d4d711c27
Merge: 141048b 0942cac
Author: Jared Camins-Esakov <jcamins at cpbibliography.com>
Date: Thu Apr 25 22:14:26 2013 -0400
Merge branch 'bug_10006' into 3.14-master
-----------------------------------------------------------------------
Summary of changes:
C4/XSLT.pm | 2 +
.../data/mysql/de-DE/mandatory/class_sources.txt | 2 +-
.../de-DE/mandatory/message_transport_types.txt | 3 +-
.../data/mysql/de-DE/mandatory/sample_notices.sql | 2 +-
.../sample_notices_message_attributes.txt | 3 +-
.../sample_notices_message_transports.txt | 4 +-
.../mysql/de-DE/mandatory/system_preferences.sql | 13 +-
.../mysql/de-DE/mandatory/system_preferences.txt | 2 +-
installer/data/mysql/de-DE/mandatory/userflags.sql | 14 +-
.../data/mysql/de-DE/mandatory/userpermissions.sql | 12 +-
.../data/mysql/de-DE/mandatory/userpermissions.txt | 2 +-
installer/data/mysql/de-DE/optional/auth_val.txt | 4 +-
.../optional/marc21_holdings_coded_values.txt | 2 +-
installer/data/mysql/de-DE/optional/parameters.sql | 10 +-
installer/data/mysql/de-DE/optional/parameters.txt | 2 +-
.../mysql/de-DE/optional/patron_categories.sql | 2 +-
.../mysql/de-DE/optional/patron_categories.txt | 19 +-
.../mysql/de-DE/optional/sample_creator_data.sql | 4 +-
.../mysql/de-DE/optional/sample_creator_data.txt | 2 +-
.../data/mysql/de-DE/optional/sample_holidays.sql | 10 +-
.../data/mysql/de-DE/optional/sample_itemtypes.sql | 2 +-
.../data/mysql/de-DE/optional/sample_itemtypes.txt | 2 +-
.../data/mysql/de-DE/optional/sample_libraries.sql | 4 -
.../data/mysql/de-DE/optional/sample_news.sql | 4 +-
.../data/mysql/de-DE/optional/sample_patrons.txt | 2 +-
.../fr-FR/1-Obligatoire/authorised_values.sql | 587 +++++++++++++++-----
.../intranet-tmpl/prog/en/css/pages/batchMod.css | 7 -
.../intranet-tmpl/prog/en/css/staff-global.css | 8 +
.../intranet-tmpl/prog/en/includes/table-pager.inc | 17 -
koha-tmpl/intranet-tmpl/prog/en/js/acq.js | 80 +--
.../intranet-tmpl/prog/en/modules/acqui/invoice.tt | 2 +-
.../intranet-tmpl/prog/en/modules/admin/aqplan.tt | 102 ++--
.../prog/en/modules/admin/smart-rules.tt | 2 +-
.../intranet-tmpl/prog/en/modules/help/about.tt | 2 +-
.../prog/en/modules/help/acqui/acqcontract.tt | 2 +-
.../prog/en/modules/help/acqui/acqui-home.tt | 2 +-
.../prog/en/modules/help/acqui/addorderiso2709.tt | 2 +-
.../prog/en/modules/help/acqui/basket.tt | 2 +-
.../prog/en/modules/help/acqui/basketgroup.tt | 2 +-
.../prog/en/modules/help/acqui/basketheader.tt | 2 +-
.../prog/en/modules/help/acqui/booksellers.tt | 2 +-
.../prog/en/modules/help/acqui/histsearch.tt | 2 +-
.../prog/en/modules/help/acqui/invoice.tt | 2 +-
.../prog/en/modules/help/acqui/invoices.tt | 2 +-
.../prog/en/modules/help/acqui/lateorders.tt | 2 +-
.../prog/en/modules/help/acqui/neworderbiblio.tt | 2 +-
.../prog/en/modules/help/acqui/neworderempty.tt | 2 +-
.../en/modules/help/acqui/newordersuggestion.tt | 13 +-
.../prog/en/modules/help/acqui/orderreceive.tt | 2 +-
.../prog/en/modules/help/acqui/parcel.tt | 2 +-
.../prog/en/modules/help/acqui/parcels.tt | 2 +-
.../prog/en/modules/help/acqui/supplier.tt | 2 +-
.../prog/en/modules/help/acqui/uncertainprice.tt | 2 +-
.../prog/en/modules/help/acqui/z3950_search.tt | 2 +-
.../prog/en/modules/help/admin/admin-home.tt | 2 +-
.../prog/en/modules/help/admin/aqbudgetperiods.tt | 2 +-
.../prog/en/modules/help/admin/aqbudgets.tt | 2 +-
.../prog/en/modules/help/admin/aqplan.tt | 2 +-
.../modules/help/admin/auth_subfields_structure.tt | 2 +-
.../en/modules/help/admin/auth_tag_structure.tt | 2 +-
.../en/modules/help/admin/authorised_values.tt | 43 ++-
.../prog/en/modules/help/admin/authtypes.tt | 2 +-
.../prog/en/modules/help/admin/biblio_framework.tt | 2 +-
.../modules/help/admin/branch_transfer_limits.tt | 2 +-
.../prog/en/modules/help/admin/branches.tt | 2 +-
.../prog/en/modules/help/admin/categorie.tt | 3 +-
.../prog/en/modules/help/admin/checkmarc.tt | 2 +-
.../prog/en/modules/help/admin/cities.tt | 2 +-
.../prog/en/modules/help/admin/classsources.tt | 2 +-
.../prog/en/modules/help/admin/currency.tt | 2 +-
.../prog/en/modules/help/admin/didyoumean.tt | 2 +-
.../prog/en/modules/help/admin/fieldmapping.tt | 2 +-
.../modules/help/admin/item_circulation_alerts.tt | 2 +-
.../prog/en/modules/help/admin/itemtypes.tt | 2 +-
.../prog/en/modules/help/admin/koha2marclinks.tt | 2 +-
.../modules/help/admin/marc_subfields_structure.tt | 2 +-
.../prog/en/modules/help/admin/marctagstructure.tt | 2 +-
.../prog/en/modules/help/admin/matching-rules.tt | 2 +-
.../prog/en/modules/help/admin/oai_set_mappings.tt | 2 +-
.../prog/en/modules/help/admin/oai_sets.tt | 2 +-
.../en/modules/help/admin/patron-attr-types.tt | 3 +-
.../prog/en/modules/help/admin/preferences.tt | 2 +-
.../prog/en/modules/help/admin/roadtype.tt | 2 +-
.../prog/en/modules/help/admin/smart-rules.tt | 2 +-
.../prog/en/modules/help/admin/stopwords.tt | 2 +-
.../en/modules/help/admin/transport-cost-matrix.tt | 2 +-
.../prog/en/modules/help/admin/z3950servers.tt | 2 +-
.../modules/help/authorities/authorities-home.tt | 2 +-
.../en/modules/help/authorities/authorities.tt | 2 +-
.../prog/en/modules/help/authorities/detail.tt | 2 +-
.../prog/en/modules/help/catalogue/detail.tt | 2 +-
.../prog/en/modules/help/catalogue/issuehistory.tt | 2 +-
.../prog/en/modules/help/catalogue/moredetail.tt | 2 +-
.../prog/en/modules/help/catalogue/search.tt | 14 +-
.../en/modules/help/labels/label-edit-batch.tt | 2 +-
.../en/modules/help/labels/label-edit-layout.tt | 2 +-
.../en/modules/help/labels/label-edit-profile.tt | 2 +-
.../en/modules/help/labels/label-edit-template.tt | 2 +-
.../prog/en/modules/help/labels/label-home.tt | 2 +-
.../prog/en/modules/help/labels/spinelabel-home.tt | 2 +-
.../intranet-tmpl/prog/en/modules/help/mainpage.tt | 2 +-
.../prog/en/modules/help/members/boraccount.tt | 4 +-
.../prog/en/modules/help/members/files.tt | 2 +-
.../prog/en/modules/help/members/mancredit.tt | 4 +-
.../prog/en/modules/help/members/maninvoice.tt | 4 +-
.../prog/en/modules/help/members/member-flags.tt | 169 ++++--
.../en/modules/help/members/member-password.tt | 2 +-
.../prog/en/modules/help/members/member.tt | 9 +-
.../prog/en/modules/help/members/memberentry.tt | 4 +-
.../prog/en/modules/help/members/members-home.tt | 7 +-
.../prog/en/modules/help/members/members-update.tt | 13 +
.../prog/en/modules/help/members/moremember.tt | 4 +-
.../prog/en/modules/help/members/notices.tt | 4 +-
.../prog/en/modules/help/members/pay.tt | 2 +-
.../prog/en/modules/help/members/paycollect.tt | 2 +-
.../prog/en/modules/help/members/readingrec.tt | 4 +-
.../prog/en/modules/help/members/routing-lists.tt | 2 +-
.../prog/en/modules/help/members/statistics.tt | 2 +-
.../intranet-tmpl/prog/en/modules/help/nohelp.tt | 2 +-
.../prog/en/modules/help/patroncards/edit-batch.tt | 2 +-
.../en/modules/help/patroncards/edit-layout.tt | 2 +-
.../en/modules/help/patroncards/edit-profile.tt | 2 +-
.../en/modules/help/patroncards/edit-template.tt | 2 +-
.../prog/en/modules/help/patroncards/home.tt | 2 +-
.../en/modules/help/patroncards/image-manage.tt | 2 +-
.../prog/en/modules/help/patroncards/manage.tt | 2 +-
.../prog/en/modules/help/reserve/request.tt | 2 +-
.../prog/en/modules/help/reviews/reviewswaiting.tt | 2 +-
.../prog/en/modules/help/tags/list.tt | 11 +
.../prog/en/modules/help/tags/review.tt | 4 +-
.../prog/en/modules/help/virtualshelves/shelves.tt | 2 +-
.../prog/en/modules/reports/acquisitions_stats.tt | 14 +-
.../prog/en/modules/suggestion/suggestion.tt | 6 +-
.../prog/en/modules/tools/batchMod-del.tt | 1 -
.../prog/en/modules/tools/batchMod-edit.tt | 1 -
opac/opac-search.pl | 2 +-
reports/acquisitions_stats.pl | 4 +-
137 files changed, 910 insertions(+), 528 deletions(-)
delete mode 100644 koha-tmpl/intranet-tmpl/prog/en/css/pages/batchMod.css
delete mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/table-pager.inc
create mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/help/members/members-update.tt
create mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/help/tags/list.tt
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list