[koha-commits] main Koha release repository branch master updated. v3.14.00-1132-g41db1ee
Git repo owner
gitmaster at git.koha-community.org
Mon May 5 05:07:16 CEST 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 41db1ee32f1d89f5d677eec2df05f2050a01e191 (commit)
via 54ada7d0697e01987a0ac6db494e8516bc8c58fe (commit)
via 3f2300e13296e5fbb887ea0806f00920fba3db5e (commit)
from da08f65e11fbd33ad6a572a1234d031efd2a3647 (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 41db1ee32f1d89f5d677eec2df05f2050a01e191
Author: Liz Rea <liz at catalyst.net.nz>
Date: Wed Dec 4 09:52:19 2013 +1300
Bug 10944: follow-up for Bootstrap Amazon images on https OPAC
see test plan for previous patch, only bootstrap theme instead of prog. :)
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
commit 54ada7d0697e01987a0ac6db494e8516bc8c58fe
Author: Robin Sheat <robin at catalyst.net.nz>
Date: Fri Oct 4 16:13:20 2013 +1300
Bug 10944: fix mixed content warnings for covers on staff client
This switches the URLs used to access Amazon's cover images to the
SSL image server, preventing warnings when using this on a secure
site.
To test:
* Enable Amazon images in the sysprefs, all other cover images off.
* Do a search in the staff client. Using firebug or similar, inspect the
images that indicate both "no image found" and the covers.
* Are they all https, and showing correctly?
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
commit 3f2300e13296e5fbb887ea0806f00920fba3db5e
Author: Liz Rea <liz at catalyst.net.nz>
Date: Wed Sep 25 14:50:24 2013 +1200
Bug 10944: fix mixed content warnings in opac results and detail with Amazon images on https
It's probably going to become more popular to run Koha in SSL
environments.
Currently on SSL, with Amazon images enabled, a SSL enabled site
will either not show Amazon images (IE, some versions of Firefox?),
or show a warning to users about mixed secure and insecure content
(Firefox, Chrome).
Since we now have the using_https template variable, it makes sense
to use it.
To test:
In each browser you have access to, and preferably with SSL set up
(you can set up a self signed cert for your dev install by following,
more or less, the instructions here:
https://wiki.debian.org/Self-Signed_Certificate)
For the apache config, just copy the one for the OPAC, but set it to
use 443 instead of 80 for the port, and point it to your keys per the
instructions above.
** note that using a self signed cert on your dev install will prompt
you when you connect the first time that OMG I CAN'T VERIFY THIS IS
COOL. You did it yourself, if you can't trust yourself... then who can
you trust?
* Enable Amazon images in the system preferences
* Do a search that you know will have images for, verify that without
SSL
1. the images show
2. the image source is from an Amazon url that uses http://
3. the images are the right size, and look ok
* Do the same using https, verify that with SSL
1. the images show
2. the image source is from an Amazon url that uses https://
3. the images are the right size, and look ok
Clicking on the image should link to the item on Amazon. This patch
also corrects a problem with the Amazon URL used on the images -
it was pointing to a feature that is currently unavailable. That's
fixed here. All you need to check is that it goes to a valid Amazon
endpoint that doesn't show an error.
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
-----------------------------------------------------------------------
Summary of changes:
.../intranet-tmpl/prog/en/modules/catalogue/detail.tt | 14 +++++++-------
.../intranet-tmpl/prog/en/modules/catalogue/results.tt | 6 +++---
koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt | 9 +++++++--
koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt | 4 ++++
koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tt | 13 ++++++++++++-
koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tt | 2 +-
6 files changed, 34 insertions(+), 14 deletions(-)
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list