[koha-commits] main Koha release repository branch 16.11.x updated. v16.11.04-11-g3dedc5e
Git repo owner
gitmaster at git.koha-community.org
Mon Mar 13 00:15:22 CET 2017
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, 16.11.x has been updated
via 3dedc5e4ba1b749e6a8582248bc04a731e01853e (commit)
via fbb93fb43002e2d4224e3d7778d3cc91225654a1 (commit)
via 9e3f087a6e0ea5c818756da553eb042256175f26 (commit)
via 4d4834f1d3de49564357d580248fa5b58b6b93a2 (commit)
via 1ce1107af53c58692ea31912f53944ee1c450f6c (commit)
via c548686674e991d074f2c67438844b64b0ceb4d7 (commit)
via 8a9adc4bc0dff1ed97192997fd3739ef479731d0 (commit)
via 6f512cff8b264167f27ff8d007da9b172a772192 (commit)
via 9ce369fb8af98b4efa91c3fc25a8a958cea408bc (commit)
via 0b1311ccb9f0b0a67ae94f0304ac0bd4f31a7485 (commit)
via 56938d7630ae4f90b3bcf650bbce3a6c5ad2c81e (commit)
from 829016f8b7e3bf0b10b26f63e0f02418f5352149 (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 3dedc5e4ba1b749e6a8582248bc04a731e01853e
Author: Marc Véron <veron at veron.ch>
Date: Wed Feb 15 10:24:56 2017 +0100
Bug 18122 - Audio alerts: Add hint on where to enable sounds
This patch adds a hint to page Home > Administration > Audio alerts
and related help page about where to enable the sound system
(syspref 'AudioAlerts').
To test:
- Apply patch
- Disable syspref 'AudioAlerts'
- Go to Home > Administration > Audio alerts
- Note hint below title 'Audio alerts'
- Enable syspref 'AudioAlerts'
- Go to Home > Administration > Audio alerts
- Hint is no longer visible (since audios are enabled)
- Open Help page (top right)
- Verify that hint on help page makes sense.
Amended to add alert class as requested by comment #2 2017-02-21 mv
Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
(cherry picked from commit b6cb18c4a8292cabe5fd611b349b51d5c79b5fe4)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit fbb93fb43002e2d4224e3d7778d3cc91225654a1
Author: Emma Smith <emma.nakamura.smith at gmail.com>
Date: Tue Jan 17 03:23:18 2017 +0000
Bug 17840: adding classes to notes in checkouts
Test Plan
1) Add an internal and a public note to an item.
2) Check out the item.
3) Verify that both notes are shown in between title and barcode in the
second column of the details table.
4) Verify there is an empty class="" in the HTML source code for each
5) Apply patch and refresh page
6) View page source, confirm that class has been changed
I tested this by first applying the patch for bug 17919 to catch the
check-in software error. Patch working as expected :)
Signed-off-by: Claire Gravely <claire_gravely at hotmail.com>
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
(cherry picked from commit 257c1793420108f1cb5efdec7bf03649d41940a0)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit 9e3f087a6e0ea5c818756da553eb042256175f26
Author: Mark Tompsett <mtompset at hotmail.com>
Date: Tue Feb 21 13:13:02 2017 -0500
Bug 13968: Follow up - Clean HTML tags for hints
Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
(cherry picked from commit e9d5615e70056cd887b9471827611a78275016ab)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit 4d4834f1d3de49564357d580248fa5b58b6b93a2
Author: Marc Véron <veron at veron.ch>
Date: Sat Feb 18 17:15:06 2017 +0100
Bug 13968 - Branch email hints are misleading
This patch replaces missleading notes with Reply-To and Return-Path fields
to reflect indicate falback values if they are empty (ReplyToDefault and
ReturnpathDefault system prefs).
To test:
- Apply patch
- In Home > Administration > Libraties and Groups, edit a library
- Verify that hints display for fields Reply-To and Return-Path, indicating
their default values.
Amended to remove extra </li> - 2017-02-21 mv
Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
(cherry picked from commit b2eb6109ff308de7d2bc9338d708ac7fe9b6e3d7)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit 1ce1107af53c58692ea31912f53944ee1c450f6c
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Tue Feb 14 10:52:14 2017 +0100
Bug 18087: Handle invalid filetypes
If an invalid file is used as biblionumber list, we should display a
message.
Test plan:
1/ Use csv, plain text files
=> Should work
2/ Use invalid files (binary files like pdf, doc*, xsl*, etc.)
=> Should not work and see a warning message.
Amended patch after signoff: Remove one warn debug line
Signed-off-by: Joy Nelson <joy at bywatersolutions.com>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
(cherry picked from commit d43131c4fca8124a8a9e4dcdea82e2bdf1af196a)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit c548686674e991d074f2c67438844b64b0ceb4d7
Author: Joy Nelson <joy at bywatersolutions.com>
Date: Thu Feb 9 11:42:57 2017 -0800
Bug 18087 - Clarification on File type when using file of biblionumbers to export data
Added a line to the screen detailing the types of files that can be used to upload a list of biblionumbers.
Test plan:
1. Go to tools->export data
2. under File option, (File types accepted: .csv and .txt) should appear
3. Check both Bibliographic and Authority Export screens for this new string.
Signed-off-by: Claire Gravely <claire_gravely at hotmail.com>
Signed-off-by: Joy Nelson <joy at bywatersolutions.com>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
(cherry picked from commit 18af48bffe112a5df61a8a546da86dc31f32a7e7)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit 8a9adc4bc0dff1ed97192997fd3739ef479731d0
Author: Katrin Fischer <katrin.fischer.83 at web.de>
Date: Sun Mar 12 23:09:39 2017 +0100
Bug 17260: DBRev 16.11.04.001
commit 6f512cff8b264167f27ff8d007da9b172a772192
Author: Blou <philippe.blouin at inlibro.com>
Date: Fri Jan 27 16:51:26 2017 +0000
Bug 17260: updatedatabase.pl fails on invalid entries in ENUM and BOOLEAN columns
The loading of file admin/searchengine/elasticsearch/mappings.yaml
specifies 'type' as empty, which fails with Mysql 5.7+ which is more
stringent.
Also, forcing an empty value into a boolean also fails.
Both issues arise when updatedatabase.pl hit 3.23.00.050.
NOTE: both issues could also be resolved by actually setting values in
the load file. This doesn't make this solution incorrect, though.
To Test/reproduce:
-1) Happens with Mysql 5.7.4. Maybe earlier, but certainly at
that point. Use a Xenial kohadevbox to more easily test.
0) Find a database on 3.22 or earlier, save it.
a) place
sql_mode=IGNORE_SPACE,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION
into the [mysqld] section of /etc/mysql/mysql.conf.d/mysqld.cnf
b) restart you mysql server
c) drop the db and recreate it
d) checkout the 3.22.x branch
e) do a web install
f) remove the added sql_mode
g) restart the mysql server
1) Set your code base to master
2) run updatedatabase.pl
3) See the errors on 3.23.00.050
4) Apply the patch
5) Reload the 3.22 db.
a) repeat steps 0(a)-0(g)
b) don't forget the caching issues
6) succeed with updatedatabase.pl
7) drop the db and recreate it
8) run the web installer
9) notice no issues either.
10) run koha qa test tools
NOTE: This bug only solved the upgrade portion.
I added the kohastructure.sql change as well.
I confirmed that all the code changes were
triggered with this test plan.
Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
Signed-off-by: Mehdi Hamidi <mehdi.hamidi at inlibro.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
(cherry picked from commit 77337a2ab537843eab70cc06b8bc2531ad2014dc)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit 9ce369fb8af98b4efa91c3fc25a8a958cea408bc
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Wed Nov 23 14:47:10 2016 +0000
Bug 18248: Fix SQL statement to setting marc_subfield_structure.authorised_value to NULL
We want to update it if it's empty, not equal to ';'
nopaste vim mode is to blame
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
(cherry picked from commit 11bae489bc85a9463712c9caafd2caf7b63155d9)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit 0b1311ccb9f0b0a67ae94f0304ac0bd4f31a7485
Author: Aleisha Amohia <aleishaamohia at hotmail.com>
Date: Mon Jan 23 22:32:39 2017 +0000
Bug 17947: Searching my library first shows the branchcode by the search bar rather than branchname
Test Plan
1: Turn on SearchMyLibraryFirst and go into OPAC
2: It should say Search (in <Branch Code> Only)
3: Apply patch and refresh page. It should now say Search (in <Library Name> only)
Sponsored-by: Catalyst IT
Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
(cherry picked from commit e8420b5d80558a8a74f7f6a1421352dcad2c9c88)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
commit 56938d7630ae4f90b3bcf650bbce3a6c5ad2c81e
Author: Aleisha Amohia <aleishaamohia at hotmail.com>
Date: Fri Jan 13 00:19:48 2017 +0000
Bug 17895: 'Re-set' typo fix
To test:
1) Log into OPAC and go to change your password
2) Enter current password incorrectly and click Submit changes
3) Observe error message and typo 're-set'
4) Apply patch and refresh page
5) May be asked to resend data - if so, click Resend, if not, repeat
step 2
6) Observe error message and corrected spelling of 'reset'
Sponsored-by: Catalyst IT
Signed-off-by: Caitlin Goodger <caitlingoodger.student at wegc.school.nz>
Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
(cherry picked from commit 86ec263b2d0994ecb53ff283ef246b529d4570e2)
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
-----------------------------------------------------------------------
Summary of changes:
Koha.pm | 2 +-
Koha/SearchEngine/Elasticsearch.pm | 2 +-
installer/data/mysql/kohastructure.sql | 2 +-
installer/data/mysql/updatedatabase.pl | 15 +++++++++++++--
.../intranet-tmpl/prog/en/modules/admin/audio_alerts.tt | 7 +++++++
.../intranet-tmpl/prog/en/modules/admin/branches.tt | 4 ++--
.../prog/en/modules/help/admin/audio_alerts.tt | 2 ++
koha-tmpl/intranet-tmpl/prog/en/modules/tools/export.tt | 13 +++++++++++--
koha-tmpl/intranet-tmpl/prog/js/checkouts.js | 10 ++--------
koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc | 2 +-
koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-passwd.tt | 2 +-
tools/export.pl | 12 ++++++++++++
12 files changed, 54 insertions(+), 19 deletions(-)
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list