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 a4b2280b6be100727e5d6f85b9e6fe58392febf0 (commit) via 3884e1693fcab4615362cb339262bb160479ccdc (commit) via 4669a10776ff958a3b2d51963b7c4ec90ec02f09 (commit) via b3866aff5d21b4558e8d4580ba37873422054a3e (commit) via 6e59b9a295a640e24742325c660c165a4d962091 (commit) via 2ecdf2fda94b7bcf59129079c28d26b15bcea8fb (commit) via b8f3120bf5f5e7f2da73c213ed74bb003cf5da25 (commit) via a898b69dccc667f62b00f975392ccc9c4bcd6f8d (commit) via eeb0d7c0d3f81a016429961d52c6126a7bab563b (commit) via aaa80a54dc30ff94384a93af34395343a1088b88 (commit) from f7190f48aad671485bcf8a535bf7e48f493d8c22 (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 a4b2280b6be100727e5d6f85b9e6fe58392febf0 Merge: 4669a10776ff958a3b2d51963b7c4ec90ec02f09 3884e1693fcab4615362cb339262bb160479ccdc Author: Chris Cormack <chr...@catalyst.net.nz> Date: Sun Mar 27 21:19:24 2011 +1300 Merge remote branch 'kc/new/bug_3670' into kcmaster Conflicts: koha-tmpl/intranet-tmpl/prog/en/includes/messaging-preference-form.inc commit 4669a10776ff958a3b2d51963b7c4ec90ec02f09 Merge: 6e59b9a295a640e24742325c660c165a4d962091 b3866aff5d21b4558e8d4580ba37873422054a3e Author: Chris Cormack <chr...@catalyst.net.nz> Date: Sun Mar 27 21:12:40 2011 +1300 Merge remote branch 'kc/new/enh/bug_1962' into kcmaster Conflicts: circ/returns.pl installer/data/mysql/fr-FR/1-Obligatoire/unimarc_standard_systemprefs.sql installer/data/mysql/it-IT/necessari/sysprefs.sql installer/data/mysql/pl-PL/mandatory/sysprefs.sql installer/data/mysql/ru-RU/mandatory/system_preferences_full_optimal_for_install_only.sql installer/data/mysql/uk-UA/mandatory/system_preferences_full_optimal_for_install_only.sql installer/data/mysql/updatedatabase.pl kohaversion.pl ----------------------------------------------------------------------- Summary of changes: C4/AuthoritiesMarc.pm | 13 +- C4/Serials.pm | 35 +- circ/returns.pl | 10 +- installer/data/mysql/de-DE/mandatory/sysprefs.sql | 1 + installer/data/mysql/en/mandatory/sysprefs.sql | 1 + .../1-Obligatoire/unimarc_standard_systemprefs.sql | 1 + installer/data/mysql/it-IT/necessari/sysprefs.sql | 1 + installer/data/mysql/pl-PL/mandatory/sysprefs.sql | 2 +- ...m_preferences_full_optimal_for_install_only.sql | 1 + ...m_preferences_full_optimal_for_install_only.sql | 3 +- installer/data/mysql/updatedatabase.pl | 7 + .../prog/en/includes/messaging-preference-form.inc | 2 +- .../en/modules/admin/preferences/circulation.pref | 6 + .../en/modules/help/catalogue/issuehistory.tmpl | 4 +- .../prog/en/modules/help/catalogue/search.tmpl | 10 +- .../en/modules/help/cataloguing/addbiblio.tmpl | 284 +++---------- .../prog/en/modules/help/cataloguing/additem.tmpl | 57 +++- .../prog/en/modules/help/members/boraccount.tmpl | 51 +-- .../prog/en/modules/help/members/mancredit.tmpl | 16 +- .../prog/en/modules/help/members/maninvoice.tmpl | 20 +- .../prog/en/modules/help/members/member-flags.tmpl | 433 ++++++++++++++++---- .../en/modules/help/members/member-password.tmpl | 13 +- .../prog/en/modules/help/members/member.tmpl | 3 +- .../prog/en/modules/help/members/memberentry.tmpl | 242 ++++-------- .../prog/en/modules/help/members/members-home.tmpl | 5 +- .../prog/en/modules/help/members/messaging.tmpl | 16 +- .../prog/en/modules/help/members/moremember.tmpl | 99 ++++- .../prog/en/modules/help/members/notices.tmpl | 7 + .../prog/en/modules/help/members/pay.tmpl | 27 +- .../prog/en/modules/help/members/readingrec.tmpl | 14 +- .../prog/en/xslt/MARC21slim2intranetDetail.xsl | 2 +- koha-tmpl/opac-tmpl/prog/en/includes/masthead.inc | 2 +- .../prog/en/modules/opac-authorities-home.tmpl | 35 +-- .../prog/en/modules/opac-authoritiesdetail.tmpl | 16 +- .../prog/en/xslt/MARC21slim2OPACDetail.xsl | 2 +- kohaversion.pl | 2 +- opac/opac-authoritiesdetail.pl | 5 + 37 files changed, 799 insertions(+), 649 deletions(-) create mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/help/members/notices.tmpl 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