summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2009-03-09Merge commit 'upstream/master' into prv/pointrigeri
2009-03-09po: fixed last unaddressed item from Joey's review, please have a lookintrigeri
Signed-off-by: intrigeri <intrigeri@boum.org>
2009-03-09revert exposing of %backlinks and $backlinks_calculatedintrigeri
This change was introduced in 85f865b5d98e0122934d11e3f3eb6703e4f4c620 and c3af3840a295780e0f32df398f2dc7d34653e75e ; it may be necessary for the meta-po integration, but the po branch alone is supposed to work without it. Signed-off-by: intrigeri <intrigeri@boum.org>
2009-03-08add news item for ikiwiki 3.07Joey Hess
2009-03-08releasing version 3.07Joey Hess
2009-03-08When loading a template in scan mode, let preprocess know it only needs to scan.Joey Hess
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-08avoid potential infinite loop in smiley expansionJoey Hess
- 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-08fix doc, prefix directives have been default for a whileJoey Hess
2009-03-08configure wmd to leave text in markdownJoey Hess
2009-03-08Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.infoJoey Hess
Conflicts: doc/todo/mdwn_preview.mdwn
2009-03-08po doc: po4a 0.35 has been released, eventuallyintrigeri
2009-03-08detailsintrigeri
2009-03-08brought back checkcontent hook full-content compat.intrigeri
This modification was initially done in editpage, in commit a3726968bc13f19f458c372cbd7cf92ae4c6fce5, but was then lost while merging upstream/master branch. Signed-off-by: intrigeri <intrigeri@boum.org>
2009-03-08implemented Joey's solutionintrigeri
2009-03-08rename: remove duplicates that hook functions may have added to @torenameintrigeri
Signed-off-by: intrigeri <intrigeri@boum.org>
2009-03-08License grant for my code. And note that I'll look at a more advanced ↵http://www.cse.unsw.edu.au/~willu/
version when I get time.
2009-03-08rename: moved subpages addition to a rename hookintrigeri
Signed-off-by: intrigeri <intrigeri@boum.org>
2009-03-08rename hook: run once per file to be renamedintrigeri
... as Joey suggested on todo/need_global_renamepage_hook This hook is applied recursively to returned additional rename hashes, so that it handles the case where two plugins use the hook: plugin A would see when plugin B adds a new file to be renamed. The full set of rename hashes can no longer be changed by hook functions, that are only allowed to return any additional rename hashes it wants to add. Rationale: the correct behavior of the recursion would be hard, if not impossible, to define, if already considered pages were changing on the run. Signed-off-by: intrigeri <intrigeri@boum.org>
2009-03-08Merge commit 'upstream/master' into prv/pointrigeri
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-07bugJoey Hess
2009-03-07another thoughtJoey Hess
2009-03-07remove patch, and more commentsJoey Hess
2009-03-07look for wmd/wmd.jsJoey Hess
This means that the underlay needs to have a wmd/wmd/wmd.js, which is a trifle weird, but it isolates all the wmd stuff in a single wmd subdirectory of the built wiki. The wmd/images creating a toplevel images directory was particularly bad.
2009-03-07update, add some examplesJoey Hess
2009-03-07wmd stuffJoey Hess
2009-03-07make wmd comment support comment editing (I think)Joey Hess
2009-03-07forgot to add wmd tag hereJoey Hess
2009-03-07wmd copyright?Joey Hess
2009-03-07questionJoey Hess
2009-03-07note that a wmd plugin has appearedJoey Hess
2009-03-07point at wmd pluginJoey Hess
2009-03-07commentsJoey Hess
2009-03-07rebuild not neededJoey Hess
This plugin only affects the page edit, not the compiled wiki.
2009-03-07wmd plugin from willuJoey Hess
2009-03-06Updated French translation (Jean-Luc Coulon). Closes: #518510Joey Hess
2009-03-06Note another issue with the basic plugin.http://www.cse.unsw.edu.au/~willu/
2009-03-06Add patch for WMD plugin. This new plugin adds live preview and text ↵http://www.cse.unsw.edu.au/~willu/
controls to ikiwiki edit pages.
2009-03-05(no commit message)https://launchpad.net/~jelmer
2009-03-05Updated German translation (Kai Wasserbäch). Closes: #518377Joey Hess
2009-03-04Notes that the wikiwyg plugin link is broken, and more.http://www.cse.unsw.edu.au/~willu/
2009-03-04responseJoey Hess
2009-03-04that's wikiwygJoey Hess
close as dup todo
2009-03-04Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.infoJoey Hess
2009-03-04(no commit message)http://liw.fi/
2009-03-04typo and typographyPaulePanter
2009-03-03(no commit message)http://sarin.myopenid.com/
2009-03-03updated spanish translationVíctor Moral
2009-03-02(no commit message)http://electropo.mp/
2009-03-01add news item for ikiwiki 3.06Joey Hess
2009-03-01releasing version 3.06Joey Hess