From: Joey Hess Date: Thu, 2 Dec 2010 00:36:07 +0000 (-0400) Subject: Merge branch 'bugfix' X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=017f335aff7df37d0a22f11f45fec05c5e446826;p=ikiwiki.git Merge branch 'bugfix' --- 017f335aff7df37d0a22f11f45fec05c5e446826 diff --cc debian/changelog index 33c2d3d07,cecf61d5e..ec85743a7 --- a/debian/changelog +++ b/debian/changelog @@@ -1,20 -1,11 +1,28 @@@ + ikiwiki (3.20101201) unstable; urgency=low + + * meta: Fix calling of htmlscrubber to pass the page parameter. + The change of the htmlscrubber to look at page rather than destpage + caused htmlscrubber_skip to not work for meta directives. + + -- Joey Hess Wed, 01 Dec 2010 20:28:01 -0400 + +ikiwiki (3.20101130) UNRELEASED; urgency=low + + * Better support for serving the same site on multiple urls. (Such as + a http and a https url, or a ipv4 and an ipv6 url.) + (Thanks, smcv) + * API: urlto without a defined second parameter now generates an url + that starts with "/" (when possible; eg when the site's url and cgiurl + are on the same domain). + * Now when users log in via https, ikiwiki sends a secure cookie, that can + only be used over https. If the user switches to using http, they will + need to re-login. (smcv) + * meta: Fix calling of htmlscrubber to pass the page parameter. + The change of the htmlscrubber to look at page rather than destpage + caused htmlscrubber_skip to not work for meta directives. + + -- Joey Hess Mon, 29 Nov 2010 14:44:13 -0400 + ikiwiki (3.20101129) unstable; urgency=low * websetup: Fix encoding problem when restoring old setup file.