[koha-commits] main Koha release repository branch 3.8.x updated. v3.08.13-87-gcdf6e36

[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.8.x has been updated
       via  cdf6e36abebf4cf65df8e6ddd9aee039a43608e6 (commit)
       via  1e9b8dedda519dafeedeb23a6d64c7225d636e7e (commit)
       via  ea007b48e06a42fa699645993a63256ef8e7dbd4 (commit)
      from  1324646ff7bc9a1ae03db0baea9cb45e51f730cc (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 cdf6e36abebf4cf65df8e6ddd9aee039a43608e6
Author: Chris Cormack <chris at bigballofwax.co.nz>
Date:   Sun Jul 7 20:38:55 2013 +1200

    Bug 7143: Updating history and about page
    
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>
    (cherry picked from commit d647090a4ab9b53577c1959dcdb0642a29fcbe6d)
    Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
    (cherry picked from commit 9886445eb8e82788167ec2440dfeddf0a6b3b58d)
    
    Conflicts:
    
    	docs/history.txt
    
    Solved minor conflicts
    
    Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
    (cherry picked from commit 9886445eb8e82788167ec2440dfeddf0a6b3b58d)
    
    Conflicts:
    	docs/history.txt
    
    Signed-off-by: Chris Hall <followingthepath at gmail.com>
    (cherry picked from commit docs/history.txt)

commit 1e9b8dedda519dafeedeb23a6d64c7225d636e7e
Author: Owen Leonard <oleonard at myacpl.org>
Date:   Thu Jul 11 10:28:55 2013 -0400

    Bug 10514: improve visibility of Add item link on new order form
    
    This patch converts the "Add" and "Clear" links
    to the standard "submit/cancel" format inside a fieldset. This gives
    them a little more visual weight.
    
    Based on the changes made by Liz Rea and Jonathan Druart.
    
    To test:
    
    - create a basket
    - add a record to it
    - scroll down - the link to add item and cancel should both be more
      prominent now.
    - Click "Add item" - it should add an item.
    
    Signed-off-by: Liz Rea <liz at catalyst.net.nz>
    I still feel weird about the button, but as two people have said they'd rather have the button, I'm alright with it I guess.
    Really what I want is people to notice it's there and click it at the appropriate time. I hope this will help that issue.
    
    Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
    Passes all tests and QA script.
    Leaves the translation problems, but that needs more work and is
    out of the scope of this bug.
    Tested Add and Update functionality works correctly.
    
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>
    (cherry picked from commit 275f405c8b3920634907e5e1f2ef8ccecf497868)
    Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
    (cherry picked from commit 606a25bc41047291e4b11390b97caf5d9f01ae65)
    Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
    (cherry picked from commit 606a25bc41047291e4b11390b97caf5d9f01ae65)
    Signed-off-by: Chris Hall <followingthepath at gmail.com>
    (cherry picked from commit f3611a8030983e70a154e7b60ba418bae65f0af1)

commit ea007b48e06a42fa699645993a63256ef8e7dbd4
Author: Robin Sheat <robin at catalyst.net.nz>
Date:   Wed Jun 5 17:50:29 2013 +1200

    Bug 10411: add cache control headers for static resources (Debian package)
    
    This adds caching directives to the static resources so that the browser
    doesn't ask about them all the time.
    
    By default, Debian apache doesn't have the required module (mod_expires)
    enabled, and so this patch will have no effect. In order to enable this
    function, run:
    
    a2enmod expires
    
    and restart apache.
    
    Test Plan:
    * Using firebug or equivalent, load a page.
    * Note that none of the images, css, or js files have a Cache-Control or
      Expires header set.
    * Add this patch, redeploy the package with it (or overwrite the
      apache-share.conf file) enable the 'expires' module, restart apache.
    * Force-reload the page
    * Note that the images, css, js now have Cache-Control and Expires set
      for 12 hours into the future.
    
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>
    Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>
    (cherry picked from commit be905428722522f1ace4e99d13ffcb5d11f65657)
    Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
    (cherry picked from commit 6b94a9a3406f7c1b58a88b54c598ad617b84ee52)
    Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
    (cherry picked from commit 6b94a9a3406f7c1b58a88b54c598ad617b84ee52)
    Signed-off-by: Chris Hall <followingthepath at gmail.com>
    (cherry picked from commit 5b93649f79e6011e316055bb48c367f829c3966f)

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

Summary of changes:
 debian/templates/apache-shared.conf              |    7 +++++
 docs/history.txt                                 |   30 +++++++++++++++++++++-
 koha-tmpl/intranet-tmpl/prog/en/js/additem.js    |   15 ++++++----
 koha-tmpl/intranet-tmpl/prog/en/modules/about.tt |    2 +
 4 files changed, 47 insertions(+), 7 deletions(-)


hooks/post-receive
-- 
main Koha release repository