[koha-commits] main Koha release repository branch 18.11.x updated. v18.11.01-21-g965d86e
Git repo owner
gitmaster at git.koha-community.org
Mon Jan 7 16:57:54 CET 2019
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, 18.11.x has been updated
via 965d86ecf804f4e761282ece8994e492e8084f0a (commit)
via 8e73dc678ff8e5b902f1cbbf97fe9eec1b305c8b (commit)
via 1f5aa58a2ce0b6f1bf076a50cbbd2f728b47d0e1 (commit)
via 270138aa678e858b835f65f5533e6b182e07ac76 (commit)
via 5a255af085c126a5b7610a08ed6153e1cfc3087c (commit)
via bfe255f8619996749b3996d96fc747862a637aa0 (commit)
via dbb15a2c977890f0f57d6ef12091ef1ce571bf40 (commit)
via b6cf429827da2c8ca0e8d0827e85355a8ae9b5de (commit)
from 25a22f2e639d368cff4813043130e29e53ab6940 (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 965d86ecf804f4e761282ece8994e492e8084f0a
Author: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Date: Mon Jan 7 15:41:32 2019 +0000
Bug 21802: Compiled CSS
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 8e73dc678ff8e5b902f1cbbf97fe9eec1b305c8b
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Sun Dec 16 12:58:14 2018 -0300
Bug 21802: Align fieldset with accordion headers when editing notice's template
Test plan:
Regenerate the css using `yarn css`
Edit a notice's template and confirm that the fieldsets are aligned with
the accordion headers
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
(cherry picked from commit 0a68a662ee4b7b2aebdb313ee33f9d9ca54e2c22)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 1f5aa58a2ce0b6f1bf076a50cbbd2f728b47d0e1
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Wed Dec 12 12:22:47 2018 -0300
Bug 21990: Replace dialog .error with .alert
<div class="dialog error"> will display a div without background color, the correct class is "dialog alert".
https://wiki.koha-community.org/wiki/Interface_patterns#Error_messages
Test plan:
Hit /cgi-bin/koha/acqui/parcel.pl
Notice the background color change with and without this patch
Signed-off-by: Pierre-Marc Thibault <pierre-marc.thibault at inLibro.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
(cherry picked from commit d44a42e417b563f501f038cc5226eda0f5fb3ca5)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 270138aa678e858b835f65f5533e6b182e07ac76
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Thu Dec 20 19:55:46 2018 -0300
Bug 22034: Handle default framework for MARC view with framework
To test:
- Create a record in any framework that is not default
- Search for the record in your catalog
- Switch to the MARC tab
- Change framework pull down to default on top
- Note the page reloads and the framework stay default
- Verify it works for other frameworks
Also test the "labeled MARC" view (you will need the pref viewLabeledMARC turned on)
Signed-off-by: Nazlı Çetin <nazli at devinim.com.tr>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
(cherry picked from commit 54e295e4c14e3d2b3959e3185a54447a9b90d945)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 5a255af085c126a5b7610a08ed6153e1cfc3087c
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Fri Dec 14 17:34:59 2018 -0300
Bug 22007: Generated with add_missing_filters.pl
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
(cherry picked from commit 464bf007d60bb647ce3dda183134363962c76209)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit bfe255f8619996749b3996d96fc747862a637aa0
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Fri Dec 14 17:34:52 2018 -0300
Bug 22007: Also handle Price and HtmlTags
Those 2 filters should return safe output as well
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
(cherry picked from commit a8fa74ab02d037d059e4bf78b74232aeba219212)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit dbb15a2c977890f0f57d6ef12091ef1ce571bf40
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Fri Dec 14 17:29:18 2018 -0300
Bug 22007: Handle safe filtered output (KohaDates)
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
(cherry picked from commit 912fb42458a422248986c74fd8a1fd92df531fb5)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit b6cf429827da2c8ca0e8d0827e85355a8ae9b5de
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Fri Dec 14 17:20:52 2018 -0300
Bug 22007: Remove html filters when KohaDates called with a parameter
Bug 13618 took care of the KohaDates output but not if it is called
with a parameter (eg. [% var | $KohaDates with_hours => 1 %]).
We could avoid unnecessary processing by removing the extra html filter.
Patch generated with the following command:
% perl -p -i -e 's/KohaDates([^%\|]*)\s?\|\s?html\s?/KohaDates $1/g' **/*.inc **/*.tt
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
(cherry picked from commit 5d49ea039c981ee73085c70b326ea47c29bee0ba)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
-----------------------------------------------------------------------
Summary of changes:
catalogue/MARCdetail.pl | 3 +-
catalogue/labeledMARCdetail.pl | 3 +-
.../intranet-tmpl/prog/css/src/staff-global.scss | 2 +-
koha-tmpl/intranet-tmpl/prog/css/staff-global.css | 2 +-
koha-tmpl/intranet-tmpl/prog/en/modules/about.tt | 2 +-
.../prog/en/modules/acqui/addorderiso2709.tt | 4 +-
.../intranet-tmpl/prog/en/modules/acqui/basket.tt | 24 +++++------
.../prog/en/modules/acqui/lateorders.tt | 2 +-
.../prog/en/modules/acqui/orderreceive.tt | 4 +-
.../intranet-tmpl/prog/en/modules/acqui/parcel.tt | 4 +-
.../prog/en/modules/admin/aqbudgetperiods.tt | 2 +-
.../prog/en/modules/admin/aqbudgets.tt | 4 +-
.../prog/en/modules/admin/categories.tt | 4 +-
.../prog/en/modules/catalogue/issuehistory.tt | 8 ++--
.../prog/en/modules/catalogue/search-history.tt | 8 ++--
.../prog/en/modules/circ/bookcount.tt | 2 +-
.../prog/en/modules/circ/circulation.tt | 2 +-
.../prog/en/modules/ill/ill-requests.tt | 4 +-
.../prog/en/modules/members/accountline-details.tt | 4 +-
.../prog/en/modules/members/moremember-print.tt | 2 +-
.../prog/en/modules/members/notices.tt | 2 +-
.../prog/en/modules/members/paycollect.tt | 2 +-
.../prog/en/modules/members/readingrec.tt | 8 ++--
.../en/modules/reports/guided_reports_start.tt | 4 +-
.../prog/en/modules/reserve/request.tt | 2 +-
.../prog/en/modules/tools/batch_delete_records.tt | 2 +-
koha-tmpl/opac-tmpl/bootstrap/css/opac.css | 2 +-
.../bootstrap/en/modules/opac-course-details.tt | 2 +-
.../opac-tmpl/bootstrap/en/modules/opac-detail.tt | 2 +-
.../opac-tmpl/bootstrap/en/modules/opac-main.tt | 2 +-
.../bootstrap/en/modules/opac-memberentry.tt | 2 +-
.../bootstrap/en/modules/opac-search-history.tt | 8 ++--
.../opac-tmpl/bootstrap/en/modules/opac-user.tt | 6 +--
.../opac-tmpl/bootstrap/en/modules/sco/sco-main.tt | 4 +-
t/LangInstaller/templates/simple.tt | 1 +
t/lib/QA/TemplateFilters.pm | 24 +++++++++--
t/template_filters.t | 45 +++++++++++++++++++-
37 files changed, 134 insertions(+), 74 deletions(-)
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list