[koha-commits] main Koha release repository branch master updated. v3.14.00-1138-g1df244d
Git repo owner
gitmaster at git.koha-community.org
Mon May 5 05:44:22 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 1df244d5786d020aa9298adeaf5330d261c0f431 (commit)
via 2bd3aaa58e7b45a0e38344a66bc7be3a0f2f8236 (commit)
via 3070650200a80de23a4744da1b5490f98c6e36e2 (commit)
via a1febe1c1e714be1a9355f9d520ba39a02a9622a (commit)
via 179a7f8d767c7a042bc0c91f97ee979115b40259 (commit)
from 19131a9d8ee85dd28033856d02f8573625ce74f8 (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 1df244d5786d020aa9298adeaf5330d261c0f431
Author: Galen Charlton <gmc at esilibrary.com>
Date: Mon May 5 04:08:34 2014 +0000
Bug 8952: (follow-up) apply link change for social networks to Bootstrap theme
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
commit 2bd3aaa58e7b45a0e38344a66bc7be3a0f2f8236
Author: Galen Charlton <gmc at esilibrary.com>
Date: Mon May 5 04:03:26 2014 +0000
Bug 8952: (follow-up) remove hard-coded LFTL ID added by a previous patch
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
commit 3070650200a80de23a4744da1b5490f98c6e36e2
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date: Thu May 23 17:28:25 2013 +0200
Bug 8952: (follow-up) using_https does not deal with Plack
When using Plack, the https method returns 'OFF'.
We have to test this value before sending the value to templates.
Test plan:
1/ Fill your OPACBaseUrl
2/ Configure apache for using http
3/ Check the social networks links (should be http://OPACBaseUrl)
4/ Launch Plack
5/ Check the social networks link (should be http://OPACBaseUrl)
6/ Stop Plack
7/ Configure apache for using https
sudo openssl req -x509 -nodes -days 365 -newkey rsa:1024 -out
/etc/apache2/server.crt -keyout /etc/apache2/server.key
and add in you virtualhost (with :443)
SSLEngine on
SSLCertificateFile /etc/apache2/server.crt
SSLCertificateKeyFile /etc/apache2/server.key
a2enmod ssl
service apache2 restart
8/ Check the social networks links (should be https://OPACBaseUrl)
FIXME: Under Plack, with ssl actived, the CGI->https() method always
returns 'OFF'.
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
commit a1febe1c1e714be1a9355f9d520ba39a02a9622a
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date: Thu Oct 25 09:29:28 2012 +0200
Bug 8952: (follow-up) change occurrences of using_https
Signed-off-by: Corey Fuimaono <agent.075 at gmail.com>
Verified.
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
commit 179a7f8d767c7a042bc0c91f97ee979115b40259
Author: Owen Leonard <oleonard at myacpl.org>
Date: Wed Oct 24 12:30:33 2012 -0400
Bug 8952: Add http:// to url in social media links on opac-detail
This patch adds a variable to the template, "protocol" based on
whether "using_https" is set. The appropriate protocol is
inserted before social media links.
To test, confirm that OPACBaseURL is set and lacks "http(s)://"
Social media links should include correct URLs.
A follow-up patch could copy use of this [% protocol %] variable
in other parts of this template which duplicate large chunks of
HTML based on [% using_https %].
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
-----------------------------------------------------------------------
Summary of changes:
C4/Auth.pm | 8 +-
.../opac-tmpl/bootstrap/en/modules/opac-detail.tt | 17 +++--
koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tt | 78 +++++++-------------
3 files changed, 46 insertions(+), 57 deletions(-)
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list