[koha-commits] main Koha release repository branch, new/bug_5940, updated. v3.02.00-928-gfb4aec2

Git repo owner gitmaster at git.koha-community.org
Thu Mar 31 09:47:01 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/bug_5940 has been updated
       via  fb4aec265f4790f6db7139419282f784e5bdd8bf (commit)
       via  c597635b36bc37e611707dce3772763f9b4499e5 (commit)
       via  fc5ccbf5a3d6ef2b69fd55cee07923c2ded04049 (commit)
       via  de58d82465b1f7f3eeb4b7316cccb4297af71d9f (commit)
       via  641616ef7fd43600864d46f39b938ef3cd8cd4f3 (commit)
       via  c584003c1d96df21a06af47eebcf2f9a7f461123 (commit)
       via  223436970b44098b97679fc6e696b88eb74f2db3 (commit)
       via  e57dadf762101cfb7371c3d2c93e8163a2ace69f (commit)
       via  e1760e84630912b01c53559d3fc4eeb5a80325f3 (commit)
       via  48ee1dcb3f835fb8250bcdd781085521411e6c26 (commit)
       via  88cb47339a8eab4ff4b95956207bf2d1dcdffeff (commit)
       via  268f860e24171f3c5fe5f4b2c4a752e7c5abd5c1 (commit)
       via  735d986a0c976a888948ddd912917ad091267b7e (commit)
       via  84e43e06155e107e3965f06ea5ba37cc5d1b7d30 (commit)
       via  51604b548756fbf74620061a779d0182167c36f3 (commit)
       via  813f5c3f5164707041fcaa90839f4368355eb8e9 (commit)
       via  c12660a4b3e49383cc3dc9e4953aa6d88b1a26d5 (commit)
       via  5a89ef7ea5733ba8c8ff4c49efebb3ab8d760eda (commit)
       via  5d43524cdbc2c9fa4b5de83dcb9d51f9a154efc2 (commit)
       via  c83589e0e18e6eece98b3cfe713a646ab6b55c0f (commit)
       via  091d3100169a12e9498f6d58c8b61ac01a5a5db6 (commit)
       via  412966eff0016c69e5763197f1542e88c74580a1 (commit)
       via  b5a050d759b08027b210106e90d5714eb02b9032 (commit)
       via  aef8358cf2ce8db9803d94c14f6728cdf9ebd0d4 (commit)
       via  04ff06931c2eb83efed492727d32e24c8d33afbb (commit)
       via  8958f152e7273d3b1fc45a6f7494ab6066aab55e (commit)
       via  38b51b56380b44fbc69656164725998db25e88a9 (commit)
       via  fa7ca5c8b8b5fdf27fae63fd0ada7fe539651bc2 (commit)
       via  e8c43dbf3db84545e87b2853e5bdfe02cb3273e4 (commit)
       via  b853b79001ceefc897eac781a6ebf28e7cc29c85 (commit)
       via  63541e4223224831e4eb2bb51d108cc4a2155388 (commit)
       via  c9ca5edf85a25b9f9b1584a0f490d4176c1d05e4 (commit)
       via  1d6f791541686dfa409843f8f5b1624f1be6e8cb (commit)
       via  42f316ae480100572e996a7a4de76b9528db3d23 (commit)
       via  7ddb28d1dd8fee0b6eecfb32ce078dde05ed4eb3 (commit)
       via  36ca010cc48c1f2a26eb542966f011de0fe2fca0 (commit)
       via  a4b2280b6be100727e5d6f85b9e6fe58392febf0 (commit)
       via  3884e1693fcab4615362cb339262bb160479ccdc (commit)
       via  4669a10776ff958a3b2d51963b7c4ec90ec02f09 (commit)
       via  b3866aff5d21b4558e8d4580ba37873422054a3e (commit)
       via  6e59b9a295a640e24742325c660c165a4d962091 (commit)
       via  32d5fe33aaebde6b4b8d570dca723002940980db (commit)
      from  f144af1a958acb36cf7bbf2b745e62a4656913d0 (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 fb4aec265f4790f6db7139419282f784e5bdd8bf
Merge: c597635b36bc37e611707dce3772763f9b4499e5 641616ef7fd43600864d46f39b938ef3cd8cd4f3
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date:   Thu Mar 31 20:45:52 2011 +1300

    Merge remote branch 'kc/master' into new/bug_5940

commit c597635b36bc37e611707dce3772763f9b4499e5
Author: Nicole C. Engard <nengard at bywatersolutions.com>
Date:   Wed Mar 30 16:47:13 2011 -0400

    Bug 5940: Offline Circ & Patron Card Help Files for 3.4
    
    Signed-off-by: Nicole C. Engard <nengard at bywatersolutions.com>
    Signed-off-by: Jared Camins-Esakov <jcamins at bywatersolutions.com>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

commit fc5ccbf5a3d6ef2b69fd55cee07923c2ded04049
Author: Nicole C. Engard <nengard at bywatersolutions.com>
Date:   Wed Mar 30 15:48:04 2011 -0400

    Bug5940: Authority, Labels, Circ help files for 3.4
    
    Signed-off-by: Nicole C. Engard <nengard at bywatersolutions.com>
    Signed-off-by: Jared Camins-Esakov <jcamins at bywatersolutions.com>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

commit de58d82465b1f7f3eeb4b7316cccb4297af71d9f
Author: Nicole C. Engard <nengard at bywatersolutions.com>
Date:   Tue Mar 29 17:35:41 2011 -0400

    Bug 5940: Admin Help Files for 3.4
    
    Signed-off-by: Nicole C. Engard <nengard at bywatersolutions.com>
    Signed-off-by: Ian Walls <ian.walls at bywatersolutions.com>
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

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

Summary of changes:
 C4/Auth.pm                                         |    1 +
 C4/Biblio.pm                                       |  111 +++++----
 C4/Circulation.pm                                  |  195 +++++++++++----
 C4/ClassSortRoutine/Dewey.pm                       |    4 +
 C4/Letters.pm                                      |   12 +-
 C4/Members.pm                                      |   21 ++
 C4/Output.pm                                       |    2 +-
 C4/Search.pm                                       |   20 +-
 C4/XSLT.pm                                         |    2 +-
 admin/categorie.pl                                 |   15 +-
 admin/smart-rules.pl                               |   20 ++-
 admin/systempreferences.pl                         |    2 -
 catalogue/detail.pl                                |   16 +-
 catalogue/moredetail.pl                            |   24 ++-
 catalogue/search.pl                                |    4 +-
 circ/circulation.pl                                |   18 +--
 circ/returns.pl                                    |   10 +-
 installer/data/mysql/de-DE/mandatory/sysprefs.sql  |    6 +-
 installer/data/mysql/en/mandatory/sysprefs.sql     |    6 +-
 .../1-Obligatoire/unimarc_standard_systemprefs.sql |    6 +-
 installer/data/mysql/it-IT/necessari/sysprefs.sql  |    5 +-
 installer/data/mysql/kohastructure.sql             |    3 +
 installer/data/mysql/pl-PL/mandatory/sysprefs.sql  |    6 +-
 ...m_preferences_full_optimal_for_install_only.sql |    5 +-
 ...m_preferences_full_optimal_for_install_only.sql |    7 +-
 installer/data/mysql/updatedatabase.pl             |   46 ++++
 .../prog/en/includes/messaging-preference-form.inc |    2 +-
 .../prog/en/modules/admin/aqbudgets.tmpl           |    4 +-
 .../prog/en/modules/admin/categorie.tmpl           |   12 +
 .../en/modules/admin/preferences/circulation.pref  |   16 +-
 .../en/modules/admin/preferences/searching.pref    |    7 +
 .../en/modules/admin/preferences/staff_client.pref |    6 +
 .../prog/en/modules/admin/smart-rules.tmpl         |   38 +++-
 .../prog/en/modules/catalogue/detail.tmpl          |    7 +-
 .../prog/en/modules/catalogue/moredetail.tmpl      |    3 +-
 .../prog/en/modules/catalogue/results.tmpl         |   12 +-
 .../prog/en/modules/circ/circulation.tmpl          |    2 +-
 .../prog/en/modules/circ/view_holdsqueue.tmpl      |    4 +-
 .../prog/en/modules/help/admin/admin-home.tmpl     |    8 +
 .../en/modules/help/admin/aqbudgetperiods.tmpl     |   16 +-
 .../prog/en/modules/help/admin/aqbudgets.tmpl      |   22 +-
 .../prog/en/modules/help/admin/aqplan.tmpl         |    4 +-
 .../help/admin/auth_subfields_structure.tmpl       |  161 ++++++++++--
 .../en/modules/help/admin/auth_tag_structure.tmpl  |   24 ++
 .../en/modules/help/admin/authorised_values.tmpl   |  274 ++++++++++----------
 .../prog/en/modules/help/admin/authtypes.tmpl      |   40 +---
 .../en/modules/help/admin/biblio_framework.tmpl    |   36 +++-
 .../modules/help/admin/branch_transfer_limits.tmpl |   41 ++--
 .../prog/en/modules/help/admin/branches.tmpl       |   95 +++----
 .../prog/en/modules/help/admin/categorie.tmpl      |  101 ++++++--
 .../prog/en/modules/help/admin/checkmarc.tmpl      |    5 +-
 .../prog/en/modules/help/admin/cities.tmpl         |   32 ++-
 .../prog/en/modules/help/admin/classsources.tmpl   |   86 ++++---
 .../prog/en/modules/help/admin/currency.tmpl       |    8 +-
 .../prog/en/modules/help/admin/fieldmapping.tmpl   |   12 +-
 .../help/admin/item_circulation_alerts.tmpl        |   44 +--
 .../prog/en/modules/help/admin/itemtypes.tmpl      |   97 ++++---
 .../prog/en/modules/help/admin/koha2marclinks.tmpl |   12 +-
 .../help/admin/marc_subfields_structure.tmpl       |  181 ++++++++++----
 .../en/modules/help/admin/marctagstructure.tmpl    |   34 +--
 .../prog/en/modules/help/admin/matching-rules.tmpl |   50 +++-
 .../en/modules/help/admin/patron-attr-types.tmpl   |   88 ++++---
 .../prog/en/modules/help/admin/preferences.tmpl    |   18 +-
 .../prog/en/modules/help/admin/roadtype.tmpl       |   24 +-
 .../prog/en/modules/help/admin/smart-rules.tmpl    |  125 +++++----
 .../prog/en/modules/help/admin/stopwords.tmpl      |   15 +-
 .../prog/en/modules/help/admin/z3950servers.tmpl   |   38 +++-
 .../modules/help/authorities/authorities-home.tmpl |   12 +-
 .../en/modules/help/authorities/authorities.tmpl   |   77 ++-----
 .../prog/en/modules/help/authorities/detail.tmpl   |   15 +
 .../prog/en/modules/help/circ/branchtransfers.tmpl |   38 ++--
 .../en/modules/help/circ/circulation-home.tmpl     |   27 ++-
 .../prog/en/modules/help/circ/circulation.tmpl     |   92 +++++--
 .../prog/en/modules/help/circ/overdue.tmpl         |   15 +-
 .../prog/en/modules/help/circ/pendingreserves.tmpl |   33 ++-
 .../prog/en/modules/help/circ/reserveratios.tmpl   |    4 +-
 .../prog/en/modules/help/circ/returns.tmpl         |   59 +++--
 .../en/modules/help/circ/transferstoreceive.tmpl   |   21 +-
 .../prog/en/modules/help/circ/view_holdsqueue.tmpl |   17 +-
 .../prog/en/modules/help/circ/waitingreserves.tmpl |    6 +-
 .../prog/en/modules/help/export/marc.tmpl          |   34 +++-
 .../en/modules/help/labels/label-edit-batch.tmpl   |   25 ++
 .../en/modules/help/labels/label-edit-layout.tmpl  |   30 +--
 .../en/modules/help/labels/label-edit-profile.tmpl |   78 +++----
 .../modules/help/labels/label-edit-template.tmpl   |   33 +++
 .../prog/en/modules/help/labels/label-home.tmpl    |   41 +++-
 .../en/modules/help/labels/spinelabel-home.tmpl    |   11 +-
 .../en/modules/help/offline_circ/process_koc.tmpl  |   41 +---
 .../en/modules/help/patroncards/edit-batch.tmpl    |   11 +
 .../en/modules/help/patroncards/edit-layout.tmpl   |   30 ++-
 .../en/modules/help/patroncards/edit-profile.tmpl  |   20 +-
 .../en/modules/help/patroncards/edit-template.tmpl |   31 ++-
 .../prog/en/modules/help/patroncards/home.tmpl     |   27 +-
 .../en/modules/help/patroncards/image-manage.tmpl  |   19 ++
 .../prog/en/modules/help/patroncards/manage.tmpl   |   22 +--
 .../en/modules/reports/guided_reports_start.tmpl   |    4 +-
 .../prog/en/modules/reserve/request.tmpl           |    8 +-
 .../prog/en/xslt/MARC21slim2intranetDetail.xsl     |   16 +-
 .../intranet-tmpl/prog/en/xslt/MARC21slimUtils.xsl |    4 +-
 .../opac-tmpl/prog/en/modules/opac-advsearch.tmpl  |   10 +-
 .../opac-tmpl/prog/en/modules/opac-detail.tmpl     |    2 +-
 .../prog/en/xslt/MARC21slim2OPACDetail.xsl         |   16 +-
 .../opac-tmpl/prog/en/xslt/MARC21slimUtils.xsl     |    4 +-
 kohaversion.pl                                     |    2 +-
 members/memberentry.pl                             |    1 +
 members/readingrec.pl                              |   16 +-
 misc/check_sysprefs.pl                             |   50 ++--
 misc/cronjobs/runreport.pl                         |   83 +++++--
 opac/opac-search.pl                                |    2 +-
 opac/opac-user.pl                                  |    1 +
 reserve/request.pl                                 |    9 +-
 111 files changed, 2208 insertions(+), 1260 deletions(-)
 create mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/auth_tag_structure.tmpl
 create mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/help/authorities/detail.tmpl
 create mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/help/labels/label-edit-batch.tmpl
 create mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/help/labels/label-edit-template.tmpl
 create mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/help/patroncards/edit-batch.tmpl
 create mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/help/patroncards/image-manage.tmpl


hooks/post-receive
-- 
main Koha release repository


More information about the koha-commits mailing list