[koha-commits] main Koha release repository branch 3.12.x updated. v3.12.01-70-g5207c51
Git repo owner
gitmaster at git.koha-community.org
Tue Jul 16 16:49:49 CEST 2013
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, 3.12.x has been updated
via 5207c513c36fb0e66ed5a8390fc30119e194fad1 (commit)
via 68184ade6f6b0c1ef00e5c26978eaefe0aa00e8b (commit)
via bfd82695b19ce20cd638e8c285e7e1aeed89a255 (commit)
via 689080867eb810279a912f2d9bf7a78655ffc9dd (commit)
via 9c90b651f2a1a4420a0b5b7865c0796c1d6b8764 (commit)
via f5a8bec0f7ae7a1118fd003c36c6651906f970af (commit)
via b606e3afd2ad0a64f663bf086b1d792046a5570f (commit)
via d4f6eef1b2c34f25336e6d2607fa2c3074c982c1 (commit)
via 645e80d58783aed46f368e36156ea69e2a34779e (commit)
from 85130dafc515363eba8f44973291a7af893a8b52 (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 5207c513c36fb0e66ed5a8390fc30119e194fad1
Author: Katrin Fischer <Katrin.Fischer.83 at web.de>
Date: Mon Jul 1 23:44:39 2013 +0200
Bug 4907: make 'Organize by' filter in suggestions reflect selected option
When using the 'Organize by' option to change the display of the
suggestions, the option is applied, but the pull down always jumps
back to the first entry 'Status'.
This patch fixes that.
To test:
- Try out all settings and verify that after the page reloads the selected
option is applied to your suggestions and the pull down shows
the option you selected.
Note: Until bug 10519 is properly fixed the tabs will not show
the correct descriptions, but the URL will show you the selected
option as parameter: displayby=acceptedby
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
(cherry picked from commit 60a4dffbb197fe92e7483b9e0dfcc19bc9b51664)
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit 68184ade6f6b0c1ef00e5c26978eaefe0aa00e8b
Author: Tomas Cohen Arazi <tomascohen at gmail.com>
Date: Tue Jul 16 11:08:41 2013 -0300
Bug 5858 - Advertise the updated framework to upgrading users
Just that.
Sponsored-by: Universidad Nacional de Córdoba
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit bfd82695b19ce20cd638e8c285e7e1aeed89a255
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Sun Jul 7 14:40:19 2013 +0200
Bug 5858: Followup for INSERT IGNOREs in marc21_framework_DEFAULT.sql
Changes 8 INSERTs into INSERT IGNOREs.
This allows current installs to benefit easier from the new tags/subfields.
Note that running with --force will not achieve the same! The multi-value
inserts will still be aborted, though execution continues.
Test plan:
Run the file or do a new install.
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Ran the file on a current install manually.
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
(cherry picked from commit bf9eccfeb8069c1b258916c1916138b6317122da)
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit 689080867eb810279a912f2d9bf7a78655ffc9dd
Author: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
Date: Tue Mar 19 21:25:20 2013 -0300
Bug 5858: update default MARC21 framework to April 2013 revision
Applies to new installs, although with the follow-up
patch, users can run the installer/data/mysql/en/marcflavour/marc21/mandatory/marc21_framework_DEFAULT.sql
script through the mysql client to add new tag and
subfield entries.
To test:
1) Delete MARC21 default framework
2) Apply patch
3) Test that new default framework loads without problem
Signed-off-by: Mason James <mtj at kohaaloha.com>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Run this file with and without this patch.
This patch adds 24 tags (338 vs 314) and 323 subfields (3951 vs 3628).
Verified that last QA comments were incorporated.
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
(cherry picked from commit 45669b2566c889c7a73251cdb132c81cf5127117)
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit 9c90b651f2a1a4420a0b5b7865c0796c1d6b8764
Author: Galen Charlton <gmc at esilibrary.com>
Date: Mon Jul 8 14:29:32 2013 +0000
Bug 10289: (follow-up) don't set cardnumber for test patron
Since the patron barcode is nullable, and since the tests using
the test patron don't care what the barcode is, don't set it. This
avoids the tests failing if the test database happens to already
have a patron record with the hard-coded barcode that used
to be supplied.
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
(cherry picked from commit 7957dd2a06cd20997f50f49aa1b77e24589ae71c)
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit f5a8bec0f7ae7a1118fd003c36c6651906f970af
Author: Galen Charlton <gmc at esilibrary.com>
Date: Mon Jul 8 14:27:14 2013 +0000
Bug 10289: (follow-up) wrap tests in transaction
Applying new standard method for handling tear-down
of test data.
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
(cherry picked from commit 47cf3ec24ded468ca4b7b79c8b000b1bdb13d1a8)
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit b606e3afd2ad0a64f663bf086b1d792046a5570f
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date: Mon May 20 16:37:10 2013 +0200
Bug 10289: UT: Reserves.t needs to create its own data
Try before the patch:
prove t/db_dependent/Reserves.t
And after, it should produce:
t/db_dependent/Reserves.t .. 1/4 #
# Creating biblio instance for testing.
# Creating item instance for testing.
# Deleting item testing instance.
# Deleting biblio testing instance.
# Deleting borrower.
t/db_dependent/Reserves.t .. ok
All tests successful.
Files=1, Tests=4, 1 wallclock secs ( 0.02 usr 0.01 sys + 0.39 cusr 0.02 csys = 0.44 CPU)
Result: PASS
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
(cherry picked from commit 6e6c7608b7d9b13d3af8d2115659ef142adb1b01)
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit d4f6eef1b2c34f25336e6d2607fa2c3074c982c1
Author: Tomas Cohen Arazi <tomascohen at gmail.com>
Date: Tue Jul 16 10:50:23 2013 -0300
Bug 9519: DBRev 3.12.01.002
Sponsored-by: Universidad Nacional de Córdoba
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit 645e80d58783aed46f368e36156ea69e2a34779e
Author: Sonia LEMAIRE <sonia.lemaire at biblibre.com>
Date: Wed Jul 3 15:53:49 2013 +0200
Bug 9519: fix code for Italian language search limiter
'ind' rather than 'ita' was set as the ISO639-2 language
code for Italian in the fr-FR, it-IT, pl-PL, ru-RU, and uk-UA
installation SQL.
Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
I checked nb-NO and de-DE - language code there had already
been corrected.
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
(cherry picked from commit 707733ed2992a5d612d22510174301d65d3d7c05)
Conflicts:
installer/data/mysql/updatedatabase.pl
Trivial merge conflict in the usual suspect, updatedatabase.pl
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
-----------------------------------------------------------------------
Summary of changes:
.../marc21/mandatory/marc21_framework_DEFAULT.sql | 726 ++++++++++++++------
.../mysql/fr-FR/1-Obligatoire/subtag_registry.sql | 2 +-
.../data/mysql/it-IT/necessari/subtag_registry.sql | 2 +-
.../data/mysql/pl-PL/mandatory/subtag_registry.sql | 2 +-
.../data/mysql/ru-RU/mandatory/subtag_registry.sql | 2 +-
.../data/mysql/uk-UA/mandatory/subtag_registry.sql | 2 +-
installer/data/mysql/updatedatabase.pl | 13 +
.../prog/en/modules/suggestion/suggestion.tt | 30 +-
kohaversion.pl | 2 +-
t/db_dependent/Reserves.t | 76 +--
10 files changed, 606 insertions(+), 251 deletions(-)
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list