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 414b2ace4fa5804d27e927b9b573dcb973761c87 (commit)
via b96617dea8fcd35d4f4f2f19860a2b7f14489e97 (commit)
via 36df1f6cdf231c72527d79bb08efeca01dd0e902 (commit)
via 140fde57def7d146a633769ffdbb405222044432 (commit)
via 51405bcce471dd38b59425d1b3b6609e1d595572 (commit)
via 321eed98334bac3564b0b11abf3fb6fe34074f0d (commit)
via b0e29e5595f5d92cbd9a66ab306652a01d6382ed (commit)
via bd28366523c0778f496a310395f4481348e30ccf (commit)
via c4de64629d7f0853f3919cb5d09f98b2c0c60c03 (commit)
via 100099d429c3b092d9c3a9a7c65427499092d4b6 (commit)
via 82d2cf464be0439b9d52de1d951baa856a4e60a4 (commit)
via 81b3ca97eab7235dbff94d30e09e6d4325f21604 (commit)
via 3d66c2153b8be4192da055782f23ad08f2f9845f (commit)
via c3aa3d96819c32439ffa6f727367b679a1a24813 (commit)
via 68dc783c7e3b4f2721ef5efccc98934e8700f8d2 (commit)
via 0d84902eca94fca399040e3c0088ee74f69cf68c (commit)
via ec45ce356a286ee0f9002d586fea001a09c1bac5 (commit)
via 141ec0b9bcfa0bcf34d82cbb7ddc722a078e216e (commit)
via 29432ee42cf25d79f28054eaea85f46edc688d1b (commit)
via 45a6cca1a17093291dc6ab0883578b79bff0b6e7 (commit)
via 83f03fb9d3bbbf5101a7209f934e91b7876fc2dc (commit)
via b2bda465d770c078b14eef8493c0554143d90cc4 (commit)
via 0d41ba7300a228217ac32a1169bf24b0e79aff98 (commit)
via d1593acec727c6aa06fc0d3159c62b454d225518 (commit)
via 0bb33cd7ceee5cdb8bf2a5bcde552257f2279cfb (commit)
via d5eb56dd528d29aace607f2994ff7fc2c132db57 (commit)
via aa7df17f7c63ae51f8d2088b795af6d92b85e6a0 (commit)
from c836b63a7d5481f62b7c0044722b3c4bc37e0708 (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 414b2ace4fa5804d27e927b9b573dcb973761c87
Merge: c836b63a7d5481f62b7c0044722b3c4bc37e0708
b96617dea8fcd35d4f4f2f19860a2b7f14489e97
Author: Chris Cormack <chr...@catalyst.net.nz>
Date: Thu Nov 4 20:14:28 2010 +1300
Merge remote branch 'kc/new/signoffs' into kcmaster
Conflicts:
installer/data/mysql/updatedatabase.pl
Updated updatedatabase.pl to handle new version number
-----------------------------------------------------------------------
Summary of changes:
C4/Form/MessagingPreferences.pm | 3 +-
C4/Members/Messaging.pm | 29 ++++++-----
admin/aqbudgets.pl | 9 ++--
admin/preferences.pl | 2 +
catalogue/MARCdetail.pl | 37 +++++---------
cataloguing/addbiblio.pl | 3 +
circ/circulation.pl | 51 ++------------------
etc/zebradb/marc_defs/marc21/biblios/record.abs | 2 +-
.../data/mysql/en/mandatory/subtag_registry.sql | 30 ++++++++----
installer/data/mysql/updatedatabase.pl | 16 ++++++
.../prog/en/includes/acquisitions-menu.inc | 3 +-
koha-tmpl/intranet-tmpl/prog/en/js/members.js | 19 ++++----
.../prog/en/modules/acqui/basket.tmpl | 6 ++-
.../prog/en/modules/admin/aqbudgetperiods.tmpl | 4 ++
.../prog/en/modules/admin/aqbudgets.tmpl | 9 +++-
.../prog/en/modules/admin/aqplan.tmpl | 3 +
.../prog/en/modules/admin/authorised_values.tmpl | 8 ++--
.../prog/en/modules/admin/itemtypes.tmpl | 2 +-
.../prog/en/modules/admin/patron-attr-types.tmpl | 5 +--
.../prog/en/modules/admin/preferences.tmpl | 2 +-
.../en/modules/admin/preferences/cataloguing.pref | 22 ++-------
.../en/modules/admin/preferences/circulation.pref | 5 --
.../en/modules/admin/preferences/searching.pref | 4 +-
.../prog/en/modules/admin/preferences/serials.pref | 19 +++++++-
.../prog/en/modules/basket/basket.tmpl | 2 +
.../prog/en/modules/catalogue/MARCdetail.tmpl | 7 ++-
.../prog/en/modules/catalogue/moredetail.tmpl | 2 +-
.../prog/en/modules/cataloguing/addbiblio.tmpl | 38 ++++++++++++++-
.../prog/en/modules/cataloguing/addbooks.tmpl | 2 +-
.../prog/en/modules/members/memberentrygen.tmpl | 12 ++++-
.../intranet-tmpl/prog/en/modules/tags/review.tmpl | 10 ++--
kohaversion.pl | 2 +-
32 files changed, 207 insertions(+), 161 deletions(-)
mode change 100644 => 100755 etc/zebradb/marc_defs/marc21/biblios/record.abs
hooks/post-receive
--
main Koha release repository
_______________________________________________
koha-commits mailing list
koha-commits@lists.koha-community.org
http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-commits
