[koha-commits] main Koha release repository branch 18.05.x updated. v18.05.05-18-g19e4365
Git repo owner
gitmaster at git.koha-community.org
Fri Oct 26 15:04:10 CEST 2018
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, 18.05.x has been updated
via 19e4365e340cee480dc1d560e5c54c5140ed8b8a (commit)
via b9f85edd14aa4fc89b1a20457066980b4e7d4b15 (commit)
via 1f8356d2df19a704a5a12597a9443eb459941aad (commit)
via 50166e670b38f40ae0503c4c6eb6f95fd2ce0d16 (commit)
via b3f1bb0693ba9ac6a5e5f6143558505ddd00d586 (commit)
from 736fcd1cb62413f6b2de3e3190da4edbe67e09a3 (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 19e4365e340cee480dc1d560e5c54c5140ed8b8a
Author: Katrin Fischer <katrin.fischer.83 at web.de>
Date: Sun Aug 12 17:08:57 2018 +0200
Bug 14786: Use MARC istead of ISO2709 everywhere
This patch changes the term ISO2709 in the templates to use
MARC instead.
Test plan:
- The term was changed on the following pages in staff:
- Advanced catalouging editor > Save to catalog
- Patron account > Check out (Activate ExportCircHistory) > Format
- Patron account > Check out > Help page
- Lists > Download list
- Acquisitions > Add order to basket > From a staged file (breadcrumbs)
- Administration > System preferences > ExportRemoveFields
- Cart > Download
- Tools > Export data > Output format
Signed-off-by: Michal Denar <black23 at gmail.com>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
(cherry picked from commit 81875ab282c1daa98dec2e0f5f20ba74f411ac32)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit b9f85edd14aa4fc89b1a20457066980b4e7d4b15
Author: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Date: Mon Oct 8 15:25:50 2018 +0100
Bug 21456: (QA follow-up) Catch missed case in authorities merge
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
(cherry picked from commit 796e4e5d2be5ec87970f8b586f940e4abddb687d)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 1f8356d2df19a704a5a12597a9443eb459941aad
Author: Andreas Roussos <arouss1980 at gmail.com>
Date: Sun Sep 30 13:06:28 2018 +0300
Bug 21456: The 'New authority' button lists authority types inconsistently
The 'New authority' button does not always list the available
authority types in A-Z order based on their description.
This patch fixes that.
Test plan:
1) Go to Home > Authorities in the staff client; notice how the
'New authority' button lists auth types sorted by description.
2) Go to an authority's detail page; notice how the same 'New
authority' button will list auth types sorted by their code.
3) Apply the patch.
4) In an authority's detail page, the 'New authority' button will
now list the available authority types sorted by description.
Signed-off-by: Michal Denar <black23 at gmail.com>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
(cherry picked from commit bf7c8303ca7f9e4955f25fc4d1f30d65d8c52dc9)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 50166e670b38f40ae0503c4c6eb6f95fd2ce0d16
Author: Caroline Cyr La Rose <caroline.cyr-la-rose at inlibro.com>
Date: Thu Oct 4 14:52:53 2018 -0400
Bug 21490: Disambiguation of 'Order' part 2
This patch changes the 'Order' term in neworderbiblio.tt,
newordersubscription.tt, newordersuggestion.tt, and
z3950_search.tt for 'Place order'.
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
(cherry picked from commit 706d21ee53dd5072eec2234415fc5c8ff4b1ea17)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit b3f1bb0693ba9ac6a5e5f6143558505ddd00d586
Author: Caroline Cyr La Rose <caroline.cyr-la-rose at inlibro.com>
Date: Thu Oct 4 14:38:25 2018 -0400
Bug 21490: Disambiguation of 'Order'
This patch changes the 'Order' term in marc_modification_template.tt
for 'Rank'.
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
(cherry picked from commit 5ca776d6e171de1b093163ab83ba589d5ae4d7cc)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
-----------------------------------------------------------------------
Summary of changes:
authorities/detail.pl | 2 +-
authorities/merge.pl | 2 +-
.../intranet-tmpl/prog/en/includes/cateditor-ui.inc | 2 +-
.../intranet-tmpl/prog/en/includes/checkouts-table.inc | 6 +++---
.../prog/en/includes/virtualshelves-toolbar.inc | 6 +++---
.../prog/en/modules/acqui/addorderiso2709.tt | 2 +-
.../prog/en/modules/acqui/neworderbiblio.tt | 4 ++--
.../prog/en/modules/acqui/newordersubscription.tt | 9 +++++----
.../prog/en/modules/acqui/newordersuggestion.tt | 4 ++--
.../intranet-tmpl/prog/en/modules/acqui/z3950_search.tt | 14 +++++++-------
.../prog/en/modules/admin/preferences/circulation.pref | 2 +-
koha-tmpl/intranet-tmpl/prog/en/modules/basket/basket.tt | 6 +++---
.../intranet-tmpl/prog/en/modules/basket/downloadcart.tt | 2 +-
.../intranet-tmpl/prog/en/modules/cataloguing/editor.tt | 2 +-
koha-tmpl/intranet-tmpl/prog/en/modules/tools/export.tt | 8 ++++----
.../prog/en/modules/tools/marc_modification_templates.tt | 2 +-
.../prog/en/modules/virtualshelves/downloadshelf.tt | 2 +-
17 files changed, 38 insertions(+), 37 deletions(-)
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list