summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2010-07-23merged; notesJoey Hess
2010-07-23whitespace fixes and a typoJoey Hess
2010-07-23Merge commit '862fc7c1ab1f7d709561bcb02fc8ede57b90a51b'Joey Hess
2010-07-23htmlJoey Hess
2010-07-23htmlJoey Hess
2010-07-23htmlJoey Hess
2010-07-23Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.infoJoey Hess
2010-07-23template: Fix dependency tracking. Broken in version 3.20100427.Joey Hess
template_depends was adding a dependency on the source filename, instead of on the page name when a template is a page. Such a dependency doesn't work.
2010-07-23Implemented, please merge.intrigeri
2010-07-23todo updateintrigeri
2010-07-23add tipjar link to sidebarJoey Hess
and flattr button, as an experiment
2010-07-23add flattr buttonJoey Hess
2010-07-22add news item for ikiwiki 3.20100722Joey Hess
2010-07-22releasing version 3.20100722Joey Hess
2010-07-22merge translation updates from l10n siteJoey Hess
2010-07-22Avoid showing 'Add a comment' link at the bottom of the comment post form.Joey Hess
Since misctemplate is called with a page context, the comments plugin thinks it should add that, as well as the comment link in the actionbar. I kept the comment link because a quick link back to the comments to a page is sorta useful.
2010-07-20po.t: fix expected resultsintrigeri
As index.{es,fr} don't exist, po::refreshpofiles copies them from the basewiki underlay before running msgmerge. msgmerge marks as obsolete the translation strings that came from the basewiki po files, but the link plugin does not make the difference between obsolete and up-to-date links. $links{'index.fr'} and $links{'index.es'} are therefore expected to contain SandBox and ikiwiki.
2010-07-20Added tests for po::pofiles.intrigeri
2010-07-20Run checkconfig after loading the po plugin, else state is not populated.intrigeri
The pofiles function relies on @slavelanguages to have been populated by po's checkconfig hook.
2010-07-20po: optimizationintrigeri
No need to use "keys %{$config{po_slave_languages}}" repeatedly: the slave languages codes list is already cached in @slavelanguages.
2010-07-20Support ordered po_slave_languages as discussed previously.intrigeri
Backward compatibility is still supported.
2010-07-19(no commit message)http://jeremiahfoster.com/
2010-07-19(no commit message)http://jeremiahfoster.com/
2010-07-19Added examplehttp://jeremiahfoster.com/
2010-07-19Added second question.http://jeremiahfoster.com/
2010-07-19typoJavier Rojas
2010-07-19Merge branch 'master' of git://git.ikiwiki.infoJavier Rojas
2010-07-19new syntax file for ikiwiki files in vimJavier Rojas
2010-07-19fix link syntaxhttp://weakish.myopenid.com/
2010-07-19link to 404 pluginhttp://weakish.myopenid.com/
2010-07-19remove lighttpd doc: lighttpd send 200 to dynamic error pages. Thus this ↵http://weakish.myopenid.com/
plugin doesn't work with it w/o modification.
2010-07-19update urlhttp://weakish.myopenid.com/
2010-07-18Revert "po_slave_languages can now be a hash, if order matters."Joey Hess
This reverts commit 4cf185e781a5f94373b30ec9a0e10dfb626b6d86. That commit broke t/po.t (probably the test case only is testing too close the the old implementation and needs correcting). Also, we have not decided how to want to represent it yet, so I'm not ready for this change. Conflicts: IkiWiki/Plugin/po.pm doc/plugins/po.mdwn
2010-07-18merge fix for selflink po problemJoey Hess
2010-07-18response on po_slave_languages structureJoey Hess
2010-07-18typoJoey Hess
2010-07-18Merge remote branch 'intrigeri/po'Joey Hess
2010-07-18noticed a bug in the po pluginJoey Hess
(I should probably put this in bugs/, but I am not sure if intregriti watches there..)
2010-07-18(no commit message)crest
2010-07-18remove dup sentenceJoey Hess
2010-07-18merge updated translations from l10nJoey Hess
This includes an (almost) up-to-date French basewiki translation.
2010-07-18Updated French program translation from Philippe Batailler. Closes: #589423Joey Hess
2010-07-18update standards-versionJoey Hess
2010-07-18remove dead caseJoey Hess
2010-07-18Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.infoJoey Hess
2010-07-18fix other 2 cases of conflicting destdir filesJoey Hess
Cleanly fixed case where destdir file failed to be written because there was a directory with the same name. This can be detected with no extra system calls, and dealt with by finding all pages that wrote files inside the directory, and removing them and the directory. The other, inverse case would be expensive to detect in will_render, since it would need to check each parent directory of the file to see if the directory is really a conflicting file. But prep_writefile already does a similar scan for symlinks in the path, so I added code there to remove the conflicting file. This fix assumes that the file is written using writefile, and not some other means (but using other means would be a security hole too, so hopefully nothing does).
2010-07-18another class of conflicts: subdir/file conflictsJoey Hess
2010-07-18check oldrenderedfiles tooJoey Hess
Handles the case where foo.mdwn is moved too foo/index.html
2010-07-182 more casesJoey Hess
2010-07-18avoid error if two source files render the same destination fileJoey Hess
There are two sub-caces. If both source files still exist, the winner that renders the destination file is undefined. If one source file is deleted and the other added, in a refresh, the new file will take over the destination file.