urosm
/
ikiwiki
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into next 

Conflicts:

	debian/changelog
	po/ikiwiki.pot
master
Joey Hess 2008-12-28 15:12:11 -05:00
parent 25879952b1 82d94d4d4a
commit 17b2afe721
4 changed files with 11 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
debian/changelog vendored
View File

@ -26,7 +26,7 @@ ikiwiki (2.72) unstable; urgency=low
* inline: Run format hook first, to ensure other format hooks can affect
inlined content. Closes: #509710
-- Joey Hess <joeyh@debian.org> Wed, 24 Dec 2008 19:49:32 -0500
-- Joey Hess <joeyh@debian.org> Sun, 28 Dec 2008 15:01:02 -0500
ikiwiki (2.71) unstable; urgency=low

17
doc/news/version_2.67.mdwn
View File

@ -1,17 +0,0 @@
ikiwiki 2.67 released with [[!toggle text="these changes"]]
[[!toggleable text="""
* remove: Avoid $\_ breakage. (Stupid, stupid perl.)
* Updated Spanish translation from Victor Moral.
* lockedit: Support specifying which users (and IP addresses) a page
is locked for. This supports most of the ACL type things users have been
wanting to be done. Closes: #[443346](http://bugs.debian.org/443346) (It does not control who can read a
page, but that's out of scope for ikiwiki.)
* orphans: Fix unquoted page name in regexp.
* google: Plugin provides google site search, contributed by Peter Simons.
* Pass HTTPS variable through the wrapper so that CGI-&gt;https can be used
by plugins. Closes: #[502047](http://bugs.debian.org/502047)
* inline: Allow MTIME to be used in inlinepage.tmpl.
* inline: Use the feed's description in the rss and atom links.
Closes: #[502113](http://bugs.debian.org/502113)
* aggregate: Avoid bug that caused immediate expiration of items
with a date in the future."""]]

9
doc/news/version_2.72.mdwn 100644
View File

@ -0,0 +1,9 @@
ikiwiki 2.72 released with [[!toggle text="these changes"]]
[[!toggleable text="""
* Avoid comments in recentchanges being broken links (smcv)
* Add deprecation warning for GlobLists, which will stop working in 3.0.
* camelcase: Add camelcase\_ignore setting.
* googlecalendar: Add runtime deprecation warning.
* comments: Deal with users entering unqualified or partial urls.
* inline: Run format hook first, to ensure other format hooks can affect
inlined content. Closes: #[509710](http://bugs.debian.org/509710)"""]]

2
po/ikiwiki.pot
View File

@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2008-12-26 21:41-0500\n"
"POT-Creation-Date: 2008-12-28 15:01-0500\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"