[koha-commits] updated branch biblibre-integration (e227ff43e471eb05173ab12ef04c85942ee9a12c)
Koha Gitosis
gitosis at git.koha.org
Sun Sep 6 10:13:25 CEST 2009
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 "Koha GitWeb".
The branch, biblibre-integration has been updated
via e227ff43e471eb05173ab12ef04c85942ee9a12c (commit)
via 6b90ec566cd5df8ef3d65a26a8b9ce37c078b08e (commit)
via b9f4fa6260ccca1d603f425379a547a9b423cd23 (commit)
via f8ff5879a55fa30d406e7ab0d829af8bbac19a41 (commit)
via b1197477d476ddaedec43392bdd92396b94b0852 (commit)
via c000e0a28c11f3a7408e3a6e45ea05931ebf0ee5 (commit)
via c2c4f3e737fcf594b3b2ee369ad929998808d2ce (commit)
via c36098e3168165f01fd8784da82747df03a9ae97 (commit)
via 2a8df0bc2fd51ad9821721868439a1591f513e06 (commit)
via ec6aaaebb05aca77d626a126d1008923c2a64318 (commit)
via 73dd78ce1cb9ee58d036290294834afd97cfbeeb (commit)
via ddfe9f8ac0ba6a4109b78c668a11478a3f7e8f92 (commit)
via 390a270b1e846a127a3dfd40fb6fafe7f9d27912 (commit)
via b66904201a68fe860c0a58d2135a102822a077ee (commit)
via a5d298ad45012851dd7cfb17b7237bf63c793fe3 (commit)
via ee83c4ae809e79c54ab43c93a28d578d1e87ed5a (commit)
via aa3e066b5fea1293081e9a83bdb37dac59e43855 (commit)
via 81b1c692dfbcbe8fd59b15dd2ae8ca718680f730 (commit)
via ac0ac59a5a51396d289c9ce193b35db08e05175d (commit)
via 8b1ea22e59382b82de61fcfc1bcb74e674bbce8b (commit)
via c4d833148d1697523b27b377e6e7589ab1394258 (commit)
via 3b0c92c442a160cbf218b9b4bbfbce288ad66536 (commit)
via 9890a4880090292c64e8e78ef4976bdfa188d545 (commit)
via 11c88cc77dfb7dc93b0248e144047d6263ad9e7e (commit)
via 056152e142d01f2611ef10eb00ba05f7f7c4648e (commit)
via 561fcb09e6740812b55a14a3242b29d1c64e7ca1 (commit)
via 7d09555dbd7e41a343e988739470cd066cf8f34d (commit)
via dd08a539dcd9bc27e7c06547795a8e9cc692e86c (commit)
via 0bbcfeda0e624ddbbf83dfae0f964192528f4260 (commit)
via 0af3d16b278cc89fea4be707b92a0ffb65f9958f (commit)
via aa16f1229c3978575324889c1c056b2851d75b41 (commit)
via 3720e0261f409f858b790e5c215f388e943e0dca (commit)
via fce5a2f10e90f4d1c94589081fd97278233410cd (commit)
via 038c485ba5c7f9ee288a57133e14d8edf4eb4c73 (commit)
via 1b555e1fa84bd1f6cf84c1055ac553684a5290c1 (commit)
via d3a8f770116b3688bf729d204b047a307fc2ede7 (commit)
via dcfaf1121f19a4b2ef59ba86282e3305a48cc970 (commit)
via e1a4e7c756b66acb3545145de2bb51f5ada433d8 (commit)
via 6066b79817b7bbd5ef351e81381347e767be8de7 (commit)
via 8ebd1c9b1904f55c774a4ee27da79b5f75a49c83 (commit)
via ded8c88e95b034dc3363012fe02bfbac77362420 (commit)
via 9b56b1ead91707be681e1d64f94dfdf36ee05035 (commit)
via ee37448387b9e2740348ba3452515edfcc955238 (commit)
via dfca27d8983b194001d4f77a48dad56dd82c3359 (commit)
via e751044912f2f55e8092ab8357d73f019aee41f3 (commit)
via 38817fb300e27882262c7a3ff071711342116fb1 (commit)
via 71a4704f83c40d9563a68b8677097c2d2877941d (commit)
via b5fb22ea7bdcfc141ceffee90f60546fad875d3d (commit)
via 99ed8b9d1d01687d2efa5428edb0943322e67708 (commit)
via 02b759bbc5c83d911fcf72171216be5afe6fad2f (commit)
via 02822ac8051d1d13f87287b197478586af1473a0 (commit)
via bf9a25bb84311f314deb47056d24a72dd3a582ec (commit)
via 39d227d712956344ec5c8a0d3669fd690124ebbb (commit)
via 51db13b8da9a63f0f08e361f61ed9df36f4e236a (commit)
via c468a724b444a0b632ee68383e6c9515fa146f64 (commit)
via 4b4b161d50e039833610e5d8c4e6521199c6bd76 (commit)
via 13e894585fa9fc3b2318f480d2acb95ea155281d (commit)
via a339f5f94ad832ab4dba4f65e2e25fc61c668986 (commit)
via c9e6962fd4e692ccb1316253a57dc842fb6b89f9 (commit)
via 86a5bc80e26f5e76e0519ed40467bce753fa7700 (commit)
via ff606c3eb18ce3a1975c140fce56fad34b220f72 (commit)
via a192e57f00d6123a8d11fc52ef8f13e51f99e5a5 (commit)
via 204e051dffae205c240dd3e99ed63aff4ad7e1ea (commit)
via 0645c95a36f140f06b5976f9096ef91d4a9a5f9c (commit)
via d47afd597b7fe121aafd0255471dcf431dd3ad96 (commit)
via 45542226294a3a1bad71b8173069ba7093588fd9 (commit)
via b44db285a6392839360fc0941f35e8e9fd39a2d4 (commit)
via e12ae1892c9aad0ed0515bcbe9ac9f336812c792 (commit)
via 12663796ca87cf87f89fd1ba1f2949ec33b76b85 (commit)
via f514a1b383ae5c5138a3f667d9738542cbbaffd0 (commit)
via 1ebc471e15ddd3214d7c9e2a8b4e2d2cc2f6e61f (commit)
via b5d78283da4051b33cb3f43ee2ca8515f82c5f04 (commit)
via c1e34919cdee1bcbd4a65cad0641ffeb23e9e6a5 (commit)
via 537880591a051fbece62e355c0f13caef6993662 (commit)
via 1c39484c4ba694952fae79f214fffabb53b60f37 (commit)
via f4d46222e85bd3009b3cdddd7c391624e14642cb (commit)
via de66ef5c4987039f97e291257682a4941d12d0df (commit)
via 051477fbfed3667b08280ec29ed87978dd6b7d3c (commit)
via 84e88bd42eeb9e083a1bba16db1479adb8355c14 (commit)
via acbad4fff10229ff7096500412857c55fd8566ae (commit)
via 53032f511431fdcf880656cc146314e5e9e21f51 (commit)
via 8ef619bf74fec6654776f90f15ffe94996b6cf15 (commit)
via 7df9800672f329fdb2ed23253368bdaf48a9008e (commit)
from b78a85f469dbd62c5336091423f53e482976cd8d (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 e227ff43e471eb05173ab12ef04c85942ee9a12c
Merge: b78a85f469dbd62c5336091423f53e482976cd8d 6b90ec566cd5df8ef3d65a26a8b9ce37c078b08e
Author: Galen Charlton <gmcharlt at gmail.com>
Date: Sun Sep 6 13:19:42 2009 -0400
Merge commit 'origin/master' into biblibre-integration
Conflicts:
C4/Labels.pm
C4/Members.pm
-----------------------------------------------------------------------
Summary of changes:
C4/Auth.pm | 1 +
C4/Biblio.pm | 23 +-
C4/Branch.pm | 11 +-
C4/Cache.pm | 81 ++
C4/Cache/FastMemcached.pm | 95 +++
C4/Cache/Memcached.pm | 76 ++
C4/Cache/Memoize/Memcached.pm | 57 ++
C4/Context.pm | 2 +-
C4/Labels/Batch.pm | 307 ++++++++
C4/Labels/Label.pm | 798 ++++++++++++++++++++
C4/Labels/Layout.pm | 419 ++++++++++
C4/Labels/Lib.pm | 514 +++++++++++++
C4/Labels/PDF.pm | 291 +++++++
C4/Labels/Profile.pm | 355 +++++++++
C4/Labels/Template.pm | 396 ++++++++++
C4/Members.pm | 3 +
C4/Patroncards/Patroncards.pm | 292 +++++++
C4/SIP/ILS/Item.pm | 13 +
C4/SIP/ILS/Patron.pm | 5 +
C4/SIP/Sip/MsgType.pm | 2 +-
C4/VirtualShelves.pm | 21 +
admin/admin-home.pl | 2 +
admin/branch_transfer_limits.pl | 2 +
admin/item_circulation_alerts.pl | 2 +-
admin/roadtype.pl | 30 +-
admin/smart-rules.pl | 8 +-
catalogue/detail.pl | 7 +
cataloguing/addbooks.pl | 8 +-
docs/history.txt | 4 +-
installer/data/Pg/kohastructure.sql | 24 +-
installer/data/mysql/en/optional/sample_labels.sql | 40 +-
installer/data/mysql/en/optional/sample_labels.txt | 3 +-
.../data/mysql/fr-FR/2-Optionel/sample_labels.sql | 34 +-
.../data/mysql/fr-FR/2-Optionel/sample_labels.txt | 3 +-
installer/data/mysql/kohastructure.sql | 136 ++--
installer/data/mysql/labels_upgrade.pl | 184 +++++
installer/data/mysql/updatedatabase.pl | 18 +
koha-tmpl/intranet-tmpl/prog/en/css/label.css | 37 +
.../intranet-tmpl/prog/en/css/staff-global.css | 105 +++-
.../intranet-tmpl/prog/en/includes/admin-menu.inc | 2 +-
.../intranet-tmpl/prog/en/includes/header.inc | 104 ++-
.../prog/en/includes/labels-batches-toolbar.inc | 179 +++++
.../intranet-tmpl/prog/en/includes/labels-menu.inc | 10 +-
.../prog/en/includes/labels-new-toolbar.inc | 23 +
.../prog/en/includes/labels-toolbar.inc | 75 ++
.../prog/en/includes/search_indexes.inc | 2 +-
.../en/includes/tools-labels-batches-toolbar.inc | 85 ---
.../prog/en/includes/tools-labels-toolbar.inc | 29 -
.../prog/en/lib/greybox/gb_styles.css | 26 +-
.../prog/en/modules/admin/admin-home.tmpl | 4 +-
.../en/modules/admin/branch_transfer_limits.tmpl | 146 ++--
.../en/modules/admin/item_circulation_alerts.tmpl | 84 ++-
.../prog/en/modules/catalogue/detail.tmpl | 11 +
.../prog/en/modules/cataloguing/z3950_search.tmpl | 5 +-
.../en/modules/help/tools/import_borrowers.tmpl | 2 +-
.../en/modules/labels/label-create-layout.tmpl | 255 -------
.../en/modules/labels/label-create-profile.tmpl | 95 ---
.../en/modules/labels/label-create-template.tmpl | 86 ---
.../prog/en/modules/labels/label-edit-batch.tmpl | 75 ++
.../prog/en/modules/labels/label-edit-layout.tmpl | 442 +++++-------
.../prog/en/modules/labels/label-edit-profile.tmpl | 169 +++--
.../en/modules/labels/label-edit-template.tmpl | 257 ++++---
.../prog/en/modules/labels/label-home.tmpl | 125 ++--
.../prog/en/modules/labels/label-manage.tmpl | 152 ++++
.../prog/en/modules/labels/label-manager.tmpl | 4 +-
.../prog/en/modules/labels/label-print.tmpl | 343 ++++-----
.../prog/en/modules/labels/label-profiles.tmpl | 98 ---
.../prog/en/modules/labels/label-templates.tmpl | 72 --
.../prog/en/modules/labels/result.tmpl | 272 ++++----
.../prog/en/modules/members/memberentrygen.tmpl | 53 ++-
.../prog/en/modules/members/moremember.tmpl | 17 +-
.../prog/en/modules/tools/manage-marc-import.tmpl | 10 +-
.../prog/en/modules/tools/tools-home.tmpl | 5 +-
koha-tmpl/intranet-tmpl/prog/img/csv_icon.gif | Bin 0 -> 1315 bytes
koha-tmpl/intranet-tmpl/prog/img/icon_xml.gif | Bin 0 -> 1239 bytes
.../prog/img/itemtypeimg/bridge/e_video.gif | Bin 0 -> 1891 bytes
.../intranet-tmpl/prog/img/label-creator-image.png | Bin 0 -> 154915 bytes
koha-tmpl/intranet-tmpl/prog/img/pdficon_large.gif | Bin 0 -> 434 bytes
koha-tmpl/opac-tmpl/prog/en/css/opac.css | 6 +
.../opac-tmpl/prog/en/modules/opac-ISBDdetail.tmpl | 141 +----
.../opac-tmpl/prog/en/modules/opac-MARCdetail.tmpl | 96 ++-
.../opac-tmpl/prog/en/modules/opac-detail.tmpl | 9 +
.../prog/en/modules/opac-userdetails.tmpl | 2 +-
.../opac-tmpl/prog/en/modules/opac-userupdate.tmpl | 8 +-
.../prog/en/xslt/UNIMARCslim2OPACDetail.xsl | 346 ++++-----
.../prog/en/xslt/UNIMARCslim2OPACResults.xsl | 60 +-
.../opac-tmpl/prog/en/xslt/UNIMARCslimUtils.xsl | 287 ++++++--
.../opac-tmpl/prog/itemtypeimg/bridge/e_video.gif | Bin 0 -> 1891 bytes
kohaversion.pl | 2 +-
labels/label-create-csv.pl | 110 +++
labels/label-create-layout.pl | 73 --
labels/label-create-pdf.pl | 225 ++++++
labels/label-create-profile.pl | 103 ---
labels/label-create-template.pl | 103 ---
labels/label-create-xml.pl | 119 +++
labels/label-edit-batch.pl | 124 +++
labels/label-edit-layout.pl | 205 ++++--
labels/label-edit-profile.pl | 143 ++--
labels/label-edit-template.pl | 200 +++---
labels/label-home.pl | 95 +--
labels/label-item-search.pl | 140 ++---
labels/label-manage.pl | 113 +++
labels/label-manager.pl | 192 -----
labels/label-print-csv.pl | 55 --
labels/label-print-pdf.pl | 260 -------
labels/label-print.pl | 131 ++++
labels/label-profiles.pl | 63 --
labels/label-save-template.pl | 53 --
labels/label-templates.pl | 77 --
members/boraccount.pl | 6 +-
members/memberentry.pl | 6 +-
members/pay.pl | 4 +-
misc/migration_tools/bulkmarcimport.pl | 2 +-
misc/migration_tools/rebuild_nozebra.pl | 53 +-
opac/opac-detail.pl | 8 +
t/db_dependent/Labels/t_Batch.t | 82 ++
t/db_dependent/Labels/t_Layout.t | 100 +++
t/db_dependent/Labels/t_Profile.t | 95 +++
t/db_dependent/Labels/t_Template.t | 133 ++++
tools/manage-marc-import.pl | 31 +-
tools/overduerules.pl | 43 +-
121 files changed, 8078 insertions(+), 3752 deletions(-)
create mode 100644 C4/Cache.pm
create mode 100644 C4/Cache/FastMemcached.pm
create mode 100644 C4/Cache/Memcached.pm
create mode 100644 C4/Cache/Memoize/Memcached.pm
create mode 100644 C4/Labels/Batch.pm
create mode 100644 C4/Labels/Label.pm
create mode 100644 C4/Labels/Layout.pm
create mode 100644 C4/Labels/Lib.pm
create mode 100644 C4/Labels/PDF.pm
create mode 100644 C4/Labels/Profile.pm
create mode 100644 C4/Labels/Template.pm
create mode 100644 C4/Patroncards/Patroncards.pm
create mode 100644 installer/data/mysql/labels_upgrade.pl
create mode 100644 koha-tmpl/intranet-tmpl/prog/en/css/label.css
create mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/labels-batches-toolbar.inc
create mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/labels-new-toolbar.inc
create mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/labels-toolbar.inc
delete mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/tools-labels-batches-toolbar.inc
delete mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/tools-labels-toolbar.inc
delete mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-create-layout.tmpl
delete mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-create-profile.tmpl
delete mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-create-template.tmpl
create mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-batch.tmpl
create mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-manage.tmpl
delete mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-profiles.tmpl
delete mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-templates.tmpl
create mode 100644 koha-tmpl/intranet-tmpl/prog/img/csv_icon.gif
create mode 100644 koha-tmpl/intranet-tmpl/prog/img/icon_xml.gif
create mode 100644 koha-tmpl/intranet-tmpl/prog/img/itemtypeimg/bridge/e_video.gif
create mode 100644 koha-tmpl/intranet-tmpl/prog/img/label-creator-image.png
create mode 100644 koha-tmpl/intranet-tmpl/prog/img/pdficon_large.gif
create mode 100644 koha-tmpl/opac-tmpl/prog/itemtypeimg/bridge/e_video.gif
create mode 100755 labels/label-create-csv.pl
delete mode 100755 labels/label-create-layout.pl
create mode 100755 labels/label-create-pdf.pl
delete mode 100755 labels/label-create-profile.pl
delete mode 100755 labels/label-create-template.pl
create mode 100755 labels/label-create-xml.pl
create mode 100755 labels/label-edit-batch.pl
create mode 100755 labels/label-manage.pl
delete mode 100755 labels/label-manager.pl
delete mode 100755 labels/label-print-csv.pl
delete mode 100755 labels/label-print-pdf.pl
create mode 100755 labels/label-print.pl
delete mode 100755 labels/label-profiles.pl
delete mode 100755 labels/label-save-template.pl
delete mode 100755 labels/label-templates.pl
create mode 100644 t/db_dependent/Labels/t_Batch.t
create mode 100644 t/db_dependent/Labels/t_Layout.t
create mode 100644 t/db_dependent/Labels/t_Profile.t
create mode 100644 t/db_dependent/Labels/t_Template.t
hooks/post-receive
--
Koha GitWeb
More information about the koha-commits
mailing list