aboutsummaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorJoey Hess <joey@kitenet.net>2010-05-07 19:10:50 -0400
committerJoey Hess <joey@kitenet.net>2010-05-07 19:10:50 -0400
commit378c64776856ee1313c030375a921e8acb4ff1ef (patch)
tree46ac4d04807b83ddaa6d1026e616ef4626261237 /debian
parent76f6ff5f6b437534f8778abf225e2c4398262489 (diff)
downloadikiwiki-378c64776856ee1313c030375a921e8acb4ff1ef.tar
ikiwiki-378c64776856ee1313c030375a921e8acb4ff1ef.tar.gz
patch hidden field setting code
Fixes http://code.google.com/p/openid-selector/issues/detail?id=11#c3
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog2
-rw-r--r--debian/copyright7
2 files changed, 9 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index 31d64e237..c335030ed 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,8 @@ ikiwiki (3.20100505) UNRELEASED; urgency=low
* inline: Call indexhtml when inlining internal pages, so their
text can be indexed for searching.
* Delete hooks are passed deleted internal pages.
+ * openid: Incorporated a fancy openid-selector signin form
+ (http://code.google.com/p/openid-selector/).
-- Joey Hess <joeyh@debian.org> Wed, 05 May 2010 18:07:29 -0400
diff --git a/debian/copyright b/debian/copyright
index d4bb1009f..b6dd3782b 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -192,6 +192,13 @@ License: GPL-2+
Files: cvs.pm
Copyright: © 2009 Amitai Schlair
License: BSD-C2
+
+Files: underlays/javascript/ikiwiki/openid-selector/*
+Copyright: © 2008-2010 andyjm, david.j.boden
+License: BSD-C2
+ From http://code.google.com/p/openid-selector/
+
+License: BSD-C2
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions
are met: