[koha-commits] main Koha release repository branch 3.18.x updated. v3.18.06-3-21-g82fc468

[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  82fc4687822d77151abf958ec8322b091613fb0f (commit)
       via  6b8b844e34b1def3a0b9fdd5b93bcbd45e234dbe (commit)
       via  3842d94c045e74b81d637b1b484e737db3767d0b (commit)
      from  a1e96eb64579db710b9365d045926da9ef57f54e (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 82fc4687822d77151abf958ec8322b091613fb0f
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date:   Thu Apr 23 10:30:14 2015 +0200

    Bug 14051: Tiny adjustment of ReturnPathDefault pref description
    
    Adding that Return-Path is bounce address. Note that if it is empty, the From address is used. This could be the admin address, but Koha uses other from addresses too.
    
    Test plan:
    Read the description on the preferences page.
    Check some Koha mails with/without this pref. Note that this patch does not
    change behavior in any way.
    
    Signed-off-by: Marc Veron <veron at veron.ch>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
    (cherry picked from commit 85d7ccb210d62cd5c3642ee0023e12c95180cb60)
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

commit 6b8b844e34b1def3a0b9fdd5b93bcbd45e234dbe
Author: Marc Véron <veron at veron.ch>
Date:   Wed Apr 22 22:09:48 2015 +0200

    Bug 13834: News: Wording not consistent for Publication date / Creation date
    
    This patch replaces column header "Creation date" with "Publication date" in staff client > Home > Tools > News
    (same as the field label in editing form for news).
    
    To test apply patch and verify that column header displays as appropriate.
    
    Signed-off-by: vagrant <eskaaren at yahoo.no>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
    (cherry picked from commit e8eb8ddc1fc3820ab689ba7e7101036b32434d80)
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

commit 3842d94c045e74b81d637b1b484e737db3767d0b
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date:   Wed Apr 15 12:19:42 2015 +0200

    Bug 10174: Add a tooltip to explain what is a digest
    
    The digest term seems to be ambiguous for some people.
    
    This patch adds a tooltip to explain what it is (feel free to provide
    a better wording).
    
    Test plan:
    Go at the OPAC and click on the "Your messaging tab", you should see an
    icon close to "Digest only" to explain what is a digest.
    Same at the intranet on editing/showing patron info
    
    Signed-off-by: Nick Clemens <nick at quecheelibrary.org>
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
    (cherry picked from commit d2dd4ca624aba7e93baab02c8efdc8a29a15a74e)
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>

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

Summary of changes:
 .../prog/en/includes/messaging-preference-form.inc          |    4 +++-
 .../prog/en/modules/admin/preferences/admin.pref            |    2 +-
 koha-tmpl/intranet-tmpl/prog/en/modules/tools/koha-news.tt  |    2 +-
 koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-messaging.tt  |   11 ++++++++++-
 4 files changed, 15 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
main Koha release repository