[koha-commits] main Koha release repository branch master updated. v3.18.00-beta-107-gb141e6d

Git repo owner gitmaster at git.koha-community.org
Wed Nov 26 15:32:43 CET 2014


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  b141e6d42a6ac4ef58a2eaf831d97f32fb5e48c8 (commit)
       via  2cc8e74487aac6d8e091a72ebd398a11efa7ab76 (commit)
       via  f63aaf22429eb77de08e2efa15c9ffe479fadde7 (commit)
       via  6e75899b00d933b63e4d541b329901c70e05964b (commit)
      from  e3fe0bdb316ef2ea901dabc9f97d4dd30dacf3f9 (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 b141e6d42a6ac4ef58a2eaf831d97f32fb5e48c8
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date:   Tue Nov 25 15:04:25 2014 +0100

    Bug 13332: Fix conflict between 5304 and 10860
    
    These 2 bugs are in conflict.
    The first one always join the issue table, the second one join on this
    table too if the OnSiteCheckouts pref is enable.
    So DBI raises an error if the pref is enabled (2 joins on the same
    table).
    
    This patch removes the conditional join.
    
    Test plan:
    Go on a detail record page with items and verify that items are list and
    that the error no more appears in the log file.
    
    Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
    Reproduced the problem, the patch fixes it, no noticeable regression found.
    
    Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
    Works as described, items are visible again.
    Passes tests and QA script.
    
    Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>

commit 2cc8e74487aac6d8e091a72ebd398a11efa7ab76
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date:   Wed Nov 26 12:39:22 2014 +0100

    Bug 9043: Add a wonderful image
    
    This patch adds the missing multiple-select.png image.
    
    Test plan:
    - search the pref 'advsearch'
    - without this patch, you get a 404 error for the image
    - with this patch, you don't get the error but a wonderful image on the
      right of the "multiple" pref
    
    Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>

commit f63aaf22429eb77de08e2efa15c9ffe479fadde7
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date:   Wed Nov 26 09:41:36 2014 +0100

    Bug 13242: Remove warning if no parameter given
    
    Without any parameter, dt_from_string should not raise a warning
    message.
    
    Test plan:
    Verify that the test file t/DateUtils.t displays a warning:
    
      Use of uninitialized value $date_string in pattern match (m//) at
      Koha/DateUtils.pm line 58
    
    if the change in dt_from_string is not applied (manually edit the file).
    
    Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>

commit 6e75899b00d933b63e4d541b329901c70e05964b
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date:   Wed Nov 26 13:39:24 2014 +0100

    Bug 13314: Follow-up for m.de.rooy in .mailmap
    
    Email addresses in git seem to be case sensitive.
    The list of shortlog -ns was good, but git shortlog -e still made a
    difference.
    Additionally, reworded initial comments slightly.
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>

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

Summary of changes:
 .mailmap                                                         |    6 ++++--
 C4/Items.pm                                                      |    5 +----
 Koha/DateUtils.pm                                                |    2 +-
 .../lib/jquery/plugins/multiple-select/multiple-select.png       |  Bin 0 -> 3342 bytes
 t/DateUtils.t                                                    |    5 ++++-
 t/db_dependent/Items.t                                           |    4 +++-
 6 files changed, 13 insertions(+), 9 deletions(-)
 create mode 100644 koha-tmpl/intranet-tmpl/lib/jquery/plugins/multiple-select/multiple-select.png


hooks/post-receive
-- 
main Koha release repository


More information about the koha-commits mailing list