summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess <joey@kitenet.net>2010-11-29 15:00:22 -0400
committerJoey Hess <joey@kitenet.net>2010-11-29 15:00:22 -0400
commit141dc37d361107a6607b3ff549f107c26fa700d4 (patch)
treef08a387cbd6bd0e4fb10789b93905a315948cb98
parent53d466a07f542dca86732764ab4f13608d701a1c (diff)
merged localurl branch; changelog
-rw-r--r--debian/changelog12
-rw-r--r--doc/todo/want_to_avoid_ikiwiki_using_http_or_https_in_urls_to_allow_serving_both.mdwn2
2 files changed, 14 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index fd271dab1..ec995a08a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -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
* websetup: Fix encoding problem when restoring old setup file.
diff --git a/doc/todo/want_to_avoid_ikiwiki_using_http_or_https_in_urls_to_allow_serving_both.mdwn b/doc/todo/want_to_avoid_ikiwiki_using_http_or_https_in_urls_to_allow_serving_both.mdwn
index 264eb9688..f7938b061 100644
--- a/doc/todo/want_to_avoid_ikiwiki_using_http_or_https_in_urls_to_allow_serving_both.mdwn
+++ b/doc/todo/want_to_avoid_ikiwiki_using_http_or_https_in_urls_to_allow_serving_both.mdwn
@@ -319,3 +319,5 @@ Potential future things:
>> 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
>> to the top of the wiki --[[smcv]]
+
+[[merged|done]] --[[Joey]]