From: Joey Hess Date: Wed, 23 Jul 2008 21:34:01 +0000 (-0400) Subject: Merge branch 'master' into tova X-Git-Tag: 2.55~60 X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/96dab37a8e3acc58fb0ab5be0657c0e545e9684a?ds=sidebyside;hp=-c Merge branch 'master' into tova --- 96dab37a8e3acc58fb0ab5be0657c0e545e9684a diff --combined debian/changelog index a0d526f88,2b216ca95..cfe168825 --- a/debian/changelog +++ b/debian/changelog @@@ -1,11 -1,5 +1,11 @@@ ikiwiki (2.55) UNRELEASED; urgency=low + * remove: New plugin that adds the ability to remove pages via the web. + (Sponsored by The TOVA Company.) + * rename: New plugin that adds the ability to rename pages via the web. + (Sponsored by The TOVA Company.) (This one's for you, Kyle.) + * All rcs backends need to implement rcs_remove, rcs_commitstaged, + and rcs_rename. (Done for svn, git). * prefix_directives enabled in doc wiki, all preprocessor directives converted. (Simon McVittie) * editpage: Don't show attachments link when attachments are disabled. @@@ -17,11 -11,8 +17,12 @@@ * Add allow_symlinks_before_srcdir config setting that can be used to avoid a security check that is a good safe default, but problimatic overkill in some situations. + * Don't allow uploading an attachment with the same name as an existing + page, to avoid confusion. + * Split out error messages from editpage.tmpl into several separate + templates. * attachment: Do not escape _ when determining attachment filenames. + * Rebuild pages that change their type. (Gabriel McManus) -- Joey Hess Mon, 21 Jul 2008 11:35:46 -0400