[koha-commits] main Koha release repository branch, new/enh/bug_5917, updated. v3.02.00-1316-g1c9ef0f
Git repo owner
gitmaster at git.koha-community.org
Thu Apr 7 21:15:01 CEST 2011
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, new/enh/bug_5917 has been updated
via 1c9ef0f9aeb35d42068db99615db677974c95d16 (commit)
via fe331a0209585b9ac84eff0e886cbe2eb67de0c9 (commit)
via 69d4d8f1cca9c536a0e182a847726f363768f578 (commit)
via 33c7b21cde85230d4ea6080bfa85d70bf60ee587 (commit)
via 2ca3edc69087bdda6192ef0dd55a3061fe7924ed (commit)
via 46041a8fdc51c9c1173cd8cc343e6ac1f7bd46f6 (commit)
via c03f31479c620eaaa8caec25bfc34d79daebafd3 (commit)
via 141a52ac30c94b0f5e8dde0d29552bc8d5f44553 (commit)
via 311e81810ab894b2b7f2dc186cbf3a8c6a337a1f (commit)
via aaa6ecf2b6bad86b51ec21299407c92840d2417c (commit)
via c9def9328613401f751f038653273b35b3e9d84e (commit)
via 3974ac63c9cba664066ea0ea41c88bd02a25812a (commit)
via 6a73fe511a88f249d8f82e8e73816bb94a256d17 (commit)
via 9dc9f73bfeeeea0ed43158cf73357e239c11989a (commit)
via 21404359d498865ea55beb745327763a819f81fe (commit)
via f76b9fb42e9ce7b90e3b45f2cc4c68470828e12a (commit)
via 07f16fc52e7192588f04cfa115c997506ab480bf (commit)
via c649ed9257d3c7f4d71f484d8ea6e2d5af2e48d7 (commit)
via 700de9664d0e9016845d12916905e458cab9dbd4 (commit)
via 8ca5d5ff85c429ee972b3f80f91f5b27a58cf5d5 (commit)
via d58092dd96383378f8abdce92d07c1795c617f97 (commit)
via 0f6270d310498aee2e5e81037d43348feb2a6058 (commit)
via 9bb36148fddd4cb249c83033c5d6c27bef0513a6 (commit)
via 3a8be8d8e0619e248ee02a851a0f21497d3490a7 (commit)
via 332e701c258a126cbc90862c12249de7aaada710 (commit)
via 8b582d863debf1a60c69560b1cb797a9931bdcf8 (commit)
via 0645f83c225c6b95e3b0c7b091b493481a35d3f2 (commit)
via 2b71959a88029d9b948e13ad2f1f863fad8c44d6 (commit)
via cecdc193696c6c91560128da5954681aa7ce610f (commit)
via 13ad14a7540dab8b27a21fb6cb00a6edc875040d (commit)
via 99b49e2b1aa2e5d2629f1167e2b63c3b3158ffe8 (commit)
via b00c36989f2c480263478d358e4fcf670d047331 (commit)
via 0f39c4fcc3ff1a5a3d8b7e3866c77febf68d60a3 (commit)
via 0f7411ceee5887751fb34ad2c72c83216d55f0c1 (commit)
via a6f28246ae08440da8065183dae091bbf0a0b34b (commit)
via 31c519006ef2850c7b9451d688858b2b19e97e37 (commit)
via ab7435f964336a18f760b9dd91d4b4506528a051 (commit)
via c19d505abb1b492cc21e6f5b78fb4de91da44419 (commit)
via fcbcdcf4cebdb32544a545d8ef91de1bbe67f457 (commit)
via ecbeafff07fa32918d552bbf4ba9cd8410207633 (commit)
via 0c21ab2622d2d9b131c24c2002ed6e65875a6b24 (commit)
via f9658db163ca2c2533d47362f550b0157d49e5d7 (commit)
via 0f4edffc16adacb439601f9051bacd89869018f7 (commit)
via 99f49c1108dad5ef7548929b23d4a3815ae1a166 (commit)
via 58013b6c2ad01b87c778ec56bf02dd58e826200e (commit)
via 99160747f48e591b482a3fcd7844d11b57f1e8db (commit)
via 96f054e90d4a582b13f1f6d2922b4ae99999a23d (commit)
via 2a28b30a3c5a02475d59d4beab9c3b67cfc666e3 (commit)
via 5bdfefc7e1962a64079eb119d5229bfa28cf979d (commit)
via 827c575b18c0914045b2855b066277f104e22ded (commit)
via 3291784a88676cadb4ab86b936d14903da01a69e (commit)
via e9db636e6321000216151e3bdea400fb638dd288 (commit)
via b1daec9fa3aa3636e8f7e6c724305ec4f7e492c1 (commit)
via ad206a73f867f6a184f64d41e4ccfa8e5bb0cd21 (commit)
via 132743f66bc07f6b8799835aac6cf440430bd44e (commit)
via 706a881b7fc12a0700affd55c289eeffe415a49a (commit)
via 9cab9be3d6114898e0b8354d784fb8d56ad51fbc (commit)
via ce71043216f843ad1b1d2fb254db4dd2635e1066 (commit)
via e43da19e34745d734ab6ee5cb5540e4d6e92adf3 (commit)
via 66de13af9a5b00e70fb93ada6a92f3481db1a981 (commit)
via ff4645523b7e273438a4211ed4735f59084f5baf (commit)
via 10b9e3186f626437607050f1fabd4a5aed8434e3 (commit)
via a1a8945c2f88849f581f456f4bf04cef456d7b67 (commit)
via 0a43ba114d0fee9a478def455b926121442a0814 (commit)
from 2fd51eb84447dd068d0f290648cfb74a866a933e (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 1c9ef0f9aeb35d42068db99615db677974c95d16
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date: Fri Apr 8 07:08:54 2011 +1200
Bug 5917 : Tracking template changes
commit fe331a0209585b9ac84eff0e886cbe2eb67de0c9
Merge: 2fd51eb84447dd068d0f290648cfb74a866a933e 69d4d8f1cca9c536a0e182a847726f363768f578
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date: Fri Apr 8 07:12:06 2011 +1200
Merge remote branch 'kc/master' into new/enh/bug_5917
Conflicts:
installer/data/mysql/updatedatabase.pl
-----------------------------------------------------------------------
Summary of changes:
C4/Acquisition.pm | 8 +-
C4/AuthoritiesMarc.pm | 90 ++--
C4/Heading.pm | 4 +-
C4/Log.pm | 23 +-
C4/Overdues.pm | 6 +-
C4/Reports/Guided.pm | 2 +-
C4/Search.pm | 9 +-
acqui/addorder.pl | 1 +
acqui/basketgroup.pl | 50 ++-
acqui/pdfformat/layout2pages.pm | 25 +-
acqui/pdfformat/layout3pages.pm | 25 +-
acqui/updatesupplier.pl | 2 +-
catalogue/search.pl | 2 +-
cataloguing/addbiblio.pl | 16 +-
cataloguing/value_builder/barcode.pl | 14 +-
debian/templates/zebra-biblios-site.cfg.in | 4 +-
docs/history.txt | 2 +
etc/zebradb/marc_defs/marc21/biblios/record.abs | 22 +-
etc/zebradb/marc_defs/unimarc/biblios/record.abs | 10 +-
etc/zebradb/zebra-biblios.cfg | 4 +-
.../Obligatoire/autorite_default.sql | 454 ++++++++++++++++++++
.../Obligatoire/autorite_default.txt | 1 +
installer/data/mysql/kohastructure.sql | 7 +-
installer/data/mysql/updatedatabase.pl | 32 ++
.../prog/en/includes/background-job.inc | 2 +-
.../intranet-tmpl/prog/en/includes/circ-menu.inc | 2 +-
.../prog/en/includes/labels-batches-toolbar.inc | 10 +-
.../en/includes/patroncards-batches-toolbar.inc | 10 +-
koha-tmpl/intranet-tmpl/prog/en/js/acq.js | 23 +-
.../intranet-tmpl/prog/en/js/xmlControlfield.js | 2 +-
.../prog/en/modules/acqui/basket.tmpl | 9 +-
.../prog/en/modules/acqui/basketgroup.tmpl | 3 +
.../prog/en/modules/acqui/neworderempty.tmpl | 6 +-
.../prog/en/modules/acqui/orderreceive.tmpl | 16 +-
.../prog/en/modules/admin/aqbudgets.tmpl | 4 +-
.../prog/en/modules/admin/aqplan.tmpl | 2 +-
.../prog/en/modules/admin/biblio_framework.tmpl | 6 +-
.../prog/en/modules/admin/cities.tmpl | 2 +-
.../prog/en/modules/admin/stopwords.tmpl | 2 +-
.../en/modules/authorities/searchresultlist.tmpl | 7 +-
.../prog/en/modules/cataloguing/additem.tmpl | 2 +-
.../modules/cataloguing/value_builder/macles.tmpl | 2 +-
.../prog/en/modules/labels/label-edit-batch.tmpl | 2 +-
.../prog/en/modules/labels/label-manage.tmpl | 8 +-
.../prog/en/modules/members/moremember-print.tmpl | 4 +-
.../prog/en/modules/members/moremember.tmpl | 2 +
.../prog/en/modules/offline_circ/process_koc.tmpl | 6 +-
.../prog/en/modules/patroncards/image-manage.tmpl | 2 +-
.../prog/en/modules/patroncards/manage.tmpl | 8 +-
.../prog/en/modules/serials/checkexpiration.tmpl | 2 +-
.../prog/en/modules/serials/serials-recieve.tmpl | 2 +-
.../prog/en/modules/tools/cleanborrowers.tmpl | 4 +-
.../prog/en/modules/tools/stage-marc-import.tmpl | 2 +-
.../prog/en/modules/tools/viewlog.tmpl | 73 ++++
.../prog/en/modules/virtualshelves/shelves.tmpl | 2 +-
.../prog/en/xslt/MARC21slim2intranetDetail.xsl | 6 +-
.../prog/en/modules/opac-results-grouped.tmpl | 4 +-
.../opac-tmpl/prog/en/modules/opac-results.tmpl | 4 +-
.../opac-tmpl/prog/en/modules/opac-review.tmpl | 4 +-
.../opac-tmpl/prog/en/modules/opac-shelves.tmpl | 2 +-
.../prog/en/xslt/MARC21slim2OPACDetail.xsl | 6 +-
.../prog/en/includes/background-job.inc | 2 +-
.../intranet-tmpl/prog/en/includes/circ-menu.inc | 2 +-
.../prog/en/includes/labels-batches-toolbar.inc | 10 +-
.../en/includes/patroncards-batches-toolbar.inc | 10 +-
.../intranet-tmpl/prog/en/modules/acqui/basket.tt | 9 +-
.../prog/en/modules/acqui/basketgroup.tt | 3 +
.../prog/en/modules/acqui/neworderempty.tt | 6 +-
.../prog/en/modules/acqui/orderreceive.tt | 16 +-
.../prog/en/modules/admin/aqbudgets.tt | 4 +-
.../intranet-tmpl/prog/en/modules/admin/aqplan.tt | 2 +-
.../prog/en/modules/admin/biblio_framework.tt | 6 +-
.../intranet-tmpl/prog/en/modules/admin/cities.tt | 2 +-
.../prog/en/modules/admin/stopwords.tt | 2 +-
.../en/modules/authorities/searchresultlist.tt | 7 +-
.../prog/en/modules/cataloguing/additem.tt | 2 +-
.../en/modules/cataloguing/value_builder/macles.tt | 2 +-
.../prog/en/modules/labels/label-edit-batch.tt | 2 +-
.../prog/en/modules/labels/label-manage.tt | 8 +-
.../prog/en/modules/members/moremember-print.tt | 4 +-
.../prog/en/modules/members/moremember.tt | 2 +
.../prog/en/modules/offline_circ/process_koc.tt | 6 +-
.../prog/en/modules/patroncards/image-manage.tt | 2 +-
.../prog/en/modules/patroncards/manage.tt | 8 +-
.../prog/en/modules/serials/checkexpiration.tt | 2 +-
.../prog/en/modules/serials/serials-recieve.tt | 2 +-
.../prog/en/modules/tools/cleanborrowers.tt | 4 +-
.../prog/en/modules/tools/stage-marc-import.tt | 2 +-
.../intranet-tmpl/prog/en/modules/tools/viewlog.tt | 73 ++++
.../prog/en/modules/virtualshelves/shelves.tt | 2 +-
.../prog/en/xslt/MARC21slim2intranetDetail.xsl | 6 +-
.../prog/en/modules/opac-results-grouped.tt | 4 +-
koha-tt/opac-tmpl/prog/en/modules/opac-results.tt | 4 +-
koha-tt/opac-tmpl/prog/en/modules/opac-review.tt | 4 +-
koha-tt/opac-tmpl/prog/en/modules/opac-shelves.tt | 2 +-
.../prog/en/xslt/MARC21slim2OPACDetail.xsl | 6 +-
kohaversion.pl | 2 +-
misc/cronjobs/holds/build_holds_queue.pl | 5 +-
misc/migration_tools/merge_authority.pl | 2 +-
opac/oai.pl | 6 +-
opac/opac-export.pl | 44 ++-
opac/opac-search.pl | 6 +-
patroncards/members-search.pl | 2 +-
reserve/request.pl | 2 +-
suggestion/suggestion.pl | 5 +-
tools/overduerules.pl | 6 +-
tools/viewlog.pl | 22 +-
107 files changed, 1073 insertions(+), 323 deletions(-)
create mode 100644 installer/data/mysql/fr-FR/marcflavour/unimarc_complet/Obligatoire/autorite_default.sql
create mode 100644 installer/data/mysql/fr-FR/marcflavour/unimarc_complet/Obligatoire/autorite_default.txt
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list