[koha-commits] main Koha release repository branch master updated. v3.14.00-280-g8fbf21d
Git repo owner
gitmaster at git.koha-community.org
Mon Jan 13 22:40:56 CET 2014
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, master has been updated
via 8fbf21da1c540d19cc19fe75c0a5cb83a8fbe849 (commit)
via e8f5ee9eef7a558ae1af8237493f8dc52e52945a (commit)
via f2c61429944140abfd0a097bdb50b03e08ef569b (commit)
via cfc3ce6772b908bb73a38a3bb778b8f25bb4ac9e (commit)
via 5920ca6fa02d65e2a2b9076d08444a4cd6a157a9 (commit)
via b7b1db5c81eb67e51851efc5bc2d1fb2a0cb7d04 (commit)
via 0d28ab498885a44ee2c20c411ae16b904c12663a (commit)
via 83ab4edc5a79c6e2ca0f4d394387d20c9aee7453 (commit)
via a5c762d491465bcc7ad8d8f5e94ff5c36c172091 (commit)
from da853bf74eefbd935734177722aaa763ce71d170 (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 8fbf21da1c540d19cc19fe75c0a5cb83a8fbe849
Author: Ketan Kulkarni <ketan at carvingit.com>
Date: Wed Oct 9 20:07:27 2013 +0530
Bug 10318: Show primary email in patron search results
This patch makes the patron's primary email address be displayed (as
a mailto link) on the patron search results page.
Signed-off-by: Melissa Lefebvre <melissa at bywatersolutions.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
Works as described, template only change.
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
commit e8f5ee9eef7a558ae1af8237493f8dc52e52945a
Author: Owen Leonard <oleonard at myacpl.org>
Date: Fri Jan 10 15:46:29 2014 -0500
Bug 11505: fix untranslatable table headers in Label batch manager
The label batch manager script hard-codes the table header cell labels
in order to pass them to an HTML-building function. This obviously isn't
the best solution for internationalization, but picking the whole scheme
apart would be very complicated.
Instead this patch uses a SWITCH statement to check for each possible
case and outputs the correct translatable string for each.
To test, apply the patch and run "perl translate update" for any
translation. Check the revised po file and confirm that the new strings
are present. View the label batch edit page and confirm that the table
headings look correct: Tools -> Labels -> Manage batches -> Edit batch.
Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
Works as described, passes all tests.
Similar fixes are probably needed for other pages of the labels
modules.
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
commit f2c61429944140abfd0a097bdb50b03e08ef569b
Author: Owen Leonard <oleonard at myacpl.org>
Date: Fri Jan 10 12:45:30 2014 -0500
Bug 11381: improve styling of IDreamBooks content in bootstrap theme
Styling of IDreamBooks elements is not correct in the bootstrap theme
because the relevant CSS was not transferred from the prog theme. This
patch adds it back.
To test, switch to the bootstrap theme and enable IDreamBooks system
preferences in the OPAC, particularly IDreamBooksReadometer. Find a book
in the OPAC which shows IDreamBooks review data and confirm that
everything looks correct.
Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
Works as described. Tested with "The help".
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
commit cfc3ce6772b908bb73a38a3bb778b8f25bb4ac9e
Author: Tomas Cohen Arazi <tomascohen at gmail.com>
Date: Mon Jan 6 10:52:38 2014 -0300
Bug 10896: Add a --verbose option to koha-translate
The -v and --verbose option switches add the --verbose switch to the
misc/translator/translate script call in the packages' 'koha-translate'
command.
The docs are updated accordingly.
Sponsored-by: Universidad Nacional de Cordoba
Signed-off-by: Magnus Enger <magnus at enger.priv.no>
Works as expected with and without -v. Man page looks good.
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
commit 5920ca6fa02d65e2a2b9076d08444a4cd6a157a9
Author: Galen Charlton <gmc at esilibrary.com>
Date: Thu Dec 12 23:55:14 2013 +0000
Bug 11389: reenable Pg as a DB scheme that Koha can connect to
This patch restores the ability to request a DBI database handle
or a DBIx::Class schema object connected to a PostgreSQL database.
To address the concerns raised in bug 7188, only "mysql" and "Pg"
are recognized as valid DB schemes. If anything else is passed
to C4::Context::db_scheme2dbi or set as the db_scheme in the Koha
configuration file, the DBD driver to load is assumed to be "mysql".
Note that this patch drops any pretense of Oracle support.
To test:
[1] Apply patch, and verify that the database-dependent tests
pass when run against a MySQL Koha database.
[2] To test against PostgreSQL, create a Pg database and
edit koha-conf.xml to set db_scheme to Pg (and adjust
the other DB connection parameters appropriately). The
following tests should pass, at minimum:
t/Context.t
t/db_dependent/Koha_Database.t
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
Works as described, some additional notes:
- Installed Postgres following
http://wiki.ubuntuusers.de/PostgreSQL
- Created a database user koha
- Created a database koha
- Changed the koha-conf.xml file
<db_scheme>Pg</db_scheme>
<database>koha</database>
<hostname>localhost</hostname>
<port>5432</port>
<user>koha</user>
<pass>xxxx</pass>
- Installed libdbd-pg-perl
- Ran the web installer until step 3 everything looked ok
Step 3 complains:
Password for user koha: psql: fe_sendauth: no password supplied
- Both t/Context.t and t/db_dependent/Koha_Database.t pass
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
commit b7b1db5c81eb67e51851efc5bc2d1fb2a0cb7d04
Author: Galen Charlton <gmc at esilibrary.com>
Date: Mon Jan 13 20:54:37 2014 +0000
Bug 11509: (follow-up) fix a couple typos
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
commit 0d28ab498885a44ee2c20c411ae16b904c12663a
Author: Tomas Cohen Arazi <tomascohen at gmail.com>
Date: Thu Jan 9 10:56:56 2014 -0300
Bug 11509: improve usage information printed by koha-create
This patch makes koha-create print better and more descriptive usage
information. Also adds the --help and -h switches.
Sponsored-by: Universidad Nacional de Cordoba
Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
Removed trailing " from:
$scriptname [db usage mode] [options] instancename"
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
commit 83ab4edc5a79c6e2ca0f4d394387d20c9aee7453
Author: Tomas Cohen Arazi <tomascohen at gmail.com>
Date: Thu Jan 9 12:37:20 2014 -0300
Bug 11510: koha-translate usage message fixes
The koha-translate's usage message has a couple of inconsistencies:
'--all' should be '--available'
and '--help' is missing from the usage examples.
Sponsored-by: Universidad Nacional de Cordoba
Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
Works as described, tested using instructions on
http://wiki.koha-community.org/wiki/Testing_man_pages
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
commit a5c762d491465bcc7ad8d8f5e94ff5c36c172091
Author: Owen Leonard <oleonard at myacpl.org>
Date: Fri Jan 10 11:00:22 2014 -0500
Bug 11503: fix several typos
This patch corrects several typos: Some reported in Bug 11503, others
found during a systematic spell check of the help files.
To test, examine the changes and confirm that the spelling changes are
correct.
Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
-----------------------------------------------------------------------
Summary of changes:
C4/Context.pm | 33 ++++------
Koha/Database.pm | 8 +--
debian/docs/koha-create.xml | 10 +++
debian/docs/koha-translate.xml | 17 ++++-
debian/scripts/koha-create | 67 +++++++++++++++-----
debian/scripts/koha-translate | 20 ++++--
etc/koha-conf.xml | 1 +
.../prog/en/includes/subtypes_unimarc.inc | 2 +-
.../prog/en/modules/authorities/authorities.tt | 2 +-
.../value_builder/unimarc_field_121a.tt | 8 +--
.../intranet-tmpl/prog/en/modules/help/about.tt | 2 +-
.../prog/en/modules/help/acqui/basket.tt | 2 +-
.../prog/en/modules/help/acqui/lateorders.tt | 2 +-
.../modules/help/admin/auth_subfields_structure.tt | 4 +-
.../en/modules/help/admin/authorised_values.tt | 2 +-
.../modules/help/admin/item_circulation_alerts.tt | 2 +-
.../prog/en/modules/help/admin/preferences.tt | 2 +-
.../prog/en/modules/help/admin/smart-rules.tt | 6 +-
.../intranet-tmpl/prog/en/modules/help/mainpage.tt | 2 +-
.../prog/en/modules/help/members/member-flags.tt | 6 +-
.../prog/en/modules/help/plugins/plugins-home.tt | 2 +-
.../prog/en/modules/help/plugins/plugins-upload.tt | 2 +-
.../prog/en/modules/help/reports/guided_reports.tt | 4 +-
.../prog/en/modules/help/reserve/request.tt | 4 +-
.../prog/en/modules/help/serials/serials-edit.tt | 2 +-
.../en/modules/help/serials/subscription-detail.tt | 2 +-
.../help/serials/subscription-frequencies.tt | 2 +-
.../prog/en/modules/help/tools/holidays.tt | 2 +-
.../help/tools/marc_modification_templates.tt | 8 +--
.../prog/en/modules/help/tools/quotes-upload.tt | 2 +-
.../prog/en/modules/help/tools/quotes.tt | 2 +-
.../prog/en/modules/labels/label-edit-batch.tt | 15 ++++-
.../prog/en/modules/members/member.tt | 4 +-
.../prog/en/modules/reserve/request.tt | 2 +-
koha-tmpl/opac-tmpl/bootstrap/css/opac.css | 41 ++++++++++++
koha-tmpl/opac-tmpl/bootstrap/less/opac.less | 50 +++++++++++++++
t/Context.t | 7 +-
37 files changed, 260 insertions(+), 89 deletions(-)
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list