diff options
| author | Joey Hess <joey@kitenet.net> | 2010-05-07 22:30:42 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2010-05-07 22:30:42 -0400 |
| commit | 937b24e0cf98d75dd353d80267efddcecab9e908 (patch) | |
| tree | 38d303ec9fee5e84f4cde843d894a46386d73256 /debian | |
| parent | be2669e1e1e51ccf1514ce60697e1ba7ed05497e (diff) | |
| parent | f1f6973d2d05e2cfc7f463df8568de07314e1720 (diff) | |
Merge branch 'master' into commentreorg
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/NEWS | 5 | ||||
| -rw-r--r-- | debian/changelog | 8 | ||||
| -rw-r--r-- | debian/copyright | 11 |
3 files changed, 24 insertions, 0 deletions
diff --git a/debian/NEWS b/debian/NEWS index 8f456bced..68f0a207b 100644 --- a/debian/NEWS +++ b/debian/NEWS @@ -15,6 +15,11 @@ ikiwiki (3.20100505) UNRELEASED; urgency=low things that looked like comments. The old pagespec will now also match comments that are held for moderation; likely not what you want. + There have also been some changes to the style.css in this version, + particularly to support the new openid selector. If you have a modified + version, of style.css, updating it (or moving it to local.css) is + recommended. + -- Joey Hess <joeyh@debian.org> Wed, 05 May 2010 21:47:08 -0400 ikiwiki (3.20100427) unstable; urgency=low diff --git a/debian/changelog b/debian/changelog index 0851a975d..f74e9929f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -18,6 +18,14 @@ 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/) + * openid: Use "openid_identifier" as the form field, as required + by OpenID Authentication v2.0 spec. + * Removed the openidsignup option. Instead, my recommendation is to + leave passwordauth enabled and let people who don't have an openid use it. + The openid selector form avoids the UI annoyance of having both openid + and passwordauth on one form. -- Joey Hess <joeyh@debian.org> Wed, 05 May 2010 18:07:29 -0400 diff --git a/debian/copyright b/debian/copyright index d4bb1009f..7ef266151 100644 --- a/debian/copyright +++ b/debian/copyright @@ -192,6 +192,17 @@ License: GPL-2+ Files: cvs.pm Copyright: © 2009 Amitai Schlair License: BSD-C2 + +Files: underlays/openid-selector/ikiwiki/openid/* +Copyright: © 2008-2010 andyjm, david.j.boden +License: BSD-C2 + From http://code.google.com/p/openid-selector/ + +Files: underlays/openid-selector/ikiwiki/openid/jquery.js +Copyright: © 2005-2008 by John Resig, Branden Aaron & Jörn Zaefferer +License: GPL-2 + +License: BSD-C2 Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: |