[koha-commits] main Koha release repository branch 19.05.x updated. v19.05.10-97-g8d1412aff4
Git repo owner
gitmaster at git.koha-community.org
Fri May 15 22:26:40 CEST 2020
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, 19.05.x has been updated
via 8d1412aff4fb880018c3081cc00d9707df2cc635 (commit)
via 26e550332e2af0e41656a6ec2634d21aaf1db3d8 (commit)
via 7ba8d1752a8950556dd774c397bbaf3a1176ef89 (commit)
via 6733535c52320679d517d88fabc71e74792beddf (commit)
from c8da8f1b64776134402d76100e2b88c424283541 (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 8d1412aff4fb880018c3081cc00d9707df2cc635
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Mon May 4 11:33:11 2020 +0000
Bug 25133: (follow-up) Move changes to timepicker.inc
Witht the changes in calendar.inc there can be a js error where the timepicker is not
included. Moving the changes to timepicker.inc should resolve this
Note: in previous patches the amnames/pmnames were removed. It is possible they had
no effect because they were declared in two files, so I have left them in timepicker.inc
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Joy Nelson <joy at bywatersolutions.com>
(cherry picked from commit f5c7e3fd76f3d08b7b7ed2090f4d822bd3f2e3de)
Signed-off-by: Lucas Gass <lucas at bywatersolutions.com>
commit 26e550332e2af0e41656a6ec2634d21aaf1db3d8
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Tue Apr 21 12:06:09 2020 +0000
Bug 25133: (follow-up) Remove Names as they do no affect display
In testing I couldn't make any changes to the names have an effect
and everythign worked as expected without these lines
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Kelly McElligott <kelly at bywatersolutions.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Joy Nelson <joy at bywatersolutions.com>
(cherry picked from commit 7202498771468b9263474e1255039e3845da64c0)
Signed-off-by: Lucas Gass <lucas at bywatersolutions.com>
commit 7ba8d1752a8950556dd774c397bbaf3a1176ef89
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Mon Apr 20 10:59:55 2020 +0200
Bug 25133: Handle 12hr format for dt_from_string
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Kelly McElligott <kelly at bywatersolutions.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Joy Nelson <joy at bywatersolutions.com>
(cherry picked from commit 1adb28bc23b11e4c11b97f0524b829e840c70a74)
Signed-off-by: Lucas Gass <lucas at bywatersolutions.com>
commit 6733535c52320679d517d88fabc71e74792beddf
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Fri Apr 17 12:11:25 2020 +0200
Bug 25133: Fix time part of due date for 12hr
With Timeformat system preference set to 12 hours format:
Prior to 19.05.08, when due date was specified at checkout,
the time in the box would show in 24hr format (e.g. 15:59)
while the due date in the patron's checkouts would show
in 12hr format (e.g. 3:59 PM).
After 19.05.08, the format in the specify a due date box
shows in 24hr format and the due date in 12hr format
(in patron checkouts) as before.
But when checking out multiple items using the specify due
date option for the session, the time changes from PM to
AM.
To test:
- Check out an item with specified due date 15:50 PM
- Check out a second item in same transaction
- Verify date changed to AM
- Apply patch
- Repeat
- Verify this time the date is kept as set
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Kelly McElligott <kelly at bywatersolutions.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Joy Nelson <joy at bywatersolutions.com>
(cherry picked from commit 1973003eaafd4cc7f7040cc66f946751eb2bacc3)
Signed-off-by: Lucas Gass <lucas at bywatersolutions.com>
-----------------------------------------------------------------------
Summary of changes:
Koha/DateUtils.pm | 9 +++++++++
circ/circulation.pl | 2 +-
koha-tmpl/intranet-tmpl/prog/en/includes/timepicker.inc | 1 +
koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt | 8 ++++++++
t/DateUtils.t | 13 ++++++++++++-
5 files changed, 31 insertions(+), 2 deletions(-)
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list