merged localurl branch; changelog

master
Joey Hess 2010-11-29 15:00:22 -04:00
parent 53d466a07f
commit 141dc37d36
2 changed files with 14 additions and 0 deletions

12
debian/changelog vendored
View File

@ -1,3 +1,15 @@
ikiwiki (3.20101130) UNRELEASED; urgency=low
* Better support for serving the same site by both http and https.
Links generated by the CGI will now remain on https if it was accessed
via https.
(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).
-- Joey Hess <joeyh@debian.org> Mon, 29 Nov 2010 14:44:13 -0400
ikiwiki (3.20101129) unstable; urgency=low ikiwiki (3.20101129) unstable; urgency=low
* websetup: Fix encoding problem when restoring old setup file. * websetup: Fix encoding problem when restoring old setup file.

View File

@ -319,3 +319,5 @@ Potential future things:
>> core code (IkiWiki, CGI, Render and the pseudo-core part of editpage) >> core code (IkiWiki, CGI, Render and the pseudo-core part of editpage)
>> and 5 in plugins, since I used it for things like redirection back >> and 5 in plugins, since I used it for things like redirection back
>> to the top of the wiki --[[smcv]] >> to the top of the wiki --[[smcv]]
[[merged|done]] --[[Joey]]