[koha-commits] main Koha release repository branch 3.10.x updated. v3.10.09-36-gc6fbb45
Git repo owner
gitmaster at git.koha-community.org
Sun Aug 4 21:42:29 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.10.x has been updated
via c6fbb45f4f07db4443dcb1c850221c821f49f558 (commit)
via 5b93649f79e6011e316055bb48c367f829c3966f (commit)
via e9fc5c04e75f1444fdb26d2fc2228605b82f5807 (commit)
via d4a14ce46090a1fd309b3bd1fef52c80c62dbe90 (commit)
via d930e973119e28de9ce15b2633c73cbcccc44e76 (commit)
via 2727ca9512ad9e06fbba9a3c299dbdd78289da7c (commit)
via 4cae5281851983d59fb6a463aebc868398e6f2ba (commit)
via e510a73acf53f76f73168466ee80f5f98d2c8e82 (commit)
via 58f7b60bf3d718a9d76e87632086adbc734a1117 (commit)
from e1b677188a0464a9e4752313a3bb6843bdb38a62 (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 c6fbb45f4f07db4443dcb1c850221c821f49f558
Author: Tomas Cohen Arazi <tomascohen at gmail.com>
Date: Tue Jul 2 18:35:58 2013 -0300
Bug 8911: make sure history.txt gets installed where history.txt can see it
This patch makes Makefile.PL put the history.txt file in the right places
depending on the chosen setup layout, adds a reference to that place in
koha-conf.xml (and debian template version), and finally tweaks about.pl to
use it.
To test, apply the patch and verify that perl Makefile.PL runs fine, and
installing in
- dev
- single
- standard
layouts works as expected. Then go to the about.pl page and see if Koha's
history shows there.
Then, build your packages and test on your newly created instances.
Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
(cherry picked from commit 0fe3d053ffe0adc4fda4fdb660ed93203ecc02d8)
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
Fixed a trivial conflict in Makefile.PL (course reserves are not in 3.12)
(cherry picked from commit 2803bab669162aebf0c8f6360328842d2dfa2dc7)
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
(cherry picked from commit 2803bab669162aebf0c8f6360328842d2dfa2dc7)
commit 5b93649f79e6011e316055bb48c367f829c3966f
Author: Robin Sheat <robin at catalyst.net.nz>
Date: Wed Jun 5 17:50:29 2013 +1200
Bug 10411: add cache control headers for static resources (Debian package)
This adds caching directives to the static resources so that the browser
doesn't ask about them all the time.
By default, Debian apache doesn't have the required module (mod_expires)
enabled, and so this patch will have no effect. In order to enable this
function, run:
a2enmod expires
and restart apache.
Test Plan:
* Using firebug or equivalent, load a page.
* Note that none of the images, css, or js files have a Cache-Control or
Expires header set.
* Add this patch, redeploy the package with it (or overwrite the
apache-share.conf file) enable the 'expires' module, restart apache.
* Force-reload the page
* Note that the images, css, js now have Cache-Control and Expires set
for 12 hours into the future.
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
(cherry picked from commit be905428722522f1ace4e99d13ffcb5d11f65657)
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
(cherry picked from commit 6b94a9a3406f7c1b58a88b54c598ad617b84ee52)
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
(cherry picked from commit 6b94a9a3406f7c1b58a88b54c598ad617b84ee52)
commit e9fc5c04e75f1444fdb26d2fc2228605b82f5807
Author: Colin Campbell <colin.campbell at ptfs-europe.com>
Date: Tue Jul 9 11:18:49 2013 +0100
Bug 10507: improve warning about duplicate patron attribute value
If a warning about a duplicated patron attribute is returned,
the value was being passed back for display in the warning
message with the same name as the variable in errors
As the message is displayed in the context of errors
the error value 1 was being displayed not the value
duplicated as intended.
Pass the value to the template with a unique name.
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
I fixed another tiny typo while signing off: "is already in use" instead
of "is already is use."
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Passes koha-qa.pl, works as advertised.
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
(cherry picked from commit 2614e07e1e2e6386b5f91e65f127940072e54d4d)
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
(cherry picked from commit b3bf4592a534a5c9824bdd54c6c0b354c3d34f61)
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
(cherry picked from commit b3bf4592a534a5c9824bdd54c6c0b354c3d34f61)
commit d4a14ce46090a1fd309b3bd1fef52c80c62dbe90
Author: Owen Leonard <oleonard at myacpl.org>
Date: Tue Jun 25 12:46:04 2013 -0400
Bug 10475 - Item form in acquisition not hiding subfields properly
Subfields hidden in your ACQ framework leave a gap where they used to
be in the item entry form when adding an item to an order. This patch
makes the same change made by 7116 to services/itemrecorddisplay.tt to
correct the problem.
To test:
- Edit your ACQ framework and set some item subfields to hidden in the
editor.
- Set your AcqCreateItem system preference to "when placing an order."
- Add a title to an existing basket from an existing record.
The item entry form should display correctly with your hidden subfields
hidden. No whitespace should be left behind where the subfields were
hidden.
Also changed: Invalid "size" attributes on hidden form fields in
neworderempty.tt, stray </li>.
Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
Works nicely, passes all tests and QA script.
Thx Owen!
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
(cherry picked from commit 5e1f8caf609aa58eabf6f353d12ec25e0e8e23a0)
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
(cherry picked from commit db3ae2c96dade62540cf66f066fc5faca73fa69b)
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
(cherry picked from commit db3ae2c96dade62540cf66f066fc5faca73fa69b)
commit d930e973119e28de9ce15b2633c73cbcccc44e76
Author: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
Date: Sun Aug 4 12:07:55 2013 -0300
Bug 10490: DBRev 3.10.09.003
Uppdate database number
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
commit 2727ca9512ad9e06fbba9a3c299dbdd78289da7c
Author: Katrin Fischer <Katrin.Fischer.83 at web.de>
Date: Mon Jul 1 21:58:57 2013 +0200
Bug 10490: Overdue fines cap can't store decimal values
When overduefinescap was added to the issuingrules the datatype
given was decimal. This translates in MySQL to decimal(10,0).
This doesn't allow you to store decimal values and therefore
values like 4.5 are saved as 5 in the database.
To test:
On a current installation:
1) Try to enter 4.5 as Overdue fines cap. Verify that the value
is not correctly saved.
2) Apply patch and run database update.
3) Try adding/changing an issuing rule setting Overdue fines cap
to 4.5 again.
4) Verify the value is saved correctly.
Create a new Koha installation from scratch:
1) Verify that the issuingrules table has been created correctly
and that you can add/mofidy issuingrules correctly.
Because this bug can create data loss, the old database update
has also been changed to avoid this problem for people updating
at a later point in time. Checkout an older version of Koha
pre 3.09.00.027.
1) Run the database updates.
2) Verify again, that adding/modifying issuingrules works correctly.
Signed-off-by: Srdjan <srdjan at catalyst.net.nz>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
(cherry picked from commit 16c57940441aac62c1c90538f3c7b7cd386e6d92)
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
(cherry picked from commit 47df7c9641321b70cd132790d4cfeab500bc34be)
Conflicts:
installer/data/mysql/updatedatabase.pl
Solved
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
(cherry picked from commit 47df7c9641321b70cd132790d4cfeab500bc34be)
commit 4cae5281851983d59fb6a463aebc868398e6f2ba
Author: Galen Charlton <gmc at esilibrary.com>
Date: Fri Jul 12 14:57:11 2013 +0000
Bug 10560: add regression test
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
(cherry picked from commit e2bb7af21666ca61f65fb3163d8449823f5cab4b)
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
(cherry picked from commit a8ed0e52c65f3fed53108fc1cbe9b860e63f98b5)
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
(cherry picked from commit a8ed0e52c65f3fed53108fc1cbe9b860e63f98b5)
commit e510a73acf53f76f73168466ee80f5f98d2c8e82
Author: Robin Sheat <robin at catalyst.net.nz>
Date: Fri Nov 30 15:48:50 2012 +1300
Bug 10560: make it possible for default interface language to not be English
If you enable another translation, and disable English, then if you dont
have a cookie set, or your browser is not set to that language, you will
get English. So you can not disable English in either the staff client
or the OPAC.
This patch fixes the language selection to do the right thing.
To test you must have at least one other language installed besides
English. Apply the patch and disable the en translation. Koha should
fall back to one of the enabled translations.
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
I added a patch description and test plan, missing from the
original patch.
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
I have tested with various combinations of activated languages
and have found no regression. If the cookie is set, the right
language is shown accordingly. Else the first language in the
list seems to be picked. It did never fall back to English
in my tests, when English was explicitly deactivated.
Passes all tests and QA script.
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
(cherry picked from commit 38f596d48e19c8f7890caea7a6eb59b6174cf5fa)
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
Works as advertised.
(cherry picked from commit 8f0ce3c1a0e43e6fb8b7bae56e4d658bfc315631)
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
(cherry picked from commit 8f0ce3c1a0e43e6fb8b7bae56e4d658bfc315631)
commit 58f7b60bf3d718a9d76e87632086adbc734a1117
Author: Fridolyn SOMERS <fridolyn.somers at biblibre.com>
Date: Wed Jul 3 14:24:23 2013 +0200
Bug 10535: by default sort funds by name
In parcels.pl, and other acquisition pages, the funds are not sorted
by name in combo-box. With a great number of funds, it is difficult
to find one.
This patch adds a default value to $orderby arg of C4::Budgets::GetBudgets.
Test plan :
- Create a new fund with a name beginning with 'z' and set you as owner.
- Create a new fund with a name beginning with 'a' and set you as owner.
- Go to a vendor and click "Receive shipments"
- Look at fund combobox
=> Funds are sorted by name
Signed-off-by: Silvia Simonetti <s.simonetti at cineca.it>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
Passes all tests and QA script.
When testing make sure your funds would sort the other way
around when sorting by code instead of description.
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
(cherry picked from commit aa6cdb60a9ab2581ffef08796a349242d3d2ff66)
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
(cherry picked from commit f56768adba9fb1d39861e04796fac2be8cfdf914)
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
(cherry picked from commit f56768adba9fb1d39861e04796fac2be8cfdf914)
-----------------------------------------------------------------------
Summary of changes:
C4/Budgets.pm | 3 +-
C4/Templates.pm | 4 ++
Makefile.PL | 1 +
about.pl | 4 +-
debian/templates/apache-shared.conf | 7 +++
debian/templates/koha-conf-site.xml.in | 1 +
etc/koha-conf.xml | 1 +
installer/data/mysql/kohastructure.sql | 2 +-
installer/data/mysql/updatedatabase.pl | 8 +++-
.../prog/en/modules/acqui/neworderempty.tt | 31 ++++++------
.../prog/en/modules/members/memberentrygen.tt | 2 +-
.../prog/en/modules/services/itemrecorddisplay.tt | 8 ++-
kohaversion.pl | 2 +-
members/memberentry.pl | 2 +-
t/Templates.t | 51 ++++++++++++++++++++
15 files changed, 101 insertions(+), 26 deletions(-)
create mode 100644 t/Templates.t
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list