Commit Graph

1459 Commits (d1b316dc0526fd5324b4a68c4c6c8543a1933931)

Author SHA1 Message Date
Joey Hess 45c8b951a1 Updated Danish translation from Jonas Smedegaard. Closes: #525751 2009-04-27 13:54:48 -04:00
Joey Hess aa306957ba pagespec_match_list added and used in most appropriate places
* pagespec_match_list: New API function, matches pages in a list
  and throws an error if the pagespec is bad.
* inline, brokenlinks, calendar, linkmap, map, orphans, pagecount,
  pagestate, postsparkline: Display a handy error message if the pagespec
  is erronious.
2009-04-23 15:45:30 -04:00
Joey Hess 527d178c12 comments: Add link to comment post form to allow user to sign in if they wish to, if the configuration makes signin optional for commenting. 2009-04-23 14:56:10 -04:00
Joey Hess 748aa7af77 pagespec error/failure distinction and error display by inline
* Add IkiWiki::ErrorReason objects, and modify pagespecs to return
  them in cases where they fail to match due to a configuration or syntax
  error.
* inline: Display a handy error message if the inline cannot display any
  pages due to such an error.

This is perhaps somewhat incomplete, as other users of pagespecs do not
display the error, and will eventually need similar modifications to inline.
I should probably factor out a pagespec_match_all function and make it throw
ErrorReasons.
2009-04-23 14:07:28 -04:00
Joey Hess 2c74f09bb8 relativedate: Deal with clock skew.
If the server has a clock running a bit ahead of the web browsing client,
relativedate could cause somewhat confusing displays like "3 seconds from now"
for just posted things.

As a hack, avoid displaying times in the future if they're less than a
small slip forward. I chose 30 minutes because both client and server could
be wrong in different directions, while it's still close enough that "just
now" is not horribly wrong.
2009-04-23 13:39:42 -04:00
Joey Hess 565e5291cd websetup: If setup fails, restore old setup file. 2009-04-22 14:05:37 -04:00
Joey Hess 55377e7336 blogspam: Load RPC::XML library in checkconfig, so that an error can be printed at that point if it's not available, allowing the admin to see it during wiki setup. Closes: #520015 2009-04-22 13:33:20 -04:00
Joey Hess 4fbe1c3d44 websetup: Display stderr in browser if ikiwiki setup fails. 2009-04-22 13:31:56 -04:00
Joey Hess 3177b3f76b Add python:Depends to control file. Closes: #525086 2009-04-21 21:46:01 -04:00
intrigeri 4558457402 Merge commit 'upstream/master' into pub/po
Conflicts:

	debian/changelog
	debian/control
2009-04-20 12:21:18 +02:00
Joey Hess e88a110d62 releasing version 3.10 2009-04-18 22:51:25 -04:00
Joey Hess b6eccfd3d3 Add a microblog template that is useful for inlining microblogging posts. 2009-04-11 12:40:15 -04:00
Joey Hess a25d8f992b inline: Add author info to archive display.
This won't change it normally, and is useful if using archive
format to display some aggregated feed titles.
2009-04-10 21:49:43 -04:00
Joey Hess a6d3bad29d debian/control: Wrap fields. 2009-04-10 21:29:51 -04:00
Joey Hess 98ae0fb92c Add missing permalink support to archivepage and titlepage templates. 2009-04-10 18:02:03 -04:00
Joey Hess 760e100947 Merge branch 'darcs'
Conflicts:
	debian/changelog
2009-04-04 18:38:16 -04:00
Joey Hess 3fb4653d8a Add missing newline to Confirm Password prompt. 2009-04-04 18:25:52 -04:00
Joey Hess f7fa696619 move comments to copyright and changelog 2009-04-04 17:49:04 -04:00
Joey Hess 8a11983946 Fix git test suite to use a bare repo.
This works around an enormous (and, in this context, enormously confusing)
message that git has begun to print when one attempts to push changes into
a non-bare repo.

As a bonus, it now tests whether ikiwiki-makerepo works.
2009-04-04 14:58:34 -04:00
Joey Hess 6157c8697b clarify 2009-04-01 19:33:49 -04:00
Joey Hess 72b9482835 recentchanges: change to using do=goto links. 2009-04-01 19:18:43 -04:00
Joey Hess b1f9996078 Add missing suggests on libtext-textile-perl. Closes: #522039 2009-03-31 14:16:32 -04:00
Joey Hess 7bbe9cf94d Fix documentation of anonok_pagespec. Closes: #521793 2009-03-30 13:07:50 -04:00
Joey Hess 89425d0cba update changelog 2009-03-27 15:34:02 -04:00
Joey Hess 0b2791ccc7 no need to use CORE::rename since I renamed the rename function 2009-03-27 15:28:35 -04:00
Joey Hess 825e2b1378 Merge branch 'master' into po
Conflicts:
	debian/control
2009-03-27 15:09:41 -04:00
Joey Hess 10822a22b3 comments: Fix anchor ids to be legal xhtml. Closes: #521339
Well, that was a PITA.

Luckily, this doesn't break guids to comments in rss feeds,
though it does change the links.

I haven't put in a warning about needing to rebuild to get
this fix. It's probably good enough for new comments to get the
fix, without a lot of mass rebuilding.
2009-03-26 16:45:53 -04:00
Joey Hess 503d83ffbc comments: Fix too loose test for comments pages that matched normal pages with "comment_" in their name. Closes: #521322 2009-03-26 14:04:28 -04:00
Joey Hess 9e4adba63a css: Add clear: both to inlinefooter.
If an inlined page contains a floating element, this ensures
that the footer appears beneath it, and prevents the floating element from
possibly leaking down to the next inlined page.
2009-03-25 18:04:45 -04:00
Joey Hess 4538747649 Updated French translation (Jean-Luc Coulon). Closes: #521072 2009-03-24 15:52:37 -04:00
Joey Hess 10a9c00151 git, mercurial: Fix --getctime to return file creation time, not last commit time. 2009-03-20 16:36:51 -04:00
Joey Hess 78845566b5 add Sort::Naturally to suggests and use cpan link 2009-03-19 16:14:14 -04:00
Joey Hess a1c8520ce8 inline: Fix urls to feed when feedfile is used on an index page.
It would be better to use urlto() here, but will_render
has not yet been called on the feed files at this point, so
it won't work. (And reorganizing so it can be is tricky.)
2009-03-19 16:01:30 -04:00
Joey Hess 86956b3392 title_natural patch merged 2009-03-19 15:36:31 -04:00
Joey Hess 42dddf6a3f releasing version 3.08 2009-03-15 18:24:57 -04:00
Joey Hess c176dcde98 Fix bug that caused weird things to appear as page types.
The problem was introduced by the recent noextension patches.
Object autovivification caused junk to get into %htmlize,
and all keys of that showed up as page types.
2009-03-15 17:39:14 -04:00
Joey Hess 4ac0b29531 git: Manually decode git output from utf-8, avoids warning messages on invalidly encoded output. 2009-03-09 14:18:55 -04:00
Joey Hess 7bd0d53644 git: Fix utf-8 encoding of author names.
I guess what's happening here is that since the name
is passed to git via an environment variable, perl's normal
utf-8 IO layer stuff doesn't work. So we have to explicitly
decode the string from perl's internal representation into
utf-8.
2009-03-09 14:01:40 -04:00
intrigeri f4a1732b0e Merge commit 'upstream/master' into prv/po 2009-03-09 00:32:10 +01:00
Joey Hess 3520d55361 releasing version 3.07 2009-03-08 19:05:59 -04:00
Joey Hess dd2fa2efb9 When loading a template in scan mode, let preprocess know it only needs to scan.
This makes wikis such as zack's much faster in the scan pass.
In that pass, when a template contains an inline, there is no reason to
process the entire inline and all its pages. I'd forgotten to pass
along the flag to let preprocess() know it was in scan mode, leading to
much unncessary churning.
2009-03-08 18:57:47 -04:00
Joey Hess d3b4c2dbd1 avoid potential infinite loop in smiley expansion
- In 3.05, ikiwiki began expanding templates in scan mode,
  for annoying, expensive, but ultimatly necessary reasons
  of correctness.
- Smiley processing has a bug: It inserts a span for the smiley,
  and then continues searching forward in the content for more,
  starting at $end_of_smiley+1. Which means it searches for smilies
  in the span too! And if it somehow finds one, we get an infinite loop
  here.
- This bug can, probably, only be tickled if a htmllink to
  show the smiley fails, because the smiley file doesn't exist,
  or because ikiwiki doesn't know about it. In that case,
  a link will be inserted to _create_ the missing page,
  and that link will include the smiley inside the <a></a>.
- When a template is expanded in scan mode, and it contains
  an inline, the sanitize hook is run during scan mode,
  which never happened before. That causes the smiley processor
  to run, before ikiwiki is, necessarily, aware that all
  the smiley files exist (depending on scan order). So
  it inserts creation links for them, and triggers the bug.

I've put in the simple fix of jumping forward past the inserted
span, and it does fix the problem. I will need to look in a bit
more detail into why an inline nested inside a template is
fully expanded during the scan pass -- that really shouldn't
be necessary, and it makes things much slower than they need
to be.
2009-03-08 18:49:34 -04:00
intrigeri ae474d8e14 Merge commit 'upstream/master' into prv/po
Conflicts:

	IkiWiki/Plugin/editpage.pm
	debian/control
	debian/copyright
	doc/todo/need_global_renamepage_hook.mdwn

Signed-off-by: intrigeri <intrigeri@boum.org>
2009-03-08 09:50:27 +01:00
Joey Hess 29d387d2ba wmd stuff 2009-03-07 18:57:06 -05:00
Joey Hess dc4b6b1a42 Updated French translation (Jean-Luc Coulon). Closes: #518510 2009-03-06 13:36:44 -05:00
Joey Hess 535f70b372 Updated German translation (Kai Wasserbäch). Closes: #518377 2009-03-05 15:44:11 -05:00
Joey Hess 8c26a1dd8b releasing version 3.06 2009-03-01 15:11:11 -05:00
Joey Hess 062f87ce38 Setup automator: Fix bug in password comparison. Closes: #517654 2009-03-01 15:01:08 -05:00
Joey Hess b0117082ed releasing version 3.05 2009-02-27 15:54:52 -05:00
Joey Hess c42ad8e8de lintian fixes 2009-02-27 15:40:42 -05:00
Joey Hess 4558674d70 fix clean on clean tree 2009-02-27 15:35:40 -05:00
Joey Hess 6f3e348d31 lower debhelper build-dep
debhelper 7.0.50 will support everything needed, and will
be backported to stable
2009-02-27 15:33:50 -05:00
Joey Hess affd4ca3da goto: Fix typo that broke recentchanges_link compatability. 2009-02-27 13:21:29 -05:00
Joey Hess 596b2906fd bzr: Add missing rcs_diff. (liw) 2009-02-26 14:09:26 -05:00
Joey Hess b30c1b0c38 comments: Avoid showing comment moderation button in prefs to non-admins. 2009-02-26 02:31:13 -05:00
Joey Hess 63439fa10b bzr: Add missing stub rcs_diff. 2009-02-25 16:56:02 -05:00
Joey Hess 8682daad58 Setup automator: Prompt for password twice. Closes: #516973 2009-02-24 16:35:33 -05:00
Joey Hess bf5dfa8a68 Updated German translation (Kai Wasserbäch). Closes: #516770 2009-02-23 13:44:32 -05:00
Joey Hess ca7a4ae840 comments 2009-02-19 18:58:46 -05:00
Joey Hess f813b10fef rename tag() to tagged(); add docs 2009-02-19 18:54:25 -05:00
Joey Hess 66dc253437 Add noextension parameter to htmlize hooks to support, eg, Makefile. 2009-02-19 18:38:45 -05:00
Joey Hess 52f2235e60 goto: Fix redirect to comments. 2009-02-17 19:36:58 -05:00
Joey Hess 9acc4d578d template: Load templates in scan mode
This is potentially expensive, but is necessary so that meta and tag
directives, and other links on templates affect the page using the template
reliably.
2009-02-17 13:30:07 -05:00
Joey Hess a4497591f9 Revert "comments" (stupid commit)
This reverts commit bb8b8787ef.
2009-02-17 13:29:08 -05:00
Joey Hess bb8b8787ef comments 2009-02-17 13:25:06 -05:00
Joey Hess 25b1f60aeb need to pass PREFIX=/usr to avoid
was lost in rules file rewrite

I used debhelper 7.2 features too, shoot me :-)
2009-02-16 21:54:30 -05:00
Joey Hess e30725efa8 update compat level 2009-02-16 21:54:30 -05:00
Joey Hess 14e081b2c6 avoid compressing html 2009-02-15 22:08:04 -05:00
Joey Hess 862caff2a9 debhelper v7; rules file minimisation. 2009-02-15 20:12:16 -05:00
Joey Hess 6e6e40254c typo 2009-02-14 02:32:11 -05:00
Joey Hess 2c51b18aec move check_canedit, check_content to IkiWiki library from editpage
It no longer makes sense to keep these functions in editpage, because
serveral plugins now exist that use them, and users may want to disable
editpage, while leaving those plugins enabled.

Most notably, comments uses both functions, and it's entirely appropriate
to disable editpage but still want to have comments enabled.

Less likely, attachments, rename, and remove all use check_canedit -- but
it would be unusual indeed to want to use these w/o editpage.
2009-02-12 16:33:35 -05:00
Joey Hess 9e786e7b24 update deps and bundles 2009-02-12 13:15:23 -05:00
Joey Hess 46819b530b shortcut: If default_pageext is set, first look for shortcuts.default_pageext
Falls back to looking for shortcuts.mdwn for backwards compatabiity; there
probably exist wikis that have changed the pageext but still use
shortcuts.mdwn.
2009-02-12 13:04:20 -05:00
Joey Hess badc6c229f Create any missing directory necessary to put the wrapper file into. Closes: #514384 2009-02-09 15:13:12 -05:00
Joey Hess 6605764c52 Fix unusual --setup --post-commit command line option combo. 2009-02-09 14:58:10 -05:00
Joey Hess 3403ba08da Updated German translation (Kai Wasserbäch). Closes: #514251 2009-02-05 12:47:58 -05:00
Joey Hess cba0b67a19 Work around XML::Atom strangeness that results in double-encoded posts. (smcv) 2009-02-03 15:05:18 -05:00
Joey Hess 3b83e52018 rename apache404 -> 404
This may already work with other web servers that have copied apache's
interface, and it should be easy to add support to it for web servers that
use some other interface. So, make the name more general.
2009-01-31 19:26:36 -05:00
Joey Hess e5c8bc6222 doc updates for goto branch merge 2009-01-31 19:10:48 -05:00
Joey Hess 78529b335c releasing version 3.03 2009-01-29 14:44:48 -05:00
Joey Hess 94c932ee3d thought 2009-01-27 13:14:53 -05:00
Joey Hess c1befe5d87 update 2009-01-26 20:39:12 -05:00
Joey Hess 625ccace9a underlay: New plugin, allows pulling in additional files not in version control. (smcv) 2009-01-26 20:15:34 -05:00
Joey Hess 9b4040992d meta: New "updated" metadata specifies a fake modification time for a page, to be output into RSS and Atom feeds. (smcv) 2009-01-26 20:11:33 -05:00
intrigeri 61aa88d00a suggest a po4a version not subject to DoS
Signed-off-by: intrigeri <intrigeri@boum.org>
2009-01-26 23:08:53 +01:00
Joey Hess 12eb056b33 Merge branch 'master' into po 2009-01-26 13:05:38 -05:00
Joey Hess ce39f8e000 git: Fix malformed utf8 recieved from git.
If git log outputs malformed utf8 in, eg, usernames, detect it and fix it
up. This avoids commits such as f71abc92aa
breaking things.
2009-01-25 23:13:14 -05:00
Joey Hess 731fc9e7a2 comments: Add a moderation web interface. 2009-01-25 18:49:57 -05:00
Joey Hess c154fa5d6c comments: If comment content checks fail, store the comment (in .ikiwiki/comments_pending) for moderator review. 2009-01-25 15:42:13 -05:00
Joey Hess ee74e61ffc blogspam: Fix use of blogspam_options and blogspam_server config settings. 2009-01-25 14:37:04 -05:00
Joey Hess b5309d2dd7 Remove nonstandard css. Closes: #512378 2009-01-20 11:20:13 -05:00
Joey Hess 8360e96a86 blogspam: Log spam info on failure. 2009-01-19 14:11:15 -05:00
Joey Hess 639f464cb3 Avoid feeding decoded unicode to Term::ReadLine
That resulted in double encoded display when using perl's stub
readline module. Apparently that module unconditionally upgrades
text to utf8, in a quite braindead way.

(Term::ReadLine::Gnu::Perl worked ok.)
2009-01-18 14:52:49 -05:00
intrigeri e9e75f5f29 Merge commit 'upstream/master' into prv/po
Conflicts:

	t/syntax.t
2009-01-18 00:38:31 +01:00
Joey Hess a94318f61c releasing version 3.02 2009-01-17 18:27:05 -05:00
intrigeri 832d4d31d1 Merge commit 'upstream/master' into prv/po
Conflicts:

	IkiWiki/Plugin/editpage.pm
	IkiWiki/Plugin/skeleton.pm.example
	doc/plugins/write.mdwn
	t/syntax.t
2009-01-17 14:01:53 +01:00
Joey Hess 8e821c0e35 reorder 2009-01-16 22:42:24 -05:00
Joey Hess 7ee92cab40 blogspam: New plugin, adding spam filtering for page editing / comment posting using the BlogSpam.net API. 2009-01-16 22:39:11 -05:00
Joey Hess f7b2cfcf50 checkcontent: New hook, can be used to implement arbitrary content filters, including spam filters. 2009-01-16 20:46:55 -05:00
intrigeri e6992480e2 Merge commit 'upstream/master' into prv/po
Conflicts:

	debian/control
2009-01-15 20:04:31 +01:00