summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2009-08-29This is in my git branch now, no need for a copy of the code here.Amitai Schlair
2009-08-29Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.infoJoey Hess
2009-08-29doc/po(test suite failures): follow-upintrigeri
Signed-off-by: intrigeri <intrigeri@boum.org>
2009-08-29mod_auth_openidhttp://schmonz.livejournal.com/
2009-08-29build failure on nearlyfreespeech.netbremner
2009-08-29Answer to Joey, and justify my text (in the source)http://emptty.myopenid.com/
2009-08-28teximg: Make TeX handle preventing unsafe things; remove insufficient blacklistJosh Triplett
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.
2009-08-29note that debian-* branches are subject to being rebasedJoey Hess
2009-08-28img: Don't generate new verison of image if it is scaled to be larger in ↵Joey Hess
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.
2009-08-28mergedJoey Hess
2009-08-28Merge commit 'intrigeri/po'Joey Hess
2009-08-28avoid clobbering origsub if checkconfig runs more than onceJoey Hess
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
2009-08-28po test suite failureJoey Hess
2009-08-28(no commit message)furby
2009-08-28(no commit message)furby
2009-08-28<pedant>rename depends_exact to depends_simpleJoey Hess
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.
2009-08-28changelpgJoey Hess
2009-08-28Merge commit 'smcv/ready/depends-exact'Joey Hess
2009-08-28responseJoey Hess
2009-08-28Merge commit 'smcv/ready/trivia'Joey Hess
2009-08-28Introduce myselfhttp://emptty.myopenid.com/
2009-08-28my first edit to this site, please forgive mistakeshttp://emptty.myopenid.com/
2009-08-28Some crude benchmarking on a larger wikiSimon McVittie
2009-08-28Merge commit 'origin/master'Simon McVittie
2009-08-28Mark as doneSimon McVittie
2009-08-28Updated branch, thanks for the feedbackSimon McVittie
2009-08-28Avoid duplicating debug message for building a page due to a dependencySimon McVittie
As per Joey's review
2009-08-28Force %depends_exact to lower case, fixing incorrect case-sensitivitySimon McVittie
2009-08-28Auto-detect "simple dependencies" instead of requiring callers to use ↵Simon McVittie
add_depends_exact()
2009-08-28doc/po: report problem with link() + propose patchintrigeri
Signed-off-by: intrigeri <intrigeri@boum.org>
2009-08-28po: fix link() pagespec when used on translation pagesintrigeri
Signed-off-by: intrigeri <intrigeri@boum.org>
2009-08-28Fix typo in dependency debug messageSimon McVittie
2009-08-28Add depends_exact: simplified dependency tracking for dependencies on a ↵Simon McVittie
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.
2009-08-28inline: if using pagenames, don't add a dependency on "page1 or page2 or..."Simon McVittie
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.
2009-08-28Fix typo in underlay.setupSimon McVittie
2009-08-28Merge commit 'upstream/master' into prv/pointrigeri
2009-08-28follow-upintrigeri
Signed-off-by: intrigeri <intrigeri@boum.org>
2009-08-28doc/po: bug report + patch proposal wrt. inline's post form's rootpageintrigeri
Signed-off-by: intrigeri <intrigeri@boum.org>
2009-08-28po: better rootpage logic for inline's post formintrigeri
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>
2009-08-28Revert "po: keep masterpage as the rootpage for inline's post form"intrigeri
This reverts commit cf43ae5a1f5460a98cdd7acb36c0691b2eec988f, which actually only works when a rootpage parameter is set. A more complete fix will be written soon.
2009-08-28Merge commit 'upstream/master' into prv/pointrigeri
2009-08-28po: keep masterpage as the rootpage for inline's post formintrigeri
Signed-off-by: intrigeri <intrigeri@boum.org>
2009-08-28inline: moved rootpage logic to a functionintrigeri
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>
2009-08-28Merge commit 'intrigeri/po'Joey Hess
2009-08-28both changes pickedJoey Hess
2009-08-28po: favor the type of linking page's masterpage on page creationintrigeri
Signed-off-by: intrigeri <intrigeri@boum.org>
2009-08-28po: fix interdiction to create pages of type pointrigeri
... which was broken by the new page_types code. Signed-off-by: intrigeri <intrigeri@boum.org> (cherry picked from commit 1914ae2fd24e1e8021404eae847d70c710f8542d)
2009-08-28doc/po: reported bug + patches wrt. created page typeintrigeri
Signed-off-by: intrigeri <intrigeri@boum.org>
2009-08-28po: favor the type of linking page's masterpage on page creationintrigeri
Signed-off-by: intrigeri <intrigeri@boum.org>
2009-08-28po: fix interdiction to create pages of type pointrigeri
... which was broken by the new page_types code. Signed-off-by: intrigeri <intrigeri@boum.org>