[koha-commits] main Koha release repository branch master updated. v18.05.00-1481-g505e105
Git repo owner
gitmaster at git.koha-community.org
Thu Nov 15 14:02:42 CET 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, master has been updated
via 505e10585ce8683af0862027aca8177b5facf3df (commit)
via ecf68132b7e2eafff0d0dc8991b8ebc52534f75e (commit)
via 2d1b80d216b2bdf4eefc05f773d85f9cf14823b3 (commit)
via cbb90000fd21d16aa23077dd061d15954bd1955c (commit)
via c6e6b78a5099d34ecfc2b71fa03f154554ddfc6f (commit)
via e3e2afd88d090b68ece1ae7445c10cf58d139b24 (commit)
via af7e9abd2de7bef8ce379d83d5aecafee13e11c6 (commit)
from 15684a0f703735359a0c2aa4b084f6ba43f48d11 (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 505e10585ce8683af0862027aca8177b5facf3df
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Thu Nov 15 12:37:22 2018 +0000
Bug 7143: Update about page for new dev Thatcher Leoonard
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit ecf68132b7e2eafff0d0dc8991b8ebc52534f75e
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date: Mon Nov 12 15:03:34 2018 -0300
Bug 21749: (QA follow-up) Add more tests for ImportFramework
This patch adds tests for:
- Output of ImportFramework on fields removal and error conditions (file
not found)
- Different file format behaviour (csv, xml and ods are tested).
To test:
- Run
$ kshell
k$ prove t/db_dependent/ImportExportFramework.t
=> SUCCESS: All green :-D
- Sign off :-D
Note: the biblio_framework* files are based on the original one on the
patchset, and exported in 17.11 with different formats.
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit 2d1b80d216b2bdf4eefc05f773d85f9cf14823b3
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Mon Nov 12 13:14:19 2018 -0300
Bug 21749: Fix import of CSV biblio framework
Bug 9701 added 2 new columns to the table marc_tag_structure which broke
the import of biblio frameworks if the CSV file was generated with a
previous version.
Test plan:
- Export a biblio framework from 17.11
- Import it into 18.05+
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
https://bugs.koha-community.org/show_bug.cgi?id=21740
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit cbb90000fd21d16aa23077dd061d15954bd1955c
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Mon Nov 12 13:11:42 2018 -0300
Bug 21749: Add tests for ImportFramework
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit c6e6b78a5099d34ecfc2b71fa03f154554ddfc6f
Author: Owen Leonard <oleonard at myacpl.org>
Date: Fri Nov 9 19:02:25 2018 +0000
Bug 21805: Duplicate include file in search results template causes JS error
This patch removes a redundant include file, browser-strings.inc, from
the top of the staff client search results template. The
correctly-placed include is in the JavaScript block at the bottom of the
template. The duplication causes a JavaScript error which can be seen in
the browser console.
To test, apply the patch and peform a catalog search in the staff
client. Open the browser console and confirm that there are no errors.
Signed-off-by: Pierre-Marc Thibault <pierre-marc.thibault at inLibro.com>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit e3e2afd88d090b68ece1ae7445c10cf58d139b24
Author: Thatcher Leonard <thatcher.f.leonard at gmail.com>
Date: Tue Nov 6 14:39:28 2018 +0000
Bug 18584: Our legacy code contains trailing-spaces
This patch removes trailing spaces from acquisitions-search.inc
Mentored-by: Owen Leonard <oleonard at myacpl.org>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
commit af7e9abd2de7bef8ce379d83d5aecafee13e11c6
Author: Nightly Build Bot <nightly at abunchofthings.net>
Date: Thu Nov 15 00:25:09 2018 +0100
Bug 17084: Automatic debian/control updates (unstable/master)
Signed-off-by: Mirko Tietgen <mirko at abunchofthings.net>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
-----------------------------------------------------------------------
Summary of changes:
C4/ImportExportFramework.pm | 55 +++++------
debian/control | 6 +-
docs/history.txt | 1 +
.../prog/en/includes/acquisitions-search.inc | 6 +-
koha-tmpl/intranet-tmpl/prog/en/modules/about.tt | 1 +
.../prog/en/modules/catalogue/results.tt | 1 -
t/db_dependent/ImportExportFramework.t | 100 ++++++++++++++++++++
.../data/frameworks/biblio_framework.csv | 23 +++++
.../data/frameworks/biblio_framework.ods | Bin 0 -> 5227 bytes
.../data/frameworks/biblio_framework.xml | 28 ++++++
.../data/frameworks/biblio_framework_smaller.csv | 18 ++++
.../data/frameworks/biblio_framework_smaller.ods | Bin 0 -> 5027 bytes
.../data/frameworks/biblio_framework_smaller.xml | 28 ++++++
13 files changed, 229 insertions(+), 38 deletions(-)
create mode 100644 t/db_dependent/ImportExportFramework.t
create mode 100644 t/db_dependent/data/frameworks/biblio_framework.csv
create mode 100644 t/db_dependent/data/frameworks/biblio_framework.ods
create mode 100644 t/db_dependent/data/frameworks/biblio_framework.xml
create mode 100644 t/db_dependent/data/frameworks/biblio_framework_smaller.csv
create mode 100644 t/db_dependent/data/frameworks/biblio_framework_smaller.ods
create mode 100644 t/db_dependent/data/frameworks/biblio_framework_smaller.xml
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list