[koha-commits] updated branch master (ae830774dbccb20aca90cf85a417aa2da2a9cc5c)

Wed Feb 3 21:23:22 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 "Koha GitWeb".

The branch, master has been updated
       via  ae830774dbccb20aca90cf85a417aa2da2a9cc5c (commit)
       via  cd921163c0b9edf3cbd42cb5d3ca69514d377195 (commit)
       via  04935441102fb3252c9427634ad96eeac3c76188 (commit)
       via  30e56e430e6dc017707a8f7898607c2038f85916 (commit)
       via  f86b788e3b5d1c08786e235a4be9a9cddd97207d (commit)
       via  2616faf1329fbe34401f353ad3ad6cc1a7d44cfb (commit)
       via  710a7f00862d9cafae3b452406b4d2b61574b2ab (commit)
       via  dde8191aa5c92390d2c14f4481b8143cce9204ef (commit)
      from  6e376d0484dba6b96a66f2cded20efd61b8f1d13 (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 ae830774dbccb20aca90cf85a417aa2da2a9cc5c
Author: Colin Campbell <colin.campbell at ptfs-europe.com>
Date:   Wed Feb 3 14:45:27 2010 +0000

    Fix pod markup errors in C4/Budgets.pm

    Signed-off-by: Galen Charlton <gmcharlt at gmail.com>

commit cd921163c0b9edf3cbd42cb5d3ca69514d377195
Author: Owen Leonard <oleonard at myacpl.org>
Date:   Wed Feb 3 10:43:23 2010 -0500

    Fixes for Bug 3089, Date entry fields should indicate required date format

    - Added include, date-format.inc, which shows format, e.g. "(DD/MM/YYYY)"
    - Hint shows expected date format based on system preference
    - Removing calendar.inc include from templates which don't use it

    Signed-off-by: Galen Charlton <gmcharlt at gmail.com>

commit 04935441102fb3252c9427634ad96eeac3c76188
Author: Nicole Engard <nengard at gmail.com>
Date:   Tue Feb 2 02:58:30 2010 -0500

    remove mysql5.0 errors in patroncard upgrade

    Signed-off-by: Galen Charlton <gmcharlt at gmail.com>

commit 30e56e430e6dc017707a8f7898607c2038f85916
Author: Owen Leonard <oleonard at myacpl.org>
Date:   Wed Feb 3 11:51:03 2010 -0500

    Fix for Bug 4086, categorycode on patron search confusing

    - Changed 'categorycode' to 'category'
    - Formatted additional options to be more compact
    - Returning patron search page to wide layout following
      removal of patron filter from the sidebar
    - Corrected some other markup that was causing validation errors

    Signed-off-by: Galen Charlton <gmcharlt at gmail.com>

commit f86b788e3b5d1c08786e235a4be9a9cddd97207d
Author: Chris Nighswonger <cnighswonger at foundations.edu>
Date:   Wed Feb 3 13:07:32 2010 -0500

    Bugfix: Upping the byte size limit of patron images

    This brings it more in line with the size limit placed on other images
    uploaded for use on patron cards.

    Signed-off-by: Galen Charlton <gmcharlt at gmail.com>

commit 2616faf1329fbe34401f353ad3ad6cc1a7d44cfb
Author: Nicole Engard <nengard at gmail.com>
Date:   Wed Feb 3 08:42:51 2010 -0500

    follow-up to bug 3854: resolve budget period language issues

    top level: "Root Budget" becomes "Budget"
    second level: "Budget" becomes "Fund"
    third level and below: "Sub-Budget" is also a "Fund", but for things
    like the "create sub-budget" link, they'll be changed to "create child
    fund".

    Signed-off-by: Galen Charlton <gmcharlt at gmail.com>

commit 710a7f00862d9cafae3b452406b4d2b61574b2ab
Author: Nicole Engard <nengard at gmail.com>
Date:   Wed Feb 3 09:21:26 2010 -0500

    bug 4101 patroncards changed to patron card creator

    There are references to patroncards in label text through out the patron card creator - I have changed it to 'patron card creator'

    Signed-off-by: Galen Charlton <gmcharlt at gmail.com>

commit dde8191aa5c92390d2c14f4481b8143cce9204ef
Author: Colin Campbell <colin.campbell at ptfs-europe.com>
Date:   Wed Feb 3 19:34:58 2010 +0000

    Bug 3808 Display correct number of records in neworderbiblio screen

    New version of patch to apply against 3.2alpha
    Also remove related FIXME message that was displaying to the user

    Signed-off-by: Galen Charlton <gmcharlt at gmail.com>

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

Summary of changes:
 C4/Budgets.pm                                      |   11 ++--
 acqui/neworderbiblio.pl                            |   14 ++----
 installer/data/mysql/patroncards_upgrade.pl        |    8 ++--
 .../intranet-tmpl/prog/en/css/staff-global.css     |    6 ++-
 .../prog/en/includes/acquisitions-menu.inc         |    4 +-
 .../prog/en/includes/budgetperiods-admin.inc       |    4 +-
 .../prog/en/includes/budgets-admin-toolbar.inc     |   12 ++--
 .../intranet-tmpl/prog/en/includes/date-format.inc |    1 +
 .../prog/en/includes/patron-search.inc             |   26 +++++-----
 .../prog/en/includes/patron-toolbar.inc            |    8 ++--
 .../prog/en/includes/patroncards-menu.inc          |    2 +-
 .../prog/en/modules/acqui/acqui-home.tmpl          |    4 +-
 .../prog/en/modules/acqui/basket.tmpl              |    2 +-
 .../prog/en/modules/acqui/histsearch.tmpl          |    2 +
 .../prog/en/modules/acqui/neworderbiblio.tmpl      |    2 +-
 .../prog/en/modules/acqui/parcels.tmpl             |    3 +-
 .../prog/en/modules/admin/admin-home.tmpl          |    6 +-
 .../prog/en/modules/admin/aqbudgetperiods.tmpl     |   42 +++++++++--------
 .../prog/en/modules/admin/aqbudgets.tmpl           |   37 +++++++--------
 .../prog/en/modules/admin/aqcontract.tmpl          |    2 +
 .../prog/en/modules/admin/aqplan.tmpl              |   19 ++++----
 .../prog/en/modules/circ/circulation.tmpl          |    6 +-
 .../prog/en/modules/labels/search.tmpl             |    2 +
 .../prog/en/modules/members/member.tmpl            |   21 ++++----
 .../prog/en/modules/members/memberentrygen.tmpl    |    3 +
 .../prog/en/modules/members/moremember.tmpl        |    1 +
 .../prog/en/modules/patroncards/card-print.tmpl    |   16 +++---
 .../prog/en/modules/patroncards/edit-batch.tmpl    |    6 +-
 .../prog/en/modules/patroncards/edit-layout.tmpl   |   12 ++--
 .../prog/en/modules/patroncards/edit-profile.tmpl  |    4 +-
 .../prog/en/modules/patroncards/edit-template.tmpl |   14 +++---
 .../prog/en/modules/patroncards/home.tmpl          |    8 ++--
 .../prog/en/modules/patroncards/image-manage.tmpl  |    2 +-
 .../prog/en/modules/patroncards/manage.tmpl        |    2 +-
 .../en/modules/reports/acquisitions_stats.tmpl     |    4 ++
 .../prog/en/modules/reports/bor_issues_top.tmpl    |    4 +-
 .../prog/en/modules/reports/borrowers_stats.tmpl   |    2 +-
 .../prog/en/modules/reports/cat_issues_top.tmpl    |    4 +-
 .../prog/en/modules/reports/dictionary.tmpl        |    2 +
 .../en/modules/reports/guided_reports_start.tmpl   |    2 +
 .../prog/en/modules/reports/issues_avg_stats.tmpl  |    4 +-
 .../prog/en/modules/reports/issues_stats.tmpl      |    2 +-
 .../prog/en/modules/serials/checkexpiration.tmpl   |    3 +-
 .../prog/en/modules/serials/claims.tmpl            |    2 +-
 .../intranet-tmpl/prog/en/modules/tags/review.tmpl |    4 +-
 .../prog/en/modules/tools/batchMod-del.tmpl        |    1 -
 .../prog/en/modules/tools/batchMod-edit.tmpl       |    1 -
 .../prog/en/modules/tools/batchMod.tmpl            |    1 -
 .../prog/en/modules/tools/cleanborrowers.tmpl      |    4 +-
 .../prog/en/modules/tools/inventory.tmpl           |    2 +
 .../prog/en/modules/tools/koha-news.tmpl           |    2 +
 .../prog/en/modules/tools/scheduler.tmpl           |    2 +-
 .../prog/en/modules/tools/viewlog.tmpl             |   49 ++++++++------------
 tools/picture-upload.pl                            |    2 +-
 54 files changed, 212 insertions(+), 197 deletions(-)
 create mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/date-format.inc

hooks/post-receive
-- 
Koha GitWeb