[koha-commits] main Koha release repository branch 3.18.x updated. v3.18.02-81-gc1cf327

[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  c1cf3270fc6fa8a82d50d498f2a5b377321cb291 (commit)
       via  bc81f5f3b77e10ff81346175746749502829a435 (commit)
       via  57389536c70b31897dba2639d1464c5053bafecc (commit)
       via  ca8d6b4827b3803cc843ea68a1c8698cfc84f543 (commit)
       via  819562fd181f57ddd41456a1badc3315eae09e12 (commit)
      from  d1a129ab4734322bb864d66402c2d59e1771c002 (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 c1cf3270fc6fa8a82d50d498f2a5b377321cb291
Author: Marc Véron <veron at veron.ch>
Date:   Tue Jan 13 05:42:02 2015 +0100

    Bug 13566 - Change translation for 'Rotating collection' in German web installer
    
    This page changes 'Wanderned Sammlungen verwalten' to 'Rotationsbestände verwalten'
    
    Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
    Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
    (cherry picked from commit 76f4723ba655ae9131f6b09299a040e1a31adaec)

commit bc81f5f3b77e10ff81346175746749502829a435
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date:   Wed Jan 14 13:47:22 2015 +0100

    Bug 13579: Open history.txt using utf-8 encoding
    
    Test plan:
    Verify about>Timeline is correctly encoded
    
    Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    Replaced <encoding by <:encoding.
    
    Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
    (cherry picked from commit 9cf3a2276527585bafe7b903b6d5acabe77c4f7a)
    Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>

commit 57389536c70b31897dba2639d1464c5053bafecc
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date:   Wed Jan 14 16:08:11 2015 +0100

    Bug 13579: Prefer like instead of ok to match a regex
    
    Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
    (cherry picked from commit 178e51cad7ad216d560aa2d203778f4683e89f85)
    Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>

commit ca8d6b4827b3803cc843ea68a1c8698cfc84f543
Author: Tomas Cohen Arazi <tomascohen at gmail.com>
Date:   Wed Jan 14 11:45:34 2015 -0300

    Bug 13579: (regression tests) Encoding issues on about > timeline get tested
    
    This patch introduces two tests for encoding issues on about > timeline
    
    To test:
    - Apply the patch and run
      $ KOHA_USER=kohaadmin KOHA_PASS=katikoan KOHA_INTRANET_URL=http://koha-dev.biblioadmin prove t/db_dependent/www/history.t
      (adjust to your own settings, the user needs to have access to the about page)
    
    Regards
    
    Signed-off-by: Manuel Cohen Arazi <manuelcohenarazi at gmail.com>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
    (cherry picked from commit 29ebdc3ad5baf6e2d1d9a40118175e399ccd2517)
    Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>

commit 819562fd181f57ddd41456a1badc3315eae09e12
Author: Morag Hills <the.invinnysible.one at gmail.com>
Date:   Tue Jan 13 03:24:36 2015 +0000

    Bug 13530: Typo in bulkmarcimport
    
    GetFrameworkCode was incorrectly spelt as GetFrameworkcode on line 401.
    
    Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
    Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
    (cherry picked from commit f831176787916bfdd79592d7df2d2578004a07b9)
    Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>

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

Summary of changes:
 about.pl                                           |    2 +-
 .../data/mysql/de-DE/mandatory/userpermissions.sql |    2 +-
 misc/migration_tools/bulkmarcimport.pl             |    2 +-
 t/db_dependent/www/history.t                       |   67 ++++++++++++++++++++
 4 files changed, 70 insertions(+), 3 deletions(-)
 create mode 100644 t/db_dependent/www/history.t


hooks/post-receive
-- 
main Koha release repository