[koha-commits] main Koha release repository branch 3.14.x updated. v3.14.02-13-gc601ee3

[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.14.x has been updated
       via  c601ee306f798d3ba4771fc4520eed53964e358d (commit)
       via  29a4167ee81e1548469510544cfabf706b008b44 (commit)
       via  0d87d93b283adbc2973c5c722c542bb6c1d23045 (commit)
      from  3d0a247567fa6513ae71cef420b296bbe9699e75 (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 c601ee306f798d3ba4771fc4520eed53964e358d
Author: Galen Charlton <gmc at esilibrary.com>
Date:   Thu Dec 19 17:02:19 2013 +0000

    Bug 11179: (follow-up) add comment to item-status.inc
    
    This patch adds a comment to item-status.inc to describe
    the parameters it can accept.
    
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>
    (cherry picked from commit ec7fff647d547c9ff5adadcb4c1cb35bc4ea7baf)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

commit 29a4167ee81e1548469510544cfabf706b008b44
Author: Owen Leonard <oleonard at myacpl.org>
Date:   Thu Nov 14 15:41:02 2013 -0500

    Bug 11179: (follow-up) apply fix to Boostrap theme
    
    This follow-up applies the same fix to the Bootstrap theme. This patch
    also includes the changes to item-status.inc in the Bootstrap theme
    which were made to the prog theme in Bug 10820: display item status as
    lost if item is both lost and on loan.
    
    Signed-off-by: Liz Rea <liz at catalyst.net.nz>
    Bootstrap theme looking so nice. Also the patch works.
    
    Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>
    (cherry picked from commit 78b73c3fffc6f5125a688e91582da92287fbbef2)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
    
    Conflicts:
    	koha-tmpl/opac-tmpl/bootstrap/en/includes/item-status.inc

commit 0d87d93b283adbc2973c5c722c542bb6c1d23045
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date:   Thu Oct 31 14:27:30 2013 -0400

    Bug 11179: make OPAC course details page display status of checked out items correctly
    
    If an item is listed for a course and is checked out, the item will
    still show as being available from the course details page which lists
    all the items that are part of a course. This is due to the way the
    course reserves system handles items and issues separately, while
    item-status.inc assumes the due date has been embedded in items.datedue
    
    Test Plan:
    1) Create a course
    2) Add an item to that course
    3) Check the item out to a patron
    4) View the course details from the opac
    5) Note the status says "Available"
    6) Apply this patch
    7) Repeat step 4
    8) Note the status no longer says "Available"
    
    Signed-off-by: Owen Leonard <oleonard at myacpl.org>
    Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>
    (cherry picked from commit dc5e4e5b631116ce7ce16143ba56c5eb0385d986)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

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

Summary of changes:
 .../bootstrap/en/includes/item-status.inc          |   31 ++++++++++++--------
 .../bootstrap/en/modules/opac-course-details.tt    |    2 +-
 .../opac-tmpl/prog/en/includes/item-status.inc     |    9 +++++-
 .../prog/en/modules/opac-course-details.tt         |    2 +-
 4 files changed, 29 insertions(+), 15 deletions(-)


hooks/post-receive
-- 
main Koha release repository