[koha-commits] main Koha release repository branch, 3.2.x, updated. 3.02.02-24-g819b5fc

Fri Dec 24 05:39:07 CET 2010

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, 3.2.x has been updated
       via  819b5fc308b0d9a319e938a41e54a5c5f785b76a (commit)
       via  e298b5e3be369b0a64f2e1f223f426156664dcde (commit)
       via  92adf8d04065a842b49581d22aa6de37515d095e (commit)
       via  fe4ed2507cdc9e460645287cdc799e6ae581bd14 (commit)
       via  e173f2ba89223c37ceedd3870b191a5131dc951d (commit)
       via  0c507b2eb3a60ab7d2902467e290a64ab3c03ea1 (commit)
       via  df31659c2ac314abd12395e87fc5c4b8eadedbe4 (commit)
       via  9f8722d8f2b4c3800cb77f39a80a1a269e0c2eff (commit)
       via  db26c21e113371ee128780ae4b200a70255578f2 (commit)
       via  8bd49794a9446a82833276723d06af5740f359f2 (commit)
       via  be38fadf1509f51c518ad9c56b3b270cfc358288 (commit)
       via  908a023fcec5d4a92785a8f258e40163fd4beb56 (commit)
       via  984a6e62b8d48764613e0c850caa4706ff955854 (commit)
       via  3443cd38f030c24b9e58e4068586978b4f517a25 (commit)
       via  2ed66165bfbd57c120d751d2c5665387d547cff8 (commit)
       via  c7b13ef0e46fc05fb6a8407f4aa10d15b47c55e9 (commit)
       via  c705c3f61c85abde42c1146bcbd1a2d61ee2971d (commit)
       via  4ef03eb5b520d3ec8e3dca59eb82cb24aef5a693 (commit)
       via  eda5105edff20955ed6331e02c90d098e4cdcf9c (commit)
       via  7bd9e223e94bb06dcb5a155ca82f0e39c10bd121 (commit)
       via  31548e0f6238975633f8282ba95ef5df54b27c47 (commit)
       via  f491326296f26da22ea69e3d96d244e044232469 (commit)
       via  a9c98acac7ecb634733fe5e958d702e16e474629 (commit)
       via  2202f1b6b952470a2713c5712ca57ad83717beb1 (commit)
      from  eac7c17e9fc7c444b8fdfa8637f4a5e4047e3e82 (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 819b5fc308b0d9a319e938a41e54a5c5f785b76a
Author: Owen Leonard <oleonard at myacpl.org>
Date:   Fri Dec 17 18:11:43 2010 -0500

    Fix for bug 5451, can add tags with userlogin turned off

    Signed-off-by: Nicole Engard <nengard at bywatersolutions.com>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

    (Corrected to apply to 3.2.x)

commit e298b5e3be369b0a64f2e1f223f426156664dcde
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date:   Wed Dec 22 15:06:51 2010 +1300

    Bug 5531: adding some missing sysprefs
    (cherry picked from commit 2124887428afc6c9198404241a1afd93c456dc8f)

    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit 92adf8d04065a842b49581d22aa6de37515d095e
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date:   Wed Dec 22 14:59:11 2010 +1300

    Bug 5531: Updated Polish, Ukranian and Russian syspref files

    Retrieved from
    http://git.koha-community.org/gitweb/?p=wip/koha-chris_n.git;a=commit;h=f23969c7e1cb87d4bd9552e3d6bc85cc948dedd9
    (cherry picked from commit 0482e534519dafb2ff37177f117534d77bc4cbeb)

    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit fe4ed2507cdc9e460645287cdc799e6ae581bd14
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date:   Wed Dec 22 14:44:33 2010 +1300

    Bug 5531: further fix for fr-FR files
    (cherry picked from commit c9db18bf0b084136451ee078cab7c9fffd53f615)

    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit e173f2ba89223c37ceedd3870b191a5131dc951d
Author: Henri-Damien LAURENT <henridamien.laurent at biblibre.com>
Date:   Wed Dec 22 00:00:17 2010 +0100

    Based on Chris Nighswonger french unimarc_standard_sysprefs.sql
    (cherry picked from commit 409dcdfe6aaf3a6d2d90918f54a48c2c326f5f85)

    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit 0c507b2eb3a60ab7d2902467e290a64ab3c03ea1
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date:   Tue Dec 21 08:31:07 2010 +1300

    Bug 4473: Making a change to TmplTokenizer.pm to stop translation error
    (cherry picked from commit f5e65148ace51060f739fce4c26b772d09f35ba6)

    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit df31659c2ac314abd12395e87fc5c4b8eadedbe4
Author: Liz Rea <lrea at nekls.org>
Date:   Thu Dec 16 19:20:25 2010 -0500

    Bug 5143: Help file revisions per Owen Leonard

    Nice changes, thanks. :)

    LR

    Signed-off-by: Nicole Engard <nengard at bywatersolutions.com>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    (cherry picked from commit c25aaf1ca49c2733c22325057037dd5e14e0cfd8)

    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit 9f8722d8f2b4c3800cb77f39a80a1a269e0c2eff
Author: Amit Gupta <amit.gupta at osslabs.biz>
Date:   Thu Dec 16 06:47:17 2010 -0500

    Bug 5489: Send hold email to branch email address if it exists instead of koha email address

    Signed-off-by: Nicole Engard <nengard at bywatersolutions.com>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    (cherry picked from commit 21cae2609d12075f685f51b66a5821eb41d30c97)

    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit db26c21e113371ee128780ae4b200a70255578f2
Author: Owen Leonard <oleonard at myacpl.org>
Date:   Thu Dec 16 06:42:51 2010 -0500

    Fix for Bug 3262 - OPAC needs syspref to show homebranch on detail page

    Revised version of Liz Rea's fix adding homebranch by default. This
    revision displays the homebranch name instead of branchcode.

    Signed-off-by: Nicole Engard <nengard at bywatersolutions.com>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    (cherry picked from commit 75762a63e940040d3d9bcc26566b0079000078a8)

    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit 8bd49794a9446a82833276723d06af5740f359f2
Author: Frédéric Demians <f.demians at tamil.fr>
Date:   Fri Dec 17 11:16:52 2010 +0000

    Bug 5446 Fix a bug introduces by previous patch

    When AcqCreateItem was set to 'cataloguing' there was no items fields in the
    acq web form to validate in JS...

    Alert commented.

    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    (cherry picked from commit 9a048e2b12e2004fad51b5b0db3187a8eb6c2a04)

    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit be38fadf1509f51c518ad9c56b3b270cfc358288
Author: Colin Campbell <colin.campbell at ptfs-europe.com>
Date:   Thu Dec 16 04:59:34 2010 -0500

    Bug 4286 Allow receiving if subscription enddate not set

    HasSubscriptionExpired is not a boolean return it may also
    return that a valid subscription enddate is not set
    This should not block receipting of issues

    Signed-off-by: Nicole Engard <nengard at bywatersolutions.com>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    (cherry picked from commit 74e63fe0e602f745e711cf00417b965614f7be68)

    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit 908a023fcec5d4a92785a8f258e40163fd4beb56
Author: Owen Leonard <oleonard at myacpl.org>
Date:   Thu Dec 16 04:20:01 2010 -0500

    Fix for Bug 5518 - Add to shelf icon doesn't appear in OPAC results page

    Signed-off-by: Nicole Engard <nengard at bywatersolutions.com>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    (cherry picked from commit 276e1c34307b9bcb2986e4bd1b1318b4bfe12d75)

    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit 984a6e62b8d48764613e0c850caa4706ff955854
Author: Owen Leonard <oleonard at myacpl.org>
Date:   Thu Dec 16 04:15:53 2010 -0500

    Follow-up patch for Bug 4908, show patron's home library in OPAC

    Adding home library to list of details when OPACPatronDetails pref
    is set to "don't allow"

    Signed-off-by: Nicole Engard <nengard at bywatersolutions.com>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    (cherry picked from commit c4f8b9d636d8e37069233870b720ccc2ad2eeb3b)

    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit 3443cd38f030c24b9e58e4068586978b4f517a25
Author: Owen Leonard <oleonard at myacpl.org>
Date:   Thu Dec 16 03:02:53 2010 -0500

    Fix for Bug 5470 - improvements to results display in the staff client

    Signed-off-by: Nicole Engard <nengard at bywatersolutions.com>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    (cherry picked from commit be70444f687144063dd6e640dfd93afc2256cf44)

    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit 2ed66165bfbd57c120d751d2c5665387d547cff8
Author: Robin Sheat <robin at catalyst.net.nz>
Date:   Thu Dec 16 02:50:08 2010 -0500

    bug4891 - sort facets in search sidebar (OPAC and staff client)

    Signed-off-by: Nicole Engard <nengard at bywatersolutions.com>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    (cherry picked from commit 13bc505c5ffdd22533b49ddc4d1e79ecce49ed4d)

    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit c7b13ef0e46fc05fb6a8407f4aa10d15b47c55e9
Author: Owen Leonard <oleonard at myacpl.org>
Date:   Thu Dec 16 02:34:47 2010 -0500

    Fix for Bug 3987 - New Sys Prefs Branch - Alphabetize prefs in sections

    Adding jquery tablesorter, sorting on sys pref variable by default

    Signed-off-by: Nicole Engard <nengard at bywatersolutions.com>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    (cherry picked from commit 396c2143d9f0196126af5d24f23e4b286f55d830)

    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit c705c3f61c85abde42c1146bcbd1a2d61ee2971d
Author: Srdjan Jankovic <srdjan at catalyst.net.nz>
Date:   Thu Dec 16 19:23:31 2010 +1300

    Bug 5510: prepend output with system name

    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    (cherry picked from commit 1c86e93cec3749ce5821d237e6d86fa888f62fa3)

    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit 4ef03eb5b520d3ec8e3dca59eb82cb24aef5a693
Author: Serhij Dubyk {Сергій Дубик} <serhijdubyk at gmail.com>
Date:   Thu Dec 16 01:49:51 2010 +0200

    Deleted old sample budget sql-data for Ukrainian and Russian

    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    (cherry picked from commit bd8f379d70be0afe5e37c843f8b7dd0ab82be1ed)

    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit eda5105edff20955ed6331e02c90d098e4cdcf9c
Author: Owen Leonard <oleonard at myacpl.org>
Date:   Wed Dec 15 21:33:59 2010 -0500

    Fix for Bug 4997, More searches menu not on OPAC MARC and ISBD detail pages

    Signed-off-by: Nicole Engard <nengard at bywatersolutions.com>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    (cherry picked from commit 402240bbe25aaffd205a34a01663e556be01ac15)

    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit 7bd9e223e94bb06dcb5a155ca82f0e39c10bd121
Author: Owen Leonard <oleonard at myacpl.org>
Date:   Wed Dec 15 21:30:38 2010 -0500

    Fix for Bug 4946 - hold warning needs rewording

    This patch improves the phrasing of several messages by
    breaking the message variable into distinct parts for more
    natural-sounding warnings when:

    - Checking out an item on hold for another patron
    - Checking out an item which is waiting for another patron
    - Checking out an item which is checked out to another patron
    - Checking out an item which is checked out to this patron
    - Checking out to a patron who has too many checked out

    I would appreciate special attention to my changes to the
    TooMany function in Circulation.pm to make sure I handled
    it correctly.

    Signed-off-by: Nicole Engard <nengard at bywatersolutions.com>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    (cherry picked from commit 324991fefd1c6f336308b0f7aec8e8f0047e6e1a)

    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit 31548e0f6238975633f8282ba95ef5df54b27c47
Author: Owen Leonard <oleonard at myacpl.org>
Date:   Wed Dec 15 21:16:24 2010 -0500

    Fix for Bug 3859, Attach item clarification

    - Modifies hint text
    - Adds handling for BiblioDefaultView preference
    - Markup and CSS tweaks

    Signed-off-by: Nicole Engard <nengard at bywatersolutions.com>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    (cherry picked from commit d6e83087a479d9d2f552c9a6a2e5554c0f693596)

    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit f491326296f26da22ea69e3d96d244e044232469
Author: Srdjan Jankovic <srdjan at catalyst.net.nz>
Date:   Wed Dec 15 20:10:12 2010 -0500

    Bug 5294 - Unescape vendor name when pushing back

    Signed-off-by: Robin Sheat <robin at catalyst.net.nz>
    Signed-off-by: Nicole Engard <nengard at bywatersolutions.com>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    (cherry picked from commit 750a8a8dae8a445d678f6645b6cbd3405e27924d)

    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit a9c98acac7ecb634733fe5e958d702e16e474629
Author: Galen Charlton <gmcharlt at gmail.com>
Date:   Wed Dec 15 11:26:04 2010 -0500

    bug 5398: make additional pages in staff interface obey noItemTypeImages

    Signed-off-by: Galen Charlton <gmcharlt at gmail.com>
    Signed-off-by: Owen Leonard <oleonard at myacpl.org>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    (cherry picked from commit 0560aa768cc1b128891259982a25ee2450470e79)

    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

commit 2202f1b6b952470a2713c5712ca57ad83717beb1
Author: Nicole Engard <nengard at bywatersolutions.com>
Date:   Wed Dec 15 09:23:14 2010 -0500

    bug 4826 change 'add basket' to 'new basket'

    Signed-off-by: Owen Leonard <oleonard at myacpl.org>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    (cherry picked from commit 07834371f25ab207688e1534c39654049b890951)

    Signed-off-by: Chris Nighswonger <chris.nighswonger at gmail.com>

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

Summary of changes:
 C4/Circulation.pm                                  |   42 ++++++---
 C4/Reserves.pm                                     |    5 +-
 catalogue/detail.pl                                |    2 +
 catalogue/search.pl                                |    6 +
 circ/circulation.pl                                |    1 +
 debian/scripts/koha-foreach                        |    7 +-
 .../1-Obligatoire/unimarc_standard_systemprefs.sql |   58 ++++++------
 installer/data/mysql/pl-PL/mandatory/sysprefs.sql  |   18 ++++-
 ...m_preferences_full_optimal_for_install_only.sql |   69 ++++++++++++--
 .../mysql/ru-RU/optional/acqusion_book_funds.sql   |   12 ---
 .../mysql/ru-RU/optional/acqusion_book_funds.txt   |    1 -
 ...m_preferences_full_optimal_for_install_only.sql |   69 ++++++++++++--
 .../mysql/uk-UA/optional/acqusion_book_funds.sql   |   12 ---
 .../mysql/uk-UA/optional/acqusion_book_funds.txt   |    1 -
 .../intranet-tmpl/prog/en/js/pages/preferences.js  |    7 ++
 .../prog/en/modules/acqui/booksellers.tmpl         |    2 +-
 .../prog/en/modules/acqui/neworderempty.tmpl       |   21 +++--
 .../prog/en/modules/admin/preferences.tmpl         |    6 +-
 .../prog/en/modules/catalogue/advsearch.tmpl       |    2 +
 .../prog/en/modules/catalogue/detail.tmpl          |    6 +-
 .../prog/en/modules/catalogue/results.tmpl         |    9 +-
 .../prog/en/modules/cataloguing/moveitem.tmpl      |   35 +++++---
 .../prog/en/modules/circ/circulation.tmpl          |   10 +-
 .../prog/en/modules/help/circ/view_holdsqueue.tmpl |    8 +-
 .../prog/en/modules/reserve/request.tmpl           |    5 +-
 .../en/modules/serials/acqui-search-result.tmpl    |    2 +-
 .../prog/en/modules/suggestion/suggestion.tmpl     |    1 -
 .../prog/en/modules/virtualshelves/shelves.tmpl    |    2 +-
 .../opac-tmpl/prog/en/includes/doc-head-close.inc  |    2 +-
 koha-tmpl/opac-tmpl/prog/en/includes/usermenu.inc  |    4 +-
 .../opac-tmpl/prog/en/modules/opac-ISBDdetail.tmpl |   28 ++++++
 .../opac-tmpl/prog/en/modules/opac-MARCdetail.tmpl |   35 +++++++-
 .../opac-tmpl/prog/en/modules/opac-basket.tmpl     |   47 +++++-----
 .../opac-tmpl/prog/en/modules/opac-detail.tmpl     |   24 +++--
 .../opac-tmpl/prog/en/modules/opac-results.tmpl    |  100 ++++++++++----------
 .../opac-tmpl/prog/en/modules/opac-shelves.tmpl    |   52 +++++------
 koha-tmpl/opac-tmpl/prog/en/modules/opac-tags.tmpl |    9 +-
 .../opac-tmpl/prog/en/modules/opac-userupdate.tmpl |    1 +
 misc/translator/TmplTokenizer.pm                   |    4 +-
 opac/opac-ISBDdetail.pl                            |   10 ++
 opac/opac-MARCdetail.pl                            |   10 ++
 opac/opac-search.pl                                |    7 ++
 serials/serials-edit.pl                            |    2 +-
 43 files changed, 501 insertions(+), 253 deletions(-)
 delete mode 100644 installer/data/mysql/ru-RU/optional/acqusion_book_funds.sql
 delete mode 100644 installer/data/mysql/ru-RU/optional/acqusion_book_funds.txt
 delete mode 100644 installer/data/mysql/uk-UA/optional/acqusion_book_funds.sql
 delete mode 100644 installer/data/mysql/uk-UA/optional/acqusion_book_funds.txt

hooks/post-receive
-- 
main Koha release repository