[koha-commits] main Koha release repository branch 18.05.x updated. v18.05.07-25-g0363116

[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.05.x has been updated
       via  03631164c5d683c92d4728b416e094994c9fc14a (commit)
       via  2c15a838be5a51b82cb866b261836b7586dfa6a2 (commit)
      from  5f1ed5e86fb295941a49e39d7b7e5c728f9b3627 (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 03631164c5d683c92d4728b416e094994c9fc14a
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>
    (cherry picked from commit 1f5aa58a2ce0b6f1bf076a50cbbd2f728b47d0e1)
    
    Signed-off-by: Jesse Maseto <jesse at bywatersolutions.com>

commit 2c15a838be5a51b82cb866b261836b7586dfa6a2
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>
    (cherry picked from commit 270138aa678e858b835f65f5533e6b182e07ac76)
    
    Signed-off-by: Jesse Maseto <jesse at bywatersolutions.com>

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

Summary of changes:
 catalogue/MARCdetail.pl                                            |    3 +--
 catalogue/labeledMARCdetail.pl                                     |    3 +--
 koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt            |    4 ++--
 .../intranet-tmpl/prog/en/modules/tools/batch_delete_records.tt    |    2 +-
 4 files changed, 5 insertions(+), 7 deletions(-)


hooks/post-receive
-- 
main Koha release repository