From: intrigeri Date: Tue, 4 Nov 2008 11:33:30 +0000 (+0100) Subject: Merge commit 'upstream/master' X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/694a8dcbdd44a07e166baa1708563bc9e6fdff51?hp=e54ec757d01fd77001fc5efe1942bdeea8ee468f Merge commit 'upstream/master' --- diff --git a/debian/changelog b/debian/changelog index 38701b6db..d04e5ee25 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -ikiwiki (2.68) UNRELEASED; urgency=low +ikiwiki (2.68) unstable; urgency=low * Add support for checking pushes from untrusted git committers. This can be used to set up anonymous git pushes, and other similar things. @@ -43,7 +43,7 @@ ikiwiki (2.68) UNRELEASED; urgency=low * Preserve syslog setting when doing `ikiwiki -setup foo -dumpsetup bar` * Several fixes to --render mode. - -- Joey Hess Fri, 17 Oct 2008 20:11:02 -0400 + -- Joey Hess Mon, 03 Nov 2008 16:31:11 -0500 ikiwiki (2.67) unstable; urgency=low diff --git a/doc/bugs/txt_plugin_having_problems_with_meta_directives.mdwn b/doc/bugs/txt_plugin_having_problems_with_meta_directives.mdwn new file mode 100644 index 000000000..d2d5a46ed --- /dev/null +++ b/doc/bugs/txt_plugin_having_problems_with_meta_directives.mdwn @@ -0,0 +1,17 @@ +When applying my usual copyright and licensing header to a [[plugins/txt]] +page, garbled output is created. + +Here is the header: + + \[[meta copyright="Copyright © 2001, 2002, 2003, 2004, 2005, 2008 Free + Software Foundation, Inc."]] + + \[[meta license="""[[toggle id="license" text="GFDL 1.2+"]][[toggleable + id="license" text="Permission is granted to copy, distribute and/or modify + this document under the terms of the GNU Free Documentation License, + Version 1.2 or any later version published by the Free Software Foundation; + with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts. + A copy of the license is included in the section entitled + [[GNU_Free_Documentation_License|/fdl]]."]]"""]] + +--[[tschwinge]] diff --git a/doc/news/version_2.63.mdwn b/doc/news/version_2.63.mdwn deleted file mode 100644 index 165f60ceb..000000000 --- a/doc/news/version_2.63.mdwn +++ /dev/null @@ -1,21 +0,0 @@ -ikiwiki 2.63 released with [[!toggle text="these changes"]] -[[!toggleable text=""" - * Set cookies HttpOnly. - * Typo. Closes: #[497003](http://bugs.debian.org/497003) - * Ignore failure to install files into /etc, in case install is running as - non-root. - * Work around perl $\_ scoping nonsense that caused breakage when loading - external plugins. - * style.css: Add missing semicolon. Closes: #[497176](http://bugs.debian.org/497176) - * filecheck: Fall back to testing for binary or plain text files - if no mime type is detected. - * table: Support header=column to make the table header be the first - column of the data. (AlexandreDupas) - * For fine control over what characters are allowed, unescaped in - source filenames, the wiki\_file\_chars setting is added. For example, - set to "-[:alnum:]+/.\_" to disable colons from being used in source files - (which can cause troubl om Windows). - * po/Makefile: update po files when the pot file has changed. - Closes: #[497951](http://bugs.debian.org/497951) - * editpage: New core plugin factoring out page editing to allow disabling it - if desired."""]] \ No newline at end of file diff --git a/doc/news/version_2.68.mdwn b/doc/news/version_2.68.mdwn new file mode 100644 index 000000000..b7e625026 --- /dev/null +++ b/doc/news/version_2.68.mdwn @@ -0,0 +1,44 @@ +ikiwiki 2.68 released with [[!toggle text="these changes"]] +[[!toggleable text=""" + * Add support for checking pushes from untrusted git committers. This can be + used to set up anonymous git pushes, and other similar things. + * format: New plugin, allows embedding differently formatted text inside a + page (ie, otl inside a mdwn page, or syntax highlighted code inside a + page). + * relativedate: New javascript-alicious plugin that makes all dates display + relative, in a very nice way, if I say so myself. + * Optimise the no-op post-commit hook, to speed up web edits by a fraction + of a second. + * git: Allow [[sha1\_commit]] to be used in the diffurl, to support cgit. + * shortcut: Fix display of shortcuts while previewing. + * Plugins that used to override displaytime should instead override + formattime. displaytime will call that, and may wrap markup around the + formatted time. + * Add an underlay for javascript, and add ikiwiki.js containing some utility + code. + * toggle: Stop embedding the full toggle code on each page using it, and + move it to toggle.js in the javascript underlay. + * recentchanges: Make feed links point back to anchors on the recentchanges + page. (JasonBlevins) + * Fix issue with utf-8 in wikiname breaking session cookies, by + entity-encoding the wikiname in the session cookie. + * Use the pure perl Data::Dumper when generating setup files to ensure that + utf-8 characters are written out as such, and not as the encoded perl + strings the C Data::Dumper produces. + * inline: Only the last feed link was put on the page, fix this to include + all feed links. So rss will be included along with atom, and pages with + multiple feeds will get links added for all feeds. + * tag: When tagpage is set, force the links created by tagging to point at + the toplevel tagpage, and not closer subpages. The html links already went + there, but internally the links were not recorded as absolute, which could + cause confusing backlinks etc. + * Add an inject function, that can be used by plugins that want to + replace one of ikiwiki's functions with their own version. + (This is a scary thing that grubs through the symbol table, and replaces + all exported occurances of a function with the injected version.) + * external: RPC functions can be injected to replace exported functions. + * Updated French translation. Closes: #[502694](http://bugs.debian.org/502694) + * Updated Spanish translation from the ever vigilant Victor Moral. + * Updated Danish translation from Jonas Smedegaard. Closes: #[503117](http://bugs.debian.org/503117) + * Preserve syslog setting when doing `ikiwiki -setup foo -dumpsetup bar` + * Several fixes to --render mode."""]] \ No newline at end of file diff --git a/doc/plugins/img/discussion.mdwn b/doc/plugins/img/discussion.mdwn index 02d46e380..5bf340c56 100644 --- a/doc/plugins/img/discussion.mdwn +++ b/doc/plugins/img/discussion.mdwn @@ -5,3 +5,5 @@ logo link to \[[hurd/logo]] / instead of linking to the PNG image file. --[[tschwinge]] > Done, use link=somepage --[[Joey]] + +It would be handy if the `class` and `id` tags were passed through to the surrounding `table` in the case of `caption` being present. Would this break anything? --[[neale]] diff --git a/doc/users/intrigeri.mdwn b/doc/users/intrigeri.mdwn index f9a216e18..8fa9965a5 100644 --- a/doc/users/intrigeri.mdwn +++ b/doc/users/intrigeri.mdwn @@ -1,4 +1,4 @@ intrigeri AT boum.org, already loving ikiwiki. * [gnupg key](http://gaffer.ptitcanardnoir.org/intrigeri/intrigeri.asc) -* Git repository ([gitweb](http://repo.or.cz/w/ikiwiki/intrigeri.git)) with various ikiwiki {feature, bugfix}-branches : `git://repo.or.cz/ikiwiki/intrigeri.git` +* Git repository with various ikiwiki {feature, bugfix}-branches : `git://gaffer.ptitcanardnoir.org/ikiwiki.git` diff --git a/po/ikiwiki.pot b/po/ikiwiki.pot index f3eb0eb55..5db0c51af 100644 --- a/po/ikiwiki.pot +++ b/po/ikiwiki.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-10-31 16:38-0400\n" +"POT-Creation-Date: 2008-11-03 16:31-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -246,11 +246,11 @@ msgstr "" msgid "failed to process" msgstr "" -#: ../IkiWiki/Plugin/format.pm:22 +#: ../IkiWiki/Plugin/format.pm:20 msgid "must specify format and text" msgstr "" -#: ../IkiWiki/Plugin/format.pm:25 +#: ../IkiWiki/Plugin/format.pm:23 #, perl-format msgid "unsupported page format %s" msgstr ""