Joey Hess [Wed, 17 Dec 2008 19:06:57 +0000 (14:06 -0500)]
Merge branch 'master' into comments
Joey Hess [Wed, 17 Dec 2008 18:59:12 +0000 (13:59 -0500)]
monotone: When getting the log, tell monotone how many entries we want, rather than closing the pipe, which it dislikes. (thm)
Joey Hess [Wed, 17 Dec 2008 18:56:10 +0000 (13:56 -0500)]
rename: Fix double-escaping of page name in edit box.
titlepage normally escapes, but so does formbuilder.
http://thm.id.fedoraproject.org/ [Wed, 17 Dec 2008 10:54:16 +0000 (05:54 -0500)]
rename bugs/bugfix_for:___38____35__34__59__mtn:_operation_canceled:_Broken_pipe__38____35__34__59_____40__patch__41__.mdwn to bugs/bugfix_for:___34__mtn:_operation_canceled:_Broken_pipe__34_____40__patch__41__.mdwn
http://thm.id.fedoraproject.org/ [Wed, 17 Dec 2008 10:52:10 +0000 (05:52 -0500)]
rename bugs/bugfix_for:___34__mtn:_operation_canceled:_Broken_pipe__34__.mdwn to bugs/bugfix_for:___38____35__34__59__mtn:_operation_canceled:_Broken_pipe__38____35__34__59_____40__patch__41__.mdwn
http://thm.id.fedoraproject.org/ [Tue, 16 Dec 2008 11:56:19 +0000 (06:56 -0500)]
http://thm.id.fedoraproject.org/ [Tue, 16 Dec 2008 11:54:55 +0000 (06:54 -0500)]
Jon Dowland [Mon, 15 Dec 2008 16:09:26 +0000 (16:09 +0000)]
add a meta title
Jon Dowland [Mon, 15 Dec 2008 15:39:07 +0000 (15:39 +0000)]
not putting cgi in destdir
Joey Hess [Fri, 12 Dec 2008 20:38:23 +0000 (15:38 -0500)]
elide unnecessary variables
Joey Hess [Fri, 12 Dec 2008 20:25:12 +0000 (15:25 -0500)]
remove fixme
sessioncgi hooks are always called with the wiki locked
Joey Hess [Fri, 12 Dec 2008 20:22:43 +0000 (15:22 -0500)]
fix redefinition of $author
Joey Hess [Fri, 12 Dec 2008 20:19:01 +0000 (15:19 -0500)]
move related code together
Joey Hess [Fri, 12 Dec 2008 20:13:07 +0000 (15:13 -0500)]
whitespace
Joey Hess [Fri, 12 Dec 2008 20:10:17 +0000 (15:10 -0500)]
don't explicitly use inline
loadplugin("inline") should take care of that
Joey Hess [Fri, 12 Dec 2008 20:08:06 +0000 (15:08 -0500)]
avoid unnecessary variable
Joey Hess [Fri, 12 Dec 2008 20:05:26 +0000 (15:05 -0500)]
get rid of the [postcomment] hack
I think that using a flag variable is sorta cleaner.
(This is untested.)
Joey Hess [Fri, 12 Dec 2008 20:02:40 +0000 (15:02 -0500)]
improve documentation of postcomment
Joey Hess [Fri, 12 Dec 2008 19:59:23 +0000 (14:59 -0500)]
move getsetup to usual place
Joey Hess [Fri, 12 Dec 2008 19:52:05 +0000 (14:52 -0500)]
first pass through comments documentation
Moved documentation out of contrib.
Mostly tweaked some wording. Moved documentation of various bits to other
pages (pagespec, etc), and linked to those.
Documented the new templates in wikitemplates.
Small quantities of documentation were removed. Particularly the list of
template variables, which I think is fairly obvious when editing the
template.
Joey Hess [Fri, 12 Dec 2008 19:29:42 +0000 (14:29 -0500)]
update changelog
Joey Hess [Fri, 12 Dec 2008 19:27:56 +0000 (14:27 -0500)]
update copyright
Joey Hess [Fri, 12 Dec 2008 19:24:35 +0000 (14:24 -0500)]
Merge branch 'master' into comments
Joey Hess [Fri, 12 Dec 2008 19:23:33 +0000 (14:23 -0500)]
add log entry
Simon McVittie [Tue, 18 Nov 2008 11:25:13 +0000 (11:25 +0000)]
htmlbalance: don't compact whitespace, and set misc other options
Not compacting whitespace is the most important one: now that we run
sanitize hooks on individual posted comments in the comments plugin,
whitespace that is significant to Markdown (but not HTML) is lost.
(cherry picked from commit
cb5aaa3cee8b35d6fc6e88a7449a9477a6587c7a)
Joey Hess [Fri, 12 Dec 2008 19:21:08 +0000 (14:21 -0500)]
Merge branch 'master' into comments
Joey Hess [Fri, 12 Dec 2008 19:06:45 +0000 (14:06 -0500)]
meta: Pass info to htmlscrubber so htmlscrubber_skip can take effect.
http://smcv.pseudorandom.co.uk/ [Fri, 12 Dec 2008 11:34:51 +0000 (06:34 -0500)]
Another TODO item
http://smcv.pseudorandom.co.uk/ [Fri, 12 Dec 2008 11:29:02 +0000 (06:29 -0500)]
update with some more code improvements
Simon McVittie [Fri, 12 Dec 2008 11:02:41 +0000 (11:02 +0000)]
comments: Store dates in GMT and in ISO-8601
The [[!_comment]] directive is a serialization format, not something for
presentation to users, so we should use the least ambiguous possible
representation.
http://john.choffee.co.uk/ [Fri, 12 Dec 2008 10:22:53 +0000 (05:22 -0500)]
justin [Fri, 12 Dec 2008 05:40:00 +0000 (00:40 -0500)]
adding setup note
tschwinge [Fri, 12 Dec 2008 00:38:53 +0000 (19:38 -0500)]
Fix too much quoting.
tschwinge [Fri, 12 Dec 2008 00:36:36 +0000 (19:36 -0500)]
Fix cut'n'past-o.
Joey Hess [Thu, 11 Dec 2008 22:31:57 +0000 (17:31 -0500)]
simplifiy logic
Simon McVittie [Thu, 11 Dec 2008 21:23:55 +0000 (21:23 +0000)]
comments: Change internal-use-only directive from [[!comment]] to [[!_comment]]
Simon McVittie [Thu, 11 Dec 2008 21:19:50 +0000 (21:19 +0000)]
comments: Use new feedfile, emptyfeeds options to inline
Simon McVittie [Thu, 11 Dec 2008 02:29:11 +0000 (02:29 +0000)]
comments: don't interpolate IP into anonymous user's "name"
If an admin wants the IP in the comment display template they can still
get it (the default template shows it).
Simon McVittie [Thu, 11 Dec 2008 02:28:05 +0000 (02:28 +0000)]
comments_display.tmpl: use less nice formatting to avoid whitespace in output
Simon McVittie [Thu, 11 Dec 2008 02:24:27 +0000 (02:24 +0000)]
comments_display.tmpl: preferentially use confirmed username, but fall back to claimed author if unauthenticated
This still isn't quite right (it displays the IP address twice if the user
doesn't specify a name).
Simon McVittie [Thu, 11 Dec 2008 02:22:20 +0000 (02:22 +0000)]
comments: fix invocation of possibly_foolish_untaint
Simon McVittie [Thu, 11 Dec 2008 02:22:04 +0000 (02:22 +0000)]
comments_form.tmpl: show labels for name, website
Simon McVittie [Thu, 11 Dec 2008 02:03:07 +0000 (02:03 +0000)]
comments: avoid warning if there's no subject
Simon McVittie [Thu, 11 Dec 2008 01:33:43 +0000 (01:33 +0000)]
comments: Optionally allow anonymous commenters to set their name/URL.
Also provide a way for the comment template to pick up the verified
username/IP.
Simon McVittie [Thu, 11 Dec 2008 01:24:01 +0000 (01:24 +0000)]
comments: Remove some dead code
Simon McVittie [Thu, 11 Dec 2008 00:22:34 +0000 (00:22 +0000)]
comments: rename main field to "editcontent" consistent with editpage
This has the side-effect that Ikiwiki's default style.css gives the text
box 100% width.
Simon McVittie [Thu, 11 Dec 2008 00:19:39 +0000 (00:19 +0000)]
comments: instead of hard-coding mdwn, allow any supported page format
Simon McVittie [Wed, 10 Dec 2008 23:53:04 +0000 (23:53 +0000)]
comments: Save comments as a file with one big [[!comment]] directive.
This delays all comment formatting until the last possible time, allows
us to set metadata without worrying that commenters may be able to evade
it, and means that changes to how a comment is saved can be handled
gracefully. It also gives us somewhere to put the commenter's username
or IP address for later reference.
Simon McVittie [Wed, 10 Dec 2008 22:18:26 +0000 (22:18 +0000)]
Remove dead code for preprocessing [[!comments]]
Simon McVittie [Sun, 23 Nov 2008 18:31:11 +0000 (18:31 +0000)]
comments: Duplicate logic and CGI hook from recentchanges to link user pages correctly
Simon McVittie [Sun, 23 Nov 2008 17:53:33 +0000 (17:53 +0000)]
Qualify name of formattime() correctly
Simon McVittie [Sun, 23 Nov 2008 17:52:30 +0000 (17:52 +0000)]
Delay checking for session expiry til we actually post a comment
Simon McVittie [Sun, 23 Nov 2008 17:43:06 +0000 (17:43 +0000)]
comments: record the time at which each comment was posted
Simon McVittie [Sun, 23 Nov 2008 17:42:50 +0000 (17:42 +0000)]
comments: Use a checkconfig hook to get the default value of comments_pagename
Simon McVittie [Sun, 23 Nov 2008 17:11:30 +0000 (17:11 +0000)]
Remove comments_embed.tmpl (no longer needed)
Simon McVittie [Sun, 23 Nov 2008 17:11:14 +0000 (17:11 +0000)]
comments: render comments/commenturl in page.tmpl
Simon McVittie [Sun, 23 Nov 2008 17:10:44 +0000 (17:10 +0000)]
comments: use global config to decide whether commenting is allowed, and for name of page
Also:
* decide comment page name sooner
* set permalink on it
Simon McVittie [Sun, 23 Nov 2008 17:07:58 +0000 (17:07 +0000)]
comments: use global configuration for allow_directives, commit, and pagename
Simon McVittie [Sun, 23 Nov 2008 12:11:18 +0000 (12:11 +0000)]
comments: Add some global configuration
Simon McVittie [Sun, 23 Nov 2008 17:07:28 +0000 (17:07 +0000)]
comments: make preprocess a no-op
Simon McVittie [Sun, 23 Nov 2008 17:07:07 +0000 (17:07 +0000)]
page.tmpl: optionally include "add comment" link
Simon McVittie [Sun, 23 Nov 2008 17:06:40 +0000 (17:06 +0000)]
comments_comment.tmpl: allow permalink, anchor to be passed in
Simon McVittie [Sun, 23 Nov 2008 12:05:24 +0000 (12:05 +0000)]
comments: document what linkuser does
Simon McVittie [Sun, 23 Nov 2008 12:04:00 +0000 (12:04 +0000)]
comments: add a stub pagetemplate hook to show the comments
Simon McVittie [Sun, 23 Nov 2008 12:03:05 +0000 (12:03 +0000)]
comments: Use HTML entities to escape directives
Simon McVittie [Sun, 23 Nov 2008 12:02:39 +0000 (12:02 +0000)]
Embed comments into comments_embed.tmpl rather than concatenating in perl
Simon McVittie [Sun, 23 Nov 2008 12:01:42 +0000 (12:01 +0000)]
comments_embed.tmpl: include the inlined comments if present
Simon McVittie [Sat, 22 Nov 2008 21:54:31 +0000 (21:54 +0000)]
comments: use CGI module's checksessionexpiry
Simon McVittie [Sat, 22 Nov 2008 21:53:33 +0000 (21:53 +0000)]
editpage: factor out checksessionexpiry into IkiWiki::CGI
Simon McVittie [Sat, 22 Nov 2008 19:01:28 +0000 (19:01 +0000)]
Add comments to page.tmpl
Simon McVittie [Tue, 18 Nov 2008 11:25:13 +0000 (11:25 +0000)]
htmlbalance: don't compact whitespace, and set misc other options
Not compacting whitespace is the most important one: now that we run
sanitize hooks on individual posted comments in the comments plugin,
whitespace that is significant to Markdown (but not HTML) is lost.
Simon McVittie [Tue, 18 Nov 2008 10:44:34 +0000 (10:44 +0000)]
comments: remove allowhtml option, just switch it on all the time
Now that posts are individually sanitized, that should be safe.
Simon McVittie [Tue, 18 Nov 2008 10:43:39 +0000 (10:43 +0000)]
comments: load inline and mdwn lazily
Simon McVittie [Tue, 18 Nov 2008 10:43:11 +0000 (10:43 +0000)]
comments: don't rely on mdwn getting loaded first
Simon McVittie [Tue, 18 Nov 2008 10:29:16 +0000 (10:29 +0000)]
comments: sanitize the body of each comment before posting it
This should ensure that users can't "break out" from the enclosing
<div>, making it impossible to forge comments (assuming htmlscrubber
is enabled, and so is either htmlbalance or htmltidy).
Simon McVittie [Tue, 18 Nov 2008 10:25:10 +0000 (10:25 +0000)]
Fix typo that led to comments being blanked
Simon McVittie [Tue, 18 Nov 2008 10:17:18 +0000 (10:17 +0000)]
postcomment: Rename plugin to comments, use *._comment files
The PageSpec is still called "postcomment" since that's what it means.
Simon McVittie [Mon, 17 Nov 2008 11:16:31 +0000 (11:16 +0000)]
Rename smcvpostcomment plugin to postcomment to propose for inclusion
Simon McVittie [Mon, 17 Nov 2008 10:42:01 +0000 (10:42 +0000)]
smcvpostcomment: allow commenting to be closed
Simon McVittie [Mon, 17 Nov 2008 10:41:50 +0000 (10:41 +0000)]
smcvpostcomment: import other plugins lazily and remove unnecessary use of CGI
Simon McVittie [Mon, 17 Nov 2008 10:40:49 +0000 (10:40 +0000)]
smcvpostcomment_*.tmpl: make class names match template names
Also put "posting comments disabled" in [], and change "Page preview"
to "Comment preview".
Simon McVittie [Mon, 17 Nov 2008 09:10:50 +0000 (09:10 +0000)]
smcvpostcomment: allow inlining to be disabled, and pass through atom etc. better
Simon McVittie [Mon, 17 Nov 2008 09:09:52 +0000 (09:09 +0000)]
smcvpostcomment: make allowhtml etc. configurable, and don't allow commenting on pages where comments have never been allowed
Simon McVittie [Mon, 17 Nov 2008 09:08:54 +0000 (09:08 +0000)]
smcvpostcomment: indicate in form whether HTML and directives are allowed
Simon McVittie [Mon, 17 Nov 2008 09:10:06 +0000 (09:10 +0000)]
smcvpostcomment: remove HTML if not allowed
Simon McVittie [Sun, 16 Nov 2008 18:23:23 +0000 (18:23 +0000)]
smcvpostcomment: always allow wikilinks, and do access control
wikilinks are harmless, so we might as well allow them.
Access control for this plugin is a bit odd, since we specifically
don't want to allow comments to be edited - so the check is whether the
user is allowed to edit a deliberately invalid page name,
page/commented/on[smcvpostcomment]. You can put smcvpostcomment(*)
or smcvpostcomment(some/subdir/*) in $config{anonok_pagespec}
or the opposite in $config{locked_pages} to allow "editing" (really
just posting) comments.
Simon McVittie [Sun, 16 Nov 2008 18:11:55 +0000 (18:11 +0000)]
smcvpostcomment: reduce length of subject field
Simon McVittie [Sat, 15 Nov 2008 14:13:10 +0000 (14:13 +0000)]
smcvpostcomment: explain what $fake is for
Simon McVittie [Sat, 15 Nov 2008 14:12:57 +0000 (14:12 +0000)]
smcvpostcomment: avoid warnings if form field 'body' is undef
Simon McVittie [Sat, 15 Nov 2008 14:12:42 +0000 (14:12 +0000)]
smcvpostcomment: load inline plugin more forcibly
Simon McVittie [Sat, 15 Nov 2008 14:12:26 +0000 (14:12 +0000)]
smcvpostcomment: use better names for special comment files
Simon McVittie [Sat, 15 Nov 2008 14:11:24 +0000 (14:11 +0000)]
smcvpostcomment: use gettext where appropriate
Simon McVittie [Sat, 15 Nov 2008 14:08:31 +0000 (14:08 +0000)]
Use a link rather than a button for "post comments"
Simon McVittie [Sun, 21 Sep 2008 18:42:38 +0000 (19:42 +0100)]
Add some basic stylesheet rules for smcvpostcomment
Simon McVittie [Sun, 21 Sep 2008 18:37:52 +0000 (19:37 +0100)]
style.css: reduce the scope of the .author rule to when it's nested in .inlineheader
In the initial template for blog-style comments, I don't want the author
name to be quite as large and prominent as the author of a blog post - I
expect that comments will be rather short, so the author name stands out
better for a given font size.
Simon McVittie [Sun, 21 Sep 2008 18:33:45 +0000 (19:33 +0100)]
Add initial version of a postcomment plugin (temporarily namespaced as smcvpostcomment)
Joey Hess [Thu, 11 Dec 2008 20:01:26 +0000 (15:01 -0500)]
inline: Support feedfile option to change the filename of the feed generated.
Joey Hess [Thu, 11 Dec 2008 19:26:58 +0000 (14:26 -0500)]
looking closer, the existing %knownfeeds won't work
Joey Hess [Thu, 11 Dec 2008 19:12:03 +0000 (14:12 -0500)]
rethink
Joey Hess [Thu, 11 Dec 2008 19:09:34 +0000 (14:09 -0500)]
thoughts