From: Joey Hess Date: Sun, 27 Nov 2011 22:33:04 +0000 (-0400) Subject: Merge remote-tracking branch 'smcv/umask-keywords' X-Git-Tag: 3.20111107~16 X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/884496b4daa3d2d0400f401f75a6e62dd649d2fb?hp=3df7d143469d8d659a9a70cae24b71ddcb73f70e Merge remote-tracking branch 'smcv/umask-keywords' --- diff --git a/IkiWiki/Plugin/editpage.pm b/IkiWiki/Plugin/editpage.pm index a5c29a352..54051c58c 100644 --- a/IkiWiki/Plugin/editpage.pm +++ b/IkiWiki/Plugin/editpage.pm @@ -231,7 +231,7 @@ sub cgi_editpage ($$) { if ! $form->submitted && lc($page) ne $page; } elsif (lc $page eq lc $config{discussionpage}) { - @page_locs=$best_loc=$page="$from/".lc($page); + @page_locs=$best_loc="$from/".lc($page); } else { my $dir=$from."/"; diff --git a/debian/changelog b/debian/changelog index 7f6564d7f..52d9ddf3e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ ikiwiki (3.20111107) UNRELEASED; urgency=low * img: Bugfix to width/height tags for scaled down image when only one dimension was provided. Thanks, Per Carlson. + * editpage: Fix FormattingHelp link on Discussion pages. -- Joey Hess Thu, 17 Nov 2011 18:52:23 -0400 diff --git a/doc/bugs/Sub-Discussion_pages_have_a_broken___34__FormattingHelp__34___link.mdwn b/doc/bugs/Sub-Discussion_pages_have_a_broken___34__FormattingHelp__34___link.mdwn index 0eadc5809..8f87329ae 100644 --- a/doc/bugs/Sub-Discussion_pages_have_a_broken___34__FormattingHelp__34___link.mdwn +++ b/doc/bugs/Sub-Discussion_pages_have_a_broken___34__FormattingHelp__34___link.mdwn @@ -1 +1,3 @@ For an example of what I mean, go to [[TourBusStop]]. Click the Discussion link. Click the FormattingHelp link. You'll be sent to [TourBusStop/ikiwiki/formatting](/TourBusStop/ikiwiki/formatting/) which of course doesn't exist. + +> A bug introduced in the last release. [[fixed|done]] --[[Joey]] diff --git a/doc/bugs/octal_umask_setting_is_unintuitive.mdwn b/doc/bugs/octal_umask_setting_is_unintuitive.mdwn index 0a63940ce..15bea3132 100644 --- a/doc/bugs/octal_umask_setting_is_unintuitive.mdwn +++ b/doc/bugs/octal_umask_setting_is_unintuitive.mdwn @@ -28,6 +28,9 @@ you have to use one of and if you try to say 022 you'll get 22 decimal = 026 octal. +[[!tag patch]] +[[!template id=gitbranch branch=smcv/umask-keywords author="[[smcv]]"]] + Perhaps the best way to solve this would be to have keywords for the few values of `umask` that are actually useful? @@ -43,3 +46,8 @@ via a symlink attack. So I don't think we need keywords for those. --[[smcv]] + +> I support this change, but your git repository does not seem to have +> that branch (or anything) in it today. --[[Joey]] + +>> git pushes have a restrictive umask, ironically... fixed. --[[smcv]] diff --git a/doc/forum/ikiwiki_generates_html_files_with_600_permission./comment_3_962306f22ceb17afb4150e766e9a05b3._comment b/doc/forum/ikiwiki_generates_html_files_with_600_permission./comment_3_962306f22ceb17afb4150e766e9a05b3._comment new file mode 100644 index 000000000..6ed955061 --- /dev/null +++ b/doc/forum/ikiwiki_generates_html_files_with_600_permission./comment_3_962306f22ceb17afb4150e766e9a05b3._comment @@ -0,0 +1,10 @@ +[[!comment format=mdwn + username="ikiwikert" + ip="134.99.22.236" + subject="comment 3" + date="2011-11-27T16:54:05Z" + content=""" +thank you for your enlighting post! i set the umask option to 022 (octal) and the wrapper to 0755 and it worked. However i guess it is not a good thing to mix modes and i would appreciate it, if you implemented the \"keyword-approach\" you mentioned. + +Or at least one way of defining modes would be okay for average joes like me. +"""]] diff --git a/doc/todo/wmd_editor_live_preview.mdwn b/doc/todo/wmd_editor_live_preview.mdwn index fb7f04c09..891b8199f 100644 --- a/doc/todo/wmd_editor_live_preview.mdwn +++ b/doc/todo/wmd_editor_live_preview.mdwn @@ -3,3 +3,7 @@ Some time ago there was [[a question|http://ikiwiki.info/forum/wmd_editor_double I use the wmd editor in my ikiwiki. However live preview seems not to be a fully correct preview so nevertheless I have to hit the preview button to get a correct preview. However then I have two previews so that I have to scroll down to see the correct one. Is it possible to disable the live preview or to replace the live preview with the correct one after pressing the preview button? + +> There's another page already tracking this UI problem: [[mdwn_preview]] +> There is a patch there, but AFAIK nobody has done any more work on +> WMD integration with ikiwiki. --[[Joey]]