[koha-commits] main Koha release repository branch 3.8.x updated. v3.08.00-20-gd7b29df
Git repo owner
gitmaster at git.koha-community.org
Tue May 8 00:48:51 CEST 2012
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.8.x has been updated
via d7b29df50635c83045ae869bbd4a500aae786eb2 (commit)
via 1c8f4c8fc04858b9c6ce4fbd067980dea6b43aed (commit)
via 419a7dbabe1b488622cfd8c46823acce26b16697 (commit)
via 0d2bf47a8a64bc1c3fba2317c861f8709296db6a (commit)
via daca73c96a95494998ad3bc969c906196f26e969 (commit)
via ae48a3198ee78a0a468462d34e01eb6cb13b8adc (commit)
via 1754e0fa3ed942d4867490a1fed536620cfac543 (commit)
via 98436d47be9f34afe23ee1b9218cbf45687464a0 (commit)
via e30a101b5996f0c17f4a308ac8ab4a54a34c7eda (commit)
via bc853b720efcfebc8eb5abb65209d64ce1918d91 (commit)
via 17b60dea53a75d2313a7d19002e6e005c5b4a1cc (commit)
via e7ca2fb63be3830cc91470bd7dbbd26347b23de3 (commit)
via ea86502bd77fc8cb73170f1767634972e3cad9b7 (commit)
via c5c88b215319c7fd8a0b4007bacf8759690cec0a (commit)
via 702080eb861261292b55cfa2bbc07127024d6f9e (commit)
via 37421c31e339a28e63818e371b59a8690b7f4f90 (commit)
via 6ce6ecd92d851ad5ddcbd7d2e72236d175cf95d1 (commit)
via 3a22e06c1b08965d5cb0596eb94c38b6397a502c (commit)
from 60fe518c6299c7ea079e17d1ad6373b72bad1b2d (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 d7b29df50635c83045ae869bbd4a500aae786eb2
Author: Paul Poulain <paul.poulain at biblibre.com>
Date: Mon May 7 23:26:16 2012 +0200
Bug 7903 follow-up, wrong capital cases
Also fixing a tiny indentation problem
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
commit 1c8f4c8fc04858b9c6ce4fbd067980dea6b43aed
Author: Lyon3 Team <koha at univ-lyon3.fr>
Date: Thu Apr 5 15:14:39 2012 +0200
Bug 7903: Add ordernumber column in orders history table
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
There was a conflict (whitespace changes causing a conflict)
Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
commit 419a7dbabe1b488622cfd8c46823acce26b16697
Author: Stéphane Delaune <stephane.delaune at biblibre.com>
Date: Fri Apr 20 15:32:10 2012 +0200
bug 7990 - styl= in aqplan.tt
Signed-off-by: Mason James <mtj at kohaaloha.com>
Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
commit 0d2bf47a8a64bc1c3fba2317c861f8709296db6a
Author: Liz Rea <wizzyrea at gmail.com>
Date: Thu Apr 12 16:54:28 2012 -0500
Bug 7953 - add opacuserjs to the sco template
To test:
add some jquery to opacuserjs that would change the screen
a la: $(".checkout label[for='patronid']").css("border","3px solid red");
verify you see a red box on the sco-main page.
Also adds the ability to use opacusercss to style sco-main.tt
to test:
Add some css to opacusercss that would change the screen:
.checkout { background: grey; }
verify you see a grey box around the checkout div.
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
commit daca73c96a95494998ad3bc969c906196f26e969
Author: Magnus Enger <magnus at enger.priv.no>
Date: Wed Apr 25 14:28:32 2012 +0200
Bug 8008 - Fix typo in man page for koha-create
Line 121 had "/etc/koha/koha-site.conf" instead of "/etc/koha/koha-sites.conf"
To test:
I don't think this needs any actual testing, just read the patch and check
that it looks sensible...
Signed-off-by: Marc Veron <veron at veron.ch>
Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
commit ae48a3198ee78a0a468462d34e01eb6cb13b8adc
Author: Srdjan <srdjan at catalyst.net.nz>
Date: Fri Mar 23 13:08:54 2012 +1300
bug 6372: moved background-job.inc to background-job-progressbar.js
Check for div 0 when calculating percentage
Signed-off-by: Liz Rea <wizzyrea at gmail.com>
div0 no longer appears on 0 size jobs.
Passes t xt
Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
commit 1754e0fa3ed942d4867490a1fed536620cfac543
Author: Katrin Fischer <Katrin.Fischer.83 at web.de>
Date: Wed Apr 11 08:06:00 2012 +0200
Bug 7929 - Duplicate id "availability" on XSLT result page
Changes id="availability" to class="availability" for XHTML valididy
(ids have to be unique on a page).
Signed-off-by: mveron <veron at veron.ch>
Signed-off-by: Mason James <mtj at kohaaloha.com>
Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
commit 98436d47be9f34afe23ee1b9218cbf45687464a0
Author: Colin Campbell <colin.campbell at ptfs-europe.com>
Date: Fri Apr 20 12:16:13 2012 +0100
Bug 7987 [SIGNED-OFF] Fix typo in circulation template
li was not properly closed after loss of a character
Signed-off-by: Marc Veron <veron at veron.ch>
- Checked koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt before / after applying patch
- Line is changed as expected, ends now with </li>
Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
commit e30a101b5996f0c17f4a308ac8ab4a54a34c7eda
Author: Katrin Fischer <Katrin.Fischer.83 at web.de>
Date: Tue Apr 3 20:23:47 2012 +0200
Bug 2399: Follow up removing MySQLisms from ru-RU and uk-UA sample files
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
commit bc853b720efcfebc8eb5abb65209d64ce1918d91
Author: Katrin Fischer <Katrin.Fischer.83 at web.de>
Date: Mon Apr 2 19:28:37 2012 +0200
Bug 2399: All status fields in the item edit interface offer two blank/null entries per dropdown instead of one
Removes the '0' values without description from the sample date for
authorised values.
To test:
1) Verify that SQL files load correctly
- truncate authorised_values; /* empty authorised values table */
- load sample data using one of the SQL files
2) Check cataloging interface - all status fields should only show 1 empty line
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
commit 17b60dea53a75d2313a7d19002e6e005c5b4a1cc
Author: Katrin Fischer <Katrin.Fischer.83 at web.de>
Date: Mon Apr 9 11:44:06 2012 +0200
Bug 3413: Checkboxes for new subfields not saving correctly
The bug was in the numbering of the fields and subfields in the form.
The form elements for the 'new subfield' got the same numbered names and ids as
the form elements for the second subfield. (example: repeatable1)
The patch fixes the numbering to continue to the new subfield.
To test:
- Create some new subfields and check all checkbox fields save correctly
(mandatory, repeatable, is url)
- Check that other subfields' checkboxes are not changed
- Check existing subfields and newly created subfields can be edited
Signed-off-by: mveron <veron at veron.ch>
Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
commit e7ca2fb63be3830cc91470bd7dbbd26347b23de3
Author: Robin Sheat <robin at catalyst.net.nz>
Date: Sat Apr 28 12:40:09 2012 +1200
Bug 8020 - [3.8.x] Update changelog for 3.8.0-1
Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
commit ea86502bd77fc8cb73170f1767634972e3cad9b7
Author: Robin Sheat <robin at catalyst.net.nz>
Date: Wed Oct 26 16:02:32 2011 +1300
Bug 8020 [3.8.x/MASTER] - update changelogs to get to 3.8
Signed-off-by: Jared Camins-Esakov <jcamins at cpbibliography.com>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
commit c5c88b215319c7fd8a0b4007bacf8759690cec0a
Author: Adrien Saurat <adrien.saurat at biblibre.com>
Date: Mon Apr 30 10:05:07 2012 +0200
Bug 8025: corrects the return of a zero value for authorised values
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
commit 702080eb861261292b55cfa2bbc07127024d6f9e
Author: Adrien Saurat <adrien.saurat at biblibre.com>
Date: Mon Apr 30 12:15:13 2012 +0200
Bug 8027: fix param order for z3950 INSERT
In the z3950servers.pl order of columns which are inserted
for new server is wrong, which results in empty timeout
and encoding values when new server is added.
Test scenario:
1. Open Z39.50 server administration
2. add new server with encoding and timeout
3. save server and verify that it has encoding and timeout
Signed-off-by: Dobrica Pavlinusic <dpavlin at rot13.org>
Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
commit 37421c31e339a28e63818e371b59a8690b7f4f90
Author: Katrin Fischer <Katrin.Fischer.83 at web.de>
Date: Sat Apr 14 18:12:42 2012 +0200
Bug 3969: Budget search in acquisition doesn't work (string changes)
String changes:
- Correcting tab name from "Search budgets" to "Seach funds"
- Changing search option from "Name" to "Fund code"
Signed-off-by: Nicole C. Engard <nengard at bywatersolutions.com>
Strings look a-ok.
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
commit 6ce6ecd92d851ad5ddcbd7d2e72236d175cf95d1
Author: Chris Cormack <chrisc at catalyst.net.nz>
Date: Tue May 8 09:36:32 2012 +1200
Database version bump
commit 3a22e06c1b08965d5cb0596eb94c38b6397a502c
Author: Owen Leonard <oleonard at myacpl.org>
Date: Tue Apr 24 11:20:42 2012 -0400
Bug 8002 [SIGNED-OFF][REVISED] Can't add patron attribute type in newer installation
Correcting patron_attributes_types definition in kohastructure.sql
to allow NULL entries for category_code, matching the definition
specified in updatedatabase.pl. Adds an entry to updatedatabase.pl
to correct existing installations with the incorrect table structure.
After running the updated updatedatabase.pl the category_code
column in borrower_attribute_types should show that it allows
NULL entries. Adding a new patron attribute type with no
patron category specified should work correctly.
To test the update to kohastructure.sql: Back up your Koha
database, drop it, and recreate it. Load the staff interface
and go through the web installer. After recreating the database
enable ExtendedPatronAttributes and try adding a new patron
attribute type with no patron category specified. The operation
should be successful.
signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
a new update for installations affected.
Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
-----------------------------------------------------------------------
Summary of changes:
C4/Koha.pm | 23 +++--
admin/marc_subfields_structure.pl | 27 +++---
admin/z3950servers.pl | 4 +-
debian/changelog | 39 +++++++++
debian/docs/koha-create.xml | 2 +-
installer/data/mysql/de-DE/optional/auth_val.sql | 7 +--
installer/data/mysql/en/optional/auth_val.sql | 5 -
installer/data/mysql/es-ES/optional/auth_val.sql | 5 -
installer/data/mysql/kohastructure.sql | 2 +-
.../data/mysql/nb-NO/2-Valgfritt/auth_val.sql | 5 -
installer/data/mysql/pl-PL/optional/auth_val.sql | 5 -
.../authorised_values_[DAMAGED].sql | 1 -
.../authorised_values/authorised_values_[LOST].sql | 16 +---
.../authorised_values_[NOT_LOAN].sql | 1 -
.../authorised_values_[RESTRICTED].sql | 1 -
.../authorised_values_[WITHDRAWN].sql | 1 -
.../authorised_values_[DAMAGED].sql | 1 -
.../authorised_values/authorised_values_[LOST].sql | 16 +---
.../authorised_values_[NOT_LOAN].sql | 1 -
.../authorised_values_[RESTRICTED].sql | 1 -
.../authorised_values_[WITHDRAWN].sql | 1 -
installer/data/mysql/updatedatabase.pl | 7 ++
.../prog/en/includes/background-job.inc | 91 --------------------
.../prog/en/includes/budgets-admin-search.inc | 50 +++++------
.../prog/en/js/background-job-progressbar.js | 84 ++++++++++++++++++
.../prog/en/modules/acqui/histsearch.tt | 4 +-
.../intranet-tmpl/prog/en/modules/admin/aqplan.tt | 2 +-
.../en/modules/admin/marc_subfields_structure.tt | 6 +-
.../prog/en/modules/circ/circulation.tt | 2 +-
.../prog/en/modules/offline_circ/process_koc.tt | 2 +-
.../prog/en/modules/test/progressbar.tt | 2 +-
.../prog/en/modules/tools/batchMod-del.tt | 2 +-
.../prog/en/modules/tools/batchMod-edit.tt | 2 +-
.../prog/en/modules/tools/manage-marc-import.tt | 2 +-
.../prog/en/modules/tools/stage-marc-import.tt | 2 +-
.../prog/en/modules/tools/upload-images.tt | 2 +-
.../opac-tmpl/prog/en/modules/sco/sco-main.tt | 6 ++
.../prog/en/xslt/MARC21slim2OPACResults.xsl | 2 +-
kohaversion.pl | 2 +-
tools/batchMod.pl | 10 --
40 files changed, 215 insertions(+), 229 deletions(-)
delete mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/background-job.inc
create mode 100644 koha-tmpl/intranet-tmpl/prog/en/js/background-job-progressbar.js
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list