[koha-commits] main Koha release repository branch, new/enh/bug_5166, updated. html_template_pro-325-g1339635

Git repo owner gitmaster at git.koha-community.org
Mon Apr 18 17:19:26 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_5166 has been updated
       via  1339635a7fb4187550d2ff197106c1d977bf9cad (commit)
       via  7457243d4d54a76588d51d1833df3517ee40988b (commit)
       via  ed9b0c551ef1a87303c8cfbc6204ddf83dabacb6 (commit)
       via  55984a1610504ab7d6e81cccca3c5df85fd4bdd5 (commit)
       via  9d6fbefce6c0bb3b6fbe024c9c30e7321ef92c4a (commit)
       via  12e15ebb617636791fdc7b2a3b2ae8dc90cf4367 (commit)
       via  d44896079b2c8619b120cda789de717fa77bfeea (commit)
       via  265167d0c3ab4898c1ac6d19ce8e5ae91ed94078 (commit)
       via  c450306d7561d56a3be30e7bbc8362833166625a (commit)
       via  97446f86ced2c2d6d4d7a11b97ed81a5a0a25d95 (commit)
       via  b0374db5ffe1ef15a331eea3fd24b50fe8396b3b (commit)
       via  c673f6cf4630c49d2adc007875059ff30ddc952a (commit)
       via  30ae70897829e1be25ec7759e082180dd6305348 (commit)
       via  b03a6a22a0b1229fad34335544f3b0bb9b36c42e (commit)
       via  67e3b861819f62d125f40564fe6a7370ee47e219 (commit)
       via  a0c815033acd1ba514c2fa812e3e0dcc1858fcc9 (commit)
       via  28205bfda2a4a43432cb6080e877d328cff78ca9 (commit)
       via  7cfa1ca50938f597ddb21b0a81a0597d60ed06d1 (commit)
       via  49af98afd7dd0a48605a3d77dcc6b24c9b9b549c (commit)
       via  d00d0721b2898481e148480906502c5445cc4dec (commit)
       via  d4f2bde05474bec3bb9534b510d424e2c5e792ed (commit)
       via  1c5005beb20962778b28b6a3418fddb0d0c90e5a (commit)
       via  2fb5b73e6b51c28d12176d33b051b20c1a48b88a (commit)
       via  9bb2554e39c583fb994a9d6bb487a75fc7c7251e (commit)
       via  b030ef9f4f4f0e82ca5bf2e31d012084b466071b (commit)
       via  548a670eaf59b9c0e761f3b1e2691da5b9378496 (commit)
       via  90962ec3803b438f8aaca7401bcbce39e991bbbe (commit)
       via  16b917c2f8a6a41aa189ee9028e00c9502b62339 (commit)
       via  499c694daf408571cc8370b4c20568336ba35cde (commit)
       via  ce06b67f5e9ec1ca0de3bbf8e03dc5c0f0610fa8 (commit)
       via  97712c2cca26bc84e8486cbda1b428c489caf070 (commit)
       via  f11ba1343c0175afb6b6d5eba8cca535a7d1cb57 (commit)
       via  25d6beb80506370b8f237f9ab1e1e29eebd55f50 (commit)
       via  c9d082bcdc353d5f49703cd598d5f3cc1f0f55da (commit)
      from  21e5c3af6382584e2502e9baa0943d40b1610499 (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 1339635a7fb4187550d2ff197106c1d977bf9cad
Merge: 21e5c3af6382584e2502e9baa0943d40b1610499 7457243d4d54a76588d51d1833df3517ee40988b
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date:   Tue Apr 19 03:18:27 2011 +1200

    Merge remote branch 'kc/master' into new/enh/bug_5166
    
    Conflicts:
    	installer/data/mysql/updatedatabase.pl

-----------------------------------------------------------------------

Summary of changes:
 C4/Accounts.pm                                     |    3 +-
 C4/Circulation.pm                                  |    2 +-
 C4/Installer/PerlDependencies.pm                   |    2 +-
 C4/Search.pm                                       |   10 +-
 cataloguing/additem.pl                             |    2 +-
 ...unimarc_leader.pl => unimarc_field_210c_bis.pl} |   95 ++++++++++----------
 cataloguing/ysearch.pl                             |   78 ++++++++++++++++
 circ/circulation.pl                                |    2 +-
 circ/returns.pl                                    |   18 ++++-
 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  |    1 +
 ...m_preferences_full_optimal_for_install_only.sql |    1 +
 ...m_preferences_full_optimal_for_install_only.sql |    1 +
 installer/data/mysql/updatedatabase.pl             |   11 ++-
 .../prog/en/includes/doc-head-open.inc             |    2 +-
 .../prog/en/modules/acqui/neworderbiblio.tt        |   24 +++---
 .../en/modules/admin/preferences/circulation.pref  |    6 ++
 .../prog/en/modules/authorities/detail.tt          |    2 +-
 .../prog/en/modules/catalogue/MARCdetail.tt        |   20 ++--
 .../prog/en/modules/catalogue/results.tt           |    8 +-
 .../value_builder/unimarc_field_210c.tt            |    2 +-
 .../value_builder/unimarc_field_210c_bis.tt        |   75 +++++++++++++++
 .../prog/en/modules/circ/circulation.tt            |   57 +++++++-----
 .../intranet-tmpl/prog/en/modules/circ/returns.tt  |    8 ++
 .../prog/en/modules/members/boraccount.tt          |   17 +++-
 .../prog/en/modules/members/moremember-receipt.tt  |    4 +-
 .../prog/en/modules/members/moremember.tt          |   38 ++++-----
 .../prog/en/modules/members/printfeercpt.tt        |    4 +-
 .../prog/en/modules/members/printinvoice.tt        |    4 +-
 .../prog/en/modules/reserve/request.tt             |   20 ++--
 .../opac-tmpl/prog/en/includes/doc-head-open.inc   |    2 +-
 .../prog/en/modules/opac-authoritiesdetail.tt      |    6 +-
 .../prog/en/modules/opac-readingrecord.tt          |    4 +-
 .../opac-tmpl/prog/en/modules/opac-reserve.tt      |    2 +-
 .../opac-tmpl/prog/en/modules/opac-userupdate.tt   |    4 +-
 kohaversion.pl                                     |    2 +-
 members/moremember.pl                              |    2 +-
 misc/migration_tools/bulkmarcimport.pl             |   29 +++---
 misc/translator/TTParser.pm                        |    2 +-
 misc/translator/TmplTokenizer.pm                   |   23 +++++-
 opac/opac-authoritiesdetail.pl                     |    2 +-
 opac/opac-readingrecord.pl                         |    5 +-
 45 files changed, 420 insertions(+), 184 deletions(-)
 copy cataloguing/value_builder/{unimarc_leader.pl => unimarc_field_210c_bis.pl} (50%)
 create mode 100755 cataloguing/ysearch.pl
 create mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_210c_bis.tt


hooks/post-receive
-- 
main Koha release repository


More information about the koha-commits mailing list