aboutsummaryrefslogtreecommitdiff
path: root/IkiWiki
Commit message (Collapse)AuthorAge
* Merge commit 'schmonz/master'Joey Hess2009-09-10
|\
| * Add NetBSD-style 2-clause BSD license.Amitai Schlair2009-09-10
| |
* | remove hook not used by cvsJoey Hess2009-09-10
| |
* | formattingJoey Hess2009-09-10
| |
* | minor simplificationJoey Hess2009-09-10
| |
* | Merge commit 'schmonz/master' into cvsJoey Hess2009-09-10
|\|
| * Catch up to the new genwrapper hook.Amitai Schlair2009-09-10
| |
| * Merge branch 'master' of git://github.com/joeyh/ikiwikiAmitai Schlair2009-09-10
| |\
* | \ Merge branch 'master' into cvsJoey Hess2009-09-10
|\ \ \
| * | | clean up use of IkiWiki::ReceiveJoey Hess2009-09-10
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | Loading and use of IkiWiki::Receive can all be pushed into the git plugin, rather than scattered around. I had at first wanted to make a receive plugin and move it there, but a plugin was not a good fit; you don't want users to have to manually load it, and making the git plugin load the receive plugin at the right times would need more, and ugly code.
| * | Add genwrapper hook, that can be used to add code into the C wrapper.Joey Hess2009-09-10
| | |
* | | typoJoey Hess2009-09-10
| | |
* | | Merge commit 'schmonz/master' into cvsJoey Hess2009-09-10
|\ \ \ | | |/ | |/|
| * | CVS operations generally need to be within CVS checkouts, so these chdir()Amitai Schlair2009-09-10
| | | | | | | | | | | | | | | | | | calls are warranted. They shouldn't modify the caller's working directory, though. Use File::chdir to keep the scope of the changes subroutine-local. The tests now pass without resetting the working directory.
| * | Abstract out CVS's involvement in the wrapper:Amitai Schlair2009-09-09
| | | | | | | | | | | | | | | | | | | | | | | | | | | * In Wrapper.pm, add a new hook "wrapperargcheck" to examine argc/argv and return success or failure. In the failure case, the wrapper terminates. * In cvs.pm, implement the new hook to return failure if a directory is being cvs added.
| * | Merge branch 'master' of git://github.com/joeyh/ikiwikiAmitai Schlair2009-09-09
| |\|
* | | Merge branch 'master' into cvsJoey Hess2009-09-10
|\ \ \ | | |/ | |/|
| * | underlay: Also allow configuring additional directories to search for ↵Joey Hess2009-09-08
| | | | | | | | | | | | template files in.
| * | Expand banned_users; it can now include PageSpecs, which allows banning by ↵Joey Hess2009-09-08
| | | | | | | | | | | | IP address.
* | | Merge commit 'schmonz/master' into cvsJoey Hess2009-09-04
|\ \ \ | | |/ | |/| | | | | | | Conflicts: IkiWiki/Plugin/cvs.pm
| * | It's STDOUT we have to shut up for cvs, and $savedout has to beAmitai Schlair2009-09-04
| | | | | | | | | | | | restored just so.
| * | Stop using IPC::Cmd and String::ShellQuote, since quoting (andAmitai Schlair2009-09-04
| | | | | | | | | | | | | | | | | | | | | | | | | | | having to quote, and the possible use of the shell) sucks. Stop passing args to cvs_runcvs() as an arrayref, since that also sucks (and was a sop to IPC::Cmd). Instead, use Joey's construction for temporarily redirecting stderr to /dev/null. Much much simpler and better. Works on my laptop with bozohttpd, now to test on the NetBSD wiki.
* | | minor formattingJoey Hess2009-09-02
| | |
* | | remove two plugins that are unrelated to cvsJoey Hess2009-09-02
|/ /
* | whitespaceAmitai Schlair2009-08-30
| |
* | Merge branch 'master' of git://github.com/joeyh/ikiwikiAmitai Schlair2009-08-30
|\|
| * Revert "po: do not inject custom bestlink function when po_link_to eq default"Joey Hess2009-08-30
| | | | | | | | | | | | | | | | | | | | This reverts commit cdc3576c8d1efb2593cac2d9da3f2393a2afe26e. Conflicts: IkiWiki/Plugin/po.pm This change broke the test suite and is not strictly necessary.
* | On some systems the commit message gets quoted properly already. Don'tAmitai Schlair2009-08-30
| | | | | | | | requote in such cases, do quote in all others.
* | Fix uninitialized value when editing a page being vivified from theAmitai Schlair2009-08-30
| | | | | | | | basewiki. Makes the filetype-testing logic more explicit anyway.
* | Merge branch 'master' of git://github.com/joeyh/ikiwikiAmitai Schlair2009-08-30
|\|
| * teximg: Make TeX handle preventing unsafe things; remove insufficient blacklistJosh Triplett2009-08-28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | TeX has configuration options that prevent unsafe things like shell escapes and insecure file reads/writes. Turn all of them on. teximg's regex-based blacklist does not suffice. For instance: [[!teximg code=""" \catcode`\%=0 %input{/etc/passwd} """]] Remove the blacklist, since the TeX configuration options seal off the underlying mechanisms more safely, and the blacklist blocks other TeX commands that can prove useful.
| * img: Don't generate new verison of image if it is scaled to be larger in ↵Joey Hess2009-08-28
| | | | | | | | | | | | | | | | either dimension. Although imagemagick handles even really large sizes sanely, using a page file, doing so would just waste time and disk space, since the browser can be told to resize it larger.
| * Merge commit 'intrigeri/po'Joey Hess2009-08-28
| |\
| | * po: fix link() pagespec when used on translation pagesintrigeri2009-08-28
| | | | | | | | | | | | Signed-off-by: intrigeri <intrigeri@boum.org>
| | * po: better rootpage logic for inline's post formintrigeri2009-08-28
| | | | | | | | | | | | | | | | | | | | | Set rootpage to the non-l10n'd rootpage parameter if it is set, else to the masterpage of the linking page. Signed-off-by: intrigeri <intrigeri@boum.org>
| | * Revert "po: keep masterpage as the rootpage for inline's post form"intrigeri2009-08-28
| | | | | | | | | | | | | | | | | | This reverts commit cf43ae5a1f5460a98cdd7acb36c0691b2eec988f, which actually only works when a rootpage parameter is set. A more complete fix will be written soon.
| | * po: keep masterpage as the rootpage for inline's post formintrigeri2009-08-28
| | | | | | | | | | | | Signed-off-by: intrigeri <intrigeri@boum.org>
| | * inline: moved rootpage logic to a functionintrigeri2009-08-28
| | | | | | | | | | | | | | | | | | | | | The po plugin's injected bestlink must do something special when called by this exact part of inline's code. Signed-off-by: intrigeri <intrigeri@boum.org>
| | * po: favor the type of linking page's masterpage on page creationintrigeri2009-08-28
| | | | | | | | | | | | Signed-off-by: intrigeri <intrigeri@boum.org>
| | * po: fix interdiction to create pages of type pointrigeri2009-08-28
| | | | | | | | | | | | | | | | | | ... which was broken by the new page_types code. Signed-off-by: intrigeri <intrigeri@boum.org>
| * | avoid clobbering origsub if checkconfig runs more than onceJoey Hess2009-08-28
| | | | | | | | | | | | | | | | | | checkconfig can run more than once in a single ikiwiki run if setup is building wrappers. That clobbered the origsub value for bestlink, leading to infinite recursion
| * | <pedant>rename depends_exact to depends_simpleJoey Hess2009-08-28
| | | | | | | | | | | | | | | | | | | | | It's not "exact" since case munging has to be done, and I think "simple" captures the optimisation better.</pedant> With apologies to smcv, who probably has to rebuild his wiki now.
| * | Avoid duplicating debug message for building a page due to a dependencySimon McVittie2009-08-28
| | | | | | | | | | | | As per Joey's review
| * | Force %depends_exact to lower case, fixing incorrect case-sensitivitySimon McVittie2009-08-28
| | |
| * | Fix typo in dependency debug messageSimon McVittie2009-08-28
| | |
| * | Add depends_exact: simplified dependency tracking for dependencies on a ↵Simon McVittie2009-08-28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | single page Let E be the number of dependencies per page of the form "A depends on B and nothing else", let D be the number of other dependencies per page, let P be the total number of pages, and let C be the number of changed pages in a refresh. This patch should speed up a refresh from O(E*C*P + D*C*P) to O(C + E*P + D*C*P), assuming that hash lookups are O(1). In practice, plugins like inline and map produce a lot of these very simple dependencies, and my album plugin's combination of inline with a large number of pages causes it to suffer particularly badly. In testing on a wiki with about 7000 objects (3500 full pages, 3500 images), a full rebuild continued to take about 5:30, and a refresh after touching about 350 pages and 350 images reduced from 5:30 to 1:30. As with my previous optimizations, this change will result in downgrades not working correctly until the wiki is rebuilt.
| * | inline: if using pagenames, don't add a dependency on "page1 or page2 or..."Simon McVittie2009-08-28
| | | | | | | | | | | | | | | | | | This is unnecessary and just slows us down (by a factor of 2, in the pessimal case where every page has an inline with pagenames); it's also not possible to optimize it into add_depends_exact calls.
| * | po: favor the type of linking page's masterpage on page creationintrigeri2009-08-28
| | | | | | | | | | | | Signed-off-by: intrigeri <intrigeri@boum.org>
| * | po: fix interdiction to create pages of type pointrigeri2009-08-28
| |/ | | | | | | | | | | | | ... which was broken by the new page_types code. Signed-off-by: intrigeri <intrigeri@boum.org> (cherry picked from commit 1914ae2fd24e1e8021404eae847d70c710f8542d)
| * htmltidy: Return an error message if tidy fails. Closes: #543722Joey Hess2009-08-27
| | | | | | | | | | On second^Wthird^Wfourth thought, putting the message into the page seems better than using stderr.