[koha-commits] main Koha release repository branch master updated. v3.20.00-801-gb8c51bf
Git repo owner
gitmaster at git.koha-community.org
Mon Oct 19 17:53:59 CEST 2015
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 b8c51bff2421528d8d01a011816b3c4e34f7a3fe (commit)
via 66a3c1057b1f3a29d37132d755a9df3f4f683e40 (commit)
via 8d4f39fb716784acc8132f80a9c1631a5f8cb37c (commit)
via 4b2b06311eb55d8a1175ee8d5e75eb465866199c (commit)
via 7f0202ab8434eb9865d2357a84c9b28868315ca5 (commit)
via 11b9f584e0985c4e751e7b92df2cbaaa6e6c120b (commit)
via 599a2b47691b29a7a19d673728448ca573a4293d (commit)
via 12b9c3965b374dd3cc2c6362c75b22ee5508d59e (commit)
via 9b029fbc45561930133fbcff5d5215ecfb9e708d (commit)
via 64aa24d5939adb652811816d400040264cacaeaa (commit)
via 12c82427550a4a53e2148d9bf479db3425fef8fd (commit)
via 1b5a3a026732b213181b988f004823bcbc1386a8 (commit)
via c6d0202569146f52898363eda621f771b61cc918 (commit)
from 5a9b8d9359424a3f0316f89348038fbb290e722b (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 b8c51bff2421528d8d01a011816b3c4e34f7a3fe
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date: Mon Oct 19 12:48:36 2015 -0300
Bug 13636: DBRev 3.21.00.036
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
commit 66a3c1057b1f3a29d37132d755a9df3f4f683e40
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Mon Oct 5 09:42:36 2015 +0100
Bug 10363: (follow-up) DB update - change in kohastructure.sql
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
commit 8d4f39fb716784acc8132f80a9c1631a5f8cb37c
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Mon Oct 5 09:38:08 2015 +0100
Bug 13636: Change wording added vs inserted
http://bugs.koha-community.org/show_bug.cgi?id=10363
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
commit 4b2b06311eb55d8a1175ee8d5e75eb465866199c
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Tue Aug 4 14:43:20 2015 +0100
Bug 10363: FIX regression - prevent duplicate
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
commit 7f0202ab8434eb9865d2357a84c9b28868315ca5
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Tue Aug 4 14:24:50 2015 +0100
Bug 10363: FIX rebase conflict error
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
commit 11b9f584e0985c4e751e7b92df2cbaaa6e6c120b
Author: Katrin Fischer <Katrin.Fischer.83 at web.de>
Date: Sun Aug 2 20:34:35 2015 +0200
Bug 10363: QA Follow-up - fixing POD and spelling
We should stick with either AE (authorized) or
BE (authorised) spelling.
Corrected error messages to use authorized.
Also fixed tiny copy & paste error in POD.
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
commit 599a2b47691b29a7a19d673728448ca573a4293d
Author: Tomás Cohen Arazi <tomascohen at theke.io>
Date: Fri Jul 31 12:41:48 2015 -0300
Bug 10363: (QA followup) DB update / atomic update
This patch just moves the DB update code into an atomicupdate file
to avoid nasty merge conflicts.
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
commit 12b9c3965b374dd3cc2c6362c75b22ee5508d59e
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date: Tue Nov 25 09:11:06 2014 +0100
Bug 10363: Fix pod
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
commit 9b029fbc45561930133fbcff5d5215ecfb9e708d
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Mon Nov 24 07:48:02 2014 -0500
Bug 10363: [QA Followup]
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
commit 64aa24d5939adb652811816d400040264cacaeaa
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date: Mon Nov 10 14:11:20 2014 +0100
Bug 10363: Use Koha::AuthorisedValue[s] in the admin page
Now we have packages, we need use them in the pl script.
Test plan:
Verify there are no regression on addind/editing/deleting authorised
values.
Done forget to test the branch limitation.
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
commit 12c82427550a4a53e2148d9bf479db3425fef8fd
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Thu Oct 23 10:46:47 2014 -0400
Bug 10363: There is no package for authorised values.
Test Plan:
1) Apply this patch
2) run updatedatabase.pl
3) prove t/db_dependent/AuthorisedValues.t
Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
commit 1b5a3a026732b213181b988f004823bcbc1386a8
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date: Mon Oct 19 12:42:59 2015 -0300
Bug 13632: (QA followup) remove xt/permissions.t
There's no longer a need for this tests, as their goal was
to make sure en (the basis) was in sync with the translated
files.
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
commit c6d0202569146f52898363eda621f771b61cc918
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Thu Oct 1 12:59:26 2015 -0400
Bug 14937: Expiration date for holds based onReservesMaxPickUpDelay should not require ExpireReservesMaxPickUpDelay
C4::Letters::_parseletter will replace reserves.expirationdate with the
date a hold will be marked as problematic ( holds over ) if both
ReservesMaxPickUpDelay and ExpireReservesMaxPickUpDelay are enabled.
There is no reason this feature needs to rely on
ExpireReservesMaxPickUpDelay as there are many libraries that would like
to send the last day to pick up a hold in notices, but would rather deal
with the expired waiting holds manually rather than have Koha cancel
them automatically.
Test Plan:
1) Apply this patch
2) Set ReservesMaxPickUpDelay to 7
3) Disable ExpireReservesMaxPickUpDelay
4) Add reserves.expirationdate to your HOLD notice
5) Fill a hold for a patron
6) View the message, not that reserves.expirationdate is replaced
with the date the hold will be marked as problematic
Signed-off-by: Karl Holton <kholten at switchinc.org>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
-----------------------------------------------------------------------
Summary of changes:
C4/Letters.pm | 5 +-
Koha.pm | 2 +-
Koha/AuthorisedValue.pm | 177 +++++++++++
Koha/{Holds.pm => AuthorisedValues.pm} | 50 ++-
Koha/Object.pm | 4 +-
Koha/Schema/Result/AuthorisedValuesBranch.pm | 28 +-
admin/authorised_values.pl | 327 ++++++++------------
installer/data/mysql/kohastructure.sql | 4 +-
installer/data/mysql/updatedatabase.pl | 11 +
.../prog/en/modules/admin/authorised_values.tt | 107 ++++---
t/db_dependent/AuthorisedValues.t | 97 ++++++
xt/permissions.t | 141 ---------
12 files changed, 516 insertions(+), 437 deletions(-)
create mode 100644 Koha/AuthorisedValue.pm
copy Koha/{Holds.pm => AuthorisedValues.pm} (50%)
create mode 100644 t/db_dependent/AuthorisedValues.t
delete mode 100755 xt/permissions.t
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list