[koha-commits] main Koha release repository branch 3.18.x updated. v3.18.10-11-ga14cc8f

[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, 3.18.x has been updated
       via  a14cc8fdc8bdcc3b9f7080c047ff85d839559886 (commit)
       via  99cfec30bf9924e7d5cf1a8967cbaa613d7ad357 (commit)
       via  6de2c37a1a09533f0995c2be59df5998b6b51fd8 (commit)
       via  424c49a632b33ed41cdde06d4ca3556510c77a24 (commit)
      from  6eb786648fc01715841b73044ec1cf64c3aa147c (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 a14cc8fdc8bdcc3b9f7080c047ff85d839559886
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date:   Fri Apr 24 10:02:19 2015 +0200

    Bug 11880: Select what has been selected before
    
    The previous patch wants to select the barcode option when the user is
    on the item search for label, in all cases.
    So even if 'title' is selected, a search done, and there is no result,
    the barcode index is selected anyway.
    In this case, the title option should be kept.
    
    Test plan:
    Confirm that the barcode option is the default choice, but other values
    are kept if the search does not return any result.
    
    Followed test plan, behaves as expected. Tested with all choices.
    Signed-off-by: Marc Veron <veron at veron.ch>
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
    (cherry picked from commit 1f0ff90360c21e5e24df9f455681b1bf4ae92031)
    Signed-off-by: Liz Rea <wizzyrea at gmail.com>

commit 99cfec30bf9924e7d5cf1a8967cbaa613d7ad357
Author: Frédérick <frederick.capovilla at libeo.com>
Date:   Fri Feb 28 16:21:46 2014 -0500

    Bug 11880: Select the barcode index by default then searching for label items.
    
    Test case:
    * Go to "Tools -> Label creator -> Manage batches"
    * Click on the "New batch" button
    * Click on the "Add item(s)" button
    * A search window should open. The "Barcode" value should be selected in the the selectbox.
    
    Followed test case. Patch behaves as expected.
    Signed-off-by: Marc Veron <veron at veron.ch>
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
    Signed-off-by: Liz Rea <wizzyrea at gmail.com>

commit 6de2c37a1a09533f0995c2be59df5998b6b51fd8
Author: Joonas Kylmälä <j.kylmala at gmail.com>
Date:   Wed Aug 19 11:00:27 2015 +0000

    Bug 14579: 'You are not logged in' should link to log in page
    
    To test:
    1) Go to any page on the staff client and make sure you are not logged in (ie an error page, cgi-bin/koha/errors/400.pl)
    2) Try click on 'You are not logged in |'
    3) Notice it is not really a link and doesn't take you anywhere
    4) Apply patch
    5) Refresh page
    6) Click on what now says 'Log in |'
    7) Confirm that you are redirected to the intranet log in page
    
    Signed-off-by: Aleisha <aleishaamohia at hotmail.com>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
    Signed-off-by: Liz Rea <wizzyrea at gmail.com>

commit 424c49a632b33ed41cdde06d4ca3556510c77a24
Author: Joonas Kylmälä <j.kylmala at gmail.com>
Date:   Tue Aug 25 07:24:54 2015 +0000

    Bug 14703: Holidays description shows \r\n for every new line
    
    Adds a new line for the holiday's description instead of the string
    \r\n.
    
    Test plan:
    1. In tools -> Calendar look at some holiday's description
       (Do a new holiday with description of multiple lines if
       there is not already)
    2. Notice that there is characters \r\n if someone has put
       a newline in the holiday's description
    3. Apply patch
    4. See that the new lines show there now nicely
    
    Sponsored-by: Vaara-kirjastot
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    Amended slightly: no need to replace title.
    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
    
    Signed-off-by: Liz Rea <wizzyrea at gmail.com>

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

Summary of changes:
 .../intranet-tmpl/prog/en/css/staff-global.css     |    2 +-
 .../intranet-tmpl/prog/en/includes/header.inc      |   19 ++++++++-----
 .../intranet-tmpl/prog/en/modules/labels/search.tt |   28 ++++++++++----------
 .../prog/en/modules/tools/holidays.tt              |    2 +-
 labels/label-item-search.pl                        |    3 ++-
 5 files changed, 31 insertions(+), 23 deletions(-)


hooks/post-receive
-- 
main Koha release repository