aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Merge branch 'master' of git://github.com/joeyh/ikiwikiAmitai Schlair2009-08-30
|\
| * mod_auth_openidhttp://schmonz.livejournal.com/2009-08-29
| |
| * build failure on nearlyfreespeech.netbremner2009-08-29
| |
| * Answer to Joey, and justify my text (in the source)http://emptty.myopenid.com/2009-08-29
| |
| * 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.
| * mergedJoey Hess2009-08-28
| |
| * 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>
| | * Merge commit 'upstream/master' into prv/pointrigeri2009-08-28
| | |\
| | * | 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.
| | * | Merge commit 'upstream/master' into prv/pointrigeri2009-08-28
| | |\ \
| | * | | 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>
| * | | | 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
| * | | | po test suite failureJoey Hess2009-08-28
| | | | |
| * | | | (no commit message)furby2009-08-28
| | | | |
| * | | | (no commit message)furby2009-08-28
| | | | |
| * | | | <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.
| * | | | changelpgJoey Hess2009-08-28
| | | | |
| * | | | Merge commit 'smcv/ready/depends-exact'Joey Hess2009-08-28
| |\ \ \ \
| | * | | | Mark as doneSimon McVittie2009-08-28
| | | | | |
| | * | | | 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
| | | | | |
| | * | | | Auto-detect "simple dependencies" instead of requiring callers to use ↵Simon McVittie2009-08-28
| | | | | | | | | | | | | | | | | | | | | | | | add_depends_exact()
| | * | | | 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.
| * | | | | responseJoey Hess2009-08-28
| | | | | |
| * | | | | Merge commit 'smcv/ready/trivia'Joey Hess2009-08-28
| |\| | | |
| | * | | | Fix typo in underlay.setupSimon McVittie2009-08-28
| | | |_|/ | | |/| |
| * | | | Introduce myselfhttp://emptty.myopenid.com/2009-08-28
| | | | |
| * | | | my first edit to this site, please forgive mistakeshttp://emptty.myopenid.com/2009-08-28
| | | | |
| * | | | Some crude benchmarking on a larger wikiSimon McVittie2009-08-28
| | | | |
| * | | | Merge commit 'origin/master'Simon McVittie2009-08-28
| |\ \ \ \
| | * | | | doc/po: report problem with link() + propose patchintrigeri2009-08-28
| | |/ / / | | | | | | | | | | | | | | | Signed-off-by: intrigeri <intrigeri@boum.org>
| * / / / Updated branch, thanks for the feedbackSimon McVittie2009-08-28
| |/ / /
| * | | follow-upintrigeri2009-08-28
| | | | | | | | | | | | | | | | Signed-off-by: intrigeri <intrigeri@boum.org>
| * | | doc/po: bug report + patch proposal wrt. inline's post form's rootpageintrigeri2009-08-28
| | |/ | |/| | | | | | | Signed-off-by: intrigeri <intrigeri@boum.org>
| * | Merge commit 'intrigeri/po'Joey Hess2009-08-28
| |\|
| | * 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>
| * | both changes pickedJoey Hess2009-08-28
| | |
| * | 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)
| * | doc/po: reported bug + patches wrt. created page typeintrigeri2009-08-28
| | | | | | | | | | | | Signed-off-by: intrigeri <intrigeri@boum.org>
| * | Czech basewiki enabledJoey Hess2009-08-28
| | |
| * | Initial Czech translation of basewiki/Miroslav Kure2009-08-28
| | |
| * | merge updates to danish translation from l10nJoey Hess2009-08-28
| |/