aboutsummaryrefslogtreecommitdiff
path: root/IkiWiki
Commit message (Collapse)AuthorAge
* Merge commit 'remotes/smcv/ready/inline-pagenames' into stagingJoey Hess2009-07-31
|\
| * inline: add pagenames parameterSimon McVittie2009-06-16
| | | | | | | | | | | | | | If given instead of pages, this is interpreted as a space-separated list of links to pages (with the same LinkingRules as in a WikiLink), and they are inlined in exactly the order given. The sort and pages parameters cannot be used in conjunction with this one.
* | Merge commit 'remotes/smcv/ready/harishcm-map-fix' into stagingJoey Hess2009-07-31
|\ \
| * | Fix failure to close <ul> in maps with no itemsharishcm2009-07-25
| | | | | | | | | | | | Signed-off-by: Simon McVittie <smcv@ http://smcv.pseudorandom.co.uk/>
* | | Merge commit 'remotes/smcv/ready/among'Joey Hess2009-07-31
|\ \ \
| * | | pagestats: add `among` parameter, which only counts links from specified pagesSimon McVittie2009-07-17
| | | |
| * | | IkiWiki::Render: split out backlink_pages() function from backlinks()Simon McVittie2009-07-17
| | | | | | | | | | | | | | | | | | | | | | | | This separates style from content - backlinks() performs lossy transformations on the page names to get it in the form that the page template wants.
| * | | pagestats: when making a tag cloud, don't emit links where the tag is unusedSimon McVittie2009-07-17
| | | |
* | | | img: Fix adding of dependency from page to the image.Joey Hess2009-07-27
| |/ / |/| | | | | | | | | | | | | | | | | | | | | | | This was impressively broken. add_depends was being called with params backwards, and on parameter was set to the name of the generated file, which isn't in the source. Now updates to images will update the page that contains them, thus updating them. This is unncessary for fullsize images, so skipped.
* | | revert revertJoey Hess2009-07-23
| | |
* | | improve string to be less confusingJoey Hess2009-07-23
| | |
* | | reverted a few of the string changesJoey Hess2009-07-23
| | | | | | | | | | | | Improved one string.
* | | Merge branch 'master' of git://git.ikiwiki.infoJonas Smedegaard2009-07-23
|\ \ \
| * | | add --previous at bubulle's suggestionJoey Hess2009-07-22
| | | |
* | | | Change rendering→building in translatable strings, to ease translations.Jonas Smedegaard2009-07-23
| | | |
* | | | Rephrase suggestion to not get confused as info on action already done.Jonas Smedegaard2009-07-23
| | | |
* | | | Rephrase 'linked to by' confusing for translators.Jonas Smedegaard2009-07-23
| | | |
* | | | Improve translatable texts to ease translation (e.g. to→into and ↵Jonas Smedegaard2009-07-23
| | | | | | | | | | | | | | | | from→inside)
* | | | Fix typo attepting→attemptingJonas Smedegaard2009-07-23
|/ / /
* | | relocate po directory up a levelJoey Hess2009-07-21
| | |
* | | turn off pot file underlay againJoey Hess2009-07-21
| | |
* | | improve invalid gettext messageJoey Hess2009-07-21
| | | | | | | | | | | | (and gettext it as translators will see this!)
* | | updateJoey Hess2009-07-21
| | |
* | | updateJoey Hess2009-07-21
| | |
* | | po: Add support for mo files in underlaysJoey Hess2009-07-21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In order to support translated basewiki and other underlays, we need support for mo files in underlays. The code did not allow this before, because if a mo file was in an underlay, then it might try to update it, and its pot, and write to the underlay, which is guaranteed to either fail due to permissions, or be undesirable. To fix, my approach is to just detect if a mo or pot file that is about to be updated is in an underlay, and skip updating it. This seems to work well: - If the mo is out of date in the underlay, it won't get updated, but this would probably be due to a problem in the underlay, or more likely, the wiki is being rebuilt and so it *thinks* the mo is out of date, but it's really not (and it would be a waste of time to rebuild it anyway). - If a page from the basewiki is edited, it is saved to the srcdir, which causes generation of an updated mo and pot also in the srcdir; the underlay stops being used for that page, and everything seems to work. Note that I am not including an underlay search directory for pot files. They *seem* to be unnecessary for the underlay, since the mo files in there never need to be updated.
* | | fix exampleJoey Hess2009-07-21
| | |
* | | po: Support running with a non-english master lang; add translated underlaysJoey Hess2009-07-20
| | | | | | | | | | | | | | | It seem to make sense to remove the check for there being slave languages as part of this, since one might want a wiki that is only in non-English.
* | | remove prototype from renamehookJoey Hess2009-07-20
| | | | | | | | | | | | | | | Recursive calls make perl whine about protypes, and it wasn't adding any value.
* | | create translated underlays in mdwn formatJoey Hess2009-07-20
| | | | | | | | | | | | | | | | | | These are for use by wikis where the primary language is not English. On such a wiki, it makes sense to use an underlay has the source for pages in the native language.
* | | split two helper functions of of render()Joey Hess2009-07-20
| | |
* | | s//bad//invalid// # jonas=Joey Hess2009-07-19
| | |
* | | avoid Po4a::Common exporting anythingJoey Hess2009-07-19
| | | | | | | | | | | | | | | It exports gettext and stuff by default, which conflicts with IkiWiki exports.
* | | shut up msgmergeJoey Hess2009-07-19
| | |
* | | bugfix: Avoid generating po files for files that are not httmlizableJoey Hess2009-07-19
| | |
* | | improve error messageJoey Hess2009-07-19
| | |
* | | Merge branch 'master' into poJoey Hess2009-07-19
|\| | | | | | | | | | | | | | Conflicts: debian/changelog
| * | Merge commit 'e12b7f5e54730325c751a889ed2e08580b5ef6ba'Joey Hess2009-07-11
| |\ \
| | * | Move OpenID pretty-printing from openid plugin to coreSimon McVittie2009-07-10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On various sites I have two IkiWiki instances running from the same repository: one accessible via http and only accepting openid logins, and one accessible via authenticated https and only accepting httpauth. The https version should still pretty-print OpenIDs seen in git history, even though it does not itself accept OpenID logins.
| * | | img: Pass the align parameter through to the generated img tag.Joey Hess2009-07-11
| |/ /
| * | svn: Fix rcs_rename to properly scope call to dirname.Joey Hess2009-07-08
| | |
| * | highlight: Fix utf-8 encoding bug. Closes: #535028Joey Hess2009-07-07
| | |
| * | Update IkiWiki::openiduser to work with Net::OpenID 2.xSimon McVittie2009-07-07
| | | | | | | | | | | | | | | | | | | | | openiduser previously used a constructor that no longer works in 2.x. However, all we actually want is the (undocumented) DisplayOfURL function that is invoked by the display method, so try to use that. (cherry picked from commit c3dd0ff5c7c10743107f203a5b456fdcd1b171df)
| * | typoJoey Hess2009-07-01
| | |
| * | img plugin: do not emit a redundant double-quote before alt attributeSimon McVittie2009-06-16
| |/
| * aggregate: Avoid resetting ctime when an item md5 changes.Joey Hess2009-06-12
| | | | | | | | | | | | | | | | | | | | | | Besides being wrong to do, this could lead to the wrong item being expired, as follows: If B is added and at the same time A is changed, then A's ctime may be set to the current time, while B's is set to its creation time. Thus the new item, A, is incorrectly removed as older. (This interacted especially badly with the bug fixed by 90b4d079605b72bb50d1da41402d994960e10937.)
| * aggregate: Fix storing of changed md5.Joey Hess2009-06-12
| | | | | | | | | | | | | | The aggregate state merge code neglected to merge changes to the md5 field of an item. Therefore, if an item's md5 changed after initial aggregation, it would be updated, and rewritten, each time thereafter. This was wasteful and indirectly led to some expire problems.
| * Disable the Preferences link if no plugin with an auth hook is enabled.Joey Hess2009-06-09
| |
| * meta: Add openid delegate parameter to allow delegating only openid or openid2.Joey Hess2009-06-08
| |
* | Merge commit 'upstream/master' into pub/pointrigeri2009-06-06
|\| | | | | | | | | | | | | | | | | Conflicts: debian/changelog debian/control Signed-off-by: intrigeri <intrigeri@boum.org>
| * goto: Support being passed a page title that is not a valid page name, to ↵Joey Hess2009-06-06
| | | | | | | | support several cases including mercurial's long user names on the RecentChanges page, and urls with spaces being handled by the 404 plugin.