[koha-commits] main Koha release repository branch, new/bug_4263, updated. v3.02.00-658-g1a0b6de

Git repo owner gitmaster at git.koha-community.org
Sun Feb 13 21:06:22 CET 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/bug_4263 has been updated
       via  1a0b6ded11a22c8c1425e1bb4a7fdd61d3c46c5b (commit)
       via  ea2ace41a44cba0485be9e7cbece5e4782d2ad38 (commit)
       via  94bd7ad545cfa996fe2ec58b5c9c3293bed8d3fa (commit)
       via  1abf1ea2d009b15762bacd764fa5f66f915c6283 (commit)
       via  d7208f76bda9073df0452b85a7aa7e3649f20d0b (commit)
       via  bdd0e225bc291280cc40b4a8326a33a21638338b (commit)
       via  224d2dee90237670672a7f2b212d5333852dd41f (commit)
       via  dcfeab4eee04cd03ca591f46cf4294b3eea85018 (commit)
       via  de491849ac3565aab985efe7ff6bd26e45977ae8 (commit)
       via  b5c58f964a9f36b70d56d2ca9be6ffaf6a14605d (commit)
       via  02824a0b08fd2178fa970277b0fe636c7ed3d1b9 (commit)
       via  d22001b1c49bf06ef86bf50855bdf0e6924c2a09 (commit)
       via  7c376879b4fc53a47a5a4d578157e069278085c9 (commit)
       via  3a29f37dff1c58a344822a52aa2bc5f030dd44f8 (commit)
       via  d251585f717203b3abc27ab1238a276cc6addbaf (commit)
       via  403f53c0d841e2a9f5991d3e6a9cb7704a83cf40 (commit)
       via  07731037ee453fe3537c257b07be9c49b66e8ced (commit)
       via  8ce06ddf3220bf4b16efe6d796ec80251f3390fb (commit)
       via  dd5f1386ae9c0fd995cdc471ac129adce971b631 (commit)
       via  d1a06829f60ba5371e649239488fdfa838883de4 (commit)
       via  083fd5776aad2dcc97a231ce5cefec1ec661e51a (commit)
       via  6709d0e4f7bf82c2110167fda132dd06e171eff3 (commit)
       via  14422c8ed9df29a6b89e8afe69c4d05056618124 (commit)
       via  60e0a76fc027ff8d97c3630fce0a7b8222b6d5fd (commit)
       via  a8222aeeb1169d7b1939d1e64c319a16e3846e8c (commit)
       via  a4cc394508182f292b4767504dfbac882744c3df (commit)
       via  7acfb3a17f9ab592b385b032c93c96d6894ff821 (commit)
       via  aac253a5e0192b14dfa23e34c76629020c392bca (commit)
       via  dec6be9148ec28b240015762cdeb7019fbfadeb6 (commit)
       via  ea93d3b56e4654530871e3c454251d16b9d5ce0e (commit)
       via  60dd25b5c230249581a9736458aad4bad783dd52 (commit)
       via  0060b10af9acdc9eb0b5529d96de29375b8c79d0 (commit)
       via  3b5aa120d71ebc7c3db7fb2177d360df03d5ed35 (commit)
       via  0088c5da53a56f44ec435f88a56b67ae99616a4d (commit)
       via  236ba72ef6a5ff8de241eb3bac16aa68924a154a (commit)
       via  f03000f50f8eeb886a4c33a00eb587147210fc30 (commit)
       via  8fd29f3d62d1aa5d7e728032ea00bd98f3aef52d (commit)
       via  6ed8d1425d9be79e2839472851c8873dcf4377cf (commit)
       via  c02e4d02d5c4ebcb01d60c4515cde3b13765fb07 (commit)
       via  e29aca325d199468673365ee7540760b38630833 (commit)
       via  e6a3029470501b3a8269986c1448d5f8b2d6b7f2 (commit)
       via  f1f36a0c940fa53a5671b379a31d77c2cbe40a7f (commit)
       via  49b5f77194ccf688e95b3fbb5f08ea5ba18f7f7e (commit)
       via  f692123bf1b2b843d348a897852018caa04de76f (commit)
       via  e7e9c1c35b841b3464ed941c0f8039a86392ea58 (commit)
      from  aa398ed055a7226ba02d6559b297cb172b3ce3df (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 1a0b6ded11a22c8c1425e1bb4a7fdd61d3c46c5b
Author: Colin Campbell <colin.campbell at ptfs-europe.com>
Date:   Fri Feb 11 11:48:20 2011 +0000

    Bug 4263: Remove duplicated lines from C4::Items
    
    Merge of bug 4263 duplicates the bulk of
    ModItemFromMarc causing compile time errors
    
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

commit ea2ace41a44cba0485be9e7cbece5e4782d2ad38
Author: Colin Campbell <colin.campbell at ptfs-europe.com>
Date:   Thu Feb 10 15:13:12 2011 -0500

    Bug 4263: Fix subfield ordering broken by earlier patch
    
    Restores alpha sorting of item subfields in add/edit screen
    
    Signed-off-by: Nicole Engard <nengard at bywatersolutions.com>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

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

Summary of changes:
 C4/Auth.pm                                         |    2 +-
 C4/Biblio.pm                                       |   10 ++-
 C4/Items.pm                                        |   56 ++++++------
 C4/Search.pm                                       |    2 +-
 admin/auth_subfields_structure.pl                  |    4 +-
 admin/auth_tag_structure.pl                        |    6 +-
 admin/authorised_values.pl                         |    8 +-
 admin/branches.pl                                  |   12 ++--
 admin/marc_subfields_structure.pl                  |    4 +-
 admin/marctagstructure.pl                          |    6 +-
 admin/systempreferences.pl                         |   28 +++---
 catalogue/moredetail.pl                            |    2 +-
 catalogue/showmarc.pl                              |    1 +
 cataloguing/addbiblio.pl                           |    3 +-
 cataloguing/additem.pl                             |   47 +++++++---
 cataloguing/moveitem.pl                            |    2 +-
 docs/history.txt                                   |    2 +
 .../data/mysql/de-DE/mandatory/subtag_registry.sql |    4 +-
 .../data/mysql/en/mandatory/subtag_registry.sql    |    4 +-
 .../mysql/fr-FR/1-Obligatoire/subtag_registry.sql  |    4 +-
 .../data/mysql/it-IT/necessari/subtag_registry.sql |    6 +-
 .../data/mysql/pl-PL/mandatory/subtag_registry.sql |    4 +-
 .../data/mysql/ru-RU/mandatory/subtag_registry.sql |    4 +-
 .../data/mysql/uk-UA/mandatory/subtag_registry.sql |    4 +-
 installer/data/mysql/updatedatabase.pl             |    8 ++
 .../intranet-tmpl/prog/en/css/preferences.css      |    5 +
 .../intranet-tmpl/prog/en/includes/header.inc      |    2 +-
 .../prog/en/includes/messaging-preference-form.inc |   18 ++--
 .../prog/en/includes/patron-toolbar.inc            |    2 +
 .../intranet-tmpl/prog/en/includes/prefs-menu.inc  |   10 +-
 .../intranet-tmpl/prog/en/js/pages/preferences.js  |   25 ++++--
 .../en/modules/admin/auth_subfields_structure.tmpl |    8 +-
 .../prog/en/modules/admin/auth_tag_structure.tmpl  |   20 ++--
 .../prog/en/modules/admin/authtypes.tmpl           |    2 +-
 .../prog/en/modules/admin/branches.tmpl            |   14 ++--
 .../prog/en/modules/admin/categorie.tmpl           |    2 +-
 .../en/modules/admin/marc_subfields_structure.tmpl |   10 +-
 .../prog/en/modules/admin/marctagstructure.tmpl    |    2 +-
 .../prog/en/modules/admin/preferences.tmpl         |   12 ++-
 ...enhanced-content.pref => enhanced_content.pref} |    0
 .../preferences/{i18n-l10n.pref => i18n_l10n.pref} |    0
 .../preferences/{local-use.pref => local_use.pref} |    0
 .../{staff-client.pref => staff_client.pref}       |    6 +-
 .../{web-services.pref => web_services.pref}       |    0
 .../prog/en/modules/admin/systempreferences.tmpl   |   36 ++++----
 .../prog/en/modules/admin/z3950servers.tmpl        |    4 +-
 .../prog/en/modules/catalogue/MARCdetail.tmpl      |   44 +++++-----
 .../prog/en/modules/catalogue/advsearch.tmpl       |    2 +-
 .../prog/en/modules/catalogue/detail.tmpl          |    8 +-
 .../prog/en/modules/catalogue/moredetail.tmpl      |    4 +-
 .../prog/en/modules/catalogue/results.tmpl         |   10 +-
 .../prog/en/modules/cataloguing/additem.tmpl       |    1 +
 .../prog/en/modules/cataloguing/merge.tmpl         |    5 +-
 .../prog/en/modules/circ/circulation.tmpl          |    5 +
 .../prog/en/modules/circ/transferstoreceive.tmpl   |    2 +-
 .../prog/en/modules/maint/catmaintain.tmpl         |   16 ++--
 .../prog/en/modules/members/member.tmpl            |    5 +
 .../prog/en/modules/members/memberentrygen.tmpl    |   12 ++--
 .../prog/en/modules/reserve/request.tmpl           |   10 +-
 .../prog/en/modules/tools/holidays.tmpl            |    3 +-
 .../prog/en/modules/virtualshelves/shelves.tmpl    |    4 +-
 .../prog/en/xslt/MARC21slim2intranetDetail.xsl     |   94 +++++++++----------
 .../opac-tmpl/prog/en/includes/doc-head-close.inc  |   16 +++-
 koha-tmpl/opac-tmpl/prog/en/js/tags.js             |   26 +++---
 .../opac-tmpl/prog/en/modules/errors/400.tmpl      |    2 +-
 .../opac-tmpl/prog/en/modules/errors/401.tmpl      |    2 +-
 .../opac-tmpl/prog/en/modules/errors/402.tmpl      |    2 +-
 .../opac-tmpl/prog/en/modules/errors/403.tmpl      |    2 +-
 .../opac-tmpl/prog/en/modules/errors/404.tmpl      |    2 +-
 .../opac-tmpl/prog/en/modules/errors/500.tmpl      |    2 +-
 koha-tmpl/opac-tmpl/prog/en/modules/ilsdi.tmpl     |    2 +-
 koha-tmpl/opac-tmpl/prog/en/modules/kohaerror.tmpl |    2 +-
 .../opac-tmpl/prog/en/modules/opac-ISBDdetail.tmpl |    4 +-
 .../opac-tmpl/prog/en/modules/opac-MARCdetail.tmpl |    4 +-
 .../opac-tmpl/prog/en/modules/opac-account.tmpl    |    6 +-
 .../prog/en/modules/opac-addbybiblionumber.tmpl    |    2 +-
 .../opac-tmpl/prog/en/modules/opac-advsearch.tmpl  |    1 +
 .../prog/en/modules/opac-alert-subscribe.tmpl      |    2 +-
 koha-tmpl/opac-tmpl/prog/en/modules/opac-auth.tmpl |    2 +-
 .../prog/en/modules/opac-authorities-home.tmpl     |    4 +-
 .../prog/en/modules/opac-authoritiesdetail.tmpl    |    6 +-
 .../modules/opac-authoritiessearchresultlist.tmpl  |    4 +-
 .../opac-tmpl/prog/en/modules/opac-basket.tmpl     |    2 +-
 .../opac-tmpl/prog/en/modules/opac-browser.tmpl    |    4 +-
 .../opac-tmpl/prog/en/modules/opac-detail.tmpl     |   18 ++--
 .../prog/en/modules/opac-downloadcart.tmpl         |    2 +-
 .../prog/en/modules/opac-downloadshelf.tmpl        |    2 +-
 .../prog/en/modules/opac-full-serial-issues.tmpl   |    2 +-
 .../opac-tmpl/prog/en/modules/opac-messaging.tmpl  |   14 ++--
 .../opac-tmpl/prog/en/modules/opac-passwd.tmpl     |    4 +-
 .../opac-tmpl/prog/en/modules/opac-privacy.tmpl    |    4 +-
 .../prog/en/modules/opac-readingrecord.tmpl        |    4 +-
 .../opac-tmpl/prog/en/modules/opac-reserve.tmpl    |   14 ++-
 .../opac-tmpl/prog/en/modules/opac-results.tmpl    |   13 ++-
 .../opac-tmpl/prog/en/modules/opac-review.tmpl     |    2 +-
 .../prog/en/modules/opac-search-history.tmpl       |    4 +-
 .../prog/en/modules/opac-sendbasketform.tmpl       |    2 +-
 .../prog/en/modules/opac-sendshelfform.tmpl        |    2 +-
 .../prog/en/modules/opac-serial-issues.tmpl        |    4 +-
 .../opac-tmpl/prog/en/modules/opac-shelves.tmpl    |    6 +-
 .../prog/en/modules/opac-showreviews.tmpl          |    4 +-
 .../prog/en/modules/opac-suggestions.tmpl          |    4 +-
 koha-tmpl/opac-tmpl/prog/en/modules/opac-tags.tmpl |    4 +-
 .../prog/en/modules/opac-tags_subject.tmpl         |    2 +-
 .../opac-tmpl/prog/en/modules/opac-topissues.tmpl  |    4 +-
 koha-tmpl/opac-tmpl/prog/en/modules/opac-user.tmpl |   18 ++--
 .../prog/en/modules/opac-userdetails.tmpl          |    4 +-
 .../opac-tmpl/prog/en/modules/opac-userupdate.tmpl |    4 +-
 kohaversion.pl                                     |    2 +-
 members/memberentry.pl                             |   39 ++++++---
 members/members-home.pl                            |   27 +++++-
 members/moremember.pl                              |    2 +-
 members/update-child.pl                            |    2 +-
 misc/cronjobs/overdue_notices.pl                   |    6 +-
 opac/opac-reserve.pl                               |    2 +-
 115 files changed, 537 insertions(+), 419 deletions(-)
 rename koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/{enhanced-content.pref => enhanced_content.pref} (100%)
 rename koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/{i18n-l10n.pref => i18n_l10n.pref} (100%)
 rename koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/{local-use.pref => local_use.pref} (100%)
 rename koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/{staff-client.pref => staff_client.pref} (98%)
 rename koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/{web-services.pref => web_services.pref} (100%)


hooks/post-receive
-- 
main Koha release repository


More information about the koha-commits mailing list