[koha-commits] main Koha release repository branch master updated. v3.18.00-173-g0f406a8

Wed Jan 14 16:37:40 CET 2015

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, master has been updated
       via  0f406a840a09b381dc12a4e9704846b126b0c214 (commit)
       via  28513edb943c255b191c94e0fbc0fe14368e6985 (commit)
       via  76f4723ba655ae9131f6b09299a040e1a31adaec (commit)
       via  9cf3a2276527585bafe7b903b6d5acabe77c4f7a (commit)
       via  178e51cad7ad216d560aa2d203778f4683e89f85 (commit)
       via  29ebdc3ad5baf6e2d1d9a40118175e399ccd2517 (commit)
       via  f831176787916bfdd79592d7df2d2578004a07b9 (commit)
      from  544520d6bdfacada4eba4caefedf42864db4b3a0 (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 0f406a840a09b381dc12a4e9704846b126b0c214
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date:   Wed Aug 20 13:42:35 2014 +0200

    Bug 12792: C4::Reserves breaks my vim syntax color

    C4/Reserves.pm is unreadable with my vim configuration.
    It appears I am the only one having this problem.
    For an incomprehensible reason, a string constructs with
      qq/my string/;
    completely breaks the syntax color for all the rest of the file (~2300l).
    If I replace it with
      qq{my string};
    all is fine!

    Test plan:
    launch
      git show HEAD
    and verify this patch won't break anything.

    Additionally, prove t/db_dependent/Reserves.t
    This will trigger the three functions that were modified.
    The prove currently fails on test 8, but the other succeeding
    tests prove that this change is fine.

    Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
    Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
    All tests pass on my installation.
    No problems found.

    Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>

commit 28513edb943c255b191c94e0fbc0fe14368e6985
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date:   Mon Dec 8 07:39:35 2014 -0500

    Bug 13408: Tell librarians they may continue scanning while checkouts table is loading

    Some librarians do not realize they can continue scanning items even if
    the checkouts table has not loaded. We should have Koha tell them
    explicitly that they may continue scanning barcodes.

    Test Plan:
    1) Apply this patch
    2) Load the checkouts table on circulation.pl, note the loading message is now
       Loading... you may continue scanning.
    3) Load the checkouts table on moremember.pl, note the loading message is still
       Loading...

    Signed-off-by: Owen Leonard <oleonard at myacpl.org>

    This one works too!

    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>

commit 76f4723ba655ae9131f6b09299a040e1a31adaec
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>

commit 9cf3a2276527585bafe7b903b6d5acabe77c4f7a
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>

commit 178e51cad7ad216d560aa2d203778f4683e89f85
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>

commit 29ebdc3ad5baf6e2d1d9a40118175e399ccd2517
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>

commit f831176787916bfdd79592d7df2d2578004a07b9
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>

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

Summary of changes:
 C4/Reserves.pm                                     |   28 ++++----
 about.pl                                           |    2 +-
 .../data/mysql/de-DE/mandatory/userpermissions.sql |    2 +-
 koha-tmpl/intranet-tmpl/prog/en/js/checkouts.js    |    1 +
 .../prog/en/modules/circ/circulation.tt            |    1 +
 misc/migration_tools/bulkmarcimport.pl             |    2 +-
 t/db_dependent/www/history.t                       |   67 ++++++++++++++++++++
 7 files changed, 86 insertions(+), 17 deletions(-)
 create mode 100644 t/db_dependent/www/history.t

hooks/post-receive
-- 
main Koha release repository