[koha-commits] main Koha release repository branch master updated. v3.18.00-781-g856861b
Git repo owner
gitmaster at git.koha-community.org
Fri Apr 24 15:04:33 CEST 2015
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 856861b47ee7e0658f790391fbf22af38e48616b (commit)
via c066a8ca2f648b9c823dedf9afad01dea1a4b6b1 (commit)
via a91dad2b0312dc7559e59843f8b4230f1011c61e (commit)
via 4fe4c0394af98f2d7c6ce5c23f2b01211b208614 (commit)
via b38370ff83b9d6a40d68f7e840f7bd8d632b75e2 (commit)
via 5b58e0f0e253502679c463dcb31bb5d2874a750a (commit)
via d7cfdb45e5c90e9816d31e55723f59b278c80966 (commit)
via 06cde076c7b19a8fb3b8f784aaeda02f90e06f53 (commit)
via 8c324dd2a092397db51e4f00a8c53da1b4c3e805 (commit)
from c953aee870c6e1f9882e178b9543ed6086e2ba17 (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 856861b47ee7e0658f790391fbf22af38e48616b
Author: Tomas Cohen Arazi <tomascohen at gmail.com>
Date: Fri Apr 24 10:03:17 2015 -0300
Bug 14030: DBRev 3.19.00.030
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit c066a8ca2f648b9c823dedf9afad01dea1a4b6b1
Author: Mark Tompsett <mtompset at hotmail.com>
Date: Mon Apr 20 20:11:23 2015 -0400
Bug 14030 - Added tests for duplicates.
It seems that the id's are not really used, but rather
the subtags, types, and language related fields.
These tests check for duplicates.
TEST PLAN
---------
1) Apply both patches
2) prove -v t/db_dependent/Languages.t
-- may fail if you have duplicates.
3) ./installer/data/mysql/updatedatabase.pl
-- this will trigger the atomicupdate, which because of
this tweak, will correct duplicates.
4) prove -v t/db_dependent/Languages.t
-- should succeed.
5) Run the updatedatabase.pl script multiple times.
6) prove -v t/db_dependent/Languages.t
-- should still succeed.
7) koha qa test tools.
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
No koha-qa errors, test run successfully, no more duplicates
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
Fixed German description.
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit a91dad2b0312dc7559e59843f8b4230f1011c61e
Author: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
Date: Mon Apr 20 21:34:05 2015 -0300
Bug 14030: Add Georgian language and fix Kannada language code
This patch adds Georgian language and a fix wrong language code
Language added: Georgian - ka - geo
I selected 'geo' for ISO639-2 instead of 'kat' because it's the
same code form http://www.loc.gov/marc/languages/language_code.html
Also a fix is needed to Kannada ISO639-1 code, from 'ka' to 'kn'
To test:
1) Apply the patch
2) Run updatedatabase.pl (once)
3) Check language, e.g. go to staff > search > More options > Limits
and search for Georgian on language list
I only added language code 'ka', not script 'Geor' nor country 'GE',
the plan is to name translation files 'ka-*', but can ammend the patch
if needed.
Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit 4fe4c0394af98f2d7c6ce5c23f2b01211b208614
Author: Katrin Fischer <Katrin.Fischer.83 at web.de>
Date: Wed Apr 15 23:33:00 2015 +0200
Bug 13941: QA Follow-up - fix for acqui/addorder.tt
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit b38370ff83b9d6a40d68f7e840f7bd8d632b75e2
Author: Frédéric Demians <f.demians at tamil.fr>
Date: Tue Apr 14 16:27:48 2015 +0200
Bug 13941: [2/2] Fix <body> tags missing id/class
Followed test plan from patch 1/2, works as expected.
Signed-off-by: Marc Véron <veron at veron.ch>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit 5b58e0f0e253502679c463dcb31bb5d2874a750a
Author: Frédéric Demians <f.demians at tamil.fr>
Date: Tue Apr 14 16:26:50 2015 +0200
Bug 13941: [1/2] Test <body> tag with id/class attributes
Test:
- Apply the first patch [1/2] containing a new test checking <body> tags in all
templates
- Run the test: prove xt/tt_valid.t
- You get a list of templates with invalid <body> tags.
- Apply the second patch [2/2] fixing all invalid <body> tags.
- Re-run the test: It passes.
Folowed test plan, works as expected
Signed-off-by: Marc Véron <veron at veron.ch>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit d7cfdb45e5c90e9816d31e55723f59b278c80966
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date: Tue Dec 23 11:59:07 2014 +0100
Bug 13492: Add the location column to the checkouts tables
Test plan:
1/ Verify that the location column is correctly displayed on the
checkouts tables (circ/circulation.pl and members/moremember.pl).
2/ Verify that you can hide/show this column (using the admin page
and/or the ColVis DT plugin).
Signed-off-by: Aleisha <aleishaamohia at hotmail.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit 06cde076c7b19a8fb3b8f784aaeda02f90e06f53
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date: Tue Dec 23 11:45:11 2014 +0100
Bug 13492: Add the column configuration for the checkouts table - morember.pl
Test plan:
1/ Verify that you can show/hide columns on the checkouts table (moremember.pl).
2/ Play with the column configuration admin page (admin/columns_settings.pl),
and confirm the behavior is correct (depends on what you have selected).
Amended patch: replace 'un' and 'deux' with 'sort_order' and
'todays_or_previous_checkouts' in the yml file.
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit 8c324dd2a092397db51e4f00a8c53da1b4c3e805
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date: Tue Dec 23 11:30:33 2014 +0100
Bug 13492: Add the column configuration for the checkouts table - circulation.pl
Test plan:
1/ Verify that you can show/hide columns on the checkouts table (circulation.pl).
2/ Play with the column configuration admin page (admin/columns_settings.pl),
and confirm the behavior is correct (depends on what you have selected).
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
-----------------------------------------------------------------------
Summary of changes:
admin/columns_settings.yml | 97 ++++++++++++++++++++
installer/data/mysql/mandatory/subtag_registry.sql | 30 +++++-
installer/data/mysql/updatedatabase.pl | 65 +++++++++++++
.../prog/en/includes/checkouts-table-footer.inc | 8 +-
.../prog/en/includes/checkouts-table.inc | 1 +
.../intranet-tmpl/prog/en/includes/help-top.inc | 2 +-
.../prog/en/includes/installer-doc-head-close.inc | 2 +-
koha-tmpl/intranet-tmpl/prog/en/js/checkouts.js | 15 +--
.../prog/en/modules/acqui/addorder.tt | 2 +-
.../prog/en/modules/acqui/cancelorder.tt | 2 +-
.../prog/en/modules/acqui/invoice-files.tt | 2 +-
.../intranet-tmpl/prog/en/modules/acqui/invoice.tt | 2 +-
.../prog/en/modules/acqui/invoices.tt | 2 +-
.../prog/en/modules/acqui/modordernotes.tt | 2 +-
.../prog/en/modules/acqui/newordersubscription.tt | 2 +-
.../prog/en/modules/acqui/transferorder.tt | 2 +-
.../prog/en/modules/admin/sru_modmapping.tt | 3 +-
.../prog/en/modules/admin/transport-cost-matrix.tt | 2 +-
.../value_builder/marc21_linking_section.tt | 4 +-
.../cataloguing/value_builder/unimarc_field_4XX.tt | 2 +-
.../en/modules/cataloguing/z3950_auth_search.tt | 2 +-
.../prog/en/modules/cataloguing/z3950_search.tt | 2 +-
.../prog/en/modules/circ/circulation.tt | 5 +
.../intranet-tmpl/prog/en/modules/circ/renew.tt | 2 +-
.../prog/en/modules/common/patron_search.tt | 2 +-
.../en/modules/course_reserves/add_items-step1.tt | 2 +-
.../en/modules/course_reserves/add_items-step2.tt | 2 +-
.../en/modules/course_reserves/course-details.tt | 2 +-
.../en/modules/course_reserves/course-reserves.tt | 2 +-
.../prog/en/modules/course_reserves/course.tt | 2 +-
.../en/modules/course_reserves/invalid-course.tt | 2 +-
.../intranet-tmpl/prog/en/modules/help/edithelp.tt | 2 +-
.../intranet-tmpl/prog/en/modules/members/files.tt | 2 +-
.../prog/en/modules/members/moremember.tt | 4 +
.../prog/en/modules/members/nl-search.tt | 2 +-
.../en/modules/members/purchase-suggestions.tt | 2 +-
.../prog/en/modules/members/routing-lists.tt | 2 +-
.../prog/en/modules/members/statistics.tt | 2 +-
.../prog/en/modules/offline_circ/enqueue_koc.tt | 2 +-
.../prog/en/modules/patron_lists/add-modify.tt | 2 +-
.../prog/en/modules/patron_lists/list.tt | 2 +-
.../prog/en/modules/patron_lists/lists.tt | 2 +-
.../prog/en/modules/plugins/plugins-disabled.tt | 2 +-
.../prog/en/modules/plugins/plugins-home.tt | 2 +-
.../prog/en/modules/plugins/plugins-upload.tt | 2 +-
.../en/modules/rotating_collections/addItems.tt | 2 +-
.../en/modules/serials/subscription-frequencies.tt | 2 +-
.../en/modules/serials/subscription-history.tt | 2 +-
.../modules/serials/subscription-numberpatterns.tt | 2 +-
.../prog/en/modules/test/progressbar.tt | 2 +-
.../modules/tools/marc_modification_templates.tt | 2 +-
.../prog/en/modules/tools/modborrowers.tt | 2 +-
.../intranet-tmpl/prog/en/modules/tools/viewlog.tt | 2 +-
.../opac-tmpl/bootstrap/en/modules/errors/400.tt | 2 +-
.../opac-tmpl/bootstrap/en/modules/errors/401.tt | 2 +-
.../opac-tmpl/bootstrap/en/modules/errors/402.tt | 2 +-
.../opac-tmpl/bootstrap/en/modules/errors/403.tt | 2 +-
.../opac-tmpl/bootstrap/en/modules/errors/404.tt | 2 +-
.../opac-tmpl/bootstrap/en/modules/errors/500.tt | 2 +-
koha-tmpl/opac-tmpl/bootstrap/en/modules/ilsdi.tt | 2 +-
.../opac-tmpl/bootstrap/en/modules/maintenance.tt | 2 +-
.../bootstrap/en/modules/opac-memberentry.tt | 2 +-
.../opac-tmpl/bootstrap/en/modules/sco/help.tt | 2 +-
.../opac-tmpl/bootstrap/en/modules/sco/sco-main.tt | 2 +-
.../bootstrap/en/modules/svc/suggestion.tt | 2 +-
kohaversion.pl | 2 +-
svc/checkouts | 2 +
t/db_dependent/Languages.t | 35 ++++++-
xt/tt_valid.t | 86 ++++++++++-------
69 files changed, 361 insertions(+), 106 deletions(-)
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list