[koha-commits] main Koha release repository branch 3.14.x updated. v3.14.06-68-g704d0cf

[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  704d0cf4b21aaca2bd3d21ea5bb2186ae6d3c848 (commit)
       via  3d79aad0a45c3714e597323cd0e804c30ab08325 (commit)
       via  786eba26cde8a1954dc4ed957d9b481c43441c44 (commit)
      from  d93700833b0c816731e2675cc436979358c0081f (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 704d0cf4b21aaca2bd3d21ea5bb2186ae6d3c848
Author: Galen Charlton <gmc at esilibrary.com>
Date:   Mon May 19 16:25:53 2014 +0000

    Bug 12271: (follow-up) fix minor errors in Bootstrap theme
    
    To test:
    
    [1] Verify that prove -v xt/author/valid-templates.t passes.
    
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>
    (cherry picked from commit bafeb881c99142fd3abf507a3c5bcddd2c12932a)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

commit 3d79aad0a45c3714e597323cd0e804c30ab08325
Author: Galen Charlton <gmc at esilibrary.com>
Date:   Mon May 19 16:14:28 2014 +0000

    Bug 12271: (follow-up) teach valid-templates.t how to include specified templates
    
    Two of the template includes in the Bootstrap theme cannot be tested
    all by themselves because they require that the template that includes
    them define BLOCKs.  This patch ensures that they are excluded
    from individual testing; they will get exercised sufficiently by being
    including by all of the other Bootstrap templates.
    
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>
    (cherry picked from commit b97e691ef87bf3fd89f38ba0b1772d8fcac44b33)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

commit 786eba26cde8a1954dc4ed957d9b481c43441c44
Author: Fridolin Somers <fridolin.somers at biblibre.com>
Date:   Fri May 16 11:25:19 2014 +0200

    Bug 12271: add Bootstrap templates to valid-templates.t tests
    
    valid-templates.t actually tests the templates and includes of only
    the "prog" theme at opac and intranet.  It does not test the opac
    templates and includes of bootstrap theme, nor ccsr.  This is critical
    since this test is used for patch integrations in release maintenance.
    
    This patch adds the test of bootstrap opac theme.
    I did not manage to add the ccsr theme since it is not a real theme,
    meaning it has no templates and not all includes.
    
    Test by runnning perl xt/author/valid-templates.t and looking at the
    logs.
    
    Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
    Now there are 902 lines, bootstrap tested (1 error detected!)
    No koha-qa errors
    
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>
    (cherry picked from commit 8bc2fb4df6e14a97c3aa7a62fbacc4bc7cf5772d)
    Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>

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

Summary of changes:
 .../bootstrap/en/modules/opac-results-grouped.tt   |    6 +--
 .../bootstrap/en/modules/search/results.tt         |    3 ++
 xt/author/valid-templates.t                        |   47 +++++++++++++++++---
 3 files changed, 47 insertions(+), 9 deletions(-)


hooks/post-receive
-- 
main Koha release repository