[koha-commits] main Koha release repository branch 18.11.x updated. v18.11.06-24-g2aa3360

[Git repo owner]

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  2aa3360ec6ccb90f34dfd58dea7c9fac1601b875 (commit)
       via  827e60e3d864461fe87877b7b0ccb7a4315818b4 (commit)
      from  132f143a9ddef1369bae07235e9151a4e6977f2b (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 2aa3360ec6ccb90f34dfd58dea7c9fac1601b875
Author: Katrin Fischer <katrin.fischer.83 at web.de>
Date:   Thu Sep 27 19:49:27 2018 +0200

    Bug 20986: (follow-up) Avoid br tags, but allow for line breaks to be added easily with CSS
    
    This patch removes the br tags from the XSLT in favor of some more
    spans and classes.
    
    This will allow to add the line breaks with one line of CSS:
    span.holdings_note_data { display:block; }
    
    Signed-off-by: Liz Rea <wizzyrea at gmail.com>
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
    (cherry picked from commit 65de22a6ef928bd6074e9a4d6a1e1351d0e1de9b)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
    (cherry picked from commit 2900debc65318237ee95fa6c5dbbbd69c8a7e6c4)
    
    Signed-off-by: Lucas Gass <lucas at bywatersolutions.com>

commit 827e60e3d864461fe87877b7b0ccb7a4315818b4
Author: Joy Nelson <joy at bywatersolutions.com>
Date:   Fri Jun 22 15:22:40 2018 -0700

    Bug 20986: Add 867 and 868 holdings display
    
    Add line breaks in the 866 Holdings display in the OPAC details and Staff details page.  Add 867 and 868 textual holdings with line breaks in the OPAC and Staff details display.
    
    Signed-off-by: Ed Veal <eveal at mckinneytexas.org>
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    Signed-off-by: Liz Rea <wizzyrea at gmail.com>
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
    (cherry picked from commit c23276324c4da519130f35cb7c471402965b3e1b)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
    (cherry picked from commit fb362dfd795080a6bcb547e5bc1d87d18bc7ffdf)
    
    Signed-off-by: Lucas Gass <lucas at bywatersolutions.com>

-----------------------------------------------------------------------

Summary of changes:
 .../prog/en/xslt/MARC21slim2intranetDetail.xsl     |   41 +++++++++++++++++---
 .../bootstrap/en/xslt/MARC21slim2OPACDetail.xsl    |   40 ++++++++++++++++---
 2 files changed, 71 insertions(+), 10 deletions(-)


hooks/post-receive
-- 
main Koha release repository