summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2010-04-21Merge branch 'master' into autotagJoey Hess
Conflicts: IkiWiki/Plugin/tag.pm
2010-04-21remove broken ./tag supportJoey Hess
The commit that added the (working) support for using /tag to override tagbase also tried to make ./tag work. Problem is, tags are links, and ./foo is not a valid link (though I think there's a wishlist about it). So, using ./tag really resulted in tag creation links that led to a "bad page name" error. And even if the tag were created in the right place, the link didn't go to it.
2010-04-21fixesJoey Hess
2010-04-21clarifyJoey Hess
2010-04-21Merge branch 'master' into autotagJoey Hess
Conflicts: IkiWiki/Plugin/tag.pm
2010-04-21pass pagespec parameters along from match_taggedJoey Hess
2010-04-21add missing undef guard in derelJoey Hess
2010-04-21fix false positive in link_types_changedJoey Hess
loadindex does not bother populating oldtypedlinks if there is no link type. However, the code in link_types_changed assumed that if oldtypedlinks is not defined, and typedlinks is, they must differ.
2010-04-21add separate template variable for tag page and sanitize displayed tag nameJoey Hess
2010-04-21remember autofiles that were tried and failed to be addedJoey Hess
This way, if an autofile is registered for a file that already exists, it is remembered that it was tried, and it doesn't get recreated when removed.
2010-04-21responseJoey Hess
2010-04-21Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.infoJoey Hess
2010-04-21note re includesJoey Hess
2010-04-21suppressing auto-creation can be quite counter-intuitivehttp://smcv.pseudorandom.co.uk/
2010-04-21elide an older patch that's no longer under discussionhttp://smcv.pseudorandom.co.uk/
2010-04-21updateJoey Hess
2010-04-21Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.infoJoey Hess
2010-04-21commit autocreated tag pagesJoey Hess
2010-04-21updateJoey Hess
2010-04-21remember autofiles alwaysJoey Hess
This fixes the problem that it did not remember if an autofile is deleted, unless a plugin happened to register the autofile at the same time. With the new code, we just never recreate an autofile more than once. Only downside is that the list of autofiles is never pruned either. And I don't really see a way to prune it.
2010-04-21bugfixesJoey Hess
2010-04-21Merge branch 'master' into autotagJoey Hess
2010-04-21update, tag deletion bugJoey Hess
2010-04-21(no commit message)http://hendry.iki.fi/
2010-04-21document tag_autocreateJoey Hess
2010-04-21(no commit message)http://hendry.iki.fi/
2010-04-21spellingJoey Hess
2010-04-21update; my branch is (partially) debugged nowJoey Hess
2010-04-21debugginghttp://hendry.iki.fi/
2010-04-21remove verify_src_fileJoey Hess
Splitting out this function bothered me. It is conceptially similar to file_pruned, and yet also very specific to exactly the security needs of find_src_files. I liked that it got rid of duplicate code in the latter function. So instead, put a helper sub in that, which I think allows refactoring things more cleanly, and with less boilerplate. As to the needs of gen_autofile, I'm not convinced this needs to handle the same set of problems that verify_src_file did. So I sat down and wrote a custom validator for autofiles, which turned out to seem to just need three things: Make sure the candidate filename is not something that would be pruned; untaint the candidate filename; and make sure that srcdir doesn't already have something with its name. (Plus, of course, all the other checks that were already in gen_autofile.) (In passing, also fixed a bunch of bugs I had introduced in this branch.)
2010-04-21add_autofile filename should be relative to srcdirJoey Hess
2010-04-21Merge branch 'master' into autotagJoey Hess
2010-04-21appliedJoey Hess
2010-04-21layoutJoey Hess
2010-04-21Always give createlink class to links to nonexistent pagesGiuseppe Bilotta
With this change, the <span> with class createlink is always created around the link text, even when no CGI URL is defined. This allows styling of these 'links' in this case too. The same class is used as when CGI URL is defined so that e.g. clones of the same ikiwiki, one with CGI and one without, display in the same way (modulo the missing question mark link). (cherry picked from commit 290d1b498f00f63e6d41218ddb76d87e68ed5081)
2010-04-21Missing links with no CGIhttp://oblomov.myopenid.com/
2010-04-20Merge branch 'master' into autotagJoey Hess
2010-04-20Merge branch 'file_pruned_revamp'Joey Hess
2010-04-20bugfixJoey Hess
So this is the one place that does need to canonpath and compare, as two argument file_pruned used to.
2010-04-20Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.infoJoey Hess
2010-04-20darcs: ensure whole darcs query manifest output is consumedJoey Hess
By a stroke of luck, after a long & full day, I happened to remember that in the morning, I had seen someone on irc mention that darcs query manifest doesn't like it if its full output is not consumed. So contrary to the usual case where bug reports sent via irc are like messages written in sand before the new tide, this one was seen and fixed. (But use http://ikiwiki.info/bugs/ next time!)
2010-04-20bugfixJoey Hess
Avoid file_pruned triggering on absolute paths causing the whole comments_pending directory being pruned. Simplify code.
2010-04-20Merge branch 'master' into file_pruned_revampJoey Hess
2010-04-20fix uninitialized value warningJoey Hess
$cgi->params('do') may not be defined. The CSRF code may delete all cgi params. This uninitalized value was introduced when do=register support was added recently.
2010-04-20Clarificationshttp://oblomov.myopenid.com/
2010-04-20typoJoey Hess
2010-04-20fix stat to use unmunged filenameJoey Hess
2010-04-20oops, fix for no_chdir modeJoey Hess
$_ will be absolute then
2010-04-20remove 2 argument form of file_prunedJoey Hess
2010-04-20switch to 1 parameter version of file_prunedJoey Hess
Another bit of code that didn't realize that File::Find sets $_ to the relative filename.